Changeset 18826

Timestamp:

11/21/14 15:23:27 (10 years ago)

Author:

hongjuy

Message:

BUG: extrude from base should actually start from base (use -1) for Pentas

File:

• issm/trunk-jpl/src/c/cores/extrudefromtop_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/cores/extrudefromtop_core.cpp

@@ -12 +12 @@
 void extrudefromtop_core(FemModel* femmodel){
 
+        /*Intermediaries*/
+        int elementtype,domaintype;
+
         if(VerboseSolution()) _printf0_("extruding solution from top...\n");
 
-        /*Call on core computations: */
-        femmodel->SetCurrentConfiguration(ExtrudeFromTopAnalysisEnum);
-        femmodel->UpdateConstraintsExtrudeFromTopx();
-        solutionsequence_linear(femmodel);
+        /*Get parameters*/
+        femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
+        femmodel->parameters->FindParam(&elementtype,MeshElementtypeEnum);
 
+        /*If this is a 2D horizontal domain, return (no need to extrude)*/
+        if(domaintype==Domain2DhorizontalEnum) return;
+
+        /*Special method for Penta, otherwise call solution sequence*/
+        if(elementtype==PentaEnum){
+                int inputenum; femmodel->parameters->FindParam(&inputenum,InputToExtrudeEnum);
+                InputExtrudex(femmodel,inputenum,+1);
+        }
+        else{
+                /*Call on core computations: */
+                femmodel->SetCurrentConfiguration(ExtrudeFromTopAnalysisEnum);
+                femmodel->UpdateConstraintsExtrudeFromTopx();
+                solutionsequence_linear(femmodel);
+        }
 }