From d7d60ca1b83ef02c1b8f78ac2709c3f4a7190583 Mon Sep 17 00:00:00 2001
From: eschnett <eschnett@4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843>
Date: Tue, 15 Jun 2010 21:25:40 +0000
Subject: Corrects parameter ranges and their description

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/Multipole/trunk@63 4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843
---
 param.ccl        | 10 ++++++----
 src/multipole.cc |  4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/param.ccl b/param.ccl
index 5210831..7ba4c91 100644
--- a/param.ccl
+++ b/param.ccl
@@ -26,20 +26,22 @@ KEYWORD integration_method "How to do surface integrals" STEERABLE=always
 CCTK_INT out_every "How often to output" \
 STEERABLE=recover
 {
-  * :: "Any integer"
+  0   :: "no output"
+  1:* :: "output every to many iterations"
 } 1
 
 CCTK_INT out_1d_every "How often to output 1d data" \
 STEERABLE=recover
 {
-  * :: "Any integer"
+  0   :: "no output"
+  1:* :: "output every to many iterations"
 } 0
 
 #physical params:
 CCTK_INT nradii "How many extraction radii?" \
 STEERABLE=recover
 {
-  0:101 :: "A positive integer less than 101"
+  0:100 :: ""
 } 1
 
 
@@ -58,7 +60,7 @@ STEERABLE=recover
 CCTK_INT nphi "How many points in the phi direction?" \
 STEERABLE=recover
 {
-  0:* :: "Positive please"
+  1:* :: ""
 } 100
 
 CCTK_STRING variables "What variables to decompose"
diff --git a/src/multipole.cc b/src/multipole.cc
index 1a2881a..6f8848c 100644
--- a/src/multipole.cc
+++ b/src/multipole.cc
@@ -130,7 +130,7 @@ static void output_1D(CCTK_ARGUMENTS, const variable_desc *v, CCTK_REAL rad,
 
   if (CCTK_MyProc(cctkGH) == 0)
   {
-    if (out_1d_every != 0 && (cctk_iteration) % out_1d_every == 0)
+    if (out_1d_every != 0 && cctk_iteration % out_1d_every == 0)
     {
       const char *real_name = CCTK_VarName(v->index);
       sprintf(name_tmp, "mp_%s_r%1.2f.th.asc", real_name, rad);
@@ -280,7 +280,7 @@ extern "C" void Multipole_Calc(CCTK_ARGUMENTS)
   int i, array_size=(ntheta+1)*(nphi+1);
   CCTK_REAL real_lm = 0.0, imag_lm = 0.0;
 
-  if (cctk_iteration % out_every != 0)
+  if (out_every == 0 || cctk_iteration % out_every != 0)
     return;
 
   int lmax = get_l_max();
-- 
cgit v1.2.3