[cig-commits] r4164 - in long/3D/Gale/trunk/src/StgFEM: . SLE/SystemSetup/src

[walter at geodynamics.org]

Author: walter
Date: 2006-08-01 01:54:55 -0700 (Tue, 01 Aug 2006)
New Revision: 4164

Modified:
   long/3D/Gale/trunk/src/StgFEM/
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.c
   long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.h
Log:
 r728 at earth:  boo | 2006-08-01 01:52:57 -0700
  r718 at earth (orig r622):  PatrickSunter | 2006-07-26 17:56:08 -0700
  Moved the "FiniteElementContext_Step" entry point hook from the
  end of the "Context_Step" EP, to the end of the "Context_Solve"
  EP, and renamed it "FiniteElementContext_PostSolve".
  
  This is quite a significant change, as the main purpose of that
  function is to calculate and set the new DT based on the velocity
  & temperature solution just calculated.
  
  Its old position at the end of "Step" was problematic in that the
  dt based on the new velocity solution would _not_ be used for
  advecting particles until the next step - hence we were effectively
  using a dt of 1 timestep ago. This was causing problems for models
  where the dt was increasing, and velocities were high near the edge
  of the box.
  
  This will cause results to change - especially the gLucifer result
  after the first timestep will show advection, rather than only show
  a solution but no advection. I will comment more on this in a 
  separate email.
  
 



Property changes on: long/3D/Gale/trunk/src/StgFEM
___________________________________________________________________
Name: svk:merge
   - 38867592-cf10-0410-9e16-a142ea72ac34:/cig:727
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:621
   + 38867592-cf10-0410-9e16-a142ea72ac34:/cig:728
db209038-57f2-0310-97fa-b160e0ae9d04:/trunk:622

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.c
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.c	2006-08-01 08:54:51 UTC (rev 4163)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.c	2006-08-01 08:54:55 UTC (rev 4164)
@@ -224,9 +224,9 @@
 		_FiniteElementContext_Solve, 
 		FiniteElementContext_Type );
 	EntryPoint_Append( 
-		Context_GetEntryPoint( self, AbstractContext_EP_Step ),
-		"default", 
-		_FiniteElementContext_Step, 
+		Context_GetEntryPoint( self, AbstractContext_EP_Solve ),
+		"postSolve", 
+		_FiniteElementContext_PostSolve, 
 		FiniteElementContext_Type );
 	EntryPoint_Append( 
 		Context_GetEntryPoint( self, AbstractContext_EP_Dt ),
@@ -374,7 +374,7 @@
 	Stream_UnIndentBranch( StG_FEM_Debug );
 }
 
-void _FiniteElementContext_Step( void* context ) {
+void _FiniteElementContext_PostSolve( void* context ) {
 	FiniteElementContext* self = (FiniteElementContext*)context;
 
 	Journal_DPrintf( self->debug, "In: %s()\n", __func__ );

Modified: long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.h
===================================================================
--- long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.h	2006-08-01 08:54:51 UTC (rev 4163)
+++ long/3D/Gale/trunk/src/StgFEM/SLE/SystemSetup/src/Context.h	2006-08-01 08:54:55 UTC (rev 4164)
@@ -135,8 +135,8 @@
 	/* Solve EntryPoint hook */
 	void _FiniteElementContext_Solve( void* context );
 
-	/* Step EntryPoint hook */
-	void _FiniteElementContext_Step( void* context ) ;
+	/* PostSolve EntryPoint hook: for things such as updating the Dt */
+	void _FiniteElementContext_PostSolve( void* context ) ;
 	
 	/* Dt related functions */
 	/** Function to assign the dt mediated by the abstract context to use for time integration