Changeset 17887

Timestamp:

04/30/14 08:54:59 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: using extrude rather than AddBasalInput

Location:

issm/trunk-jpl/src/c

Files:

• analyses/DamageEvolutionAnalysis.cpp (modified) (1 diff)
• analyses/HydrologyDCEfficientAnalysis.cpp (modified) (1 diff)
• analyses/HydrologyDCInefficientAnalysis.cpp (modified) (1 diff)
• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• cores/extrudefrombase_core.cpp (modified) (1 diff)
• cores/hydrology_core.cpp (modified) (2 diffs)
• cores/masstransport_core.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp

@@ -420 +420 @@
         }
         else{
-                basalelement->AddBasalInput(DamageDEnum,newdamage,element->GetElementType());
+                basalelement->AddInput(DamageDEnum,newdamage,element->GetElementType());
         }
 

issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp

@@ -348 +348 @@
         }
         /*Add input to the element: */
-        element->AddBasalInput(EplHeadEnum,eplHeads,P1Enum);
+        element->AddInput(EplHeadEnum,eplHeads,P1Enum);
 
         /*Free ressources:*/

issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp

@@ -460 +460 @@
 
         /*Add input to the element: */
-        element->AddBasalInput(SedimentHeadEnum,values,P1Enum);
-        element->AddBasalInput(SedimentHeadResidualEnum,residual,P1Enum);
-        element->AddBasalInput(EffectivePressureEnum,pressure,P1Enum);
+        element->AddInput(SedimentHeadEnum,values,P1Enum);
+        element->AddInput(SedimentHeadResidualEnum,residual,P1Enum);
+        element->AddInput(EffectivePressureEnum,pressure,P1Enum);
 
         /*Free ressources:*/

issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp

@@ -735 +735 @@
 
         /*Add input to the element: */
-        element->AddBasalInput(ThicknessEnum,newthickness,P1Enum);
-        element->AddBasalInput(SurfaceEnum,newsurface,P1Enum);
-        element->AddBasalInput(BaseEnum,newbed,P1Enum);
+        element->AddInput(ThicknessEnum,newthickness,P1Enum);
+        element->AddInput(SurfaceEnum,newsurface,P1Enum);
+        element->AddInput(BaseEnum,newbed,P1Enum);
 
         /*Free ressources:*/

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

@@ -13 +13 @@
 
         /*Intermediaries*/
-        int elementtype;
+        int elementtype,domaintype;
 
         if(VerboseSolution()) _printf0_("extruding solution from base...\n");
 
-         femmodel->parameters->FindParam(&elementtype,MeshElementtypeEnum);
-         if(elementtype==PentaEnum){
-                 int inputenum; femmodel->parameters->FindParam(&inputenum,InputToExtrudeEnum);
-                 InputExtrudex(femmodel,inputenum);
-         }
-         else{
-                 /*Call on core computations: */
-                 femmodel->SetCurrentConfiguration(ExtrudeFromBaseAnalysisEnum);
-                 femmodel->UpdateConstraintsExtrudeFromBasex();
-                 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);
+        }
+        else{
+                /*Call on core computations: */
+                femmodel->SetCurrentConfiguration(ExtrudeFromBaseAnalysisEnum);
+                femmodel->UpdateConstraintsExtrudeFromBasex();
+                solutionsequence_linear(femmodel);
+        }
 }

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

@@ -35 +35 @@
                 
                 /*transfer water column thickness to old water column thickness: */
-                
                 InputDuplicatex(femmodel,WatercolumnEnum,WaterColumnOldEnum);
                 
@@ -61 +60 @@
                 if(VerboseSolution()) _printf0_("   computing water head\n");
                 solutionsequence_hydro_nonlinear(femmodel);
+
                 if(save_results){
                         if(VerboseSolution()) _printf0_("   saving results \n");

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

@@ -48 +48 @@
                 femmodel->SetCurrentConfiguration(FreeSurfaceBaseAnalysisEnum);
                 solutionsequence_linear(femmodel);
-                if(domaintype!=Domain2DhorizontalEnum){
-                        femmodel->parameters->SetParam(BaseEnum,InputToExtrudeEnum);
-                        extrudefrombase_core(femmodel);
-                }
+                femmodel->parameters->SetParam(BaseEnum,InputToExtrudeEnum);
+                extrudefrombase_core(femmodel);
+
                 femmodel->SetCurrentConfiguration(FreeSurfaceTopAnalysisEnum);
                 solutionsequence_linear(femmodel);
-                if(domaintype!=Domain2DhorizontalEnum){
-                        femmodel->parameters->SetParam(SurfaceEnum,InputToExtrudeEnum);
-                        extrudefromtop_core(femmodel);
-                }
+                femmodel->parameters->SetParam(SurfaceEnum,InputToExtrudeEnum);
+                extrudefromtop_core(femmodel);
         }
         else{
                 if(VerboseSolution()) _printf0_("   call computational core\n");
                 solutionsequence_linear(femmodel);
-                if(domaintype==Domain2DverticalEnum){
-                        femmodel->parameters->SetParam(ThicknessEnum,InputToExtrudeEnum);
-                        extrudefrombase_core(femmodel);
-                        femmodel->parameters->SetParam(BaseEnum,InputToExtrudeEnum);
-                        extrudefrombase_core(femmodel);
-                        femmodel->parameters->SetParam(SurfaceEnum,InputToExtrudeEnum);
-                        extrudefrombase_core(femmodel);
-                }
+                femmodel->parameters->SetParam(ThicknessEnum,InputToExtrudeEnum);
+                extrudefrombase_core(femmodel);
+                femmodel->parameters->SetParam(BaseEnum,InputToExtrudeEnum);
+                extrudefrombase_core(femmodel);
+                femmodel->parameters->SetParam(SurfaceEnum,InputToExtrudeEnum);
+                extrudefrombase_core(femmodel);
         }