[cig-commits] commit: Simplify calls to dRc_dp

[Mercurial]

changeset:   140:532a610b132a
tag:         tip
user:        Walter Landry <wlandry at caltech.edu>
date:        Fri Mar 18 20:55:09 2011 -0700
files:       P_MDPI_Refine.C StokesFACOps/smooth_Tackley_2D.C dRc_dp.h
description:
Simplify calls to dRc_dp


diff -r 56d2468e58d4 -r 532a610b132a P_MDPI_Refine.C
--- a/P_MDPI_Refine.C	Fri Mar 18 20:38:07 2011 -0700
+++ b/P_MDPI_Refine.C	Fri Mar 18 20:55:09 2011 -0700
@@ -117,17 +117,13 @@ void SAMRAI::geom::P_MDPI_Refine::refine
                    c_fine[0]+=xx;
                    c_fine[1]+=yy;
                
-                   pdat::CellIndex left(c_fine-ip),right(c_fine+ip),
-                     down(c_fine-jp), up(c_fine+jp);
-                   pdat::SideIndex left_x(left,0,pdat::SideIndex::Lower),
-                     right_x(right,0,pdat::SideIndex::Lower),
-                     down_y(down,1,pdat::SideIndex::Lower),
-                     up_y(up,1,pdat::SideIndex::Lower);
+                   pdat::SideIndex x(c_fine,0,pdat::SideIndex::Lower),
+                     y(c_fine,1,pdat::SideIndex::Lower);
 
                    double dRc_dp_weight=
-                     dRc_dp(fine_box,c_fine,left,right,down,up,
-                            left_x,right_x,down_y,up_y,
+                     dRc_dp(fine_box,c_fine,x,y,
                             cell_viscosity,edge_viscosity,v,dx,dy);
+                            
 
                    if(c_fine==fine)
                      dRc_dp_fine=dRc_dp_weight;
diff -r 56d2468e58d4 -r 532a610b132a StokesFACOps/smooth_Tackley_2D.C
--- a/StokesFACOps/smooth_Tackley_2D.C	Fri Mar 18 20:38:07 2011 -0700
+++ b/StokesFACOps/smooth_Tackley_2D.C	Fri Mar 18 20:55:09 2011 -0700
@@ -234,10 +234,7 @@ void SAMRAI::solv::StokesFACOps::smooth_
               maxres=std::max(maxres,std::fabs(delta_R_continuity));
 
               dp(center)=delta_R_continuity*theta_continuity
-                /dRc_dp(pbox,center,center-ip,center+ip,center-jp,center+jp,
-                        x-ip,x+ip,y-jp,y+jp,
-                        cell_viscosity,edge_viscosity,
-                        v,dx,dy);
+                /dRc_dp(pbox,center,x,y,cell_viscosity,edge_viscosity,v,dx,dy);
               p(center)+=dp(center);
             }
         }
diff -r 56d2468e58d4 -r 532a610b132a dRc_dp.h
--- a/dRc_dp.h	Fri Mar 18 20:38:07 2011 -0700
+++ b/dRc_dp.h	Fri Mar 18 20:55:09 2011 -0700
@@ -14,25 +14,19 @@
 
 inline double dRc_dp(const SAMRAI::hier::Box &pbox,
                      const SAMRAI::pdat::CellIndex &center,
-                     const SAMRAI::pdat::CellIndex &left,
-                     const SAMRAI::pdat::CellIndex &right, 
-                     const SAMRAI::pdat::CellIndex &down,
-                     const SAMRAI::pdat::CellIndex &up,
-                     const SAMRAI::pdat::SideIndex &left_x,
-                     const SAMRAI::pdat::SideIndex &right_x,
-                     const SAMRAI::pdat::SideIndex &down_y,
-                     const SAMRAI::pdat::SideIndex &up_y,
+                     const SAMRAI::pdat::SideIndex &x,
+                     const SAMRAI::pdat::SideIndex &y,
                      SAMRAI::pdat::CellData<double> &cell_viscosity,
                      SAMRAI::pdat::NodeData<double> &edge_viscosity,
                      SAMRAI::pdat::SideData<double> &v,
                      const double &dx,
                      const double &dy)
 {
+  const SAMRAI::hier::Index ip(1,0), jp(0,1);
   const SAMRAI::pdat::NodeIndex
     center_e(center,SAMRAI::pdat::NodeIndex::LowerLeft),
-    up_e(up,SAMRAI::pdat::NodeIndex::LowerLeft),
-    right_e(right,SAMRAI::pdat::NodeIndex::LowerLeft);
-  const SAMRAI::hier::Index ip(1,0), jp(0,1);
+    up_e(center_e+jp),right_e(center_e+ip);
+    
   const double dRm_dp_xp(1/dx), dRm_dp_xm(-1/dx),
     dRm_dp_yp(1/dy), dRm_dp_ym(-1/dy),
     dRc_dvx_p(-1/dx), dRc_dvx_m(1/dx),
@@ -40,21 +34,22 @@ inline double dRc_dp(const SAMRAI::hier:
 
   double result(0);
 
-  if(!(center[0]==pbox.lower(0) && v(left_x)==boundary_value))
-    result+=dRc_dvx_p * dRm_dp_xp/dRm_dv(cell_viscosity,edge_viscosity,right,
+  if(!(center[0]==pbox.lower(0) && v(x-ip)==boundary_value))
+    result+=dRc_dvx_p * dRm_dp_xp/dRm_dv(cell_viscosity,edge_viscosity,
+                                         center+ip,
                                          center,up_e+ip,center_e+ip,dx,dy);
 
-  if(!(center[0]==pbox.upper(0)+1 && v(right_x)==boundary_value))
+  if(!(center[0]==pbox.upper(0)+1 && v(x+ip)==boundary_value))
     result+=dRc_dvx_m * dRm_dp_xm/dRm_dv(cell_viscosity,edge_viscosity,
-                                         center,left,up_e,center_e,dx,dy);
+                                         center,center-ip,up_e,center_e,dx,dy);
 
-  if(!(center[1]==pbox.lower(1) && v(down_y)==boundary_value))
-    result+=dRc_dvy_p * dRm_dp_yp/dRm_dv(cell_viscosity,edge_viscosity,up,
+  if(!(center[1]==pbox.lower(1) && v(y-jp)==boundary_value))
+    result+=dRc_dvy_p * dRm_dp_yp/dRm_dv(cell_viscosity,edge_viscosity,center+jp,
                                          center,right_e+jp,center_e+jp,dy,dx);
 
-  if(!(center[1]==pbox.upper(1)+1 && v(up_y)==boundary_value))
-    result+=dRc_dvy_m * dRm_dp_ym/dRm_dv(cell_viscosity,edge_viscosity,
-                                         center,down,right_e,center_e,dy,dx);
+  if(!(center[1]==pbox.upper(1)+1 && v(y+jp)==boundary_value))
+    result+=dRc_dvy_m * dRm_dp_ym/dRm_dv(cell_viscosity,edge_viscosity,center,
+                                         center-jp,right_e,center_e,dy,dx);
 
   return result;
 }