[cig-commits] r5022 - in long/3D/Gale/trunk/src/StGermain: . Base/Context/src

[walter at geodynamics.org]

Author: walter
Date: 2006-10-14 11:31:07 -0700 (Sat, 14 Oct 2006)
New Revision: 5022

Modified:
   long/3D/Gale/trunk/src/StGermain/
   long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
   long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.h
Log:
 r3049 at earth:  boo | 2006-10-14 11:08:05 -0700
  r3037 at earth (orig r3857):  LukeHodkinson | 2006-10-14 11:06:05 -0700
  Adding a dictionary options to allow the dt that
  is automatically calculated to be multiplied by a factor.
  
 



Property changes on: long/3D/Gale/trunk/src/StGermain
___________________________________________________________________
Name: svk:merge
   - 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3048
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3856
   + 1ef209d2-b310-0410-a72d-e20c9eb0015c:/cig:3049
afb6c753-b9d0-0310-b4e7-dbd8d91cdd35:/trunk/StGermain:3857

Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c	2006-10-14 18:31:03 UTC (rev 5021)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.c	2006-10-14 18:31:07 UTC (rev 5022)
@@ -381,6 +381,9 @@
 		"InitialiseAllLiveComponents", 
 		AbstractContext_InitialiseAllLiveComponents, 
 		AbstractContext_Type );
+
+	/* Check if we have been provided a constant to multiply our calculated dt values by. */
+	self->dtFactor = Dictionary_GetDouble_WithDefault( self->dictionary, "timestepFactor", 1.0 );
 }
 
 void _AbstractContext_Delete( void* abstractContext ) {
@@ -881,7 +884,7 @@
 			dt = dtLoadedFromFile;
 		}	
 		else {
-			dt = AbstractContext_Dt( self );
+			dt = self->dtFactor * AbstractContext_Dt( self );
 		}
 
 		AbstractContext_Step( self, dt );

Modified: long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.h
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.h	2006-10-14 18:31:03 UTC (rev 5021)
+++ long/3D/Gale/trunk/src/StGermain/Base/Context/src/AbstractContext.h	2006-10-14 18:31:07 UTC (rev 5022)
@@ -97,6 +97,7 @@
 		double					stopTime; \
 		double					currentTime; \
 		unsigned int				timeStep; \
+		double					dtFactor; \
 		/** This additional timestep is necessary for checkpoint restart runs, so it can be compared against
 			maxTimeSteps (which is now relative to job restart).*/ \
 		unsigned int				timeStepSinceJobRestart; \