Changeset 17157

Timestamp:

01/22/14 14:42:57 (11 years ago)

Author:

jbondzio

Message:

CHG: enthalpy melting rates and drainage are now computed in water equivalent

File:

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

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

@@ -869 +869 @@
         IssmDouble latentheat = element->GetMaterialParameter(MaterialsLatentheatEnum);
         IssmDouble rho_ice    = element->GetMaterialParameter(MaterialsRhoIceEnum);
+        IssmDouble rho_water  = element->GetMaterialParameter(MaterialsRhoWaterEnum);
         Input* enthalpy_input         = element->GetInput(EnthalpyEnum);                    _assert_(enthalpy_input);
         Input* geothermalflux_input   = element->GetInput(BasalforcingsGeothermalfluxEnum); _assert_(geothermalflux_input);
@@ -942 +943 @@
                         /* -Mb= Fb-(q-q_geo)/((1-w)*L), cf Aschwanden 2012, eq.66*/
                         heating[is]=(heatflux+basalfriction+geothermalflux);
-                        meltingrate_enthalpy[is]=heating[is]/((1-waterfraction)*latentheat*rho_ice); // m/s water equivalent //????
-                }
-        }
-        /* enthalpy might have been changed, update */
-        //element->AddInput(EnthalpyEnum,enthalpy,P1Enum);
+                        meltingrate_enthalpy[is]=heating[is]/((1-waterfraction)*latentheat*rho_water); // m/s water equivalent
+                }
+        }
 
         /******** DRAINAGE *****************************************/
@@ -987 +986 @@
                         watercolumn[vertexdown]+=meltingrate_enthalpy[is];
                 }       
+                basalmeltingrate[vertexdown]*=rho_water/rho_ice; // convert meltingrate from water to ice equivalent
                 _assert_(watercolumn[vertexdown]>=0.);
         }
@@ -1055 +1055 @@
                 vertexup   = pairindices[is*2+1];
                 height_element=fabs(xyz_list[vertexup*3+2]-xyz_list[vertexdown*3+2]);
-                pdrainrate_element[is]=(deltawaterfractions[vertexdown]+deltawaterfractions[vertexup])/2.*rho_water/rho_ice*height_element;
+                pdrainrate_element[is]=(deltawaterfractions[vertexdown]+deltawaterfractions[vertexup])/2.*height_element; // return water equivalent of drainage
         }