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

Timestamp:

02/13/12 15:50:19 (13 years ago)

Author:

cborstad

Message:

merged src changes 11330:11410 from trunk-jpl

File:

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

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

@@ -24 +24 @@
         /*parameters: */
         double finaltime,dt,yts;
-        bool   control_analysis,isdiagnostic,isprognostic,isthermal,isgroundingline;
+        bool   control_analysis,isdiagnostic,isprognostic,isthermal,isgroundingline,isenthalpy;
         bool   dakota_analysis=false;
         bool   time_adapt=false;
@@ -51 +51 @@
         femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum);
         femmodel->parameters->FindParam(&isgroundingline,TransientIsgroundinglineEnum);
+        femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum);
         if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum);
         femmodel->parameters->FindParam(&numoutputs,TransientNumRequestedOutputsEnum);
@@ -91 +92 @@
                         _printf_(VerboseSolution(),"   computing temperatures:\n");
                         #ifdef _HAVE_THERMAL_
-                        thermal_core_step(femmodel,step,time);
+                        if(isenthalpy==0){
+                                thermal_core_step(femmodel,step,time);
+                        }
+                        else{
+                                enthalpy_core_step(femmodel,step,time);
+                        }
                         #else
                         _error_("ISSM was not compiled with thermal capabilities. Exiting");
@@ -135 +141 @@
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BedEnum,step,time);
                         if(dim==3 && isthermal) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,TemperatureEnum,step,time);
-                        InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum,step,time);
+                        if(isenthalpy) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,WaterfractionEnum,step,time);
+                        if(isenthalpy) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,EnthalpyEnum,step,time);
+                        if(!isenthalpy) InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,BasalforcingsMeltingRateEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,SurfaceforcingsMassBalanceEnum,step,time);
                         InputToResultx(femmodel->elements,femmodel->nodes,femmodel->vertices,femmodel->loads,femmodel->materials,femmodel->parameters,MaskElementonfloatingiceEnum,step,time);