[cig-commits] commit: Rename v_operator to v_operator_2D

[Mercurial]

changeset:   125:97e5fd6864bf
user:        Walter Landry <wlandry at caltech.edu>
date:        Mon Mar 14 16:38:16 2011 -0700
files:       StokesFACOps.h StokesFACOps/Update_V.C StokesFACOps/residual_2D.C
description:
Rename v_operator to v_operator_2D


diff -r 7844b9f83588 -r 97e5fd6864bf StokesFACOps.h
--- a/StokesFACOps.h	Mon Mar 14 16:21:25 2011 -0700
+++ b/StokesFACOps.h	Mon Mar 14 16:38:16 2011 -0700
@@ -577,24 +577,24 @@ private:
      perspective of vx, but pass in different values for center_x
      etc. to get vy. */
 
-  double v_operator(pdat::SideData<double> &v,
-                    pdat::CellData<double> &p,
-                    pdat::CellData<double> &cell_viscosity,
-                    pdat::NodeData<double> &edge_viscosity,
-                    const pdat::CellIndex &center,
-                    const pdat::CellIndex &left,
-                    const pdat::SideIndex &center_x,
-                    const pdat::SideIndex &right_x,
-                    const pdat::SideIndex &left_x,
-                    const pdat::SideIndex &up_x,
-                    const pdat::SideIndex &down_x,
-                    const pdat::SideIndex &center_y,
-                    const pdat::SideIndex &up_y,
-                    const pdat::NodeIndex &center_e,
-                    const pdat::NodeIndex &up_e,
-                    const hier::Index &ip,
-                    const double &dx,
-                    const double &dy)
+  double v_operator_2D(pdat::SideData<double> &v,
+                       pdat::CellData<double> &p,
+                       pdat::CellData<double> &cell_viscosity,
+                       pdat::NodeData<double> &edge_viscosity,
+                       const pdat::CellIndex &center,
+                       const pdat::CellIndex &left,
+                       const pdat::SideIndex &center_x,
+                       const pdat::SideIndex &right_x,
+                       const pdat::SideIndex &left_x,
+                       const pdat::SideIndex &up_x,
+                       const pdat::SideIndex &down_x,
+                       const pdat::SideIndex &center_y,
+                       const pdat::SideIndex &up_y,
+                       const pdat::NodeIndex &center_e,
+                       const pdat::NodeIndex &up_e,
+                       const hier::Index &ip,
+                       const double &dx,
+                       const double &dy)
   {
     double dtau_xx_dx=
       2*((v(right_x)-v(center_x))*cell_viscosity(center)
diff -r 7844b9f83588 -r 97e5fd6864bf StokesFACOps/Update_V.C
--- a/StokesFACOps/Update_V.C	Mon Mar 14 16:21:25 2011 -0700
+++ b/StokesFACOps/Update_V.C	Mon Mar 14 16:38:16 2011 -0700
@@ -119,9 +119,11 @@ void SAMRAI::solv::StokesFACOps::Update_
                       dx,dy);
 
           double delta_Rx=v_rhs(center_x)
-            - v_operator(v,p,cell_viscosity,edge_viscosity,center,left,center_x,
-                         right_x,left_x,up_x,down_x,center_y,up_y,center_e,up_e,
-                         ip,dx,dy);
+            - v_operator_2D(v,p,cell_viscosity,edge_viscosity,center,
+                            left,center_x,
+                            right_x,left_x,up_x,down_x,center_y,up_y,
+                            center_e,up_e,
+                            ip,dx,dy);
 
           /* No scaling here, though there should be. */
           maxres=std::max(maxres,std::fabs(delta_Rx));
diff -r 7844b9f83588 -r 97e5fd6864bf StokesFACOps/residual_2D.C
--- a/StokesFACOps/residual_2D.C	Mon Mar 14 16:21:25 2011 -0700
+++ b/StokesFACOps/residual_2D.C	Mon Mar 14 16:38:16 2011 -0700
@@ -104,9 +104,9 @@ void SAMRAI::solv::StokesFACOps::residua
           else
             {
               v_resid(center_x)=v_rhs(center_x)
-                - v_operator(v,p,cell_viscosity,edge_viscosity,center,
-                             left,center_x,right_x,left_x,up_x,down_x,
-                             center_y,up_y,center_e,up_e,ip,dx,dy);
+                - v_operator_2D(v,p,cell_viscosity,edge_viscosity,center,
+                                left,center_x,right_x,left_x,up_x,down_x,
+                                center_y,up_y,center_e,up_e,ip,dx,dy);
             }
         }
 
@@ -122,10 +122,10 @@ void SAMRAI::solv::StokesFACOps::residua
           else
             {
               v_resid(center_y)=v_rhs(center_y)
-                - v_operator(v,p,cell_viscosity,edge_viscosity,center,
-                             down,center_y,up_y,down_y,right_y,left_y,
-                             center_x,right_x,center_e,right_e,jp,
-                             dy,dx);
+                - v_operator_2D(v,p,cell_viscosity,edge_viscosity,center,
+                                down,center_y,up_y,down_y,right_y,left_y,
+                                center_x,right_x,center_e,right_e,jp,
+                                dy,dx);
             }
         }
     }