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

Timestamp:

08/09/13 09:05:02 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: Prognostic is now Masstransport

File:

• issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (3 diffs)

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

@@ -65 +65 @@
         parameters->AddObject(iomodel->CopyConstantObject(TimesteppingTimeStepEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TimesteppingCflCoefficientEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(PrognosticHydrostaticAdjustmentEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(PrognosticStabilizationEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(MasstransportHydrostaticAdjustmentEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(MasstransportStabilizationEnum));
         parameters->AddObject(iomodel->CopyConstantObject(DiagnosticPenaltyFactorEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(PrognosticMinThicknessEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(PrognosticPenaltyFactorEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(MasstransportMinThicknessEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(MasstransportPenaltyFactorEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum));
@@ -93 +93 @@
         parameters->AddObject(iomodel->CopyConstantObject(GroundinglineMigrationEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsdiagnosticEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(TransientIsprognosticEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(TransientIsmasstransportEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsthermalEnum));
         parameters->AddObject(iomodel->CopyConstantObject(TransientIsgroundinglineEnum));
@@ -162 +162 @@
         iomodel->DeleteData(requestedoutputs,SteadystateRequestedOutputsEnum);
 
-        iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,PrognosticRequestedOutputsEnum);
-        parameters->AddObject(new IntParam(PrognosticNumRequestedOutputsEnum,numoutputs));
-        if(numoutputs)parameters->AddObject(new IntVecParam(PrognosticRequestedOutputsEnum,requestedoutputs,numoutputs));
-        iomodel->DeleteData(requestedoutputs,PrognosticRequestedOutputsEnum);
+        iomodel->FetchData(&requestedoutputs,&numoutputs,NULL,MasstransportRequestedOutputsEnum);
+        parameters->AddObject(new IntParam(MasstransportNumRequestedOutputsEnum,numoutputs));
+        if(numoutputs)parameters->AddObject(new IntVecParam(MasstransportRequestedOutputsEnum,requestedoutputs,numoutputs));
+        iomodel->DeleteData(requestedoutputs,MasstransportRequestedOutputsEnum);
 
         /*Deal with mass flux segments: {{{*/