Changeset 12759 for issm/trunk-jpl/src/c/modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp

Timestamp:

07/26/12 15:30:40 (13 years ago)

Author:

seroussi

Message:

move ispdd back to prognostic (instead of transient)

File:

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

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

@@ -21 +21 @@
         bool   dakota_analysis;
         bool   issmbgradients;
+        bool   ispdd;
+        bool   isdelta18o;
+        IssmDouble *size, Delta18oTimeSerie,Delta18oSurfaceTimeSerie ;
 
         /*Fetch data needed: */
@@ -27 +30 @@
         iomodel->Constant(&stabilization,PrognosticStabilizationEnum);
         iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum);
+        iomodel->Constant(&ispdd,SurfaceforcingsIspddEnum);
+        iomodel->Constant(&isdelta18o,SurfaceforcingsIsdelta18oEnum);
+        iomodel->Constant(&issmbgradients,SurfaceforcingsIssmbgradientsEnum);
         iomodel->FetchData(1,MeshElementsEnum);
-        iomodel->Constant(&issmbgradients,SurfaceforcingsIssmbgradientsEnum);
 
         /*Update elements: */
@@ -76 +81 @@
                 iomodel->FetchDataToInput(elements,SurfaceforcingsBNegEnum);
         }
-        //else{
-        //      iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
-        //}
+        if(ispdd){
+                iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum);
+                if(isdelta18o){
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsDelta18oEnum);
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsDelta18oSurfaceEnum);
+
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsDelta18oTemperaturesLgmEnum);
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsDelta18oTemperaturesPresentdayEnum);
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationsPresentdayEnum);
+                }
+                else{
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsPrecipitationEnum);
+                        iomodel->FetchDataToInput(elements,SurfaceforcingsMonthlytemperaturesEnum);
+                }
+        }
+        if(~ispdd & ~issmbgradients){
+                iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
+        }
 
         /*Free data: */