CarpetLib: Rename ggf::recompose_free to ggf::recompose_free_old

Rename ggf::recompose_free to ggf::recompose_free_old.
Remove code that was commented out.

darcs-hash:20070204180937-dae7b-0c0c9f5b5007d416ec16da8a6781950a4f1406e5.gz

4 files changed, 4 insertions, 18 deletions

diff --git a/Carpet/CarpetLib/src/dh.cc b/Carpet/CarpetLib/src/dh.cc
index 6fdde0a20..fb3a98538 100644
--- a/Carpet/CarpetLib/src/dh.cc
+++ b/Carpet/CarpetLib/src/dh.cc
@@ -94,7 +94,7 @@ void dh::recompose (const int rl, const bool do_prolongate)
     for (comm_state state; not state.done(); state.step()) {
       (*f)->recompose_fill (state, rl, do_prolongate);
     }
-    (*f)->recompose_free (rl);
+    (*f)->recompose_free_old (rl);
     for (comm_state state; not state.done(); state.step()) {
       (*f)->recompose_bnd_prolongate (state, rl, do_prolongate);
     }
diff --git a/Carpet/CarpetLib/src/gf.cc b/Carpet/CarpetLib/src/gf.cc
index 50bb0f661..3bd6726ae 100644
--- a/Carpet/CarpetLib/src/gf.cc
+++ b/Carpet/CarpetLib/src/gf.cc
@@ -21,24 +21,10 @@ gf<T>::gf (const int varindex_, const operator_type transport_operator_,
         t_, d_, prolongation_order_time_,
         vectorlength_, vectorindex_, vectorleader_)
 {
-  // recompose ();
   recompose_crop ();
   for (int rl=0; rl<h.reflevels(); ++rl) {
     recompose_allocate (rl);
-#if 0
-    for (comm_state state; !state.done(); state.step()) {
-      recompose_fill (state, rl, false);
-    }
-#endif
-    recompose_free (rl);
-#if 0
-    for (comm_state state; !state.done(); state.step()) {
-      recompose_bnd_prolongate (state, rl, false);
-    }
-    for (comm_state state; !state.done(); state.step()) {
-      recompose_sync (state, rl, false);
-    }
-#endif
+    recompose_free_old (rl);
   } // for rl
 }
 
diff --git a/Carpet/CarpetLib/src/ggf.cc b/Carpet/CarpetLib/src/ggf.cc
index 541c29427..0778d83fe 100644
--- a/Carpet/CarpetLib/src/ggf.cc
+++ b/Carpet/CarpetLib/src/ggf.cc
@@ -223,7 +223,7 @@ void ggf::recompose_fill (comm_state& state, const int rl,
   } // for ml
 }
 
-void ggf::recompose_free (const int rl)
+void ggf::recompose_free_old (const int rl)
 {
   // Delete old storage
   for (int ml=0; ml<(int)oldstorage.size(); ++ml) {
diff --git a/Carpet/CarpetLib/src/ggf.hh b/Carpet/CarpetLib/src/ggf.hh
index 3163983af..30752a422 100644
--- a/Carpet/CarpetLib/src/ggf.hh
+++ b/Carpet/CarpetLib/src/ggf.hh
@@ -93,7 +93,7 @@ public:
   void recompose_crop ();
   void recompose_allocate (int rl);
   void recompose_fill (comm_state& state, int rl, bool do_prolongate);
-  void recompose_free (int rl);
+  void recompose_free_old (int rl);
   void recompose_bnd_prolongate (comm_state& state, int rl, bool do_prolongate);
   void recompose_sync (comm_state& state, int rl, bool do_prolongate);