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

Timestamp:

11/12/21 06:25:41 (3 years ago)

Author:

vverjans

Message:

CHG: making stochasticforcing.m more generic, extending stochasticforcing capability to DefaultCalving (second attempt)

File:

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

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

@@ -500 +500 @@
 
         bool isstochasticforcing;
-        parameters->FindParam(&isstochasticforcing,StochasticForcingIsStochasticForcingEnum);
-        if(isstochasticforcing){
-                int num_fields;
-                char** fields;
-                parameters->AddObject(iomodel->CopyConstantObject("md.stochasticforcing.num_fields",StochasticForcingNumFieldsEnum));
-                iomodel->FindConstant(&fields,&num_fields,"md.stochasticforcing.fields");
-                if(num_fields<1) _error_("no stochasticforcing fields found");
-                int* stochasticforcing_enums = xNew<int>(num_fields);
-                for(int i=0;i<num_fields;i++){
-                        stochasticforcing_enums[i] = StringToEnumx(fields[i]);
-                        xDelete<char>(fields[i]);
-                }
-                xDelete<char*>(fields);
-                parameters->AddObject(new IntVecParam(StochasticForcingFieldsEnum,stochasticforcing_enums,num_fields));
-                xDelete<int>(stochasticforcing_enums);
-
+   parameters->FindParam(&isstochasticforcing,StochasticForcingIsStochasticForcingEnum);
+   if(isstochasticforcing){
+      int num_fields,stochastic_dim;
+      char** fields;
+      parameters->AddObject(iomodel->CopyConstantObject("md.stochasticforcing.num_fields",StochasticForcingNumFieldsEnum));
+      parameters->AddObject(iomodel->CopyConstantObject("md.stochasticforcing.defaultdimension",StochasticForcingDefaultDimensionEnum));
+      iomodel->FindConstant(&fields,&num_fields,"md.stochasticforcing.fields");
+      if(num_fields<1) _error_("no stochasticforcing fields found");
+      int* stochasticforcing_enums = xNew<int>(num_fields);
+      for(int i=0;i<num_fields;i++){
+         stochasticforcing_enums[i] = StringToEnumx(fields[i]);
+         xDelete<char>(fields[i]);
+      }
+      xDelete<char*>(fields);
+      parameters->AddObject(new IntVecParam(StochasticForcingFieldsEnum,stochasticforcing_enums,num_fields));
+      xDelete<int>(stochasticforcing_enums);
       parameters->AddObject(iomodel->CopyConstantObject("md.stochasticforcing.randomflag",StochasticForcingRandomflagEnum));
-                iomodel->FetchData(&transparam,&M,&N,"md.stochasticforcing.dimensions");
-                parameters->AddObject(new IntVecParam(StochasticForcingDimensionsEnum,transparam,N));
-                xDelete<IssmDouble>(transparam);
-                iomodel->FetchData(&transparam,&M,&N,"md.stochasticforcing.covariance");
-                parameters->AddObject(new DoubleMatParam(StochasticForcingCovarianceEnum,transparam,M,N));
-                xDelete<IssmDouble>(transparam);
-        }
+      iomodel->FetchData(&transparam,&M,&N,"md.stochasticforcing.dimensions");
+      parameters->AddObject(new IntVecParam(StochasticForcingDimensionsEnum,transparam,N));
+      xDelete<IssmDouble>(transparam);
+      iomodel->FetchData(&transparam,&M,&N,"md.stochasticforcing.covariance");
+      parameters->AddObject(new DoubleMatParam(StochasticForcingCovarianceEnum,transparam,M,N));
+      xDelete<IssmDouble>(transparam);
+   }
 
         /*Deal with mass flux segments: {{{*/