CarpetReduce: Formatting changes

darcs-hash:20070112224318-dae7b-68b8b4b34cba9b14fff76fc6c7fdbb4032297430.gz

5 files changed, 28 insertions, 26 deletions

diff --git a/Carpet/CarpetReduce/src/mask_carpet.cc b/Carpet/CarpetReduce/src/mask_carpet.cc
index b1cd753a1..f36bce12f 100644
--- a/Carpet/CarpetReduce/src/mask_carpet.cc
+++ b/Carpet/CarpetReduce/src/mask_carpet.cc
@@ -1,11 +1,11 @@
 #include <cassert>
 #include <sstream>
 
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
 
-#include "carpet.hh"
+#include <carpet.hh>
 
 #include "mask_carpet.hh"
 
@@ -31,7 +31,7 @@ namespace CarpetMask {
   {
     DECLARE_CCTK_PARAMETERS;
     
-    if (! is_singlemap_mode()) {
+    if (not is_singlemap_mode()) {
       CCTK_WARN (0, "This routine may only be called in singlemap mode");
     }
     
@@ -113,7 +113,7 @@ namespace CarpetMask {
             {
               
               ibbox const & box = (*bi) & ext;
-              if (! box.empty()) {
+              if (not box.empty()) {
                 
                 assert (all ((box.lower() - ext.lower()               ) >= 0));
                 assert (all ((box.upper() - ext.lower() + ext.stride()) >= 0));
@@ -122,7 +122,7 @@ namespace CarpetMask {
                 ivect const imin = (box.lower() - ext.lower()               ) / ext.stride();
                 ivect const imax = (box.upper() - ext.lower() + ext.stride()) / ext.stride();
                 assert (all (izero <= imin));
-                assert (box.empty() || all (imin <= imax));
+                assert (box.empty() or all (imin <= imax));
                 assert (all (imax <= ivect::ref(cctk_lsh)));
                 
                 if (verbose) {
@@ -175,7 +175,7 @@ namespace CarpetMask {
           {
             
             ibbox const & box = (*bi).contracted_for(ext) & ext;
-            if (! box.empty()) {
+            if (not box.empty()) {
               
               assert (all ((box.lower() - ext.lower()               ) >= 0));
               assert (all ((box.upper() - ext.lower() + ext.stride()) >= 0));
@@ -184,7 +184,7 @@ namespace CarpetMask {
               ivect const imin = (box.lower() - ext.lower()               ) / ext.stride();
               ivect const imax = (box.upper() - ext.lower() + ext.stride()) / ext.stride();
               assert (all (izero <= imin));
-              assert (box.empty() || all (imin <= imax));
+              assert (box.empty() or all (imin <= imax));
               assert (all (imax <= ivect::ref(cctk_lsh)));
               
               if (verbose) {
@@ -228,7 +228,7 @@ namespace CarpetMask {
             {
               
               ibbox const & box = (*bi).contracted_for(ext) & ext;
-              if (! box.empty()) {
+              if (not box.empty()) {
                 
                 assert (all ((box.lower() - ext.lower()               ) >= 0));
                 assert (all ((box.upper() - ext.lower() + ext.stride()) >= 0));
@@ -237,7 +237,7 @@ namespace CarpetMask {
                 ivect const imin = (box.lower() - ext.lower()               ) / ext.stride();
                 ivect const imax = (box.upper() - ext.lower() + ext.stride()) / ext.stride();
                 assert (all (izero <= imin));
-                assert (box.empty() || all (imin <= imax));
+                assert (box.empty() or all (imin <= imax));
                 assert (all (imax <= ivect::ref(cctk_lsh)));
                 
                 if (verbose) {
diff --git a/Carpet/CarpetReduce/src/mask_carpet.hh b/Carpet/CarpetReduce/src/mask_carpet.hh
index 5fc27e982..e0402227a 100644
--- a/Carpet/CarpetReduce/src/mask_carpet.hh
+++ b/Carpet/CarpetReduce/src/mask_carpet.hh
@@ -1,5 +1,5 @@
-#include "cctk.h"
-#include "cctk_Arguments.h"
+#include <cctk.h>
+#include <cctk_Arguments.h>
 
 namespace CarpetMask {
 
diff --git a/Carpet/CarpetReduce/src/mask_coords.c b/Carpet/CarpetReduce/src/mask_coords.c
index 91da80bb3..3252613d7 100644
--- a/Carpet/CarpetReduce/src/mask_coords.c
+++ b/Carpet/CarpetReduce/src/mask_coords.c
@@ -1,6 +1,8 @@
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
+#include <assert.h>
+
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
 
 
 
diff --git a/Carpet/CarpetReduce/src/mask_init.c b/Carpet/CarpetReduce/src/mask_init.c
index 2cb022b96..ed1297871 100644
--- a/Carpet/CarpetReduce/src/mask_init.c
+++ b/Carpet/CarpetReduce/src/mask_init.c
@@ -1,8 +1,8 @@
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
+#include <cctk.h>
+#include <cctk_Arguments.h>
+#include <cctk_Parameters.h>
 
-#include "util_Table.h"
+#include <util_Table.h>
 
 
 
diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc
index 29198cb86..3c871a125 100644
--- a/Carpet/CarpetReduce/src/reduce.cc
+++ b/Carpet/CarpetReduce/src/reduce.cc
@@ -11,14 +11,14 @@
 
 #include <mpi.h>
 
-#include "cctk.h"
-#include "util_ErrorCodes.h"
-#include "util_Table.h"
+#include <cctk.h>
+#include <util_ErrorCodes.h>
+#include <util_Table.h>
 
-#include "dist.hh"
-#include "vect.hh"
+#include <dist.hh>
+#include <vect.hh>
 
-#include "carpet.hh"
+#include <carpet.hh>
 
 #include "reduce.hh"