1 files changed, 25 insertions, 19 deletions

diff --git a/src/Setup_Vars.c b/src/Setup_Vars.c
index 056c72a..61d4ce2 100644
--- a/src/Setup_Vars.c
+++ b/src/Setup_Vars.c
@@ -69,6 +69,8 @@ static void getopt (int const idx,
 
     ierr = Util_TableDestroy (table);
     assert (!ierr);
+  } else {
+    norms_opts->bg = 0.; /* don't subtract any background */
   }
 
 }
@@ -99,14 +101,7 @@ void Norms_Setup_Vars (CCTK_ARGUMENTS)
 
   if (verbose>0)
     CCTK_VInfo(CCTK_THORNSTRING,"Starting Norms Computation at time %f",
-        cctkGH->cctk_time);
-  if (cctk_iteration % out_every != 0)
-  {
-    *do_nothing=1;
-    return;
-  }
-  else
-    *do_nothing=0;
+               (double)cctkGH->cctk_time);
 
   for(i=0;i<max_nr_vars;i++) {
     varindices_1st[i]=-1;
@@ -136,37 +131,48 @@ void Norms_Setup_Vars (CCTK_ARGUMENTS)
     CCTK_INFO("We will compute norms for the following variables");
   for (n=0; n<nvars; ++n) {
     if (norms_opts_1st[n].active) {
+      assert(*nr1stvars<max_nr_vars);
       varindices_1st[*nr1stvars]=norms_opts_1st[n].vi;
       bgvals_1st[*nr1stvars]=norms_opts_1st[n].bg;
       if (verbose>0) {
-          CCTK_VInfo(CCTK_THORNSTRING,"    %s (1st order var) - %f",
-                        CCTK_FullName(varindices_1st[*nr1stvars]),
-                        bgvals_1st[*nr1stvars]);
+        char * fullname = CCTK_FullName(varindices_1st[*nr1stvars]);
+        CCTK_VInfo(CCTK_THORNSTRING,"    %s (1st order var) - %f",
+                   fullname,
+                   (double)bgvals_1st[*nr1stvars]);
+        free (fullname);
       }
       *nr1stvars=*nr1stvars+1;
     }
     if (norms_opts_2nd[n].active) {
+      assert(*nr2ndvars<max_nr_vars);
       varindices_2nd[*nr2ndvars]=norms_opts_2nd[n].vi;
       bgvals_2nd[*nr2ndvars]=norms_opts_2nd[n].bg;
       if (verbose>0) {
-          CCTK_VInfo(CCTK_THORNSTRING,"    %s (2nd order var) - %f",
-                        CCTK_FullName(varindices_2nd[*nr2ndvars]),
-                        bgvals_2nd[*nr2ndvars]);
+        char * fullname = CCTK_FullName(varindices_2nd[*nr2ndvars]);
+        CCTK_VInfo(CCTK_THORNSTRING,"    %s (2nd order var) - %f",
+                   fullname,
+                   (double)bgvals_2nd[*nr2ndvars]);
+        free (fullname);
       }
       *nr2ndvars=*nr2ndvars+1;
     }
   }
-  assert(*nr1stvars<max_nr_vars);
-  assert(*nr2ndvars<max_nr_vars);
   if (verbose>2)
-    fprintf(stderr,"   nr1stvars %d nr2ndvars %d\n",*nr1stvars,*nr2ndvars);
+    fprintf(stderr,"   nr1stvars %d nr2ndvars %d\n",
+            (int)*nr1stvars,
+            (int)*nr2ndvars);
 
   if (verbose>4) {
     fprintf(stderr,"   The actual variable arrays look like\n");
     for (n=0;n<max_nr_vars;n++) {
       fprintf(stderr,"      i:%d (vi:%d vn:%s bg:%f) (vi:%d vn:%s bg:%f)\n",
-          n,varindices_1st[n],CCTK_VarName(varindices_1st[n]),bgvals_1st[n],
-          varindices_2nd[n],CCTK_VarName(varindices_2nd[n]),bgvals_2nd[n]);
+              n,
+              (int)varindices_1st[n],
+              CCTK_VarName(varindices_1st[n]),
+              (double)bgvals_1st[n],
+              (int)varindices_2nd[n],
+              CCTK_VarName(varindices_2nd[n]),
+              (double)bgvals_2nd[n]);
     }
   }