[cig-commits] commit: Grow a box in fix_moduli so that the edge moduli are generated in the

[Mercurial]

changeset:   270:6ca3cacf8ef1
user:        Walter Landry <wlandry at caltech.edu>
date:        Thu May 03 10:43:20 2012 -0700
files:       src/FACStokes/fix_moduli.C
description:
Grow a box in fix_moduli so that the edge moduli are generated in the
ghost zone in the direction in which they are not at a "node".

Also fix formatting.


diff -r 97e2c13edfe8 -r 6ca3cacf8ef1 src/FACStokes/fix_moduli.C
--- a/src/FACStokes/fix_moduli.C	Thu May 03 10:41:20 2012 -0700
+++ b/src/FACStokes/fix_moduli.C	Thu May 03 10:43:20 2012 -0700
@@ -69,7 +69,7 @@ void SAMRAI::FACStokes::fix_moduli()
   hier::Index pp[]={ip,jp,kp};
 
   for (int ln = 0; ln <= d_hierarchy->getFinestLevelNumber(); ++ln)
-{
+    {
       tbox::Pointer<hier::PatchLevel> level = d_hierarchy->getPatchLevel(ln);
       hier::PatchLevel::Iterator i_p(*level);
       for ( ; i_p; i_p++)
@@ -86,21 +86,21 @@ void SAMRAI::FACStokes::fix_moduli()
 
               for(pdat::NodeIterator ni(edge_moduli.getBox()); ni; ni++)
                 {
-			for (int m=0;m<2;++m)
-			{
-				pdat::NodeIndex e=ni();
-				pdat::CellIndex c(e);
-				cell_moduli(c,m);
-				cell_moduli(c-ip,m);
-				cell_moduli(c-jp,m);
-				cell_moduli(c-ip-jp,m);
-				edge_moduli(e,m)=
-		                    pow(cell_moduli(c,m)*cell_moduli(c-ip,m)
-                		        *cell_moduli(c-jp,m)*cell_moduli(c-ip-jp,m),0.25);
-			}
+                  for (int m=0;m<2;++m)
+                    {
+                      pdat::NodeIndex e=ni();
+                      pdat::CellIndex c(e);
+                      cell_moduli(c,m);
+                      cell_moduli(c-ip,m);
+                      cell_moduli(c-jp,m);
+                      cell_moduli(c-ip-jp,m);
+                      edge_moduli(e,m)=
+                        pow(cell_moduli(c,m)*cell_moduli(c-ip,m)
+                            *cell_moduli(c-jp,m)*cell_moduli(c-ip-jp,m),0.25);
+                    }
 		}
-	}
-	else
+            }
+          else
             {
               tbox::Pointer<pdat::EdgeData<double> >
                 edge_moduli_ptr = patch->getPatchData(edge_moduli_id);
@@ -108,17 +108,20 @@ void SAMRAI::FACStokes::fix_moduli()
               for(int axis=0;axis<3;++axis)
                 {
                   const int axis2((axis+1)%3), axis3((axis+2)%3);
-                  for(pdat::EdgeIterator ni(edge_moduli.getBox(),axis); ni; ni++)
+                  hier::Box pbox=patch->getBox();
+                  pbox.grow(axis,edge_moduli.getGhostCellWidth()[axis]);
+
+                  for(pdat::EdgeIterator ni(pbox,axis); ni; ni++)
                     {
                       pdat::EdgeIndex e=ni();
                       pdat::CellIndex c(e);
 		      for (int m=0;m<2;++m)
-		      {
-                      edge_moduli(e,m)=
-                        pow(cell_moduli(c,m)*cell_moduli(c-pp[axis2],m)
-                            *cell_moduli(c-pp[axis3],m)
-                            *cell_moduli(c-pp[axis2]-pp[axis3],m),0.25);
-		      }
+                        {
+                          edge_moduli(e,m)=
+                            pow(cell_moduli(c,m)*cell_moduli(c-pp[axis2],m)
+                                *cell_moduli(c-pp[axis3],m)
+                                *cell_moduli(c-pp[axis2]-pp[axis3],m),0.25);
+                        }
                     }
                 }
             }