global: Turn CarpetLib templates into classes

Turn most of the templates in CarpetLib, which used to have the form
        template<int D> class XXX
into classes, i.e., into something like
        class XXX
by setting D to the new global integer constant dim, which in turn is set to 3.

The templates gf and data, which used to be of the form
        template<typename T, int D> class XXX
are now of the form
        template<typename T> class XXX

The templates vect, bbox, and bboxset remain templates.

This change simplifies the code somewhat.

darcs-hash:20050101182234-891bb-c3063528841f0d078b12cc506309ea27d8ce730d.gz

1 files changed, 6 insertions, 6 deletions

diff --git a/Carpet/Carpet/src/Comm.cc b/Carpet/Carpet/src/Comm.cc
index c4319781a..93e17a01b 100644
--- a/Carpet/Carpet/src/Comm.cc
+++ b/Carpet/Carpet/src/Comm.cc
@@ -20,8 +20,8 @@ namespace Carpet {
                                           const char *groupname );
   static void ProlongateGroupBoundaries ( const cGH* cgh,
                                           CCTK_REAL initial_time, int group );
-  static void SyncGFGroup ( const cGH* cgh, comm_state<dim> &state, int group );
-  static void SyncGFArrayGroup ( const cGH* cgh, comm_state<dim> &state, int group );
+  static void SyncGFGroup ( const cGH* cgh, comm_state &state, int group );
+  static void SyncGFArrayGroup ( const cGH* cgh, comm_state &state, int group );
   
   int SyncGroup (const cGH* cgh, const char* groupname)
   {
@@ -66,7 +66,7 @@ namespace Carpet {
       }
     
       // Sync
-      for (comm_state<dim> state; !state.done(); state.step()) {
+      for (comm_state state; !state.done(); state.step()) {
         switch (CCTK_GroupTypeI(group)) {
           
         case CCTK_GF:
@@ -93,7 +93,7 @@ namespace Carpet {
     const CCTK_REAL time = (cgh->cctk_time - initial_time) / delta_time;
     const int tl = 0;
     
-    for (comm_state<dim> state; !state.done(); state.step()) {
+    for (comm_state state; !state.done(); state.step()) {
       for (int m=0; m<(int)arrdata.at(group).size(); ++m) {
         for (int var=0; var<CCTK_NumVarsInGroupI(group); ++var) {
           for (int c=0; c<vhh.at(m)->components(reflevel); ++c) {
@@ -105,7 +105,7 @@ namespace Carpet {
     }
   }
 
-  void SyncGFGroup ( const cGH* cgh, comm_state<dim> &state, int group )
+  void SyncGFGroup ( const cGH* cgh, comm_state &state, int group )
   {
     const int tl = 0;
     for (int m=0; m<(int)arrdata.at(group).size(); ++m) {
@@ -118,7 +118,7 @@ namespace Carpet {
     }
   }
 
-  void SyncGFArrayGroup ( const cGH* cgh, comm_state<dim> &state, int group )
+  void SyncGFArrayGroup ( const cGH* cgh, comm_state &state, int group )
   {
     for (int var=0; var<(int)arrdata.at(group).at(0).data.size(); ++var) {
       arrdata.at(group).at(0).data.at(var)->sync (state, 0, 0, 0, 0);