Changeset 16601

Timestamp:

11/01/13 13:16:31 (11 years ago)

Author:

seroussi

Message:

BUG: reverted some changes for fix NR

File:

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

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

@@ -52 +52 @@
         parameters->AddObject(iomodel->CopyConstantObject(TimesteppingCflCoefficientEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalIsenthalpyEnum)); 
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalStabilizationEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(ThermalIsdynamicbasalspcEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum));
         parameters->AddObject(iomodel->CopyConstantObject(DebugProfilingEnum));
@@ -135 +138 @@
         iomodel->DeleteData(&requestedoutputs,numoutputs,SteadystateRequestedOutputsEnum);
 
+        iomodel->FetchData(&requestedoutputs,&numoutputs,ThermalRequestedOutputsEnum);           
+        parameters->AddObject(new IntParam(ThermalNumRequestedOutputsEnum,numoutputs));          
+        if(numoutputs)parameters->AddObject(new StringArrayParam(ThermalRequestedOutputsEnum,requestedoutputs,numoutputs));              
+        iomodel->DeleteData(&requestedoutputs,numoutputs,ThermalRequestedOutputsEnum);
         /*Deal with mass flux segments: {{{*/
         iomodel->FetchData(&qmu_mass_flux_present,QmuMassFluxSegmentsPresentEnum);