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

[echoi at geodynamics.org]

Author: echoi
Date: 2010-03-31 06:44:34 -0700 (Wed, 31 Mar 2010)
New Revision: 16472

Modified:
   long/3D/SNAC/trunk/Snac/libSnac/src/Context.c
   long/3D/SNAC/trunk/Snac/libSnac/src/Force.c
   long/3D/SNAC/trunk/Snac/libSnac/src/Node.h
Log:

Expanded "node" variable to include all of its data members, for future use.



Modified: long/3D/SNAC/trunk/Snac/libSnac/src/Context.c
===================================================================
--- long/3D/SNAC/trunk/Snac/libSnac/src/Context.c	2010-03-30 23:42:39 UTC (rev 16471)
+++ long/3D/SNAC/trunk/Snac/libSnac/src/Context.c	2010-03-31 13:44:34 UTC (rev 16472)
@@ -218,7 +218,7 @@
 
 	/* Building StGermain Variables of nodal quantities... we must the "complex" constructor for Variable... the
 	 * info needs to be wrapped this generic way... */
-	Index			nodeOffsetCount = 8;
+	Index			nodeOffsetCount = 28;
 	SizeT			nodeOffsets[] = {
 					GetOffsetOfMember( tmpNode, velocity ),
 					GetOffsetOfMember( tmpNode, velocity[0] ),
@@ -227,34 +227,74 @@
 					GetOffsetOfMember( tmpNode, force ),
 					GetOffsetOfMember( tmpNode, force[0] ),
 					GetOffsetOfMember( tmpNode, force[1] ),
-					GetOffsetOfMember( tmpNode, force[2] ) };
+					GetOffsetOfMember( tmpNode, force[2] ),
+					GetOffsetOfMember( tmpNode, dh ),
+					GetOffsetOfMember( tmpNode, residualFr ),
+					GetOffsetOfMember( tmpNode, residualFt ),
+					GetOffsetOfMember( tmpNode, inertialMass ),
+					GetOffsetOfMember( tmpNode, stressSPR ),
+					GetOffsetOfMember( tmpNode, stressSPR[0] ),
+					GetOffsetOfMember( tmpNode, stressSPR[1] ),
+					GetOffsetOfMember( tmpNode, stressSPR[2] ),
+					GetOffsetOfMember( tmpNode, stressSPR[3] ),
+					GetOffsetOfMember( tmpNode, stressSPR[4] ),
+					GetOffsetOfMember( tmpNode, stressSPR[5] ),
+					GetOffsetOfMember( tmpNode, strainSPR ),
+					GetOffsetOfMember( tmpNode, strainSPR[0] ),
+					GetOffsetOfMember( tmpNode, strainSPR[1] ),
+					GetOffsetOfMember( tmpNode, strainSPR[2] ),
+					GetOffsetOfMember( tmpNode, strainSPR[3] ),
+					GetOffsetOfMember( tmpNode, strainSPR[4] ),
+					GetOffsetOfMember( tmpNode, strainSPR[5] ),
+					GetOffsetOfMember( tmpNode, material_ISPR ),
+					GetOffsetOfMember( tmpNode, densitySPR ) };
 	Variable_DataType	nodeDataTypes[] = {
-					Variable_DataType_Double,
-					Variable_DataType_Double,
-					Variable_DataType_Double,
-					Variable_DataType_Double,
-					Variable_DataType_Double,
-					Variable_DataType_Double,
-					Variable_DataType_Double,
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
+					Variable_DataType_Double, 
 					Variable_DataType_Double };
+
 	Index			nodeDataTypeCounts[] = {
-					3,
-					1,
-					1,
-					1,
-					3,
-					1,
-					1,
-					1 };
+					3, 1, 1, 1,
+					3, 1, 1, 1,
+					1, 1, 1, 1,
+					6, 1, 1, 1, 1, 1, 1,
+					6, 1, 1, 1, 1, 1, 1,
+					1, 1 };
 	Name			nodeNames[] = {
-					"velocity",
-					"vx",
-					"vy",
-					"vz",
-					"force",
-					"fx",
-					"fy",
-					"fz" };
+					"velocity", "vx", "vy", "vz",
+					"force", "fx", "fy", "fz",
+					"dh", "residualFr", "residualFt",
+					"inertialMass",
+					"stressSPR","stressSPRxx","stressSPRyy","stressSPRzz",
+					"stressSPRxy","stressSPRxz","stressSPRyz",
+					"strainSPR","strainSPRxx","strainSPRyy","strainSPRzz",
+					"strainSPRxy","strainSPRxz","strainSPRyz",
+					"material_ISPR","densitySPR" };
 
 	/* Building StGermain Variables of element quantities... we must the "complex" constructor for Variable... the
 	 * info needs to be wrapped this generic way... */

Modified: long/3D/SNAC/trunk/Snac/libSnac/src/Force.c
===================================================================
--- long/3D/SNAC/trunk/Snac/libSnac/src/Force.c	2010-03-30 23:42:39 UTC (rev 16471)
+++ long/3D/SNAC/trunk/Snac/libSnac/src/Force.c	2010-03-31 13:44:34 UTC (rev 16472)
@@ -163,6 +163,7 @@
 						( (*stress)[0][2] * (*normal)[0] +
 						  (*stress)[1][2] * (*normal)[1] +
 						  (*stress)[2][2] * (*normal)[2] ) * surface->area / 6.0f;
+					
 					if(self->spherical) {
 						(*force)[0] -= dir2centr[0] * (gravity * effDensity * tetra->volume / 8.0f);
 						(*force)[1] -= dir2centr[1] * (gravity * effDensity * tetra->volume / 8.0f);

Modified: long/3D/SNAC/trunk/Snac/libSnac/src/Node.h
===================================================================
--- long/3D/SNAC/trunk/Snac/libSnac/src/Node.h	2010-03-30 23:42:39 UTC (rev 16471)
+++ long/3D/SNAC/trunk/Snac/libSnac/src/Node.h	2010-03-31 13:44:34 UTC (rev 16472)
@@ -47,13 +47,14 @@
 	#define __Snac_Node \
 		Velocity	velocity; \
 		Force		force; \
+		double	    dh; \
+		double		residualFr; \
+		double		residualFt; \
+		Mass		inertialMass; \
 		double		stressSPR[6]; \
 		double		strainSPR[6]; \
 		double		material_ISPR; \
-		double	    dh; \
-		double		residualFr; \
-		double		residualFt; \
-		Mass		inertialMass;
+		double		densitySPR;
 	struct _Snac_Node { __Snac_Node };
 
 	/* Print the contents of an Mesh construct */