[cig-commits] commit: Remove a lot of output statements
Mercurial
hg at geodynamics.org
Fri Feb 25 14:17:07 PST 2011
changeset: 91:3327ab5dc4e3
user: Walter Landry <wlandry at caltech.edu>
date: Wed Feb 16 14:03:25 2011 -0800
files: P_Boundary_Refine.C P_Refine.C V_Coarsen.C V_Coarsen_Patch_Strategy.C V_Refine.C
description:
Remove a lot of output statements
diff -r 5512a5d6ff78 -r 3327ab5dc4e3 P_Boundary_Refine.C
--- a/P_Boundary_Refine.C Wed Feb 16 13:56:02 2011 -0800
+++ b/P_Boundary_Refine.C Wed Feb 16 14:03:25 2011 -0800
@@ -83,25 +83,25 @@ void SAMRAI::geom::P_Boundary_Refine::re
}
/* We have to infer where the boundary is from the boxes */
- tbox::plog << "PBR "
- << fine.getPatchLevelNumber() << " "
- << boundary_direction << " "
- << std::boolalpha
- << boundary_positive << " "
- << coarse_box.lower(0) << " "
- << coarse_box.upper(0) << " "
- << coarse_box.lower(1) << " "
- << coarse_box.upper(1) << " "
- << fine_box.lower(0) << " "
- << fine_box.upper(0) << " "
- << fine_box.lower(1) << " "
- << fine_box.upper(1) << " "
+ // tbox::plog << "PBR "
+ // << fine.getPatchLevelNumber() << " "
+ // << boundary_direction << " "
+ // << std::boolalpha
+ // << boundary_positive << " "
+ // << coarse_box.lower(0) << " "
+ // << coarse_box.upper(0) << " "
+ // << coarse_box.lower(1) << " "
+ // << coarse_box.upper(1) << " "
+ // << fine_box.lower(0) << " "
+ // << fine_box.upper(0) << " "
+ // << fine_box.lower(1) << " "
+ // << fine_box.upper(1) << " "
- << overlap_box.lower(0) << " "
- << overlap_box.upper(0) << " "
- << overlap_box.lower(1) << " "
- << overlap_box.upper(1) << " "
- << "\n";
+ // << overlap_box.lower(0) << " "
+ // << overlap_box.upper(0) << " "
+ // << overlap_box.lower(1) << " "
+ // << overlap_box.upper(1) << " "
+ // << "\n";
int i_min(std::max(overlap_box.lower(0),gbox.lower(0))),
i_max(std::min(overlap_box.upper(0),gbox.upper(0))),
@@ -204,24 +204,24 @@ void SAMRAI::geom::P_Boundary_Refine::Up
(*p_fine)(fine)=p_high;
}
- tbox::plog << "p bc "
- << fine[0] << " "
- << fine[1] << " "
- << center[0] << " "
- << center[1] << " "
- << jp[0] << " "
- << jp[1] << " "
- << (*p_fine)(fine) << " "
- << (*p_fine)(fine+jp) << " "
- << p_minus << " "
- << p_plus << " "
- << p_offset << " "
- << (*p)(center+jp) << " "
- << (*p)(center) << " "
- << (*p)(center-jp) << " "
- << (*p)(center+ip) << " "
- << (*p)(center-ip) << " "
- << (*p)(center-ip+jp) << " "
- << (*p)(center-ip-jp) << " "
- << "\n";
+ // tbox::plog << "p bc "
+ // << fine[0] << " "
+ // << fine[1] << " "
+ // << center[0] << " "
+ // << center[1] << " "
+ // << jp[0] << " "
+ // << jp[1] << " "
+ // << (*p_fine)(fine) << " "
+ // << (*p_fine)(fine+jp) << " "
+ // << p_minus << " "
+ // << p_plus << " "
+ // << p_offset << " "
+ // << (*p)(center+jp) << " "
+ // << (*p)(center) << " "
+ // << (*p)(center-jp) << " "
+ // << (*p)(center+ip) << " "
+ // << (*p)(center-ip) << " "
+ // << (*p)(center-ip+jp) << " "
+ // << (*p)(center-ip-jp) << " "
+ // << "\n";
}
diff -r 5512a5d6ff78 -r 3327ab5dc4e3 P_Refine.C
--- a/P_Refine.C Wed Feb 16 13:56:02 2011 -0800
+++ b/P_Refine.C Wed Feb 16 14:03:25 2011 -0800
@@ -134,15 +134,15 @@ void SAMRAI::geom::P_Refine::refine(
+ ((i%2==0) ? (-dp_dx) : dp_dx)
+ ((j%2==0) ? (-dp_dy) : dp_dy);
- tbox::plog << "P_Refine "
- << fine_patch.getPatchLevelNumber() << " "
- << i << " "
- << j << " "
- << (*p_fine)(fine) << " "
- << (*p)(center) << " "
- << dp_dx << " "
- << dp_dy << " "
- << "\n";
+ // tbox::plog << "P_Refine "
+ // << fine_patch.getPatchLevelNumber() << " "
+ // << i << " "
+ // << j << " "
+ // << (*p_fine)(fine) << " "
+ // << (*p)(center) << " "
+ // << dp_dx << " "
+ // << dp_dy << " "
+ // << "\n";
}
}
diff -r 5512a5d6ff78 -r 3327ab5dc4e3 V_Coarsen.C
--- a/V_Coarsen.C Wed Feb 16 13:56:02 2011 -0800
+++ b/V_Coarsen.C Wed Feb 16 14:03:25 2011 -0800
@@ -108,18 +108,18 @@ void SAMRAI::geom::V_Coarsen::coarsen(hi
for(int j=coarse_box.lower(1); j<=coarse_box.upper(1)+1; ++j)
for(int i=coarse_box.lower(0); i<=coarse_box.upper(0)+1; ++i)
{
- tbox::plog << "V Coarsen "
- << coarse.getPatchLevelNumber() << " "
- << i << " "
- << j << " "
- << fine.getBox().lower(0) << " "
- << fine.getBox().upper(0) << " "
- << fine.getBox().lower(1) << " "
- << fine.getBox().upper(1) << " "
- << v_fine->getGhostBox().lower(0) << " "
- << v_fine->getGhostBox().upper(0) << " "
- << v_fine->getGhostBox().lower(1) << " "
- << v_fine->getGhostBox().upper(1) << " ";
+ // tbox::plog << "V Coarsen "
+ // << coarse.getPatchLevelNumber() << " "
+ // << i << " "
+ // << j << " "
+ // << fine.getBox().lower(0) << " "
+ // << fine.getBox().upper(0) << " "
+ // << fine.getBox().lower(1) << " "
+ // << fine.getBox().upper(1) << " "
+ // << v_fine->getGhostBox().lower(0) << " "
+ // << v_fine->getGhostBox().upper(0) << " "
+ // << v_fine->getGhostBox().lower(1) << " "
+ // << v_fine->getGhostBox().upper(1) << " ";
if(directions(0) && j!=coarse_box.upper(1)+1)
{
@@ -137,14 +137,14 @@ void SAMRAI::geom::V_Coarsen::coarsen(hi
{
coarsen_v(coarse,ip,jp,v,v_fine);
}
- tbox::plog << "vx "
- << (*v)(coarse) << " "
- << (*v_fine)(center) << " "
- << (*v_fine)(center+jp) << " "
- << (*v_fine)(center+ip) << " "
- << (*v_fine)(center+jp+ip) << " "
- << (*v_fine)(center-ip) << " "
- << (*v_fine)(center+jp-ip) << " ";
+ // tbox::plog << "vx "
+ // << (*v)(coarse) << " "
+ // << (*v_fine)(center) << " "
+ // << (*v_fine)(center+jp) << " "
+ // << (*v_fine)(center+ip) << " "
+ // << (*v_fine)(center+jp+ip) << " "
+ // << (*v_fine)(center-ip) << " "
+ // << (*v_fine)(center+jp-ip) << " ";
}
if(directions(1) && i!=coarse_box.upper(0)+1)
{
@@ -156,24 +156,24 @@ void SAMRAI::geom::V_Coarsen::coarsen(hi
|| (j==coarse_box.upper(1)+1
&& cgeom->getTouchesRegularBoundary(1,1)))
{
- tbox::plog << "vy bound ";
+ // tbox::plog << "vy bound ";
(*v)(coarse)=((*v_fine)(center) + (*v_fine)(center+ip))/2;
}
else
{
- tbox::plog << "vy center ";
+ // tbox::plog << "vy center ";
coarsen_v(coarse,jp,ip,v,v_fine);
}
- tbox::plog << "vy "
- << (*v)(coarse) << " "
- << (*v_fine)(center) << " "
- << (*v_fine)(center+ip) << " "
- << (*v_fine)(center+jp) << " "
- << (*v_fine)(center+jp+ip) << " "
- << (*v_fine)(center-jp) << " "
- << (*v_fine)(center+ip-jp) << " ";
+ // tbox::plog << "vy "
+ // << (*v)(coarse) << " "
+ // << (*v_fine)(center) << " "
+ // << (*v_fine)(center+ip) << " "
+ // << (*v_fine)(center+jp) << " "
+ // << (*v_fine)(center+jp+ip) << " "
+ // << (*v_fine)(center-jp) << " "
+ // << (*v_fine)(center+ip-jp) << " ";
}
- tbox::plog << "\n";
+ // tbox::plog << "\n";
}
}
diff -r 5512a5d6ff78 -r 3327ab5dc4e3 V_Coarsen_Patch_Strategy.C
--- a/V_Coarsen_Patch_Strategy.C Wed Feb 16 13:56:02 2011 -0800
+++ b/V_Coarsen_Patch_Strategy.C Wed Feb 16 14:03:25 2011 -0800
@@ -36,28 +36,28 @@ SAMRAI::solv::V_Coarsen_Patch_Strategy::
hier::Index lower=hier::Index::coarsen(bbox.lower(),hier::Index(2,2)),
upper=hier::Index::coarsen(bbox.upper(),hier::Index(2,2));
- tbox::plog << "VCPS "
- << mm << " "
- << bbox.lower(0) << " "
- << bbox.upper(0) << " "
- << bbox.lower(1) << " "
- << bbox.upper(1) << " "
- << lower(0) << " "
- << upper(0) << " "
- << lower(1) << " "
- << upper(1) << " "
- << v_fine->getGhostBox().lower(0) << " "
- << v_fine->getGhostBox().upper(0) << " "
- << v_fine->getGhostBox().lower(1) << " "
- << v_fine->getGhostBox().upper(1) << " "
- << "\n";
+ // tbox::plog << "VCPS "
+ // << mm << " "
+ // << bbox.lower(0) << " "
+ // << bbox.upper(0) << " "
+ // << bbox.lower(1) << " "
+ // << bbox.upper(1) << " "
+ // << lower(0) << " "
+ // << upper(0) << " "
+ // << lower(1) << " "
+ // << upper(1) << " "
+ // << v_fine->getGhostBox().lower(0) << " "
+ // << v_fine->getGhostBox().upper(0) << " "
+ // << v_fine->getGhostBox().lower(1) << " "
+ // << v_fine->getGhostBox().upper(1) << " "
+ // << "\n";
for(int j=lower(1); j<=upper(1); ++j)
for(int i=lower(0); i<=upper(0); ++i)
{
- tbox::plog << "V Patch "
- << i << " "
- << j << " ";
+ // tbox::plog << "V Patch "
+ // << i << " "
+ // << j << " ";
/* Fix vx */
if(location_index==0)
{
@@ -67,7 +67,7 @@ SAMRAI::solv::V_Coarsen_Patch_Strategy::
if(center[1]>=gbox.lower(1) && center[1]<gbox.upper(1))
{
(*v)(coarse)=((*v_fine)(center) + (*v_fine)(center+jp))/2;
- tbox::plog << (*v)(coarse) << " ";
+ // tbox::plog << (*v)(coarse) << " ";
}
}
else if(location_index==1)
@@ -78,7 +78,7 @@ SAMRAI::solv::V_Coarsen_Patch_Strategy::
if(center[1]>=gbox.lower(1) && center[1]<gbox.upper(1))
{
(*v)(coarse)=((*v_fine)(center) + (*v_fine)(center+jp))/2;
- tbox::plog << (*v)(coarse) << " ";
+ // tbox::plog << (*v)(coarse) << " ";
}
}
/* Fix vy */
@@ -90,7 +90,7 @@ SAMRAI::solv::V_Coarsen_Patch_Strategy::
if(center[0]>=gbox.lower(0) && center[0]<gbox.upper(0))
{
(*v)(coarse)=((*v_fine)(center) + (*v_fine)(center+ip))/2;
- tbox::plog << (*v)(coarse) << " ";
+ // tbox::plog << (*v)(coarse) << " ";
}
}
else if(location_index==3)
@@ -101,14 +101,14 @@ SAMRAI::solv::V_Coarsen_Patch_Strategy::
if(center[0]>=gbox.lower(0) && center[0]<gbox.upper(0))
{
(*v)(coarse)=((*v_fine)(center) + (*v_fine)(center+ip))/2;
- tbox::plog << (*v)(coarse) << " ";
+ // tbox::plog << (*v)(coarse) << " ";
}
}
else
{
abort();
}
- tbox::plog << "\n";
+ // tbox::plog << "\n";
}
}
}
diff -r 5512a5d6ff78 -r 3327ab5dc4e3 V_Refine.C
--- a/V_Refine.C Wed Feb 16 13:56:02 2011 -0800
+++ b/V_Refine.C Wed Feb 16 14:03:25 2011 -0800
@@ -86,9 +86,10 @@ void SAMRAI::geom::V_Refine::refine(hier
physical boundaries, where we do not have an extra grid
space. */
- tbox::plog << "V refine "
- << i << " "
- << j << " ";
+ // tbox::plog << "V refine "
+ // << axis << " "
+ // << i << " "
+ // << j << " ";
if(axis==0)
{
@@ -117,6 +118,11 @@ void SAMRAI::geom::V_Refine::refine(hier
(*v_fine)(fine)=(*v)(center)
+ ((j%2==0) ? (-dvx_dy) : dvx_dy);
+
+ // tbox::plog << (*v)(center) << " "
+ // << center[0] << " "
+ // << center[1] << " "
+ // << dvx_dy << " ";
}
else
{
@@ -190,9 +196,8 @@ void SAMRAI::geom::V_Refine::refine(hier
+ ((i%2==0) ? (-dvy_dx) : dvy_dx))/2;
}
}
- tbox::plog << axis << " "
- << (*v_fine)(fine) << " "
- << "\n";
+ // tbox::plog << (*v_fine)(fine) << " "
+ // << "\n";
}
}
More information about the CIG-COMMITS
mailing list