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

[walter at geodynamics.org]

Author: walter
Date: 2008-12-11 01:15:35 -0800 (Thu, 11 Dec 2008)
New Revision: 13645

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.c
   long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.h
Log:
 r2406 at dante:  boo | 2008-12-11 01:13:41 -0800
 Remove the scale factor stuff from MixedStabiliserTerm



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

Modified: long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.c	2008-12-11 00:19:32 UTC (rev 13644)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.c	2008-12-11 09:15:35 UTC (rev 13645)
@@ -108,8 +108,6 @@
    self->Ni = NULL;
    self->GNx = NULL;
    self->elStiffMat = NULL;
-   self->length=1;
-   self->scale_factor=0;
 }
 
 void _MixedStabiliserTerm_Delete( void* _self ) {
@@ -137,10 +135,6 @@
    self->storeVisc =
      Stg_ComponentFactory_ConstructByKey(cf, self->name, "storeVisc",
                                          StoreVisc, True, data );
-   self->length =
-     Stg_ComponentFactory_GetDouble( cf, self->name, "height", 1.0);
-   self->scale_factor =
-     Stg_ComponentFactory_GetDouble( cf, self->name, "scale_factor", 0.0);
 }
 
 void MixedStabiliserTerm_Build( void* _self, void* data ) {
@@ -273,22 +267,6 @@
       for( jj = 0; jj < nElNodes; jj++ )
         localElStiffMat[ii][jj] -= cellArea/(nElNodes*nElNodes);
 
-   /* Apply a correction factor to account for when the pressure is
-      largely hydrostatic */
-
-   {
-     double *coord, temp_factor;
-     unsigned nInc, *inc;
-     Mesh_GetIncidence(mesh,nDims,elementIndex,MT_VERTEX,&nInc,&inc);
-     coord=Mesh_GetVertex( mesh, inc[0] );
-
-     temp_factor=self->scale_factor/
-       (viscFac*(self->length-coord[1])*self->length);
-     if(temp_factor<1  && temp_factor>0)
-       viscFac*=temp_factor;
-   }
-
-
    /* Apply the viscosity factor and negate the calculated value. */
    for( ii = 0; ii < nElNodes; ii++ ) {
       for( jj = 0; jj < nElNodes; jj++ )

Modified: long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.h
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.h	2008-12-11 00:19:32 UTC (rev 13644)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.h	2008-12-11 09:15:35 UTC (rev 13645)
@@ -48,9 +48,7 @@
    StoreVisc* storeVisc;                 \
    double* Ni;                                  \
    double** GNx;                                \
-   double** elStiffMat; \
-   double scale_factor; \
-   double length;
+   double** elStiffMat;
 
 struct MixedStabiliserTerm { __MixedStabiliserTerm };