Changeset 16813 for issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp

Timestamp:

11/17/13 09:17:18 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fixed enthalpy

File:

• issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (modified) (2 diffs)

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

@@ -293 +293 @@
 ElementVector* EnthalpyAnalysis::CreatePVectorShelf(Element* element){/*{{{*/
 
-        IssmDouble  t_pmp,dt,Jdet,scalar_ocean,pressure;
+        IssmDouble  h_pmp,dt,Jdet,scalar_ocean,pressure;
         IssmDouble *xyz_list_base = NULL;
 
@@ -326 +326 @@
 
                 pressure_input->GetInputValue(&pressure,gauss);
-                t_pmp=element->TMeltingPoint(pressure);
-
-                scalar_ocean=gauss->weight*Jdet*rho_water*mixed_layer_capacity*thermal_exchange_vel*(t_pmp)/(heatcapacity*rho_ice);
+                h_pmp=element->PureIceEnthalpy(pressure);
+
+                scalar_ocean=gauss->weight*Jdet*rho_water*mixed_layer_capacity*thermal_exchange_vel*h_pmp/(heatcapacity*rho_ice);
                 if(reCast<bool,IssmDouble>(dt)) scalar_ocean=dt*scalar_ocean;