Changeset 16470 for issm/trunk-jpl/src/c/analyses/transient_core.cpp

Timestamp:

10/20/13 20:31:07 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: merging thermal_core with enthalpy_core (removing EnthalpySolution), and replacing InputToResult by OutputRequest

File:

• issm/trunk-jpl/src/c/analyses/transient_core.cpp (modified) (4 diffs)

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

@@ -22 +22 @@
         int    i;
         IssmDouble starttime,finaltime,dt,yts;
-        bool   isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isenthalpy,isdelta18o,isgia;
+        bool   isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isdelta18o,isgia;
         bool   save_results,dakota_analysis;
         bool   time_adapt=false;
@@ -49 +49 @@
         femmodel->parameters->FindParam(&isgia,TransientIsgiaEnum);
         femmodel->parameters->FindParam(&isgroundingline,TransientIsgroundinglineEnum);
-        femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum);
         femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum);
         if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum);
@@ -116 +115 @@
                         if(VerboseSolution()) _printf0_("   computing temperatures\n");
                         #ifdef _HAVE_THERMAL_
-                        if(isenthalpy==0){
-                                thermal_core(femmodel);
-                        }
-                        else{
-                                enthalpy_core(femmodel);
-                                PostprocessingEnthalpyx(femmodel);
-                        }
+                        thermal_core(femmodel);
                         #else
                         _error_("ISSM was not compiled with thermal capabilities. Exiting");
@@ -152 +145 @@
                         #endif
                         if(save_results){
-                                InputToResultx(femmodel,SurfaceEnum);
-                                InputToResultx(femmodel,BedEnum);
-                                InputToResultx(femmodel,MaskGroundediceLevelsetEnum);
+                                const char* outputs [] = {"Surface","Bed","MaskGroundediceLevelset"};
+                                femmodel->RequestedOutputsx(&femmodel->results,(char**)&outputs[0],3);
                         }
                 }