Changeset 16309

Timestamp:

10/07/13 14:21:52 (11 years ago)

Author:

seroussi

Message:

BUG: fixed problem with volumeabovefloatation function

Location:

issm/trunk-jpl/src/c/classes/Elements

Files:

• Penta.cpp (modified) (1 diff)
• Tria.cpp (modified) (1 diff)

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

@@ -3712 +3712 @@
 
         /*Return: */
-        return base*(surface - bed + rho_water/rho_ice * bathymetry);
+        return base*(surface - bed + min( rho_water/rho_ice * bathymetry, 0.) );
 }
 /*}}}*/

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

@@ -2565 +2565 @@
         bed_input->GetInputAverage(&bed);
         bathymetry_input->GetInputAverage(&bathymetry);
-
+        
         /*Return: */
-        return base*(surface-bed+rho_water/rho_ice*bathymetry);
+        return base*(surface-bed+min(rho_water/rho_ice*bathymetry,0.));
 }
 /*}}}*/