Changeset 11590

Timestamp:

03/01/12 14:35:10 (13 years ago)

Author:

seroussi

Message:

added possibility of using enthalpy in steady state solution

Location:

issm/trunk-jpl/src

Files:

• c/solutions/AnalysisConfiguration.cpp (modified) (2 diffs)
• c/solutions/steadystate_core.cpp (modified) (3 diffs)
• m/solutions/AnalysisConfiguration.m (modified) (1 diff)
• m/solutions/steadystate_core.m (modified) (2 diffs)

issm/trunk-jpl/src/c/solutions/AnalysisConfiguration.cpp

@@ -38 +38 @@
 
                 case SteadystateSolutionEnum:
-                        numanalyses=7;
+                        numanalyses=8;
                         analyses=(int*)xmalloc(numanalyses*sizeof(int));
                         analyses[0]=DiagnosticHorizAnalysisEnum;
@@ -45 +45 @@
                         analyses[3]=SurfaceSlopeAnalysisEnum;
                         analyses[4]=BedSlopeAnalysisEnum;
-                        analyses[5]=ThermalAnalysisEnum;
-                        analyses[6]=MeltingAnalysisEnum;
+                        analyses[5]=EnthalpyAnalysisEnum;
+                        analyses[6]=ThermalAnalysisEnum;
+                        analyses[7]=MeltingAnalysisEnum;
                         break;
 

issm/trunk-jpl/src/c/solutions/steadystate_core.cpp

@@ -25 +25 @@
 
         /*parameters: */
-        int dim;
-        int solution_type;
-        int maxiter;
-        bool control_analysis;
+        bool control_analysis,isenthalpy;
+        int  dim;
+        int  solution_type;
+        int  maxiter;
         int  numoutputs         = 0;
         int  *requested_outputs = NULL;
@@ -38 +38 @@
         femmodel->parameters->FindParam(&maxiter,SteadystateMaxiterEnum);
         femmodel->parameters->FindParam(&numoutputs,SteadystateNumRequestedOutputsEnum);
+        femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum);
         if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SteadystateRequestedOutputsEnum);
 
@@ -47 +48 @@
                 _printf_(VerboseSolution(),"%s%i\n","   computing temperature and velocity for step: ",step);
                 #ifdef _HAVE_THERMAL_
-                thermal_core(femmodel);
+                if(isenthalpy==0){
+                        thermal_core(femmodel);
+                }
+                else{
+                        enthalpy_core(femmodel);
+                }
                 #else
                 _error_("ISSM was not compiled with thermal capabilities. Exiting");

issm/trunk-jpl/src/m/solutions/AnalysisConfiguration.m

@@ -14 +14 @@
 
         case SteadystateSolutionEnum,
-                numanalyses=7; 
-                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
+                numanalyses=8; 
+                analyses=[DiagnosticHorizAnalysisEnum;DiagnosticVertAnalysisEnum;DiagnosticHutterAnalysisEnum;SurfaceSlopeAnalysisEnum;BedSlopeAnalysisEnum;EnthalpyAnalysisEnum;ThermalAnalysisEnum;MeltingAnalysisEnum];
 
         case ThermalSolutionEnum,

issm/trunk-jpl/src/m/solutions/steadystate_core.m

@@ -10 +10 @@
         control_analysis=femmodel.parameters.InversionIscontrol;
         solution_type=femmodel.parameters.SolutionType;
+        isenthalpy=femmodel.parameters.ThermalIsenthalpy;
 
         %Initialize counter
@@ -17 +18 @@
 
                 issmprintf(VerboseSolution,'\n%s%i\n','   computing velocities and temperatures for step: ',step);
-                femmodel=thermal_core(femmodel); 
+                if (isenthalpy==0),
+                        femmodel=thermal_core(femmodel); 
+                else
+                        femmodel=enthalpy_core(femmodel); 
+                end
 
                 issmprintf(VerboseSolution,'\n%s',['   computing new velocity']);