[cig-commits] r12989 - in long/3D/SNAC/trunk: . Snac/libSnac/src Snac/tests

[ces74 at geodynamics.org]

Author: ces74
Date: 2008-10-03 09:53:00 -0700 (Fri, 03 Oct 2008)
New Revision: 12989

Removed:
   long/3D/SNAC/trunk/StGermain/
Modified:
   long/3D/SNAC/trunk/Snac/libSnac/src/Context.c
   long/3D/SNAC/trunk/Snac/tests/basic.xml
Log:
This version of StGermain (rev. 4222) conflicts with SNAC.
-- planning to go back to rev. 3890, which is known to work.



Modified: long/3D/SNAC/trunk/Snac/libSnac/src/Context.c
===================================================================
--- long/3D/SNAC/trunk/Snac/libSnac/src/Context.c	2008-10-03 04:04:11 UTC (rev 12988)
+++ long/3D/SNAC/trunk/Snac/libSnac/src/Context.c	2008-10-03 16:53:00 UTC (rev 12989)
@@ -348,6 +348,7 @@
 
 	/* Add boundary condition managers */
 	velocityBCsDict = Dictionary_Entry_Value_AsDictionary( Dictionary_Get( self->dictionary, "velocityBCs" ) );
+
 	self->velocityBCs = CompositeVC_New( "velocityBC", self->variable_Register, self->condFunc_Register, velocityBCsDict, self->mesh );
 
 	/* Parallelisation information */
@@ -645,7 +646,10 @@
 	Build( self->elementICs, 0, False );
 	Journal_Printf( self->verbose, "elementICs:\n" );
 	VariableCondition_PrintConcise( self->elementICs, self->verbose );
+
+	fprintf(stderr,"About to build velocityBCs...\n");
 	Build( self->velocityBCs, 0, False );
+	fprintf(stderr,"velocityBCs has been built: %d\n",self->velocityBCs->indexCount);
 	Journal_Printf( self->verbose, "velocityBCs\n" );
 	VariableCondition_PrintConcise( self->velocityBCs, self->verbose );
 
@@ -684,7 +688,9 @@
 	VariableCondition_Apply( self->elementICs, self );
 
 	/* Apply the velocity boundary conditions ... these are considered part of initial conditions */
+	fprintf(stderr,"velocityBCs has been built (2): %d\n",self->velocityBCs->indexCount);
 	VariableCondition_Apply( self->velocityBCs, self );
+	fprintf(stderr,"velocityBCs has been built (3): %d\n",self->velocityBCs->indexCount);
 }
 
 void _Snac_Context_InitializeMaterialProperties( void* context ) {
@@ -955,7 +961,9 @@
 
 	_Snac_Context_DumpPhaseIndex( self );
 
-	KeyCall( self, self->syncK, EntryPoint_VoidPtr_CallCast* )( KeyHandle(self,self->syncK), self );
+	fprintf(stderr,"velocityBCs has been built (4): %d\n",self->velocityBCs->indexCount);
+	KeyCall( self, self->syncK, EntryPoint_Class_VoidPtr_CallCast* )( KeyHandle(self,self->syncK), self );
+	/* _Snac_Context_Sync( self ); */
 }
 
 
@@ -1133,6 +1141,8 @@
 	    strain_inert=1.0e-5f & vbc_max=3.0e-10f */
 	vmax=0.0f;
 	vlb = 3.0e-11f; /* ~1 mm/yr */
+
+	fprintf(stderr,"velocityBCs has been built (5): %x\n",self);
 	for( index = 0; index < self->velocityBCs->indexCount; index++ ) {
 		Snac_Node* node;
 		node_dI = self->velocityBCs->indexTbl[index];

Modified: long/3D/SNAC/trunk/Snac/tests/basic.xml
===================================================================
--- long/3D/SNAC/trunk/Snac/tests/basic.xml	2008-10-03 04:04:11 UTC (rev 12988)
+++ long/3D/SNAC/trunk/Snac/tests/basic.xml	2008-10-03 16:53:00 UTC (rev 12989)
@@ -21,6 +21,7 @@
 	<list name="plugins">
 	</list>
 
+	<param name="journal.verbose"> on </param>
 	<param name="journal.debug"> on </param>
 	<param name="journal.debug.Context"> on </param>
 	<param name="journal.debug.Snac_Parallel"> on </param>