Changeset 23587 for issm/trunk-jpl/src/c/classes/FemModel.cpp

Timestamp:

01/02/19 20:33:39 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: simplifying some functions now that nodes and loads are for one single analysis

File:

• issm/trunk-jpl/src/c/classes/FemModel.cpp (modified) (13 diffs)

issm/trunk-jpl/src/c/classes/FemModel.cpp

@@ -352 +352 @@
                 analysis_type=output->analysis_type_list[i];
                 output->SetCurrentConfiguration(analysis_type);
-                SpcNodesx(output->nodes_list[i],output->constraints_list[i],output->parameters,analysis_type);
-                NodesDofx(output->nodes_list[i],output->parameters,analysis_type);
+                SpcNodesx(output->nodes_list[i],output->constraints_list[i],output->parameters);
+                NodesDofx(output->nodes_list[i],output->parameters);
                 ConfigureObjectsx(output->elements,output->loads_list[i],output->nodes_list[i],output->vertices,output->materials,output->parameters);
         }
@@ -445 +445 @@
 
                 if(VerboseMProcessor()) _printf0_("      resolving node constraints\n");
-                SpcNodesx(nodes,this->constraints,parameters,analysis_type_list[i]);
+                SpcNodesx(nodes,this->constraints,parameters);
 
                 if(VerboseMProcessor()) _printf0_("      creating nodal degrees of freedom\n");
-                NodesDofx(nodes,parameters,analysis_type_list[i]);
+                NodesDofx(nodes,parameters);
         }
 
@@ -525 +525 @@
                         analysis_type=this->analysis_type_list[i];
                         SetCurrentConfiguration(analysis_type);
-                        SpcNodesx(this->nodes_list[i],this->constraints_list[i],this->parameters,analysis_type);
-                        NodesDofx(this->nodes_list[i],this->parameters,analysis_type);
+                        SpcNodesx(this->nodes_list[i],this->constraints_list[i],this->parameters);
+                        NodesDofx(this->nodes_list[i],this->parameters);
                         ConfigureObjectsx(this->elements,this->loads_list[i],this->nodes_list[i],this->vertices,this->materials,this->parameters);
                 }
@@ -1279 +1279 @@
 void FemModel::GetInputLocalMinMaxOnNodesx(IssmDouble** pmin,IssmDouble** pmax,IssmDouble* ug){/*{{{*/
 
-        /*Get vector sizes for current configuration*/
-        int configuration_type;
-        this->parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-        int numnodes = this->nodes->NumberOfNodes(configuration_type);
-
         /*Initialize output vectors*/
+        int numnodes = this->nodes->NumberOfNodes();
         IssmDouble* uLmin_local = xNew<IssmDouble>(numnodes);
         IssmDouble* uLmax_local = xNew<IssmDouble>(numnodes);
@@ -2543 +2539 @@
 
         /*Second, constraints might be time dependent: */
-        SpcNodesx(nodes,constraints,parameters,config_type);
+        SpcNodesx(nodes,constraints,parameters);
 
         /*Now, update degrees of freedoms: */
-        NodesDofx(nodes,parameters,config_type);
+        NodesDofx(nodes,parameters);
 
 }
@@ -2725 +2721 @@
 
                 ConfigureObjectsx(new_elements,this->loads,new_nodes_list[i],new_vertices,new_materials,this->parameters);
-                SpcNodesx(new_nodes_list[i],new_constraints_list[i],this->parameters,analysis_type);
-                NodesDofx(new_nodes_list[i],this->parameters,analysis_type);
+                SpcNodesx(new_nodes_list[i],new_constraints_list[i],this->parameters);
+                NodesDofx(new_nodes_list[i],this->parameters);
         }
 
