Remove single mode extraction method

To simplfy the API, and because the common use case is to extract
multiple modes, this commit removes support for extracting only a
single mode.  All modes up to l = l_max (a new parameter) are now
computed always.  The old parameter l_mode is now deprecated, but if
it is used, it is a synonym for l_max. It will eventually be removed.



git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/Multipole/trunk@57 4f5cb9a8-4dd8-4c2d-9bbd-173fa4467843

1 files changed, 28 insertions, 17 deletions

diff --git a/param.ccl b/param.ccl
index e752c8d..33485fc 100644
--- a/param.ccl
+++ b/param.ccl
@@ -70,27 +70,11 @@ CCTK_BOOLEAN verbose "Output detailed information about what is happening"
 {
 } "no"
 
-KEYWORD mode_type "Which type of mode extraction do we have" STEERABLE=always
-{
-  "all modes"     :: "Extract all modes up to (l_mode, m_mode)."
-  "specific mode" :: "Select one specific (l_mode, m_mode) mode"
-} "all modes"
-
-CCTK_INT l_min "all modes: above which l mode to calculate/ specific mode: which l mode to extract" STEERABLE=always
+CCTK_INT l_max "The maximum l mode to extract" STEERABLE=always
 {
   0:* :: "l >= 0"
 } 2
 
-CCTK_INT l_mode "all modes: Up to which l mode to calculate/ specific mode: which l mode to extract" STEERABLE=always
-{
-  0:* :: "l >= 0"
-} 2
-                                                                                                         
-CCTK_INT m_mode "all modes: Up to which m mode to calculate/ specific mode: which m mode to extract " STEERABLE=always
-{
-  0:* :: "Positive Please"
-} 2
-
 CCTK_BOOLEAN enable_test "whether to set a spherical harmonic in the 'harmonic' grid functions"
 {
 } "no"
@@ -109,3 +93,30 @@ CCTK_INT test_sw "which spin weight to put into the test variables"
 {
   * :: "Any integer"
 } -2
+
+# This parameter is deprecated and is no longer used
+KEYWORD mode_type "Which type of mode extraction do we have" STEERABLE=always
+{
+  "all modes"     :: "Extract all modes up to (l_mode, m_mode)."
+  "specific mode" :: "Select one specific (l_mode, m_mode) mode"
+  "deprecated"    :: "Deprecated"
+} "deprecated"
+
+# This parameter is deprecated and is no longer used
+CCTK_INT l_min "all modes: above which l mode to calculate/ specific mode: which l mode to extract" STEERABLE=always
+{
+  -1:* :: "Deprecated"
+} -1
+
+# This parameter is deprecated and is only used if set to a nondefault
+# value, in which case it is a synonym for l_max.
+CCTK_INT l_mode "The maximum l mode to extract" STEERABLE=always
+{
+  -1:* :: "Deprecated"
+} -1
+
+# This parameter is deprecated and is no longer used
+CCTK_INT m_mode "all modes: Up to which m mode to calculate/ specific mode: which m mode to extract " STEERABLE=always
+{
+  -100:* :: "Deprecated"
+} -100