Changeset 12884 for issm/trunk-jpl/src/c/solutions/transient_core.cpp

Timestamp:

08/03/12 09:59:41 (13 years ago)

Author:

lemorzad

Message:

add temperature and precipitation calculated with isdelta18o in matlab outputs

File:

• issm/trunk-jpl/src/c/solutions/transient_core.cpp (modified) (3 diffs)

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

@@ -24 +24 @@
         /*parameters: */
         IssmDouble starttime,finaltime,dt,yts;
-        bool   isdiagnostic,isprognostic,isthermal,isgroundingline,isenthalpy;
+        bool   isdiagnostic,isprognostic,isthermal,isgroundingline,isenthalpy,isdelta18o;
         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(&isdelta18o,SurfaceforcingsIsdelta18oEnum);
 
         /*initialize: */
@@ -141 +142 @@
                         RequestedOutputsx(femmodel->results,femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,requested_outputs,numoutputs);
 
+                        if(isdelta18o){
+                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsMonthlytemperaturesEnum);
+                                InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsPrecipitationEnum);
+                        }
+
                         if(VerboseSolution()) _pprintLine_("   saving temporary results");
                         OutputResultsx(femmodel->elements, femmodel->nodes, femmodel->vertices, femmodel->loads, femmodel->materials, femmodel->parameters,femmodel->results);