[cig-commits] commit: Optimize the use of set_boundaries, and add in one that is missing for Neumann BC's

[Mercurial]

changeset:   211:3d997164808d
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Tue Apr 26 16:30:45 2011 -0700
files:       src/StokesFACOps/smooth_Tackley_2D.C src/StokesFACOps/smooth_Tackley_3D.C src/StokesFACOps/xeqScheduleGhostFill.C
description:
Optimize the use of set_boundaries, and add in one that is missing for Neumann BC's


diff -r 321506d69e1b -r 3d997164808d src/StokesFACOps/smooth_Tackley_2D.C
--- a/src/StokesFACOps/smooth_Tackley_2D.C	Tue Apr 26 15:47:43 2011 -0700
+++ b/src/StokesFACOps/smooth_Tackley_2D.C	Tue Apr 26 16:30:45 2011 -0700
@@ -119,7 +119,7 @@ void SAMRAI::solv::StokesFACOps::smooth_
                     }
                 }
             }
-          set_boundaries(p_id,v_id,level,true);
+          set_boundaries(invalid_id,v_id,level,true);
         }
 
 
@@ -173,7 +173,7 @@ void SAMRAI::solv::StokesFACOps::smooth_
                     }
                 }
             }
-          set_boundaries(p_id,v_id,level,true);
+          set_boundaries(invalid_id,v_id,level,true);
         }
 
 
@@ -236,7 +236,7 @@ void SAMRAI::solv::StokesFACOps::smooth_
               p(center)+=dp(center);
             }
         }
-      set_boundaries(p_id,v_id,level,true);
+      set_boundaries(p_id,invalid_id,level,true);
 
 
       /* fix v sweep */
@@ -298,7 +298,7 @@ void SAMRAI::solv::StokesFACOps::smooth_
                 }
             }
         }
-      set_boundaries(p_id,v_id,level,true);
+      set_boundaries(invalid_id,v_id,level,true);
 
       // if (residual_tolerance >= 0.0) {
         /*
diff -r 321506d69e1b -r 3d997164808d src/StokesFACOps/smooth_Tackley_3D.C
--- a/src/StokesFACOps/smooth_Tackley_3D.C	Tue Apr 26 15:47:43 2011 -0700
+++ b/src/StokesFACOps/smooth_Tackley_3D.C	Tue Apr 26 16:30:45 2011 -0700
@@ -121,7 +121,7 @@ void SAMRAI::solv::StokesFACOps::smooth_
                         }
                     }
               }
-            set_boundaries(p_id,v_id,level,true);
+            set_boundaries(invalid_id,v_id,level,true);
           }
 
       /* p sweep
@@ -182,7 +182,7 @@ void SAMRAI::solv::StokesFACOps::smooth_
               p(center)+=dp(center);
             }
         }
-
+      set_boundaries(p_id,invalid_id,level,true);
 
       /* fix v sweep */
       xeqScheduleGhostFillNoCoarse(dp_id,invalid_id,ln);
@@ -240,8 +240,11 @@ void SAMRAI::solv::StokesFACOps::smooth_
                     }
                 }
             }
-          set_boundaries(p_id,v_id,level,true);
         }
+      /* This is probably not necessary, since everyone always makes
+         sure that everything is set before use. */
+      set_boundaries(invalid_id,v_id,level,true);
+
       // if (residual_tolerance >= 0.0) {
         /*
          * Check for early end of sweeps due to convergence
diff -r 321506d69e1b -r 3d997164808d src/StokesFACOps/xeqScheduleGhostFill.C
--- a/src/StokesFACOps/xeqScheduleGhostFill.C	Tue Apr 26 15:47:43 2011 -0700
+++ b/src/StokesFACOps/xeqScheduleGhostFill.C	Tue Apr 26 16:30:45 2011 -0700
@@ -28,7 +28,7 @@ void SAMRAI::solv::StokesFACOps::xeqSche
     if (!v_ghostfill_refine_schedules[dest_ln]) {
       TBOX_ERROR("Expected schedule not found.");
     }
-    set_boundaries(p_id,v_id,dest_ln-1);
+    set_boundaries(-1,v_id,dest_ln-1);
     xfer::RefineAlgorithm refiner(d_dim);
     refiner.registerRefine(v_id,v_id,v_id,v_ghostfill_refine_operator);
     refiner.resetSchedule(v_ghostfill_refine_schedules[dest_ln]);