Changeset 16604

Timestamp:

11/01/13 15:40:39 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving Enthalpy parameters to EnthalpyAnalysis

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (2 diffs)

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

@@ -10 +10 @@
 }/*}}}*/
 void EnthalpyAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
+
+        int     numoutputs;
+        char**  requestedoutputs = NULL;
+
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalStabilizationEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalIsdynamicbasalspcEnum));
+
+        iomodel->FetchData(&requestedoutputs,&numoutputs,ThermalRequestedOutputsEnum);
+        parameters->AddObject(new IntParam(ThermalNumRequestedOutputsEnum,numoutputs));
+        if(numoutputs)parameters->AddObject(new StringArrayParam(ThermalRequestedOutputsEnum,requestedoutputs,numoutputs));
+        iomodel->DeleteData(&requestedoutputs,numoutputs,ThermalRequestedOutputsEnum);
 }/*}}}*/
 void EnthalpyAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/

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

@@ -51 +51 @@
         parameters->AddObject(iomodel->CopyConstantObject(TimesteppingTimeStepEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TimesteppingCflCoefficientEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum)); 
-        parameters->AddObject(iomodel->CopyConstantObject(ThermalStabilizationEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(ThermalIsdynamicbasalspcEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum));
         parameters->AddObject(iomodel->CopyConstantObject(DebugProfilingEnum));
@@ -138 +134 @@
         iomodel->DeleteData(&requestedoutputs,numoutputs,SteadystateRequestedOutputsEnum);
 
-        iomodel->FetchData(&requestedoutputs,&numoutputs,ThermalRequestedOutputsEnum);           
-        parameters->AddObject(new IntParam(ThermalNumRequestedOutputsEnum,numoutputs));          
-        if(numoutputs)parameters->AddObject(new StringArrayParam(ThermalRequestedOutputsEnum,requestedoutputs,numoutputs));              
-        iomodel->DeleteData(&requestedoutputs,numoutputs,ThermalRequestedOutputsEnum);
         /*Deal with mass flux segments: {{{*/
         iomodel->FetchData(&qmu_mass_flux_present,QmuMassFluxSegmentsPresentEnum);