[cig-commits] commit: Move Boundary.h to Constants.h, and put invalid_id there. Also change all of the magic -1 numbers to invalid_id
Mercurial
hg at geodynamics.org
Tue Apr 26 22:15:09 PDT 2011
changeset: 212:0c7c05a016e3
tag: tip
user: Walter Landry <wlandry at caltech.edu>
date: Tue Apr 26 22:13:52 2011 -0700
files: src/Boundary.h src/Constants.h src/P_Refine_Patch_Strategy.h src/StokesFACOps.h src/StokesFACOps/StokesFACOps.C src/StokesFACOps/residual_2D.C src/StokesFACOps/residual_3D.C src/StokesFACOps/set_boundaries.C src/StokesFACOps/smooth_Gerya.C src/StokesFACOps/smooth_Tackley_2D.C src/StokesFACOps/smooth_Tackley_3D.C src/StokesFACOps/smooth_V_2D.C src/StokesFACOps/smooth_V_3D.C src/StokesFACOps/xeqScheduleGhostFill.C src/V_Boundary_Refine/Update_V_2D.C src/V_Boundary_Refine/Update_V_3D.C src/V_Coarsen/coarsen_2D.C src/V_Coarsen/coarsen_3D.C src/V_Coarsen_Patch_Strategy.h src/V_Refine_Patch_Strategy.h src/dRc_dp.h src/set_boundary.C
description:
Move Boundary.h to Constants.h, and put invalid_id there. Also change all of the magic -1 numbers to invalid_id
diff -r 3d997164808d -r 0c7c05a016e3 src/Boundary.h
--- a/src/Boundary.h Tue Apr 26 16:30:45 2011 -0700
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,4 +0,0 @@
-#ifndef GAMR_BOUNDARY_H
-#define GAMR_BOUNDARY_H
-const double boundary_value=1e100;
-#endif
diff -r 3d997164808d -r 0c7c05a016e3 src/Constants.h
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Constants.h Tue Apr 26 22:13:52 2011 -0700
@@ -0,0 +1,5 @@
+#ifndef GAMR_CONSTANTS_H
+#define GAMR_CONSTANTS_H
+const double boundary_value=1e100;
+const int invalid_id=-1;
+#endif
diff -r 3d997164808d -r 0c7c05a016e3 src/P_Refine_Patch_Strategy.h
--- a/src/P_Refine_Patch_Strategy.h Tue Apr 26 16:30:45 2011 -0700
+++ b/src/P_Refine_Patch_Strategy.h Tue Apr 26 22:13:52 2011 -0700
@@ -16,7 +16,7 @@
#include "SAMRAI/geom/CartesianPatchGeometry.h"
#include "SAMRAI/pdat/CellData.h"
#include "SAMRAI/pdat/CellIndex.h"
-#include "Boundary.h"
+#include "Constants.h"
#include "set_boundary.h"
namespace SAMRAI {
@@ -72,7 +72,7 @@ public:
const hier::Box& ,
const hier::IntVector& )
{
- set_boundary(coarse,p_id,-1,true);
+ set_boundary(coarse,p_id,invalid_id,true);
}
virtual void
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps.h
--- a/src/StokesFACOps.h Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps.h Tue Apr 26 22:13:52 2011 -0700
@@ -951,8 +951,6 @@ private:
*/
int d_cell_scratch_id, d_side_scratch_id;
- const int invalid_id;
-
//@}
//@{
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps/StokesFACOps.C
--- a/src/StokesFACOps/StokesFACOps.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps/StokesFACOps.C Tue Apr 26 22:13:52 2011 -0700
@@ -8,37 +8,6 @@
*
************************************************************************/
#include "StokesFACOps.h"
-
-#include IOMANIP_HEADER_FILE
-
-#include "SAMRAI/hier/BoundaryBoxUtils.h"
-#include "SAMRAI/geom/CartesianGridGeometry.h"
-#include "SAMRAI/geom/CartesianPatchGeometry.h"
-#include "SAMRAI/hier/Index.h"
-#include "SAMRAI/hier/Variable.h"
-#include "SAMRAI/hier/VariableDatabase.h"
-#include "SAMRAI/pdat/CellDoubleConstantRefine.h"
-#include "SAMRAI/pdat/CellVariable.h"
-#include "SAMRAI/pdat/OutersideData.h"
-#include "SAMRAI/pdat/OutersideVariable.h"
-#include "SAMRAI/hier/PatchData.h"
-#include "SAMRAI/pdat/SideVariable.h"
-#include "SAMRAI/solv/FACPreconditioner.h"
-#include "StokesHypreSolver.h"
-#include "SAMRAI/tbox/Array.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/tbox/StartupShutdownManager.h"
-#include "SAMRAI/tbox/Timer.h"
-#include "SAMRAI/tbox/TimerManager.h"
-#include "SAMRAI/tbox/Utilities.h"
-#include "SAMRAI/tbox/MathUtilities.h"
-#include "SAMRAI/xfer/CoarsenAlgorithm.h"
-#include "SAMRAI/xfer/CoarsenOperator.h"
-#include "SAMRAI/xfer/CoarsenSchedule.h"
-#include "SAMRAI/xfer/RefineAlgorithm.h"
-#include "SAMRAI/xfer/RefineOperator.h"
-#include "SAMRAI/xfer/RefineSchedule.h"
-#include "SAMRAI/xfer/PatchLevelFullFillPattern.h"
#ifndef SAMRAI_INLINE
#include "StokesFACOps.I"
@@ -90,9 +59,9 @@ namespace SAMRAI {
d_coarse_solver_tolerance(1.e-8),
d_coarse_solver_max_iterations(10),
d_residual_tolerance_during_smoothing(-1.0),
- cell_viscosity_id(-1),
- edge_viscosity_id(-1),
- dp_id(-1),
+ cell_viscosity_id(invalid_id),
+ edge_viscosity_id(invalid_id),
+ dp_id(invalid_id),
#ifdef HAVE_HYPRE
d_hypre_solver(dim,
object_name + "::hypre_solver",
@@ -103,9 +72,8 @@ namespace SAMRAI {
// d_physical_bc_coef(NULL),
d_context(hier::VariableDatabase::getDatabase()
->getContext(object_name + "::PRIVATE_CONTEXT")),
- d_cell_scratch_id(-1),
- d_side_scratch_id(-1),
- invalid_id(-1),
+ d_cell_scratch_id(invalid_id),
+ d_side_scratch_id(invalid_id),
p_prolongation_refine_operator(),
p_prolongation_refine_schedules(),
v_prolongation_refine_operator(),
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps/residual_2D.C
--- a/src/StokesFACOps/residual_2D.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps/residual_2D.C Tue Apr 26 22:13:52 2011 -0700
@@ -1,5 +1,5 @@
#include "StokesFACOps.h"
-#include "Boundary.h"
+#include "Constants.h"
void SAMRAI::solv::StokesFACOps::residual_2D
(pdat::CellData<double> &p,
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps/residual_3D.C
--- a/src/StokesFACOps/residual_3D.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps/residual_3D.C Tue Apr 26 22:13:52 2011 -0700
@@ -1,5 +1,5 @@
#include "StokesFACOps.h"
-#include "Boundary.h"
+#include "Constants.h"
void SAMRAI::solv::StokesFACOps::residual_3D
(pdat::CellData<double> &p,
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps/set_boundaries.C
--- a/src/StokesFACOps/set_boundaries.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps/set_boundaries.C Tue Apr 26 22:13:52 2011 -0700
@@ -40,7 +40,7 @@
#include "SAMRAI/xfer/RefineSchedule.h"
#include "SAMRAI/xfer/PatchLevelFullFillPattern.h"
-#include "Boundary.h"
+#include "Constants.h"
#include "set_boundary.h"
/* Set the physical boundaries for the velocity. */
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps/smooth_Gerya.C
--- a/src/StokesFACOps/smooth_Gerya.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps/smooth_Gerya.C Tue Apr 26 22:13:52 2011 -0700
@@ -1,5 +1,5 @@
#include "StokesFACOps.h"
-#include "Boundary.h"
+#include "Constants.h"
/* Smooth the error using a red-black Gauss-Seidel smoother inspired
by Introduction to Numerical Geodynamic Modelling, Taras Gerya,
2010
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps/smooth_Tackley_2D.C
--- a/src/StokesFACOps/smooth_Tackley_2D.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps/smooth_Tackley_2D.C Tue Apr 26 22:13:52 2011 -0700
@@ -1,5 +1,5 @@
#include "StokesFACOps.h"
-#include "Boundary.h"
+#include "Constants.h"
#include "dRc_dp.h"
/*
********************************************************************
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps/smooth_Tackley_3D.C
--- a/src/StokesFACOps/smooth_Tackley_3D.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps/smooth_Tackley_3D.C Tue Apr 26 22:13:52 2011 -0700
@@ -1,5 +1,5 @@
#include "StokesFACOps.h"
-#include "Boundary.h"
+#include "Constants.h"
#include "dRc_dp.h"
/*
********************************************************************
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps/smooth_V_2D.C
--- a/src/StokesFACOps/smooth_V_2D.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps/smooth_V_2D.C Tue Apr 26 22:13:52 2011 -0700
@@ -1,5 +1,5 @@
#include "StokesFACOps.h"
-#include "Boundary.h"
+#include "Constants.h"
#include "dRm_dv.h"
/*
********************************************************************
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps/smooth_V_3D.C
--- a/src/StokesFACOps/smooth_V_3D.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps/smooth_V_3D.C Tue Apr 26 22:13:52 2011 -0700
@@ -1,5 +1,5 @@
#include "StokesFACOps.h"
-#include "Boundary.h"
+#include "Constants.h"
#include "dRc_dp.h"
/*
********************************************************************
diff -r 3d997164808d -r 0c7c05a016e3 src/StokesFACOps/xeqScheduleGhostFill.C
--- a/src/StokesFACOps/xeqScheduleGhostFill.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/StokesFACOps/xeqScheduleGhostFill.C Tue Apr 26 22:13:52 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(-1,v_id,dest_ln-1);
+ set_boundaries(invalid_id,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]);
diff -r 3d997164808d -r 0c7c05a016e3 src/V_Boundary_Refine/Update_V_2D.C
--- a/src/V_Boundary_Refine/Update_V_2D.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/V_Boundary_Refine/Update_V_2D.C Tue Apr 26 22:13:52 2011 -0700
@@ -1,6 +1,6 @@
#include "V_Boundary_Refine.h"
#include "quad_offset_interpolate.h"
-#include "Boundary.h"
+#include "Constants.h"
/* This is written from the perspective of axis==x. For axis==y, we
switch i and j and everything works out. */
diff -r 3d997164808d -r 0c7c05a016e3 src/V_Boundary_Refine/Update_V_3D.C
--- a/src/V_Boundary_Refine/Update_V_3D.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/V_Boundary_Refine/Update_V_3D.C Tue Apr 26 22:13:52 2011 -0700
@@ -1,6 +1,6 @@
#include "V_Boundary_Refine.h"
#include "quad_offset_interpolate.h"
-#include "Boundary.h"
+#include "Constants.h"
/* This is written from the perspective of axis==x. For axis==y, we
switch i and j and everything works out. */
diff -r 3d997164808d -r 0c7c05a016e3 src/V_Coarsen/coarsen_2D.C
--- a/src/V_Coarsen/coarsen_2D.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/V_Coarsen/coarsen_2D.C Tue Apr 26 22:13:52 2011 -0700
@@ -21,7 +21,7 @@
#include "SAMRAI/pdat/SideData.h"
#include "SAMRAI/pdat/SideVariable.h"
#include "SAMRAI/tbox/Utilities.h"
-#include "Boundary.h"
+#include "Constants.h"
using namespace SAMRAI;
diff -r 3d997164808d -r 0c7c05a016e3 src/V_Coarsen/coarsen_3D.C
--- a/src/V_Coarsen/coarsen_3D.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/V_Coarsen/coarsen_3D.C Tue Apr 26 22:13:52 2011 -0700
@@ -21,7 +21,7 @@
#include "SAMRAI/pdat/SideData.h"
#include "SAMRAI/pdat/SideVariable.h"
#include "SAMRAI/tbox/Utilities.h"
-#include "Boundary.h"
+#include "Constants.h"
using namespace SAMRAI;
diff -r 3d997164808d -r 0c7c05a016e3 src/V_Coarsen_Patch_Strategy.h
--- a/src/V_Coarsen_Patch_Strategy.h Tue Apr 26 16:30:45 2011 -0700
+++ b/src/V_Coarsen_Patch_Strategy.h Tue Apr 26 22:13:52 2011 -0700
@@ -17,7 +17,7 @@
#include "SAMRAI/hier/CoarseFineBoundary.h"
#include "SAMRAI/pdat/SideData.h"
#include "SAMRAI/pdat/CellIndex.h"
-#include "Boundary.h"
+#include "Constants.h"
#include "set_boundary.h"
namespace SAMRAI {
@@ -64,7 +64,7 @@ public:
const hier::Box& ,
const hier::IntVector& )
{
- set_boundary(fine,-1,v_id,true);
+ set_boundary(fine,invalid_id,v_id,true);
}
virtual void
diff -r 3d997164808d -r 0c7c05a016e3 src/V_Refine_Patch_Strategy.h
--- a/src/V_Refine_Patch_Strategy.h Tue Apr 26 16:30:45 2011 -0700
+++ b/src/V_Refine_Patch_Strategy.h Tue Apr 26 22:13:52 2011 -0700
@@ -16,7 +16,7 @@
#include "SAMRAI/geom/CartesianPatchGeometry.h"
#include "SAMRAI/pdat/SideData.h"
#include "SAMRAI/pdat/CellIndex.h"
-#include "Boundary.h"
+#include "Constants.h"
#include "set_boundary.h"
namespace SAMRAI {
@@ -72,7 +72,7 @@ public:
const hier::Box& ,
const hier::IntVector& )
{
- set_boundary(coarse,-1,v_id,true);
+ set_boundary(coarse,invalid_id,v_id,true);
}
virtual void
diff -r 3d997164808d -r 0c7c05a016e3 src/dRc_dp.h
--- a/src/dRc_dp.h Tue Apr 26 16:30:45 2011 -0700
+++ b/src/dRc_dp.h Tue Apr 26 22:13:52 2011 -0700
@@ -5,7 +5,7 @@
#include "SAMRAI/pdat/NodeData.h"
#include "SAMRAI/pdat/SideData.h"
#include "dRm_dv.h"
-#include "Boundary.h"
+#include "Constants.h"
/* These two functions should really have a more similar API */
diff -r 3d997164808d -r 0c7c05a016e3 src/set_boundary.C
--- a/src/set_boundary.C Tue Apr 26 16:30:45 2011 -0700
+++ b/src/set_boundary.C Tue Apr 26 22:13:52 2011 -0700
@@ -1,5 +1,5 @@
#include "set_boundary.h"
-#include "Boundary.h"
+#include "Constants.h"
#include "SAMRAI/tbox/Pointer.h"
#include "SAMRAI/pdat/SideData.h"
#include "SAMRAI/pdat/CellData.h"
@@ -33,7 +33,7 @@ void set_boundary(const SAMRAI::hier::Pa
bool upper_dirichlet[]={true,true,true};
double upper_boundary[]={0,0,0};
- if(p_id!=-1)
+ if(p_id!=invalid_id)
{
tbox::Pointer<pdat::CellData<double> > p_ptr = patch.getPatchData(p_id);
pdat::CellData<double> &p(*p_ptr);
@@ -124,7 +124,7 @@ void set_boundary(const SAMRAI::hier::Pa
}
- if(v_id!=-1)
+ if(v_id!=invalid_id)
{
tbox::Pointer<pdat::SideData<double> > v_ptr = patch.getPatchData(v_id);
pdat::SideData<double> &v(*v_ptr);
More information about the CIG-COMMITS
mailing list