[cig-commits] r14172 - long/3D/SNAC/trunk/Snac/plugins/hillSlope

[cstark at geodynamics.org]

Author: cstark
Date: 2009-02-28 16:52:59 -0800 (Sat, 28 Feb 2009)
New Revision: 14172

Modified:
   long/3D/SNAC/trunk/Snac/plugins/hillSlope/CreateWeakPoints.c
   long/3D/SNAC/trunk/Snac/plugins/hillSlope/Track.c
   long/3D/SNAC/trunk/Snac/plugins/hillSlope/make.log
Log:
Minor changes to Track.c and CreateWeakPoints.c to improve handling of elastic equilibration and plastic seeding.


Modified: long/3D/SNAC/trunk/Snac/plugins/hillSlope/CreateWeakPoints.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/hillSlope/CreateWeakPoints.c	2009-02-28 21:23:21 UTC (rev 14171)
+++ long/3D/SNAC/trunk/Snac/plugins/hillSlope/CreateWeakPoints.c	2009-03-01 00:52:59 UTC (rev 14172)
@@ -289,8 +289,8 @@
 	    /*  Force each of 5*2 tetrahedra to have extra plastic strain to impose lower cohesion indirectly */
 	    for( tetra_I = 0; tetra_I < Tetrahedra_Count; tetra_I++ ) {
 		plasticElement->plasticStrain[tetra_I] =  PlasticStrainFromCohesion(material,(double)contextExt->triggerPointCohesion);
+		if(tetra_I==0) Journal_Printf(context->snacInfo, "timeStep=%d ijkt=%d %d %d %d  setting plasticE=%e\n", context->timeStep,ijk[0],ijk[1],ijk[2], tetra_I,  plasticElement->plasticStrain[tetra_I] );
 #ifdef DEBUG
-		if(tetra_I==0) Journal_Printf(context->snacInfo, "timeStep=%d ijkt=%d %d %d %d  plasticE=%e\n", context->timeStep,ijk[0],ijk[1],ijk[2], tetra_I,  plasticElement->plasticStrain[tetra_I] );
 #endif
 	    }
 	}

Modified: long/3D/SNAC/trunk/Snac/plugins/hillSlope/Track.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/hillSlope/Track.c	2009-02-28 21:23:21 UTC (rev 14171)
+++ long/3D/SNAC/trunk/Snac/plugins/hillSlope/Track.c	2009-03-01 00:52:59 UTC (rev 14172)
@@ -44,6 +44,8 @@
 #define FALSE 0
 #endif
 
+//#define DEBUG
+
 void SnacHillSlope_Track( void* _context ) {
 	Snac_Context			*context = (Snac_Context*)_context;
 	SnacHillSlope_Context		*contextExt = ExtensionManager_Get(
@@ -163,7 +165,10 @@
 	 *  Decide whether to stop or to continue simulation
 	 */
 	if(contextExt->startedTrackingFlag && !contextExt->elasticStabilizedFlag){
-
+#ifdef DEBUG
+	    fprintf(stderr,"t=%d:  elasticStabilizedFlag=%d   startedTrackingFlag=%d\n",
+		    context->timeStep, contextExt->elasticStabilizedFlag, contextExt->startedTrackingFlag ); 
+#endif
 	    fallingFlag = CheckFallingFn(max_yVelocity,max_yAcceln,old_max_yVelocity,old_max_yAcceln);
 	    if(CheckStabilizingFn(max_yVelocity/unit_yVelocity, 
 				  max_yAcceln/unit_yAcceln, stopThreshold, fallingFlag)==TRUE
@@ -173,7 +178,7 @@
 		 */
 		contextExt->elasticStabilizedFlag=TRUE;
 		if(contextExt->solveElasticEqmOnlyFlag)
-		    context->maxTimeSteps=context->timeStep+1;
+		    context->maxTimeSteps=context->timeStep+context->dumpEvery;
 
 /* 		Journal_Printf( context->snacInfo,"Stabilizing (falling?=%d) on level %d (%g)\n", */
 /* 				fallingFlag, index_J, trackLevel ); */
@@ -212,9 +217,6 @@
 	old_max_yVelocity = max_yVelocity;
 	old_max_yAcceln = max_yAcceln;
 
-
-#ifdef DEBUG		    
-#endif
 }
 
 

Modified: long/3D/SNAC/trunk/Snac/plugins/hillSlope/make.log
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/hillSlope/make.log	2009-02-28 21:23:21 UTC (rev 14171)
+++ long/3D/SNAC/trunk/Snac/plugins/hillSlope/make.log	2009-03-01 00:52:59 UTC (rev 14172)
@@ -1,3 +1,8 @@
 make[1]: Entering directory `/usr/local/SNAC/Snac/plugins/hillSlope'
-make[1]: Nothing to be done for `all_build'.
+/usr/bin/cc -pipe  -DVERSION=\"14159\" -DCURR_MODULE_NAME=\"SnacHillSlope\" -DPLUGIN_NAME=SnacHillSlope -Wall -g   -fPIC -c -o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/Track.o -I/usr/local/SNAC/build/include   -I/usr/local/SNAC/build/include/StGermain -I/usr/local/SNAC/build/include   -I/usr/local/include   -I/usr/include/libxml2      Track.c
+Track.c: In function `SnacHillSlope_Track':
+Track.c:56: warning: unused variable `geometry'
+Track.c:70: warning: unused variable `startThreshold'
+/usr/bin/cc -pipe  -DVERSION=\"14159\" -DCURR_MODULE_NAME=\"SnacHillSlope\" -DPLUGIN_NAME=SnacHillSlope -Wall -g   -o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/SnacHillSlopemodule.so /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/Register.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/ConstructExtensions.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/Build.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/Context.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/InitialConditions.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/Track.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/CreateWeakPoints.o /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/DeleteExtensions.o  -shared  -L/usr/local/SNAC/build/lib   -L/usr/local/SNAC/build/lib  -lSnac -lStGermain   -L/usr/local/lib -lmpich -lpmpich    -lpthread  -lrt    -lxml2 -lz -lpthread -lm   -lm   -Xlinker -rpath -Xlinker /usr/local/lib         
+/bin/cp -f /usr/local/SNAC/build/tmp/mod-SnacHillSlopemodule.so/SnacHillSlopemodule.so /usr/local/SNAC/build/lib/SnacHillSlopemodule.so
 make[1]: Leaving directory `/usr/local/SNAC/Snac/plugins/hillSlope'