Changeset 10653

Timestamp:

11/15/11 11:52:10 (13 years ago)

Author:

schlegel

Message:

Save Qmu parameters for transient run

Location:

issm/trunk/src/c/modules/ModelProcessorx

Files:

• Dakota/CreateParametersDakota.cpp (modified) (1 diff)
• Prognostic/UpdateElementsPrognostic.cpp (modified) (3 diffs)
• Thermal/UpdateElementsThermal.cpp (modified) (1 diff)

issm/trunk/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp

@@ -126 +126 @@
                                 /*Recover data: */
                                 iomodel->FetchData(&dakota_parameter,&nrows,&ncols,StringToEnumx(tag));
-
-                                /*Convert units: */
-                                UnitConversion(dakota_parameter,nrows*ncols,ExtToIuEnum,StringToEnumx(tag));
 
                                 /*Add to parameters: */

issm/trunk/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

@@ -19 +19 @@
         int    numberofelements;
         int    stabilization;
+   bool   dakota_analysis;
 
         /*Fetch data needed: */
@@ -24 +25 @@
         iomodel->Constant(&numberofelements,MeshNumberofelementsEnum);
         iomodel->Constant(&stabilization,PrognosticStabilizationEnum);
+        iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum);
         iomodel->FetchData(1,MeshElementsEnum);
 
@@ -52 +54 @@
                 iomodel->FetchDataToInput(elements,PrognosticSpcthicknessEnum); //for DG, we need the spc in the element
         }
-        
+
+        if(dakota_analysis){
+                elements->InputDuplicate(BedEnum,QmuBedEnum);
+                elements->InputDuplicate(ThicknessEnum,QmuThicknessEnum);
+                elements->InputDuplicate(SurfaceEnum,QmuSurfaceEnum);
+        }
+
         if (dim==3){
                 iomodel->FetchDataToInput(elements,MeshElementonbedEnum);

issm/trunk/src/c/modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp

@@ -61 +61 @@
         iomodel->FetchDataToInput(elements,VzEnum);
         
-        if(dakota_analysis)elements->InputDuplicate(TemperatureEnum,QmuTemperatureEnum);
-
+        if(dakota_analysis){
+                elements->InputDuplicate(TemperatureEnum,QmuTemperatureEnum);
+                elements->InputDuplicate(BasalforcingsMeltingRateEnum,QmuMeltingEnum);
+        }
         /*Free data: */
         iomodel->DeleteData(1,MeshElementsEnum);