[cig-commits] r5644 - in long/3D/Gale/trunk/src/Gale: . plugins/SurfaceProcess

walter at geodynamics.org walter at geodynamics.org
Fri Jan 5 11:19:06 PST 2007


Author: walter
Date: 2007-01-05 11:19:06 -0800 (Fri, 05 Jan 2007)
New Revision: 5644

Modified:
   long/3D/Gale/trunk/src/Gale/
   long/3D/Gale/trunk/src/Gale/plugins/SurfaceProcess/SurfaceProcess.c
Log:
 r95 at earth:  boo | 2007-01-05 11:15:05 -0800
  r87 at earth (orig r72):  LukeHodkinson | 2007-01-04 18:12:42 -0800
  Ugly memory bug; was over-writing values on the
  pressure mesh causing some crazy remeshing results.
  
  
 



Property changes on: long/3D/Gale/trunk/src/Gale
___________________________________________________________________
Name: svk:merge
   - 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:71
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:94
   + 4e4aea6e-fd02-0410-981f-80ab108a5659:/trunk:72
8f887497-cf10-0410-afc2-df8ae19c7fb0:/cig:95

Modified: long/3D/Gale/trunk/src/Gale/plugins/SurfaceProcess/SurfaceProcess.c
===================================================================
--- long/3D/Gale/trunk/src/Gale/plugins/SurfaceProcess/SurfaceProcess.c	2007-01-05 19:19:03 UTC (rev 5643)
+++ long/3D/Gale/trunk/src/Gale/plugins/SurfaceProcess/SurfaceProcess.c	2007-01-05 19:19:06 UTC (rev 5644)
@@ -296,11 +296,11 @@
 
 	if( nMeshDims == 3 ) {
 		DecompTransfer_AddArray( spCtx->sendOp, 
-					 &spCtx->mesh->verts[0][2], &spCtx->surface->verts[0][2], 
+					 &spCtx->mesh->verts[0][2], &spCtx->surface->verts[0][1], 
 					 nMeshDims * sizeof(double), nSurfDims * sizeof(double), 
 					 sizeof(double) );
 		DecompTransfer_AddArray( spCtx->recvOp, 
-					 &spCtx->surface->verts[0][2], &spCtx->mesh->verts[0][2], 
+					 &spCtx->surface->verts[0][1], &spCtx->mesh->verts[0][2], 
 					 nSurfDims * sizeof(double), nMeshDims * sizeof(double), 
 					 sizeof(double) );
 	}
@@ -359,6 +359,7 @@
 	/* Transfer. */
 	DecompTransfer_Transfer( spCtx->sendOp );
 	Mesh_Sync( spCtx->surface );
+	Decomp_Sync_Array_Sync( spCtx->heightSyncArray );
 
 	/* Remap the heights to match old mesh ordering. */
 	nDomains = Mesh_GetDomainSize( spCtx->surface, MT_VERTEX );



More information about the cig-commits mailing list