From 640e7c186b58b54bb26e70b79fb8cf333890d7cb Mon Sep 17 00:00:00 2001
From: Liwei Ji <jiliwei.phys@gmail.com>
Date: Sat, 22 Jun 2024 02:27:16 +0000
Subject: [PATCH] Multipole: remove deprecated pars

---
 Multipole/param.ccl        | 28 ----------------------------
 Multipole/schedule.ccl     |  6 ------
 Multipole/src/multipole.cc | 37 +------------------------------------
 3 files changed, 1 insertion(+), 70 deletions(-)

diff --git a/Multipole/param.ccl b/Multipole/param.ccl
index cf7086ae..8469b8f2 100644
--- a/Multipole/param.ccl
+++ b/Multipole/param.ccl
@@ -121,34 +121,6 @@ CCTK_BOOLEAN test_mode_proportional_to_r "whether the test spherical harmonic co
 {
 } "no"
 
-
-# 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
-
 CCTK_BOOLEAN output_ascii "Output a simple ASCII file for each mode at each radius"
 {
 } "yes"
diff --git a/Multipole/schedule.ccl b/Multipole/schedule.ccl
index 592ad1a1..8a8a6aa7 100644
--- a/Multipole/schedule.ccl
+++ b/Multipole/schedule.ccl
@@ -10,12 +10,6 @@ if (enable_test)
 }
 
 
-SCHEDULE Multipole_ParamCheck AT CCTK_PARAMCHECK
-{
-  LANG: C
-  OPTIONS: GLOBAL
-} "Check Multipole parameters"
-
 SCHEDULE Multipole_Calc AT analysis AFTER WeylScal4_psi4_calc_4th
 {
   LANG: C
diff --git a/Multipole/src/multipole.cc b/Multipole/src/multipole.cc
index f3c0af8b..35cfa2d8 100644
--- a/Multipole/src/multipole.cc
+++ b/Multipole/src/multipole.cc
@@ -184,13 +184,6 @@ static void get_spin_weights(Multipole::variable_desc vars[], int n_vars,
   *n_weights = n_spin_weights;
 }
 
-// For backward compatibility we allow the user to set l_mode instead
-// of l_max, but if it is left at the default of -1, l_max is used.
-static int get_l_max() {
-  DECLARE_CCTK_PARAMETERS;
-  return l_mode == -1 ? l_max : l_mode;
-}
-
 static void
 setup_harmonics(const int spin_weights[max_spin_weights], int n_spin_weights,
                 int lmax, CCTK_REAL th[], CCTK_REAL ph[], int array_size,
@@ -219,34 +212,6 @@ setup_harmonics(const int spin_weights[max_spin_weights], int n_spin_weights,
   }
 }
 
-extern "C" void Multipole_ParamCheck(CCTK_ARGUMENTS) {
-  DECLARE_CCTK_PARAMETERS;
-  DECLARE_CCTK_ARGUMENTS;
-
-  if (l_mode != -1) {
-    CCTK_WARN(CCTK_WARN_ALERT,
-              "The parameter l_mode is deprecated. Use l_max instead.  For "
-              "compatibility, l_max = l_mode is being used.");
-  }
-
-  if (!CCTK_Equals(mode_type, "deprecated")) {
-    CCTK_WARN(CCTK_WARN_ALERT, "The parameter mode_type is deprecated and is "
-                               "no longer used.  All modes will be computed.");
-  }
-
-  if (l_min != -1) {
-    CCTK_WARN(CCTK_WARN_ALERT,
-              "The parameter l_min is deprecated and is no longer used.  Modes "
-              "from l = 0 will be computed.");
-  }
-
-  if (m_mode != -100) {
-    CCTK_WARN(
-        CCTK_WARN_ALERT,
-        "The parameter m_mode is deprecated. All m modes will be computed.");
-  }
-}
-
 extern "C" void Multipole_Init(CCTK_ARGUMENTS) {
   using namespace Loop;
   DECLARE_CCTK_ARGUMENTS_Multipole_Init;
@@ -290,7 +255,7 @@ extern "C" void Multipole_Calc(CCTK_ARGUMENTS) {
   if (out_every == 0 || cctk_iteration % out_every != 0)
     return;
 
-  int lmax = get_l_max();
+  int lmax = l_max;
 
   assert(lmax + 1 <= max_l_modes);