[cig-commits] r3925 - in long/3D/Gale/trunk/src/Gale: . Apps/Extension EulerDeform/src

[walter at geodynamics.org]

Author: walter
Date: 2006-07-06 02:03:16 -0700 (Thu, 06 Jul 2006)
New Revision: 3925

Modified:
   long/3D/Gale/trunk/src/Gale/
   long/3D/Gale/trunk/src/Gale/Apps/Extension/ExtensionBaseApp.xml
   long/3D/Gale/trunk/src/Gale/EulerDeform/src/EulerDeform.c
   long/3D/Gale/trunk/src/Gale/EulerDeform/src/_EulerDeform.h
Log:
 r31 at earth:  boo | 2006-07-06 01:59:05 -0700
  r30 at earth (orig r53):  PatrickSunter | 2006-07-03 22:23:11 -0700
  Modifying GALE to use the new 2nd-order fallback to 1st order enabled system
  for time integration:
   * EulerDeform component updated for the new interface. Does this
   component supersede the plugin in Underworld? Set allowFallback
   to be true for it, though it doesn't seem to matter in this
   case anyway as this component just
   uses the current nodal velocity as the derivative, so isn't 
   space-dependent.
   * ExtensionBaseApp.xml changed to use the normal 2nd order
   TimeIntegrator.xml instead of the euler-only Simultaneous
   one.
  
  
 



Property changes on: long/3D/Gale/trunk/src/Gale
___________________________________________________________________
Name: svk:merge
   - 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:52
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:27
   + 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:53
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:31

Modified: long/3D/Gale/trunk/src/Gale/Apps/Extension/ExtensionBaseApp.xml
===================================================================
--- long/3D/Gale/trunk/src/Gale/Apps/Extension/ExtensionBaseApp.xml	2006-07-06 08:52:54 UTC (rev 3924)
+++ long/3D/Gale/trunk/src/Gale/Apps/Extension/ExtensionBaseApp.xml	2006-07-06 09:03:16 UTC (rev 3925)
@@ -19,7 +19,7 @@
 	<include>StgFEM_Components/VelocityField.xml              </include>
 	<include>StgFEM_Components/PressureField.xml              </include>
 	<include>StgFEM_Components/GaussSwarm.xml                 </include>
-	<include>StgFEM_Components/TimeIntegratorSimultaneous.xml </include>
+	<include>StgFEM_Components/TimeIntegrator.xml </include>
 	<include>PIC_Components/MaterialPointSwarm.xml            </include>
 	<include>Underworld_Components/StokesFlowUzawaCompressible.xml </include>
 

Modified: long/3D/Gale/trunk/src/Gale/EulerDeform/src/EulerDeform.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/EulerDeform/src/EulerDeform.c	2006-07-06 08:52:54 UTC (rev 3924)
+++ long/3D/Gale/trunk/src/Gale/EulerDeform/src/EulerDeform.c	2006-07-06 09:03:16 UTC (rev 3925)
@@ -256,7 +256,8 @@
 	/* Create a time integratee. */
 	crdVar = FiniteElement_Mesh_RegisterNodeCoordsAsVariables( 
 								  self->velVar->feMesh, ctx->variable_Register, NULL );
-	crdAdvector = TimeIntegratee_New( "EulerDeform", ctx->timeIntegrator, crdVar, 1, (Stg_Component**)&self->velVar );
+	crdAdvector = TimeIntegratee_New( "EulerDeform", ctx->timeIntegrator, crdVar, 1, (Stg_Component**)&self->velVar,
+		True );
 	crdAdvector->_calculateTimeDeriv = _EulerDeform_TimeDeriv;
 	TimeIntegrator_PrependFinishEP( 
 		ctx->timeIntegrator, "EulerDeform_Execute", _EulerDeform_Execute, 
@@ -460,9 +461,11 @@
 }
 
 
-void _EulerDeform_TimeDeriv( void* crdAdvector, Index arrayInd, double* timeDeriv ) {
+Bool _EulerDeform_TimeDeriv( void* crdAdvector, Index arrayInd, double* timeDeriv ) {
 	TimeIntegratee*	self = (TimeIntegratee*)crdAdvector;
 	FeVariable*     velField = (FeVariable*)self->data[0];
 
 	FeVariable_GetValueAtNode( velField, arrayInd, timeDeriv );
+
+	return True;
 }

Modified: long/3D/Gale/trunk/src/Gale/EulerDeform/src/_EulerDeform.h
===================================================================
--- long/3D/Gale/trunk/src/Gale/EulerDeform/src/_EulerDeform.h	2006-07-06 08:52:54 UTC (rev 3924)
+++ long/3D/Gale/trunk/src/Gale/EulerDeform/src/_EulerDeform.h	2006-07-06 09:03:16 UTC (rev 3925)
@@ -136,7 +136,7 @@
 
 	void _EulerDeform_InterpVar( EulerDeform* self, FeVariable* var );
 
-	void _EulerDeform_TimeDeriv( void* crdAdvector, Index arrayInd, double* timeDeriv );
+	Bool _EulerDeform_TimeDeriv( void* crdAdvector, Index arrayInd, double* timeDeriv );
 
 
 #endif /* __StgFEM_plugins_EulerDeform_EulerDeform_h__ */