Changeset 11347 for issm/trunk-jpl/src/c/modules

Timestamp:

02/07/12 14:30:43 (13 years ago)

Author:

seroussi

Message:

added possibility to used enthalpy in transient solutions

Location:

issm/trunk-jpl/src/c/modules

Files:

• EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• ModelProcessorx/ModelProcessorx.cpp (modified) (3 diffs)
• StringToEnumx/StringToEnumx.cpp (modified) (1 diff)

issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -165 +165 @@
                 case ThermalSpctemperatureEnum : return "ThermalSpctemperature";
                 case ThermalStabilizationEnum : return "ThermalStabilization";
+                case ThermalIsenthalpyEnum : return "ThermalIsenthalpy";
                 case ThicknessEnum : return "Thickness";
                 case TimesteppingCflCoefficientEnum : return "TimesteppingCflCoefficient";

issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -79 +79 @@
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsthermalEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsgroundinglineEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum));
         parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum));

issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp

@@ -20 +20 @@
 
         int   i,analysis_type,dim,verbose;
-        bool  isthermal,isprognostic,isdiagnostic,isgroundingline;
+        bool  isthermal,isprognostic,isdiagnostic,isgroundingline,isenthalpy;
         
         /*output: */
@@ -39 +39 @@
         iomodel->Constant(&verbose,VerboseEnum);
         iomodel->Constant(&isthermal,TransientIsthermalEnum);
+        iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum);
         iomodel->Constant(&isprognostic,TransientIsprognosticEnum);
         iomodel->Constant(&isdiagnostic,TransientIsdiagnosticEnum);
@@ -52 +53 @@
                 if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && dim==2) continue;
                 if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && dim==2) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==EnthalpyAnalysisEnum && dim==2) continue;
                 if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && isthermal==false) continue;
                 if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && isthermal==false) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==EnthalpyAnalysisEnum && isthermal==false) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==ThermalAnalysisEnum && isenthalpy==true) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==MeltingAnalysisEnum && isenthalpy==true) continue;
+                if(solution_type==TransientSolutionEnum && analysis_type==EnthalpyAnalysisEnum && isenthalpy==false) continue;
                 if(solution_type==TransientSolutionEnum && analysis_type==PrognosticAnalysisEnum && isprognostic==false && isgroundingline==false) continue;
                 if(solution_type==TransientSolutionEnum && analysis_type==DiagnosticHorizAnalysisEnum && isdiagnostic==false) continue;

issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -163 +163 @@
         else if (strcmp(name,"ThermalSpctemperature")==0) return ThermalSpctemperatureEnum;
         else if (strcmp(name,"ThermalStabilization")==0) return ThermalStabilizationEnum;
+        else if (strcmp(name,"ThermalIsenthalpy")==0) return ThermalIsenthalpyEnum;
         else if (strcmp(name,"Thickness")==0) return ThicknessEnum;
         else if (strcmp(name,"TimesteppingCflCoefficient")==0) return TimesteppingCflCoefficientEnum;