Changeset 12759 for issm/trunk-jpl/src/c/solutions/prognostic_core.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/solutions/prognostic_core.cpp (modified) (3 diffs)

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");