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

[walter at geodynamics.org]

Author: walter
Date: 2008-12-14 11:55:55 -0800 (Sun, 14 Dec 2008)
New Revision: 13683

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/PICellerator/Utils/src/HydrostaticTerm.c
Log:
 r2444 at dante:  boo | 2008-12-14 11:53:51 -0800
 Fix bug in HydrostaticTerm



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

Modified: long/3D/Gale/trunk/src/PICellerator/Utils/src/HydrostaticTerm.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/src/HydrostaticTerm.c	2008-12-13 12:17:37 UTC (rev 13682)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/src/HydrostaticTerm.c	2008-12-14 19:55:55 UTC (rev 13683)
@@ -323,7 +323,7 @@
                                          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)/(C*h))));
+  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)
@@ -332,7 +332,7 @@
   double h=self->height-coord[1];
   double p;
 
-  if(coord[1]>self->height)
+  if(coord[1]>=self->height)
     {
       p=0;
     }