[cig-commits] r13087 - long/3D/SNAC/trunk/Snac/libSnac/src

[echoi at geodynamics.org]

Author: echoi
Date: 2008-10-15 12:09:56 -0700 (Wed, 15 Oct 2008)
New Revision: 13087

Modified:
   long/3D/SNAC/trunk/Snac/libSnac/src/Context.c
   long/3D/SNAC/trunk/Snac/libSnac/src/Context.h
   long/3D/SNAC/trunk/Snac/libSnac/src/Element.h
Log:
changes for the updated hydrostatic and winkler force calculations.



Modified: long/3D/SNAC/trunk/Snac/libSnac/src/Context.c
===================================================================
--- long/3D/SNAC/trunk/Snac/libSnac/src/Context.c	2008-10-15 19:07:14 UTC (rev 13086)
+++ long/3D/SNAC/trunk/Snac/libSnac/src/Context.c	2008-10-15 19:09:56 UTC (rev 13087)
@@ -636,8 +636,6 @@
 		self->materialProperty = (Snac_Material*)malloc( sizeof(Snac_Material) * numPhase );
 	}
 
-
-
 	if( self->rank == 0 ) Journal_Printf( self->debug, "In: %s\n", __func__ );
 
 	Build( self->nodeICs, 0, False );
@@ -646,10 +644,7 @@
 	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 );
 
@@ -688,9 +683,7 @@
 	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 ) {
@@ -961,7 +954,6 @@
 
 	_Snac_Context_DumpPhaseIndex( 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 ); */
 }
@@ -1142,7 +1134,6 @@
 	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/libSnac/src/Context.h
===================================================================
--- long/3D/SNAC/trunk/Snac/libSnac/src/Context.h	2008-10-15 19:07:14 UTC (rev 13086)
+++ long/3D/SNAC/trunk/Snac/libSnac/src/Context.h	2008-10-15 19:09:56 UTC (rev 13087)
@@ -87,6 +87,7 @@
 		double				minLengthScale; \
 		double				initMinLengthScale; \
 		\
+		double				pisos; \
 		Density				density; \
 		double				gravity; \
 		double				demf; \

Modified: long/3D/SNAC/trunk/Snac/libSnac/src/Element.h
===================================================================
--- long/3D/SNAC/trunk/Snac/libSnac/src/Element.h	2008-10-15 19:07:14 UTC (rev 13086)
+++ long/3D/SNAC/trunk/Snac/libSnac/src/Element.h	2008-10-15 19:09:56 UTC (rev 13087)
@@ -64,11 +64,14 @@
 
 	/* Element Information */
 	#define __Snac_Element \
-		Material_Index			material_I; \
+		Material_Index		material_I; \
 		Volume				volume; \
 		StrainRate			strainRate; \
 		Stress				stress; \
 		double				hydroPressure; \
+		double              rzbo; \
+		double              bottomPressure; \
+		int                 irheology; \
 		\
 		Snac_Element_Tetrahedra		tetra[Tetrahedra_Count]; 
 	struct _Snac_Element { __Snac_Element };