[cig-commits] commit: Have SurfaceProcess skip when dt==0, and change some abort()'s to Journal_Firewall

[Mercurial]

changeset:   906:97edb6153b5b
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Thu Oct 27 17:58:50 2011 -0700
files:       plugins/SurfaceProcess/SurfaceProcess.cxx
description:
Have SurfaceProcess skip when dt==0, and change some abort()'s to Journal_Firewall


diff -r 7dd98b298cae -r 97edb6153b5b plugins/SurfaceProcess/SurfaceProcess.cxx
--- a/plugins/SurfaceProcess/SurfaceProcess.cxx	Thu Oct 27 17:24:30 2011 -0700
+++ b/plugins/SurfaceProcess/SurfaceProcess.cxx	Thu Oct 27 17:58:50 2011 -0700
@@ -69,8 +69,9 @@ void Underworld_SurfaceProcess_Execute( 
 
   assert( spCtx );
   
-  /* Extract information from contexts. */
   dt = spCtx->ctx->dt;
+  if(dt==0.0)
+    return;
 
   mesh=spCtx->mesh;
   velocity=spCtx->v;
@@ -101,24 +102,20 @@ void Underworld_SurfaceProcess_Execute( 
 
           Vec_Set2D(ijk_minus,ijk);
           ijk_minus[0]-=1;
-          if(!Mesh_GlobalToDomain
-             (mesh,MT_VERTEX,
-              RegularMeshUtils_Node_3DTo1D(mesh,ijk_minus),&n_minus))
-            {
-              printf("Can not map to local domain %d %d %d\n",
-                     ijk_minus[0],ijk_minus[1],n_i);
-              abort();
-            }
+          Journal_Firewall(Mesh_GlobalToDomain
+                           (mesh,MT_VERTEX,
+                            RegularMeshUtils_Node_3DTo1D(mesh,ijk_minus),
+                            &n_minus),Underworld_Error,
+                           "Can not map to local domain %d %d %d\n",
+                           ijk_minus[0],ijk_minus[1],n_i);
           Vec_Set2D(ijk_plus,ijk);
           ijk_plus[0]+=1;
-          if(!Mesh_GlobalToDomain
-             (mesh,MT_VERTEX,
-              RegularMeshUtils_Node_3DTo1D(mesh,ijk_plus),&n_plus))
-            {
-              printf("Can not map to local domain %d %d %d\n",
-                     ijk_plus[0],ijk_plus[1],n_i);
-              abort();
-            }
+          Journal_Firewall(Mesh_GlobalToDomain
+                           (mesh,MT_VERTEX,
+                            RegularMeshUtils_Node_3DTo1D(mesh,ijk_plus),&n_plus),
+                           Underworld_Error,
+                           "Can not map to local domain %d %d %d\n",
+                           ijk_plus[0],ijk_plus[1],n_i);
 
           y_plus=mesh->verts[n_plus][1];
           y_minus=mesh->verts[n_minus][1];