[cig-commits] r14204 - in long/3D/Gale/trunk: . src/PICellerator/Utils/src

[walter at geodynamics.org]

Author: walter
Date: 2009-03-03 11:32:17 -0800 (Tue, 03 Mar 2009)
New Revision: 14204

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/PICellerator/Utils/src/HydrostaticTerm.c
Log:
 r2516 at dante:  boo | 2009-03-03 11:32:08 -0800
 Make HydrostaticTerm handle zero exponential coefficients gracefully



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2513
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:2516

Modified: long/3D/Gale/trunk/src/PICellerator/Utils/src/HydrostaticTerm.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/src/HydrostaticTerm.c	2009-03-03 17:29:02 UTC (rev 14203)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/src/HydrostaticTerm.c	2009-03-03 19:32:17 UTC (rev 14204)
@@ -323,7 +323,10 @@
                                          double T_0, double A,
                                          double B, double C)
 {
-  return density*gravity*h*(1-alpha*(T_0 + A*h/2 + B*(1+(exp(-C*h)-1)/(C*h))));
+  if(C==0)
+    return density*gravity*h*(1-alpha*(T_0 + A*h/2));
+  else
+    return density*gravity*h*(1-alpha*(T_0 + A*h/2 + B*(1+(exp(-C*h)-1)/(C*h))));
 }
 
 double HydrostaticTerm_Pressure( void* forceTerm, Coord coord)