Changeset 27181

Timestamp:

08/02/22 02:57:33 (3 years ago)

Author:

bdef

Message:

CHG:fix to parameter creation for Hydro

File:

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

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

@@ -271 +271 @@
                         iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.upperwater_melting_rate");
          parameters->AddObject(new DoubleVecParam(BasalforcingsUpperwaterMeltingRateEnum,transparam,N));
-         xDelete<IssmDouble>(transparam);   
+         xDelete<IssmDouble>(transparam);
          iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.upperwater_elevation");
          parameters->AddObject(new DoubleVecParam(BasalforcingsUpperwaterElevationEnum,transparam,N));
-         xDelete<IssmDouble>(transparam); 
+         xDelete<IssmDouble>(transparam);
                         iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.deepwater_elevation");
          parameters->AddObject(new DoubleVecParam(BasalforcingsDeepwaterElevationEnum,transparam,N));
-         xDelete<IssmDouble>(transparam);   
+         xDelete<IssmDouble>(transparam);
                         break;
                 default:
@@ -295 +295 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.time_step",TimesteppingTimeStepEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.interp_forcing",TimesteppingInterpForcingEnum));
+                        parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.average_forcing",TimesteppingAverageForcingEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.cycle_forcing",TimesteppingCycleForcingEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.coupling_time",TimesteppingCouplingTimeEnum));
@@ -305 +306 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.cfl_coefficient",TimesteppingCflCoefficientEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.interp_forcing",TimesteppingInterpForcingEnum));
+                        parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.average_forcing",TimesteppingAverageForcingEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.cycle_forcing",TimesteppingCycleForcingEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.coupling_time",TimesteppingCouplingTimeEnum));
@@ -481 +483 @@
         if(hydrology_model==HydrologydcEnum){
                 IssmDouble sedcomp, sedporo, watcomp, rhofresh, g;
-
-                /*FIXME: this should go to Analysis!!!*/
-                parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.sediment_porosity",HydrologydcSedimentPorosityEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.sediment_thickness",HydrologydcSedimentThicknessEnum));
-                parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.isefficientlayer",HydrologydcIsefficientlayerEnum));
-
                 iomodel->FindConstant(&sedcomp,"md.hydrology.sediment_compressibility");
                 iomodel->FindConstant(&sedporo,"md.hydrology.sediment_porosity");
@@ -500 +496 @@
                 if(isefficientlayer){
                         IssmDouble eplcomp, eplporo;
-                        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_initial_thickness",HydrologydcEplInitialThicknessEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_colapse_thickness",HydrologydcEplColapseThicknessEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_max_thickness",HydrologydcEplMaxThicknessEnum));
-                        parameters->AddObject(iomodel->CopyConstantObject("md.hydrology.epl_conductivity",HydrologydcEplConductivityEnum));
-
                         iomodel->FindConstant(&eplcomp,"md.hydrology.epl_compressibility");
                         iomodel->FindConstant(&eplporo,"md.hydrology.epl_porosity");