[cig-commits] r5548 - in long/3D/Gale/trunk: . src/StGermain/Discretisation/Mesh/src

[walter at geodynamics.org]

Author: walter
Date: 2006-12-08 11:46:53 -0800 (Fri, 08 Dec 2006)
New Revision: 5548

Modified:
   long/3D/Gale/trunk/
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
   long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.c
Log:
 r1192 at earth:  boo | 2006-12-08 11:40:13 -0800
 Make SurfaceAdaptor work



Property changes on: long/3D/Gale/trunk
___________________________________________________________________
Name: svk:merge
   - 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1190
   + 3a629746-de10-0410-b17b-fd6ecaaa963e:/cig:1192

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript	2006-12-08 19:10:44 UTC (rev 5547)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SConscript	2006-12-08 19:46:53 UTC (rev 5548)
@@ -39,6 +39,7 @@
 Mesh_Algorithms.h
 Mesh_ElementType.h
 Mesh_HexType.h
+SurfaceAdaptor.h
 shortcuts.h
 types.h""")
 
@@ -58,7 +59,8 @@
 MeshVariable.c
 Mesh_Algorithms.c
 Mesh_ElementType.c
-Mesh_HexType.c""")
+Mesh_HexType.c
+SurfaceAdaptor.c""")
 
 meta_files=Split("""CartesianGenerator.meta
 CommTopology.meta
@@ -71,7 +73,8 @@
 MeshTopology.meta
 MeshVariable.meta
 Mesh_Algorithms.meta
-Mesh_ElementType.meta""")
+Mesh_ElementType.meta
+SurfaceAdaptor.meta""")
 
 c_files+=[local_env.Meta(meta_files)]
 

Modified: long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.c
===================================================================
--- long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.c	2006-12-08 19:10:44 UTC (rev 5547)
+++ long/3D/Gale/trunk/src/StGermain/Discretisation/Mesh/src/SurfaceAdaptor.c	2006-12-08 19:46:53 UTC (rev 5548)
@@ -252,7 +252,7 @@
 			continue;
 
 		/* Deform this node. */
-		mesh->nodeCoord[n_i][1] += height * deformFunc( self, mesh, gSize, n_i, inds );
+		Mesh_GetVertex(mesh, n_i)[1] += deformFunc( self, mesh, gSize, n_i, inds );
 	}
 
 	/* Free resources. */
@@ -268,8 +268,8 @@
 double SurfaceAdaptor_Wedge( SurfaceAdaptor* self, Mesh* mesh, 
 			     unsigned* globalSize, unsigned vertex, unsigned* vertexInds )
 {
-	if( mesh->nodeCoord[vertex][0] >= self->info.wedge.offs )
-		return (mesh->nodeCoord[vertex][0] - self->info.wedge.offs) * self->info.wedge.grad;
+	if( mesh->verts[vertex][0] >= self->info.wedge.offs )
+		return (mesh->verts[vertex][0] - self->info.wedge.offs) * self->info.wedge.grad;
 	else
 		return 0.0;
 }
@@ -280,10 +280,10 @@
 	double	dx, dy;
 	double	rad;
 
-	dx = mesh->nodeCoord[vertex][0] - self->info.trig.origin[0];
+	dx = mesh->verts[vertex][0] - self->info.trig.origin[0];
 	rad = dx * dx;
 	if( mesh->topo->nDims == 3 ) {
-		dy = mesh->nodeCoord[vertex][1] - self->info.trig.origin[1];
+		dy = mesh->verts[vertex][1] - self->info.trig.origin[1];
 		rad += dy * dy;
 	}
 	rad = sqrt( rad );
@@ -297,10 +297,10 @@
 	double	dx, dy;
 	double	rad;
 
-	dx = mesh->nodeCoord[vertex][0] - self->info.trig.origin[0];
+	dx = mesh->verts[vertex][0] - self->info.trig.origin[0];
 	rad = dx * dx;
 	if( mesh->topo->nDims == 3 ) {
-		dy = mesh->nodeCoord[vertex][1] - self->info.trig.origin[1];
+		dy = mesh->verts[vertex][1] - self->info.trig.origin[1];
 		rad += dy * dy;
 	}
 	rad = sqrt( rad );