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

Timestamp:

04/16/21 10:47:27 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG: preparing for cycling forcing

File:

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

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

@@ -30 +30 @@
         bool         autodiff_mass_flux_present = false;
         bool         mass_flux_present          = false;
-        bool         interp;
+        bool         interp,cycle;
         IssmDouble **array                      = NULL;
         int         *mdims_array                = NULL;
@@ -160 +160 @@
                 case LinearFloatingMeltRateEnum:
                         iomodel->FindConstant(&interp,"md.timestepping.interp_forcings");
+                        iomodel->FindConstant(&cycle,"md.timestepping.cycle_forcing");
                         iomodel->FetchData(&transparam,&N,&M,"md.basalforcings.deepwater_melting_rate");
                         if(N==1){
@@ -167 +168 @@
                         else{
                                 _assert_(N==2);
-                                parameters->AddObject(new TransientParam(BasalforcingsDeepwaterMeltingRateEnum,&transparam[0],&transparam[M],interp,M));
+                                parameters->AddObject(new TransientParam(BasalforcingsDeepwaterMeltingRateEnum,&transparam[0],&transparam[M],interp,cycle,M));
                         }
                         xDelete<IssmDouble>(transparam);
@@ -177 +178 @@
                         else{
                                 _assert_(N==2);
-                                parameters->AddObject(new TransientParam(BasalforcingsUpperwaterMeltingRateEnum,&transparam[0],&transparam[M],interp,M));
+                                parameters->AddObject(new TransientParam(BasalforcingsUpperwaterMeltingRateEnum,&transparam[0],&transparam[M],interp,cycle,M));
                         }
                         xDelete<IssmDouble>(transparam);
@@ -187 +188 @@
                         else{
                                 _assert_(N==2);
-                                parameters->AddObject(new TransientParam(BasalforcingsDeepwaterElevationEnum,&transparam[0],&transparam[M],interp,M));
+                                parameters->AddObject(new TransientParam(BasalforcingsDeepwaterElevationEnum,&transparam[0],&transparam[M],interp,cycle,M));
                         }
                         xDelete<IssmDouble>(transparam);
@@ -197 +198 @@
                         else{
                                 _assert_(N==2);
-                                parameters->AddObject(new TransientParam(BasalforcingsUpperwaterElevationEnum,&transparam[0],&transparam[M],interp,M));
+                                parameters->AddObject(new TransientParam(BasalforcingsUpperwaterElevationEnum,&transparam[0],&transparam[M],interp,cycle,M));
                         }
                         xDelete<IssmDouble>(transparam);
@@ -224 +225 @@
                 case BasalforcingsPicoEnum:
                         iomodel->FindConstant(&interp,"md.timestepping.interp_forcings");
+                        iomodel->FindConstant(&cycle,"md.timestepping.cycle_forcing");
                         parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.num_basins",BasalforcingsPicoNumBasinsEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.basalforcings.maxboxcount",BasalforcingsPicoMaxboxcountEnum));
@@ -230 +232 @@
                         iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.farocean_temperature");
                         _assert_(M>=1 && N>=1);
-                        parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceantemperatureEnum,transparam,&transparam[N*(M-1)],interp,N,M));
+                        parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceantemperatureEnum,transparam,&transparam[N*(M-1)],interp,cycle,N,M));
                         xDelete<IssmDouble>(transparam);
                         iomodel->FetchData(&transparam,&M,&N,"md.basalforcings.farocean_salinity");
                         _assert_(M>=1 && N>=1);
-                        parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceansalinityEnum,transparam,&transparam[N*(M-1)],interp,N,M));
+                        parameters->AddObject(new TransientArrayParam(BasalforcingsPicoFarOceansalinityEnum,transparam,&transparam[N*(M-1)],interp,cycle,N,M));
                         xDelete<IssmDouble>(transparam);
                         break;
@@ -266 +268 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.time_step",TimesteppingTimeStepEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.interp_forcings",TimesteppingInterpForcingsEnum));
+                        parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.cycle_forcing",TimesteppingCycleForcingEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.coupling_time",TimesteppingCouplingTimeEnum));
                         break;
@@ -275 +278 @@
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.cfl_coefficient",TimesteppingCflCoefficientEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.interp_forcings",TimesteppingInterpForcingsEnum));
+                        parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.cycle_forcing",TimesteppingCycleForcingEnum));
                         parameters->AddObject(iomodel->CopyConstantObject("md.timestepping.coupling_time",TimesteppingCouplingTimeEnum));
                         break;