Changeset 12759

Timestamp:

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

Author:

seroussi

Message:

move ispdd back to prognostic (instead of transient)

Location:

issm/trunk-jpl/src/c

Files:

• modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp (modified) (3 diffs)
• modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp (modified) (1 diff)
• solutions/prognostic_core.cpp (modified) (3 diffs)
• solutions/transient_core.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: */

issm/trunk-jpl/src/c/modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp

@@ -15 +15 @@
 
 void    UpdateElementsTransient(Elements* elements, Parameters* parameters,IoModel* iomodel,int analysis_counter,int analysis_type){
-
-        bool   ispdd;
-        bool   isdelta18o;
-        IssmDouble *size, Delta18oTimeSerie,Delta18oSurfaceTimeSerie ;
-
-        /*Fetch data needed: */
-        iomodel->Constant(&ispdd,SurfaceforcingsIspddEnum);
-        iomodel->Constant(&isdelta18o,SurfaceforcingsIsdelta18oEnum);
-        iomodel->FetchData(1,MeshElementsEnum);
-
-        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);
-                }
-        }
-        else{
-                iomodel->FetchDataToInput(elements,SurfaceforcingsMassBalanceEnum);
-        }
-
-        /*Free data: */
-        iomodel->DeleteData(1,MeshElementsEnum);
 }

issm/trunk-jpl/src/c/solutions/prognostic_core.cpp

@@ -16 +16 @@
         /*parameters: */
         bool save_results;
-        bool issmbgradients;
+        bool issmbgradients,ispdd,isdelta18o;
 
         /*activate formulation: */
@@ -24 +24 @@
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
         femmodel->parameters->FindParam(&issmbgradients,SurfaceforcingsIssmbgradientsEnum);
-
+        femmodel->parameters->FindParam(&ispdd,SurfaceforcingsIspddEnum);
+        femmodel->parameters->FindParam(&isdelta18o,SurfaceforcingsIsdelta18oEnum);
 
         if(issmbgradients){
@@ -30 +31 @@
           SmbGradientsx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
         }
+        if(ispdd){
+                if(isdelta18o){
+                        if(VerboseSolution()) _pprintLine_("   call Delta18oParametrization module");
+                        Delta18oParameterizationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+                } 
+                if(VerboseSolution()) _pprintLine_("   call positive degree day module");
+                PositiveDegreeDayx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
+        }
+
 
         if(VerboseSolution()) _pprintLine_("   call computational core");

issm/trunk-jpl/src/c/solutions/transient_core.cpp

@@ -24 +24 @@
         /*parameters: */
         IssmDouble starttime,finaltime,dt,yts;
-        bool   isdiagnostic,isprognostic,isthermal,isgroundingline,isenthalpy,ispdd,isdelta18o;
+        bool   isdiagnostic,isprognostic,isthermal,isgroundingline,isenthalpy;
         bool   save_results,dakota_analysis;
         bool   time_adapt=false;
@@ -53 +53 @@
         femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum);
         if(numoutputs) femmodel->parameters->FindParam(&requested_outputs,&numoutputs,TransientRequestedOutputsEnum);
-        femmodel->parameters->FindParam(&ispdd,SurfaceforcingsIspddEnum);
-        femmodel->parameters->FindParam(&isdelta18o,SurfaceforcingsIsdelta18oEnum);
 
         /*initialize: */
@@ -109 +107 @@
                 }
                 
-                if(ispdd){
-                        if(isdelta18o){
-                                if(VerboseSolution()) _pprintLine_("   call Delta18oParametrization module");
-                                Delta18oParameterizationx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                        } 
-                        if(VerboseSolution()) _pprintLine_("   call positive degree day module");
-                        PositiveDegreeDayx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters);
-                }
-
                 if(isdiagnostic){
                         if(VerboseSolution()) _pprintLine_("   computing new velocity");