Carpet: Avoid unused and uninitialised variables

3 files changed, 8 insertions, 3 deletions

diff --git a/Carpet/Carpet/src/CarpetParamCheck.cc b/Carpet/Carpet/src/CarpetParamCheck.cc
index c02ab02b0..c9c6b1705 100644
--- a/Carpet/Carpet/src/CarpetParamCheck.cc
+++ b/Carpet/Carpet/src/CarpetParamCheck.cc
@@ -41,12 +41,13 @@ namespace Carpet {
       // InitBase
       
       enum setup_method_t {
+        init_error,
         init_some_levels,
         init_single_level,
         init_two_levels,
         init_all_levels,
       };
-      setup_method_t setup_method;
+      setup_method_t setup_method = init_error;
       
       if (CCTK_EQUALS (initial_data_setup_method, "init_some_levels")) {
         setup_method = init_some_levels;
@@ -68,12 +69,13 @@ namespace Carpet {
       // Carpet
       
       enum init_method_t {
+        error_timelevel,
         each_timelevel,           // Initialise each time level
         fill_timelevels,          // Copy the current to all past timelevels
         three_timelevels,         // Carpet's 3 timelevel scheme
         all_timelevels,           // Initial data thorn initialises all timelevels
       };
-      init_method_t init_method;
+      init_method_t init_method = error_timelevel;
       
       if (init_each_timelevel) {
         if (init_fill_timelevels) {
diff --git a/Carpet/Carpet/src/Recompose.cc b/Carpet/Carpet/src/Recompose.cc
index 6e1a519cd..642f335f7 100644
--- a/Carpet/Carpet/src/Recompose.cc
+++ b/Carpet/Carpet/src/Recompose.cc
@@ -331,7 +331,7 @@ namespace Carpet {
     timer.start();
     
     // Calculate new number of levels
-    int const oldreflevels = reflevels;
+    // int const oldreflevels = reflevels;
     reflevels = vhh.AT(0)->reflevels();
     for (int m=0; m<maps; ++m) {
       assert (vhh.AT(m)->reflevels() == reflevels);
@@ -677,6 +677,7 @@ namespace Carpet {
           // TODO: processor distribution, average load, std deviation
           
           coarsevolume = totalvolume * prod (rvect (spacereflevelfact));
+          // TODO: output coarsevolume
         }
       }
       cout.precision (oldprecision);
diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc
index 6e8225894..3135a49b2 100644
--- a/Carpet/Carpet/src/SetupGH.cc
+++ b/Carpet/Carpet/src/SetupGH.cc
@@ -347,7 +347,9 @@ namespace Carpet {
         }
         // Number of MPI processes on this host
         int const myproc = CCTK_MyProc(cctkGH);
+#if 0
         int const nprocs = CCTK_nProcs(cctkGH);
+#endif
         int const host_id = HostId(myproc);
         vector<int> const host_procs = HostProcs(host_id);
         int const num_host_procs = host_procs.size();