Changeset 24531

Timestamp:

01/27/20 13:30:55 (6 years ago)

Author:

Mathieu Morlighem

Message:

CHG: moved dsl param to analysis

Location:

issm/trunk-jpl/src/c

Files:

• analyses/SealevelriseAnalysis.cpp (modified) (1 diff)
• modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)

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

@@ -312 +312 @@
 
         /*some constant parameters: */
+        parameters->AddObject(iomodel->CopyConstantObject("md.dsl.model",DslModelEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.slr.geodetic_run_frequency",SealevelriseGeodeticRunFrequencyEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.slr.reltol",SealevelriseReltolEnum));

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

@@ -62 +62 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.inversion.type",InversionTypeEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.calving.law",CalvingLawEnum));
-        parameters->AddObject(iomodel->CopyConstantObject("md.dsl.model",DslModelEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.frontalforcings.parameterization",FrontalForcingsParamEnum));
         parameters->AddObject(new IntParam(SealevelriseRunCountEnum,1));