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

Timestamp:

02/26/19 12:51:34 (6 years ago)

Author:

schlegel

Message:

CHG: change results on nodes to be a list of strings instead of a bool

File:

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

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

@@ -21 +21 @@
         int         numoutputs,basalforcing_model,timestepping_type;
         char**      requestedoutputs = NULL;
+        char**      outputonnodes = NULL;
         char*       fieldname = NULL;
         IssmDouble  time;
@@ -54 +55 @@
         parameters->AddObject(iomodel->CopyConstantObject("md.settings.waitonlock",SettingsWaitonlockEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.mesh.numberofvertices",MeshNumberofverticesEnum));
-        parameters->AddObject(iomodel->CopyConstantObject("md.settings.results_on_nodes",SettingsResultsOnNodesEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.settings.io_gather",SettingsIoGatherEnum));
         parameters->AddObject(iomodel->CopyConstantObject("md.settings.solver_residue_threshold",SettingsSolverResidueThresholdEnum));
@@ -261 +261 @@
         /*By default, save all results*/
         parameters->AddObject(new BoolParam(SaveResultsEnum,true));
+
+        /*Should we output results on nodes?*/
+        iomodel->FindConstant(&outputonnodes,&numoutputs,"md.settings.results_on_nodes");
+        parameters->AddObject(new IntParam(SettingsNumResultsOnNodesEnum,numoutputs));
+        if(numoutputs)parameters->AddObject(new StringArrayParam(SettingsResultsOnNodesEnum,outputonnodes,numoutputs));
+        iomodel->DeleteData(&outputonnodes,numoutputs,"md.settings.results_on_nodes");
 
         /*Requested outputs */