Changeset 11815

Timestamp:

03/29/12 14:41:33 (13 years ago)

Author:

seroussi

Message:

reverted last change, bad idea to put thermal steady into steadystate

Location:

issm/trunk-jpl/src

Files:

• c/EnumDefinitions/EnumDefinitions.h (modified) (1 diff)
• c/modules/EnumToStringx/EnumToStringx.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• c/modules/ModelProcessorx/ModelProcessorx.cpp (modified) (3 diffs)
• c/modules/StringToEnumx/StringToEnumx.cpp (modified) (3 diffs)
• c/solutions/steadystate_core.cpp (modified) (4 diffs)
• m/enum/SteadystateIsdiagnosticEnum.m (deleted)
• m/enum/SteadystateIsthermalEnum.m (deleted)
• m/solutions/steadystate_core.m (modified) (2 diffs)

issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h

@@ -172 +172 @@
         TransientIsprognosticEnum,
         TransientIsthermalEnum,
-        SteadystateIsdiagnosticEnum,
-        SteadystateIsthermalEnum,
         TransientNumRequestedOutputsEnum,
         TransientRequestedOutputsEnum,

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

@@ -176 +176 @@
                 case TransientIsprognosticEnum : return "TransientIsprognostic";
                 case TransientIsthermalEnum : return "TransientIsthermal";
-                case SteadystateIsdiagnosticEnum : return "SteadystateIsdiagnostic";
-                case SteadystateIsthermalEnum : return "SteadystateIsthermal";
                 case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs";
                 case TransientRequestedOutputsEnum : return "TransientRequestedOutputs";

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

@@ -81 +81 @@
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsgroundinglineEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(SteadystateIsdiagnosticEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(SteadystateIsthermalEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum));
         parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum));

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

@@ -21 +21 @@
         int   i,analysis_type,dim,verbose;
         bool  isthermal,isprognostic,isdiagnostic,isgroundingline,isenthalpy;
-        bool  steadystateisthermal,steadystateisdiagnostic;
         
         /*output: */
@@ -44 +43 @@
         iomodel->Constant(&isdiagnostic,TransientIsdiagnosticEnum);
         iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum);
-        iomodel->Constant(&steadystateisthermal,SteadystateIsthermalEnum);
-        iomodel->Constant(&steadystateisdiagnostic,SteadystateIsdiagnosticEnum);
         
         SetVerbosityLevel(verbose);
@@ -70 +67 @@
                 if(solution_type==SteadystateSolutionEnum && analysis_type==MeltingAnalysisEnum && isenthalpy==true) continue;
                 if(solution_type==SteadystateSolutionEnum && analysis_type==EnthalpyAnalysisEnum && isenthalpy==false) continue;
-                if(solution_type==SteadystateSolutionEnum && analysis_type==EnthalpyAnalysisEnum && steadystateisthermal==false) continue;
-                if(solution_type==SteadystateSolutionEnum && analysis_type==ThermalAnalysisEnum && steadystateisthermal==false) continue;
-                if(solution_type==SteadystateSolutionEnum && analysis_type==DiagnosticHorizAnalysisEnum && steadystateisdiagnostic==false) continue;
-                if(solution_type==SteadystateSolutionEnum && analysis_type==DiagnosticVertAnalysisEnum && steadystateisdiagnostic==false) continue;
-                if(solution_type==SteadystateSolutionEnum && analysis_type==DiagnosticHutterAnalysisEnum && steadystateisdiagnostic==false) continue;
         
                 _printf_(VerboseMProcessor(),"   creating datasets for analysis %s\n",EnumToStringx(analysis_type));

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

@@ -180 +180 @@
               else if (strcmp(name,"TransientIsprognostic")==0) return TransientIsprognosticEnum;
               else if (strcmp(name,"TransientIsthermal")==0) return TransientIsthermalEnum;
-              else if (strcmp(name,"SteadystateIsdiagnostic")==0) return SteadystateIsdiagnosticEnum;
-              else if (strcmp(name,"SteadystateIsthermal")==0) return SteadystateIsthermalEnum;
               else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum;
               else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum;
@@ -260 +258 @@
               else if (strcmp(name,"Matpar")==0) return MatparEnum;
               else if (strcmp(name,"Node")==0) return NodeEnum;
