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

[walter at geodynamics.org]

Author: walter
Date: 2008-12-13 03:57:53 -0800 (Sat, 13 Dec 2008)
New Revision: 13678

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.c
Log:
 r2433 at dante:  boo | 2008-12-13 03:46:17 -0800
 Remove DensityFunction cruft from BuoyancyForceTerm since it now calls HydrostaticTerm



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

Modified: long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.c
===================================================================
--- long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.c	2008-12-13 11:57:50 UTC (rev 13677)
+++ long/3D/Gale/trunk/src/PICellerator/Utils/src/BuoyancyForceTerm.c	2008-12-13 11:57:53 UTC (rev 13678)
@@ -59,45 +59,6 @@
 #include <assert.h>
 #include <string.h>
 
-double DensityFunction(Coord coord)
-{
-  double T_0=273;
-  double A=0.0096667;
-  double B=93.333;
-  double C=1.0e-4;
-  double y_max=100000;
-  double material_boundary=68000;
-
-  double h=y_max-coord[1];
-  double alpha=3.0e-5;
-  double density, T;
-
-  if(h<0)
-    {
-      T=T_0;
-    }
-  else
-    {
-      T=T_0 + A*h + B*(1-exp(-C*h));
-    }
-  if(coord[1]>y_max)
-    {
-      density=0;
-    }
-  else if(coord[1]>material_boundary)
-    {
-      density=2800;
-    }
-  else
-    {
-      density=3300;
-    }
-
-  return density*(1-alpha*T);
-}
-
-
-
 /* Textual name of this class */
 const Type BuoyancyForceTerm_Type = "BuoyancyForceTerm";
 
@@ -454,13 +415,8 @@
     
     if(self->hydrostaticTerm)
       {
-        double density_temp=DensityFunction(coord);
-
         FeMesh_CoordLocalToGlobal(mesh, cell_I, xi, coord);
         background_density=HydrostaticTerm_Density(self->hydrostaticTerm,coord);
-
-        if(fabs(density_temp-background_density)/density_temp>1.0e-12)
-          printf("density %g %g\n",density_temp,background_density);
       }
     
     material =