Check wave support at setup time rather than runtime

NOAA-EMC · Nov 6, 2024 · 88aaa12 · 88aaa12
1 parent 86c66f9
commit 88aaa12
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 33 deletions.
diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base
@@ -131,7 +131,6 @@ export APP=@APP@
 export DO_ATM="YES"
 export DO_COUPLED="NO"
 export DO_WAVE="NO"
-export DISABLE_WAVE="@DISABLE_WAVE@"
 export DO_OCN="NO"
 export DO_ICE="NO"
 export DO_AERO="NO"
@@ -189,13 +188,8 @@ case "${APP}" in
     ;;
   ATMW)
     export DO_COUPLED="YES"
-    if [[ "${DISABLE_WAVE}" != "YES" ]]; then
-      export DO_WAVE="YES"
-      export WAVE_RUN="both"
-    else
-      echo "WARNING: WW3 is explicitly disabled but APP=ATMW!  Disabling waves."
-      export APP=ATM
-    fi
+    export DO_WAVE="YES"
+    export WAVE_RUN="both"
     ;;
   NG-GODAS)
     export DO_ATM="NO"
@@ -214,13 +208,8 @@ case "${APP}" in
     fi
 
     if [[ "${APP}" =~ ^S2SW ]]; then
-        if [[ "${DISABLE_WAVE}" != "YES" ]]; then
-          export DO_WAVE="YES"
-          export WAVE_RUN="both"
-        else
-          echo "WARNING WW3 is explicitly disabled, but APP=${APP}!  Disabling waves."
-          export APP="${APP//W/}"
-        fi
+        export DO_WAVE="YES"
+        export WAVE_RUN="both"
     fi
     ;;
   *)

diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
@@ -172,7 +172,6 @@ shopt -u extglob
 export DO_ATM="YES"
 export DO_COUPLED="NO"
 export DO_WAVE="NO"
-export DISABLE_WAVE="@DISABLE_WAVE@"
 export DO_OCN="NO"
 export DO_ICE="NO"
 export DO_AERO="NO"
@@ -235,13 +234,8 @@ case "${APP}" in
     ;;
   ATMW)
     export DO_COUPLED="YES"
-    if [[ "${DISABLE_WAVE}" != "YES" ]]; then
-      export DO_WAVE="YES"
-      export WAVE_RUN="both"
-    else
-      echo "WARNING: WW3 is explicitly disabled but APP=ATMW!  Disabling waves."
-      export APP=ATM
-    fi
+    export DO_WAVE="YES"
+    export WAVE_RUN="both"
     ;;
   NG-GODAS)
     export DO_ATM="NO"
@@ -260,13 +254,8 @@ case "${APP}" in
     fi
 
     if [[ "${APP}" =~ ^S2SW ]]; then
-        if [[ "${DISABLE_WAVE}" != "YES" ]]; then
-          export DO_WAVE="YES"
-          export WAVE_RUN="both"
-        else
-          echo "WARNING WW3 is explicitly disabled, but APP=${APP}!  Disabling waves."
-          export APP="${APP//W/}"
-        fi
+        export DO_WAVE="YES"
+        export WAVE_RUN="both"
     fi
     ;;
   *)

diff --git a/workflow/hosts/awspw.yaml b/workflow/hosts/awspw.yaml
@@ -27,5 +27,5 @@ MAKE_ACFTBUFR: 'NO'
 DO_TRACKER: 'NO'
 DO_GENESIS: 'NO'
 DO_METP: 'NO'
-DISABLE_WAVE: 'YES'
+SUPPORT_WAVES: 'NO'
 SUPPORTED_RESOLUTIONS: ['C48', 'C96'] # TODO: Test and support all cubed-sphere resolutions.
diff --git a/workflow/hosts/azurepw.yaml b/workflow/hosts/azurepw.yaml
@@ -24,5 +24,5 @@ LOCALARCH: 'NO'
 ATARDIR: '' # TODO: This will not yet work from AZURE.
 MAKE_NSSTBUFR: 'NO'
 MAKE_ACFTBUFR: 'NO'
-DISABLE_WAVE: 'YES'
+SUPPORT_WAVES: 'NO'
 SUPPORTED_RESOLUTIONS: ['C48', 'C96'] # TODO: Test and support all cubed-sphere resolutions.
diff --git a/workflow/hosts/googlepw.yaml b/workflow/hosts/googlepw.yaml
@@ -24,5 +24,5 @@ LOCALARCH: 'NO'
 ATARDIR: '' # TODO: This will not yet work from GOOGLE.
 MAKE_NSSTBUFR: 'NO'
 MAKE_ACFTBUFR: 'NO'
-DISABLE_WAVE: 'YES'
+SUPPORT_WAVES: 'NO'
 SUPPORTED_RESOLUTIONS: ['C48', 'C96'] # TODO: Test and support all cubed-sphere resolutions.
diff --git a/workflow/setup_expt.py b/workflow/setup_expt.py
@@ -364,6 +364,7 @@ def query_and_clean(dirname, force_clean=False):
 
 def validate_user_request(host, inputs):
     supp_res = host.info['SUPPORTED_RESOLUTIONS']
+    supp_waves = host.info.get('SUPPORT_WAVES', 'YES')
     machine = host.machine
     for attr in ['resdetatmos', 'resensatmos']:
         try:
@@ -373,6 +374,9 @@ def validate_user_request(host, inputs):
         if expt_res not in supp_res:
             raise NotImplementedError(f"Supported resolutions on {machine} are:\n{', '.join(supp_res)}")
 
+    if "W" in inputs.app and supp_waves == "NO":
+        raise NotImplementedError(f"Waves are not supported on {machine}")
+
 
 def get_ocean_resolution(resdetatmos):
     """