+              else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
+              else if (strcmp(name,"Param")==0) return ParamEnum;
          else stage=3;
    }
    if(stage==3){
-              if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum;
-              else if (strcmp(name,"Param")==0) return ParamEnum;
-              else if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
+              if (strcmp(name,"PattynIceFront")==0) return PattynIceFrontEnum;
               else if (strcmp(name,"Pengrid")==0) return PengridEnum;
               else if (strcmp(name,"Penpair")==0) return PenpairEnum;
@@ -383 +381 @@
               else if (strcmp(name,"BoolExternalResult")==0) return BoolExternalResultEnum;
               else if (strcmp(name,"DoubleElementResult")==0) return DoubleElementResultEnum;
+              else if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
+              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
          else stage=4;
    }
    if(stage==4){
-              if (strcmp(name,"DoubleExternalResult")==0) return DoubleExternalResultEnum;
-              else if (strcmp(name,"DoubleMatExternalResult")==0) return DoubleMatExternalResultEnum;
-              else if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
+              if (strcmp(name,"DoubleVecExternalResult")==0) return DoubleVecExternalResultEnum;
               else if (strcmp(name,"IntExternalResult")==0) return IntExternalResultEnum;
               else if (strcmp(name,"J")==0) return JEnum;

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

@@ -26 +26 @@
         /*parameters: */
         bool control_analysis,isenthalpy;
-        bool isthermal,isdiagnostic;
         int  dim;
         int  solution_type;
@@ -40 +39 @@
         femmodel->parameters->FindParam(&numoutputs,SteadystateNumRequestedOutputsEnum);
         femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum);
-        femmodel->parameters->FindParam(&isthermal,SteadystateIsthermalEnum);
-        femmodel->parameters->FindParam(&isdiagnostic,SteadystateIsdiagnosticEnum);
         if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,SteadystateRequestedOutputsEnum);
 
@@ -49 +46 @@
         for(;;){
         
+                _printf_(VerboseSolution(),"%s%i\n","   computing temperature and velocity for step: ",step);
                 #ifdef _HAVE_THERMAL_
-                if(isthermal){
-                        _printf_(VerboseSolution(),"%s%i\n","   computing temperature and velocity for step: ",step);
-                        if(isenthalpy==0){
-                                thermal_core(femmodel);
-                        }
-                        else{
-                                enthalpy_core(femmodel);
-                        }
+                if(isenthalpy==0){
+                        thermal_core(femmodel);
+                }
+                else{
+                        enthalpy_core(femmodel);
                 }
                 #else
@@ -63 +58 @@
                 #endif
 
-                if(isdiagnostic){
-                        _printf_(VerboseSolution(),"%s\n","   computing new velocity");
-                        diagnostic_core(femmodel);
-                }
+                _printf_(VerboseSolution(),"%s\n","   computing new velocity");
+                diagnostic_core(femmodel);
 
                 if (step>1){

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

@@ -11 +11 @@
         solution_type=femmodel.parameters.SolutionType;
         isenthalpy=femmodel.parameters.ThermalIsenthalpy;
-        isdiagnostic=femmodel.parameters.SteadystateIsdiagnostic;
-        isthermal=femmodel.parameters.SteadystateIsthermal;
 
         %Initialize counter
@@ -19 +17 @@
         while true,
 
-                if(isthermal),
-                        issmprintf(VerboseSolution,'\n%s%i\n','   computing velocities and temperatures for step: ',step);
-                        if (isenthalpy==0),
-                                femmodel=thermal_core(femmodel); 
-                        else
-                                femmodel=enthalpy_core(femmodel); 
-                        end
+                issmprintf(VerboseSolution,'\n%s%i\n','   computing velocities and temperatures for step: ',step);
+                if (isenthalpy==0),
+                        femmodel=thermal_core(femmodel); 
+                else
+                        femmodel=enthalpy_core(femmodel); 
                 end
 
-                if(isdiagnostic),
-                        issmprintf(VerboseSolution,'\n%s',['   computing new velocity']);
-                        femmodel=diagnostic_core(femmodel); 
-                end
+                issmprintf(VerboseSolution,'\n%s',['   computing new velocity']);
+                femmodel=diagnostic_core(femmodel); 
 
                 if step>1,