CarpetRegrid: Change "&&" and "||" to "and" and "or"

darcs-hash:20050303102007-891bb-dda44e75d217fbbd7e62cb43b509ec5096699b26.gz

7 files changed, 24 insertions, 24 deletions

diff --git a/Carpet/CarpetRegrid/src/automatic.cc b/Carpet/CarpetRegrid/src/automatic.cc
index abe685d47..e36dfbc44 100644
--- a/Carpet/CarpetRegrid/src/automatic.cc
+++ b/Carpet/CarpetRegrid/src/automatic.cc
@@ -40,11 +40,11 @@ namespace CarpetRegrid {
     
     
     const int vi = CCTK_VarIndex (errorvar);
-    assert (vi>=0 && vi<CCTK_NumVars());
+    assert (vi>=0 and vi<CCTK_NumVars());
     const int gi = CCTK_GroupIndexFromVarI (vi);
-    assert (gi>=0 && gi<CCTK_NumGroups());
+    assert (gi>=0 and gi<CCTK_NumGroups());
     const int v1 = CCTK_FirstVarIndexI(gi);
-    assert (v1>=0 && v1<=vi && v1<CCTK_NumVars());
+    assert (v1>=0 and v1<=vi and v1<CCTK_NumVars());
     
     assert (CCTK_GroupTypeI(gi) == CCTK_GF);
     assert (CCTK_VarTypeI(vi) == CCTK_VARIABLE_REAL);
@@ -155,7 +155,7 @@ namespace CarpetRegrid {
     // Create obs from bbs
     obs.resize (bbs.size());
     for (size_t c=0; c<bbs.size(); ++c) {
-      assert (hh.bases().size()>0 && hh.bases().at(0).size()>0);
+      assert (hh.bases().size()>0 and hh.bases().at(0).size()>0);
       obs.at(c) = zip ((vect<bool,2> (*) (bool, bool)) &vect<bool,2>::make,
                     bbs.at(c).lower() == hh.baseextent.lower(),
                     bbs.at(c).upper() == hh.baseextent.upper());
@@ -193,7 +193,7 @@ namespace CarpetRegrid {
     
     if (cnt == 0) {
       // Don't refine
-    } else if (width < 2*minwidth || fraction >= minfraction) {
+    } else if (width < 2*minwidth or fraction >= minfraction) {
       // Refine the whole region
       const ivect lo(region.lower());
       const ivect up(region.upper());
@@ -368,7 +368,7 @@ namespace CarpetRegrid {
     bbl.splice (bbl.end(), bbl1);
     bbl.splice (bbl.end(), bbl2);
     
-    assert (bbl1.empty() && bbl2.empty());
+    assert (bbl1.empty() and bbl2.empty());
     
     const int newnumboxes = bbl.size();
     assert (newnumboxes + numcombinedboxes == oldnumboxes);
diff --git a/Carpet/CarpetRegrid/src/centre.cc b/Carpet/CarpetRegrid/src/centre.cc
index 2bcbda6eb..f9b384142 100644
--- a/Carpet/CarpetRegrid/src/centre.cc
+++ b/Carpet/CarpetRegrid/src/centre.cc
@@ -61,7 +61,7 @@ namespace CarpetRegrid {
       ivect const half    = (rub - rlb) / 2 / rstr * rstr;
       rlb = oldrlb + symmetric.ifthen(zero, quarter);
       rub = oldrub - symmetric.ifthen(half, quarter);
-      assert (all(rlb >= oldrlb && rub <= oldrub));
+      assert (all(rlb >= oldrlb and rub <= oldrub));
       
       ibbox const bb (rlb, rub, rstr);
       vector<ibbox> bbs (1);
diff --git a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
index 2467bae24..9e8588bbb 100644
--- a/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
+++ b/Carpet/CarpetRegrid/src/manualcoordinatelist.cc
@@ -106,7 +106,7 @@ namespace CarpetRegrid {
       
     } else {                    // if ! smart_outer_boundaries
       
-      if (strcmp(outerbounds, "") !=0 ) {
+      if (strcmp(outerbounds, "") != 0) {
         istringstream ob_str (outerbounds);
         try {
           ob_str >> newobss;
@@ -116,7 +116,7 @@ namespace CarpetRegrid {
         bool good = newobss.size() == newbbss.size();
         if (good) {
           for (size_t rl=0; rl<newobss.size(); ++rl) {
-            good = good && newobss.at(rl).size() == newbbss.at(rl).size();
+            good = good and newobss.at(rl).size() == newbbss.at(rl).size();
           }
         }
         if (! good) {
diff --git a/Carpet/CarpetRegrid/src/manualcoordinates.cc b/Carpet/CarpetRegrid/src/manualcoordinates.cc
index 4495f7ac9..e64aea0e4 100644
--- a/Carpet/CarpetRegrid/src/manualcoordinates.cc
+++ b/Carpet/CarpetRegrid/src/manualcoordinates.cc
@@ -30,7 +30,7 @@ namespace CarpetRegrid {
     if (refinement_levels > 4) {
       CCTK_WARN (0, "Cannot currently specify manual refinement regions for more than 4 refinement levels");
     }
-    assert (refinement_levels >= 1 && refinement_levels <= 4);
+    assert (refinement_levels >= 1 and refinement_levels <= 4);
     
     // do nothing if the levels already exist
     if (reflevel == refinement_levels) return 0;
diff --git a/Carpet/CarpetRegrid/src/manualgridpointlist.cc b/Carpet/CarpetRegrid/src/manualgridpointlist.cc
index 93dfe6563..b279551cb 100644
--- a/Carpet/CarpetRegrid/src/manualgridpointlist.cc
+++ b/Carpet/CarpetRegrid/src/manualgridpointlist.cc
@@ -62,7 +62,7 @@ namespace CarpetRegrid {
       bool good = newobss.size() == newbbss.size();
       if (good) {
         for (size_t rl=0; rl<newobss.size(); ++rl) {
-          good = good && newobss.at(rl).size() == newbbss.at(rl).size();
+          good = good and newobss.at(rl).size() == newbbss.at(rl).size();
         }
       }
       if (! good) {
diff --git a/Carpet/CarpetRegrid/src/manualgridpoints.cc b/Carpet/CarpetRegrid/src/manualgridpoints.cc
index 92432686c..a85998997 100644
--- a/Carpet/CarpetRegrid/src/manualgridpoints.cc
+++ b/Carpet/CarpetRegrid/src/manualgridpoints.cc
@@ -31,7 +31,7 @@ namespace CarpetRegrid {
     if (refinement_levels > 4) {
       CCTK_WARN (0, "Cannot currently specify manual refinement regions for more than 4 refinement levels");
     }
-    assert (refinement_levels >= 1 && refinement_levels <= 4);
+    assert (refinement_levels >= 1 and refinement_levels <= 4);
     
     // do nothing if the levels already exist
     if (reflevel == refinement_levels) return 0;
@@ -101,7 +101,7 @@ namespace CarpetRegrid {
     const ivect str (rstr / levfac);
     const ivect lb  (ilower);
     const ivect ub  (iupper);
-    if (! all(lb>=rlb && ub<=rub)) {
+    if (! all(lb>=rlb and ub<=rub)) {
       ostringstream buf;
       buf << "The refinement region boundaries for refinement level #" << rl << " are not within the main grid.  Allowed are the grid point boundaries " << rlb << " - " << rub << "; specified were " << lb << " - " << ub << ends;
       CCTK_WARN (0, buf.str().c_str());
@@ -111,13 +111,13 @@ namespace CarpetRegrid {
       buf << "The refinement region boundaries for refinement level #" << rl << " have the upper boundary (" << ub << ") less than the lower boundary (" << lb << ")" << ends;
       CCTK_WARN (0, buf.str().c_str());
     }
-    if (! all(lb%str==0 && ub%str==0)) {
+    if (! all(lb%str==0 and ub%str==0)) {
       CCTK_VWarn (0, __LINE__, __FILE__, CCTK_THORNSTRING,
 		  "The refinement region boundaries for refinement level #%d are not a multiple of the stride for that level", rl);
     }
-    assert (all(lb>=rlb && ub<=rub));
+    assert (all(lb>=rlb and ub<=rub));
     assert (all(lb<=ub));
-    assert (all(lb%str==0 && ub%str==0));
+    assert (all(lb%str==0 and ub%str==0));
     
     bbs.push_back (ibbox(lb, ub, str));
     obs.push_back (obound);
diff --git a/Carpet/CarpetRegrid/src/regrid.cc b/Carpet/CarpetRegrid/src/regrid.cc
index 92b234d24..f3e3231c9 100644
--- a/Carpet/CarpetRegrid/src/regrid.cc
+++ b/Carpet/CarpetRegrid/src/regrid.cc
@@ -41,19 +41,19 @@ namespace CarpetRegrid {
 
     if (!force) {
 
-      assert (regrid_every == -1 || regrid_every == 0
-	      || regrid_every % maxmglevelfact == 0);
+      assert (regrid_every == -1 or regrid_every == 0
+	      or regrid_every % maxmglevelfact == 0);
     
       // Return if no regridding is desired
       if (regrid_every == -1) return 0;
       
       // Return if we want to regrid during initial data only, and this
       // is not the time for initial data
-      if (regrid_every == 0 && cctkGH->cctk_iteration != 0) return 0;
+      if (regrid_every == 0 and cctkGH->cctk_iteration != 0) return 0;
 
       // Return if we want to regrid regularly, but not at this time
-      if (regrid_every > 0 && cctkGH->cctk_iteration != 0
-	  && (cctkGH->cctk_iteration-1) % regrid_every != 0)
+      if (regrid_every > 0 and cctkGH->cctk_iteration != 0
+	  and (cctkGH->cctk_iteration-1) % regrid_every != 0)
       {
 	return 0;
       }
@@ -69,7 +69,7 @@ namespace CarpetRegrid {
 	if (cctkGH->cctk_iteration-1 >= activate_next) {
 	  const int newnumlevels
 	    = min(refinement_levels + num_new_levels, maxreflevels);
-	  assert (newnumlevels>0 && newnumlevels<=maxreflevels);
+	  assert (newnumlevels>0 and newnumlevels<=maxreflevels);
         
 	  *const_cast<CCTK_INT*>(&activate_next) = cctkGH->cctk_iteration;
 	  ostringstream next;
@@ -99,7 +99,7 @@ namespace CarpetRegrid {
 	}
 	const int newnumlevels
 	  = RegridLevel (cctkGH, refinement_levels, maxreflevels);
-	if (newnumlevels>0 && newnumlevels<=maxreflevels) {
+	if (newnumlevels>0 and newnumlevels<=maxreflevels) {
         
 	  *const_cast<CCTK_INT*>(&refinement_levels) = newnumlevels;
 	  ostringstream param;
@@ -131,7 +131,7 @@ namespace CarpetRegrid {
       // Return if this is not during initial data generation, and if no
       // change in the grid structure is desired
       if (cctkGH->cctk_iteration != 0) {
-	if (keep_same_grid_structure && refinement_levels == oldnumlevels) return 0;
+	if (keep_same_grid_structure and refinement_levels == oldnumlevels) return 0;
       }
     
     } else {