Changeset 18591

Timestamp:

10/08/14 05:05:54 (10 years ago)

Author:

jbondzio

Message:

CHG: move enthalpy core to Enthalpy::Core

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (2 diffs)
• cores/thermal_core.cpp (modified) (1 diff)

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

@@ -4 +4 @@
 #include "../shared/shared.h"
 #include "../modules/modules.h"
+#include "../solutionsequences/solutionsequences.h"
 
 /*Model processing*/
@@ -199 +200 @@
 /*Finite Element Analysis*/
 void EnthalpyAnalysis::Core(FemModel* femmodel){/*{{{*/
-        _error_("not implemented");
+        if(VerboseSolution()) _printf0_("   computing enthalpy\n");
+        femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum);
+        solutionsequence_thermal_nonlinear(femmodel);
+
+        /*transfer enthalpy to enthalpy picard for the next step: */
+        InputDuplicatex(femmodel,EnthalpyEnum,EnthalpyPicardEnum);
+
+        int solution_type;
+        femmodel->parameters->FindParam(&solution_type,SolutionTypeEnum);
+        if(solution_type!=SteadystateSolutionEnum){
+                PostProcessing(femmodel);
+        }
+
 }/*}}}*/
 ElementVector* EnthalpyAnalysis::CreateDVector(Element* element){/*{{{*/

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

@@ -28 +28 @@
 
         if(isenthalpy){
-
-                if(VerboseSolution()) _printf0_("   computing enthalpy\n");
-                femmodel->SetCurrentConfiguration(EnthalpyAnalysisEnum);
-                solutionsequence_thermal_nonlinear(femmodel);
-
-                /*transfer enthalpy to enthalpy picard for the next step: */
-                InputDuplicatex(femmodel,EnthalpyEnum,EnthalpyPicardEnum);
-
-                if(solution_type!=SteadystateSolutionEnum){
-                        /*Post process*/
-                        enthalpy_analysis = new EnthalpyAnalysis();
-                        enthalpy_analysis->PostProcessing(femmodel);
-                        delete enthalpy_analysis;
-                }
+                enthalpy_analysis = new EnthalpyAnalysis();
+                enthalpy_analysis->Core(femmodel);
+                delete enthalpy_analysis;
         }
         else{