@@ -4480 +4476 @@
 void FemModel::HydrologyEPLupdateDomainx(IssmDouble* pEplcount){ /*{{{*/
 
-        Vector<IssmDouble>* mask                                                        = NULL;
-        Vector<IssmDouble>* recurence                           = NULL;
-        Vector<IssmDouble>* active                                              = NULL;
-        IssmDouble*         serial_mask                         = NULL;
-        IssmDouble*         serial_rec                          = NULL;
-        IssmDouble*         serial_active                       = NULL;
-        IssmDouble*         old_active        = NULL;
-        int*                eplzigzag_counter = NULL;
+        Vector<IssmDouble> *mask = NULL;
+        Vector<IssmDouble> *recurence = NULL;
+        Vector<IssmDouble> *active = NULL;
+        IssmDouble         *serial_mask       = NULL;
+        IssmDouble         *serial_rec        = NULL;
+        IssmDouble         *serial_active     = NULL;
+        IssmDouble         *old_active        = NULL;
+        int                *eplzigzag_counter = NULL;
         int                 eplflip_lock;
 
-        HydrologyDCEfficientAnalysis* effanalysis =  new HydrologyDCEfficientAnalysis();
-        HydrologyDCInefficientAnalysis* inefanalysis =  new HydrologyDCInefficientAnalysis();
+        HydrologyDCEfficientAnalysis   *effanalysis  = new HydrologyDCEfficientAnalysis();
+        HydrologyDCInefficientAnalysis *inefanalysis = new HydrologyDCInefficientAnalysis();
 
         /*Step 1: update mask, the mask might be extended by residual and/or using downstream sediment head*/
-        mask=new Vector<IssmDouble>(this->nodes->NumberOfNodes(HydrologyDCEfficientAnalysisEnum));
-        recurence=new Vector<IssmDouble>(this->nodes->NumberOfNodes(HydrologyDCEfficientAnalysisEnum));
+        int numnodes = this->nodes->NumberOfNodes();
+        mask=new Vector<IssmDouble>(numnodes);
+        recurence=new Vector<IssmDouble>(numnodes);
         this->parameters->FindParam(&eplzigzag_counter,NULL,EplZigZagCounterEnum);
         this->parameters->FindParam(&eplflip_lock,HydrologydcEplflipLockEnum);
@@ -4504 +4501 @@
                 effanalysis->HydrologyEPLGetMask(mask,recurence,element);
         }
+
         /*check for changes and increment zigzag counter, change the mask if necessary*/
         recurence->Assemble();
@@ -4530 +4528 @@
         inefanalysis->ElementizeEplMask(this);
         /*Step 2: update node activity. If one element is connected to mask=1, all nodes are active*/
-        active=new Vector<IssmDouble>(nodes->NumberOfNodes(HydrologyDCEfficientAnalysisEnum));
+        active=new Vector<IssmDouble>(nodes->NumberOfNodes());
         for (int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
@@ -4566 +4564 @@
         /*Update dof indexings*/
         this->UpdateConstraintsx();
-
 }
 /*}}}*/
@@ -4583 +4580 @@
         if(isthermal){
                 /*Step 1: update mask, the mask correspond to thawed nodes (that have a meltingrate)*/
-                mask=new Vector<IssmDouble>(this->nodes->NumberOfNodes(HydrologyDCInefficientAnalysisEnum));
+                mask=new Vector<IssmDouble>(this->nodes->NumberOfNodes());
 
                 for (int i=0;i<elements->Size();i++){
@@ -4604 +4601 @@
 
         /*get node mask coherent with element mask*/
-        active=new Vector<IssmDouble>(nodes->NumberOfNodes(HydrologyDCInefficientAnalysisEnum));
+        active=new Vector<IssmDouble>(nodes->NumberOfNodes());
         for (int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));
@@ -4651 +4648 @@
         /*update node activity. If one element is connected to mask=1, all nodes are active*/
         this->SetCurrentConfiguration(HydrologyDCEfficientAnalysisEnum);
-        active=new Vector<IssmDouble>(nodes->NumberOfNodes(HydrologyDCEfficientAnalysisEnum));
+        active=new Vector<IssmDouble>(nodes->NumberOfNodes());
         for (int i=0;i<elements->Size();i++){
                 Element* element=xDynamicCast<Element*>(elements->GetObjectByOffset(i));