[cig-commits] r19594 - long/3D/SNAC/trunk/Snac/plugins/plastic_BI
echoi at geodynamics.org
echoi at geodynamics.org
Tue Feb 7 10:45:16 PST 2012
Author: echoi
Date: 2012-02-07 10:45:16 -0800 (Tue, 07 Feb 2012)
New Revision: 19594
Modified:
long/3D/SNAC/trunk/Snac/plugins/plastic_BI/Remesh.c
Log:
Restoring back the actual interpolation on the barycentric subgrid.
Modified: long/3D/SNAC/trunk/Snac/plugins/plastic_BI/Remesh.c
===================================================================
--- long/3D/SNAC/trunk/Snac/plugins/plastic_BI/Remesh.c 2012-02-07 18:39:22 UTC (rev 19593)
+++ long/3D/SNAC/trunk/Snac/plugins/plastic_BI/Remesh.c 2012-02-07 18:45:16 UTC (rev 19594)
@@ -42,22 +42,22 @@
#include "Remesh.h"
#include "Register.h"
-void _SnacPlastic_InterpolateElement( void* _context,
- Element_LocalIndex dstEltInd,
+void _SnacPlastic_InterpolateElement( void* _context,
+ Element_LocalIndex dstEltInd,
Tetrahedra_Index dstTetInd,
- Snac_Element* dstElements,
+ Snac_Element* dstElements,
Element_DomainIndex srcEltInd,
Tetrahedra_Index srcTetInd )
{
Snac_Context* context = (Snac_Context*)_context;
Mesh* mesh = context->mesh;
SnacRemesher_Mesh* meshExt = ExtensionManager_Get( context->meshExtensionMgr,
- mesh,
- SnacRemesher_MeshHandle );
+ mesh,
+ SnacRemesher_MeshHandle );
HexaMD* decomp = (HexaMD*)mesh->layout->decomp;
Snac_Element* element = (Snac_Element*)ExtensionManager_At( context->mesh->elementExtensionMgr,
- dstElements,
- dstEltInd );
+ dstElements,
+ dstEltInd );
SnacPlastic_Element* elementExt = ExtensionManager_Get( context->mesh->elementExtensionMgr,
element,
SnacPlastic_ElementHandle );
@@ -85,7 +85,6 @@
eltdI[6] = (eldI+1) + (eldJ+1)*neldI + (eldK+1)*neldI*neldJ;
eltdI[7] = eldI + (eldJ+1)*neldI + (eldK+1)*neldI*neldJ;
-#if 0
elementExt->plasticStrain[dstTetInd] = 0.0;
for(coef_I=0;coef_I<4;coef_I++) {
/* The actual src elements are the four apexes of a tet (srcTetInd) in the old barycenter grid. */
@@ -99,5 +98,4 @@
So, "dstTetInd" is used in both source and destination terms. */
elementExt->plasticStrain[dstTetInd] += meshExt->barcord[dstEltInd].L[coef_I]*srcEltExt->plasticStrain[dstTetInd];
}
-#endif
}
More information about the CIG-COMMITS
mailing list