[cig-commits] r15969 - long/3D/SNAC/trunk/Snac/plugins/plasticSPR

[echoi at geodynamics.org]

Author: echoi
Date: 2009-11-14 15:15:35 -0800 (Sat, 14 Nov 2009)
New Revision: 15969

Modified:
   long/3D/SNAC/trunk/Snac/plugins/plasticSPR/Remesh.c
Log:
Fixed a bug that was assigning the interpolated values of the recovered plastic strain field to mesh->node's extension rather than to meshExt->node's extension.


Modified: long/3D/SNAC/trunk/Snac/plugins/plasticSPR/Remesh.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/plasticSPR/Remesh.c	2009-11-14 19:14:52 UTC (rev 15968)
+++ long/3D/SNAC/trunk/Snac/plugins/plasticSPR/Remesh.c	2009-11-14 23:15:35 UTC (rev 15969)
@@ -165,12 +165,15 @@
 	Snac_Context*			context = (Snac_Context*)_context;
 	Mesh*					mesh = context->mesh;
 	NodeLayout*				nLayout = mesh->layout->nodeLayout;
-	SnacPlastic_Node*		dstNodeExt = (SnacPlastic_Node*)ExtensionManager_At( context->mesh->nodeExtensionMgr, 
-																				 dstNodes, 
-																				 nodeInd );
+	Snac_Node*				dstNode = (Snac_Node*)ExtensionManager_At( context->mesh->nodeExtensionMgr, 
+																	   dstNodes, 
+																	   nodeInd );
+	SnacPlastic_Node*		dstNodeExt = ExtensionManager_Get( context->mesh->nodeExtensionMgr, 
+															   dstNode, 
+															   SnacPlastic_NodeHandle );
 	Index					tetNode_i;
 
-	SnacPlastic_Node_Print( dstNodeExt );
+/* 	SnacPlastic_Node_Print( dstNodeExt ); */
 
 	/* Extract the element's node indices.  Note that there should always be eight of these. */
 	Node_DomainIndex*	eltNodes;
@@ -216,8 +219,8 @@
 
 
 void _SnacPlastic_InterpolateElement( void* _context, 
-									  unsigned dstEltInd,
-									  unsigned dstTetInd )
+									  Element_LocalIndex dstEltInd,
+									  Tetrahedra_Index dstTetInd )
 {
 	Snac_Context* 			context = (Snac_Context*)_context;
 	Snac_Element*			dstElt = Snac_Element_At( context, dstEltInd );
@@ -227,14 +230,15 @@
 	double				 	plasticStrain = 0.0;
 	Index 					i;
 	
+/*  	fprintf(stderr,"element:%d tet=%d\n",dstEltInd,dstTetInd);  */
 	for(i=0;i<4;i++) {
 		Snac_Node*			node = Snac_Element_Node_P( context, dstEltInd, TetraToNode[dstTetInd][i] );
 		SnacPlastic_Node*	nodeExt = ExtensionManager_Get( context->mesh->nodeExtensionMgr, 
 															node, 
 															SnacPlastic_NodeHandle );
 		plasticStrain += 0.25f*nodeExt->plStrainSPR;
- 		fprintf(stderr,"element=%d tet=%d %d:(%d %e)\n",dstEltInd, dstTetInd, i, TetraToNode[dstTetInd][i], nodeExt->plStrainSPR);
+/* 		if( nodeExt->plStrainSPR != 0.0 ) */
+/* 		  fprintf(stderr,"\t%d:(%d %e)\n", i, TetraToNode[dstTetInd][i], nodeExt->plStrainSPR); */
 	}
- 	fprintf(stderr,"\n"); 
 	dstEltExt->plasticStrain[dstTetInd] = plasticStrain;
 }