Changeset 16813

Timestamp:

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

Author:

Mathieu Morlighem

Message:

BUG: fixed enthalpy

Location:

issm/trunk-jpl/src/c

Files:

• analyses/EnthalpyAnalysis.cpp (modified) (2 diffs)
• classes/Elements/Element.h (modified) (1 diff)
• classes/Elements/Penta.cpp (modified) (1 diff)
• classes/Elements/Penta.h (modified) (1 diff)
• classes/Elements/Seg.h (modified) (1 diff)
• classes/Elements/Tria.h (modified) (1 diff)

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;
 

issm/trunk-jpl/src/c/classes/Elements/Element.h

@@ -61 +61 @@
                 virtual void   NodalFunctionsPressure(IssmDouble* basis,Gauss* gauss)=0;
                 virtual void   NormalBase(IssmDouble* normal,IssmDouble* xyz_list)=0;
+                virtual IssmDouble PureIceEnthalpy(IssmDouble pressure)=0;
                 virtual void   TransformLoadVectorCoord(ElementVector* pe,int transformenum)=0;
                 virtual void   TransformLoadVectorCoord(ElementVector* pe,int* transformenum_list)=0;

issm/trunk-jpl/src/c/classes/Elements/Penta.cpp

@@ -2640 +2640 @@
         /*clean-up*/
         delete gauss;
+}
+/*}}}*/
+/*FUNCTION Penta::PureIceEnthalpy{{{*/
+IssmDouble Penta::PureIceEnthalpy(IssmDouble pressure){
+
+        return this->matpar->PureIceEnthalpy(pressure);
 }
 /*}}}*/

issm/trunk-jpl/src/c/classes/Elements/Penta.h

@@ -109 +109 @@
                 int    NumberofNodesPressure(void);
                 int    VelocityInterpolation();
+                IssmDouble PureIceEnthalpy(IssmDouble pressure);
                 int    PressureInterpolation();
 

issm/trunk-jpl/src/c/classes/Elements/Seg.h

@@ -123 +123 @@
            Element*    SpawnBasalElement(void){_error_("not implemented yet");};
                 IssmDouble  StabilizationParameter(IssmDouble u, IssmDouble v, IssmDouble w, IssmDouble diameter, IssmDouble kappa){_error_("not implemented yet");};
+                IssmDouble  PureIceEnthalpy(IssmDouble pressure){_error_("not implemented yet");};
                 int         PressureInterpolation(void){_error_("not implemented yet");};
                 int         VelocityInterpolation(void){_error_("not implemented yet");};

issm/trunk-jpl/src/c/classes/Elements/Tria.h

@@ -126 +126 @@
                 IssmDouble  TMeltingPoint(IssmDouble pressure);
                 int         VelocityInterpolation();
+                IssmDouble  PureIceEnthalpy(IssmDouble pressure){_error_("not implemented yet");};
                 int         PressureInterpolation();
                 IssmDouble  SurfaceArea(void);