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

[walter at geodynamics.org]

Author: walter
Date: 2008-11-29 22:50:48 -0800 (Sat, 29 Nov 2008)
New Revision: 13425

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.c
Log:
 r2376 at dante:  boo | 2008-11-29 22:49:11 -0800
 Clean up MixedStabiliserTerm



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

Modified: long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.c	2008-11-30 06:50:45 UTC (rev 13424)
+++ long/3D/Gale/trunk/src/Gale/Utils/src/MixedStabiliserTerm.c	2008-11-30 06:50:48 UTC (rev 13425)
@@ -255,65 +255,11 @@
 
       visc=particleExt->effVisc;
       sumVisc += visc*integrationPoint->weight * jacDet;
-
-      printf("v %d %d %g %g %g %g\n",elementIndex,ii,visc,integrationPoint->weight * jacDet,integrationPoint->weight,jacDet);
    }
 
    /* Normalize the viscosity factor by dividing by cell area. */
    viscFac = cellArea / sumVisc;
 
-   printf("viscosity %d %g %g %g\n",elementIndex,viscFac,cellArea,sumVisc);
-
-
-/*    /\* Sum the viscosity over this element. *\/ */
-/*    if( self->materialSwarm ) { */
-/*       MaterialPointsSwarm* materialSwarm; */
-
-/*       /\* With a material swarm we need to get the stored viscosity from */
-/*          a swarm variable. *\/ */
-/*       materialSwarm = self->materialSwarm; */
-/*       cellIndex = CellLayout_MapElementIdToCellId( materialSwarm->cellLayout, elementIndex ); */
-/*       nParticles = materialSwarm->cellParticleCountTbl[cellIndex]; */
-/*       for( ii = 0; ii < nParticles; ii++ ) { */
-/*          /\* Get the stored viscosity value. *\/ */
-/* 	StoreVisc_ParticleExt*            particleExt; */
-/*         MaterialPoint *materialParticle=(MaterialPoint*)Swarm_ParticleAt */
-/*           (materialSwarm,materialSwarm->cellParticleTbl[cellIndex][ii]); */
-/*         particleExt= */
-/*           ExtensionManager_Get( materialSwarm->particleExtensionMgr, */
-/*                                 materialParticle, */
-/*                                 self->storeVisc->particleExtHandle ); */
-/*         visc=particleExt->effVisc; */
-
-/* /\*         /\\* Add value to sum. *\\/ *\/ */
-/* /\*         sumVisc += visc; *\/ */
-
-/*         integrationPoint = */
-/*           (IntegrationPoint*)Swarm_ParticleAt(swarm, materialSwarm->cellParticleTbl[cellIndex][ii]); */
-                                                    
-/*         ElementType_ShapeFunctionsGlobalDerivs(elementType, mesh, elementIndex, */
-/*                                                integrationPoint->xi, */
-/*                                                nDims, &jacDet, GNx ); */
-/*         /\* Add value to sum. *\/ */
-/*         sumVisc += visc*integrationPoint->weight * jacDet; */
-/*         printf("vpart %d %d %g %g %g\n",elementIndex,ii,visc, */
-/*                integrationPoint->weight,jacDet); */
-/*       } */
-
-/*       /\* Divide the number of particles be the summation to get the */
-/*          final factor. *\/ */
-/*       viscFac = cellArea / sumVisc; */
-/* /\*       viscFac = nParticles / sumVisc; *\/ */
-
-/*       printf("viscosity %d %g %g %g\n",elementIndex,viscFac,cellArea,sumVisc); */
-/*    } */
-/*    else { */
-
-/*       /\* Without a material swarm we just use a single viscosity value, */
-/*          so we can just invert it to get the viscosity factor. *\/ */
-/*       viscFac = 1.0 / self->viscosity; */
-/*    } */
-
    /* Adjust the calculated mass matrix by the 'special operator'. */
    for( ii = 0; ii < nElNodes; ii++ ) {
       for( jj = 0; jj < nElNodes; jj++ )