Changeset 23487

Timestamp:

11/29/18 15:58:48 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing AMR tests

File:

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

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

@@ -589 +589 @@
 
         /*If we already have the right analysis, return*/
-        if(this->analysis_counter==index) return;
+        //if(this->analysis_counter==index) return;
         this->analysis_counter=index;
 
@@ -2521 +2521 @@
 
         int index=AnalysisIndex(config_type);
+        _assert_(this->analysis_type_list[index]==config_type); 
 
         /*start module: */
@@ -2635 +2636 @@
         int nodecounter         =0;
         int constraintcounter=0;
+        this->analysis_counter=-1;
         for(int i=0;i<this->nummodels;i++){//create nodes for each analysis in analysis_type_list
 
@@ -2646 +2648 @@
                 this->CreateNodes(newnumberofvertices,my_vertices,nodecounter,analysis_enum,new_nodes);
                 this->CreateConstraints(new_vertices,nodecounter,constraintcounter,analysis_enum,new_constraints_list[i]);
-                //this->UpdateElements(newnumberofelements,newelementslist,my_elements,nodecounter,i,new_elements);
+                this->UpdateElements(newnumberofelements,newelementslist,my_elements,nodecounter,i,new_elements);
 
                 if(new_nodes->Size()) nodecounter=new_nodes->MaximumId();