Changeset 16599

Timestamp:

11/01/13 09:00:50 (11 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moving analysis specific parameters to their file

Location:

issm/trunk-jpl/src/c

Files:

• analyses/MasstransportAnalysis.cpp (modified) (1 diff)
• analyses/ThermalAnalysis.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (4 diffs)

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

@@ -11 +11 @@
 void MasstransportAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
 
+        int     numoutputs;
+        char**  requestedoutputs = NULL;
+
         parameters->AddObject(iomodel->CopyConstantObject(FlowequationIsFSEnum));
+
+        parameters->AddObject(iomodel->CopyConstantObject(MasstransportIsfreesurfaceEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(MasstransportHydrostaticAdjustmentEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(MasstransportStabilizationEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(MasstransportMinThicknessEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(MasstransportPenaltyFactorEnum));
+
+        iomodel->FetchData(&requestedoutputs,&numoutputs,MasstransportRequestedOutputsEnum);
+        parameters->AddObject(new IntParam(MasstransportNumRequestedOutputsEnum,numoutputs));
+        if(numoutputs)parameters->AddObject(new StringArrayParam(MasstransportRequestedOutputsEnum,requestedoutputs,numoutputs));
+        iomodel->DeleteData(&requestedoutputs,numoutputs,MasstransportRequestedOutputsEnum);
 
 }/*}}}*/

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

@@ -10 +10 @@
 }/*}}}*/
 void ThermalAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
+
+        int     numoutputs;
+        char**  requestedoutputs = NULL;
+
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalMaxiterEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalStabilizationEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyThresholdEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyLockEnum));
+        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 ThermalAnalysis::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(MasstransportIsfreesurfaceEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(MasstransportHydrostaticAdjustmentEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(MasstransportStabilizationEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(MasstransportMinThicknessEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(MasstransportPenaltyFactorEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum));
@@ -63 +58 @@
         parameters->AddObject(iomodel->CopyConstantObject(BalancethicknessStabilizationEnum));
         parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMeltingRateEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(ThermalMaxiterEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(ThermalStabilizationEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyThresholdEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyLockEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsWaitonlockEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MeshNumberofelementsEnum));
@@ -77 +68 @@
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsgroundinglineEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsgiaEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(ThermalIsdynamicbasalspcEnum));
         parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum));
         parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum));
@@ -145 +134 @@
         if(numoutputs)parameters->AddObject(new StringArrayParam(SteadystateRequestedOutputsEnum,requestedoutputs,numoutputs));
         iomodel->DeleteData(&requestedoutputs,numoutputs,SteadystateRequestedOutputsEnum);
-
-        iomodel->FetchData(&requestedoutputs,&numoutputs,MasstransportRequestedOutputsEnum);
-        parameters->AddObject(new IntParam(MasstransportNumRequestedOutputsEnum,numoutputs));
-        if(numoutputs)parameters->AddObject(new StringArrayParam(MasstransportRequestedOutputsEnum,requestedoutputs,numoutputs));
-        iomodel->DeleteData(&requestedoutputs,numoutputs,MasstransportRequestedOutputsEnum);
-
-        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: {{{*/