[cig-commits] commit: Move wrapTop/Bottom to before the overall remeshing, so that the coordinates will always be lined up

[Mercurial]

changeset:   871:9808789b007b
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Thu Sep 29 01:09:20 2011 -0700
files:       plugins/EulerDeform/EulerDeform.cxx
description:
Move wrapTop/Bottom to before the overall remeshing, so that the coordinates will always be lined up


diff -r 7813100f45d4 -r 9808789b007b plugins/EulerDeform/EulerDeform.cxx
--- a/plugins/EulerDeform/EulerDeform.cxx	Tue Sep 27 15:58:26 2011 -0700
+++ b/plugins/EulerDeform/EulerDeform.cxx	Thu Sep 29 01:09:20 2011 -0700
@@ -142,7 +142,6 @@ void _Underworld_EulerDeform_Build( void
 			Dictionary_Entry_Value*	varLst;
 			char*							meshName;
 			char*							remesherName;
-			char*							velFieldName;
 			char*							name;
 
 			/* Get the dictionary for this system. */
@@ -162,7 +161,6 @@ void _Underworld_EulerDeform_Build( void
 			else
 			    sys->dispField = NULL;
 
-			velFieldName = Dictionary_GetString( sysDict, (Dictionary_Entry_Key)"VelocityField"  );
 			sys->interval = Dictionary_GetInt_WithDefault( sysDict, (Dictionary_Entry_Key)"interval", -1  );
 			sys->wrapTop = Dictionary_GetBool_WithDefault( sysDict, (Dictionary_Entry_Key)"wrapTop", False  );
 			sys->wrapBottom = Dictionary_GetBool_WithDefault( sysDict, (Dictionary_Entry_Key)"wrapBottom", False  );
@@ -961,6 +959,12 @@ void EulerDeform_Remesh( TimeIntegrand* 
     }
     Journal_Printf( Underworld_Info, "*** EulerDeform: Remeshing.\n" );
 
+    /* Shrink wrap the top/bottom surface. */
+    if( sys->wrapTop )
+      EulerDeform_WrapSurface( sys, sys->mesh->verts, 1 );
+    if( sys->wrapBottom )
+      EulerDeform_WrapSurface( sys, sys->mesh->verts, 0 );
+
     /* Store old coordinates. */
     nDomainNodes = FeMesh_GetNodeDomainSize( sys->mesh );
     oldCrds = AllocArray2D( double, nDomainNodes, nDims );
@@ -970,12 +974,6 @@ void EulerDeform_Remesh( TimeIntegrand* 
     /* Remesh the system. */
     Stg_Component_Execute( sys->remesher, NULL, True );
     Mesh_Sync( sys->mesh );
-
-    /* Shrink wrap the top/bottom surface. */
-    if( sys->wrapTop )
-      EulerDeform_WrapSurface( sys, oldCrds, 1 );
-    if( sys->wrapBottom )
-      EulerDeform_WrapSurface( sys, oldCrds, 0 );
 
     /* Swap old coordinates back in temporarily. */
     newCrds = sys->mesh->verts;