[cig-commits] r14658 - in long/3D/SNAC/trunk/Snac/plugins: . hydroStaticIC

[echoi at geodynamics.org]

Author: echoi
Date: 2009-04-10 13:54:17 -0700 (Fri, 10 Apr 2009)
New Revision: 14658

Removed:
   long/3D/SNAC/trunk/Snac/plugins/creepmohrcoulomb/
   long/3D/SNAC/trunk/Snac/plugins/maxwelldruckerprager/
   long/3D/SNAC/trunk/Snac/plugins/maxwellmohrcoulomb/
   long/3D/SNAC/trunk/Snac/plugins/plasticMaxwell/
   long/3D/SNAC/trunk/Snac/plugins/winkler_G3_case3/
Modified:
   long/3D/SNAC/trunk/Snac/plugins/Makefile.def
   long/3D/SNAC/trunk/Snac/plugins/hydroStaticIC/ConstructExtensions.c
   long/3D/SNAC/trunk/Snac/plugins/hydroStaticIC/Register.c
Log:
1. hydroStaticIC

	* Changes from restartStep to restartTimestep have been made.

2. Obsolete plugins removed.

	* Makefile.def modified accordingly.




Modified: long/3D/SNAC/trunk/Snac/plugins/Makefile.def
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/Makefile.def	2009-04-10 20:46:42 UTC (rev 14657)
+++ long/3D/SNAC/trunk/Snac/plugins/Makefile.def	2009-04-10 20:54:17 UTC (rev 14658)
@@ -32,4 +32,4 @@
 ##
 ##~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-def_sub = temperature elastic plastic maxwell maxwelldruckerprager maxwellmohrcoulomb creepmohrcoulomb viscoplastic spherical exchanger remesher hydroStaticIC cylindrical cylinder_quadrant customCartesianMesh plSeeds vpSeeds winkler restarter heterogeneities hillSlope
+def_sub = customCartesianMesh cylinder_quadrant cylindrical elastic exchanger heterogeneities hillSlope hydroStaticIC maxwell plastic plSeeds remesher restarter restarter_old spherical temperature viscoplastic vpSeeds winkler 

Modified: long/3D/SNAC/trunk/Snac/plugins/hydroStaticIC/ConstructExtensions.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/hydroStaticIC/ConstructExtensions.c	2009-04-10 20:46:42 UTC (rev 14657)
+++ long/3D/SNAC/trunk/Snac/plugins/hydroStaticIC/ConstructExtensions.c	2009-04-10 20:54:17 UTC (rev 14658)
@@ -142,15 +142,7 @@
 		&context->mesh->layout->decomp->elementDomainCount,
 		(void**)&context->mesh->element,
 		context->variable_Register );
-	/* Register these functions for use in VCs */
-/* 	ConditionFunction_Register_Add( */
-/*          	context->condFunc_Register, */
-/* 	ConditionFunction_New( _SnacHydroStaticIC_IC, "SnacHydroStaticIC_IC" ) ); */
 
-/* 	ConditionFunction_Register_Add( */
-/* 	        context->condFunc_Register, */
-/* 		ConditionFunction_New( _SnacHydroStaticIC_IC_Spherical, "SnacHydroStaticIC_IC_Spherical" ) ); */
-
 	/* HydroStaticIC variables */
 
 	/* Build the temperature IC and BC managers */

Modified: long/3D/SNAC/trunk/Snac/plugins/hydroStaticIC/Register.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/hydroStaticIC/Register.c	2009-04-10 20:46:42 UTC (rev 14657)
+++ long/3D/SNAC/trunk/Snac/plugins/hydroStaticIC/Register.c	2009-04-10 20:54:17 UTC (rev 14658)
@@ -85,7 +85,7 @@
 	printf( "In %s()\n", __func__ );
 	#endif
 
-	if( context->restartStep > 0 )
+	if( context->restartTimestep > 0 )
 		return;
 
 	/*ccccc*/