Merge branch 'develop' into feature/gw-ci

NOAA-EMC · Nov 27, 2024 · 103de9d · 103de9d
2 parents 1f0e3ec + 94f2029
commit 103de9d
Show file tree

Hide file tree

Showing 23 changed files with 548 additions and 316 deletions.
diff --git a/docs/source/_static/noaacsp_cluster_1.png b/docs/source/_static/noaacsp_cluster_1.png
diff --git a/docs/source/_static/noaacsp_cluster_2.png b/docs/source/_static/noaacsp_cluster_2.png
diff --git a/docs/source/_static/noaacsp_cluster_3.png b/docs/source/_static/noaacsp_cluster_3.png
diff --git a/docs/source/_static/noaacsp_cluster_4.png b/docs/source/_static/noaacsp_cluster_4.png
diff --git a/docs/source/_static/noaacsp_cluster_5.png b/docs/source/_static/noaacsp_cluster_5.png
diff --git a/docs/source/_static/noaacsp_cluster_6.png b/docs/source/_static/noaacsp_cluster_6.png
diff --git a/docs/source/_static/noaacsp_instance_1.png b/docs/source/_static/noaacsp_instance_1.png
diff --git a/docs/source/_static/noaacsp_instance_2.png b/docs/source/_static/noaacsp_instance_2.png
diff --git a/docs/source/_static/noaacsp_instance_3.png b/docs/source/_static/noaacsp_instance_3.png
diff --git a/docs/source/_static/noaacsp_instance_4.png b/docs/source/_static/noaacsp_instance_4.png
diff --git a/docs/source/_static/noaacsp_login.png b/docs/source/_static/noaacsp_login.png
diff --git a/docs/source/_static/noaacsp_using_1.png b/docs/source/_static/noaacsp_using_1.png
diff --git a/docs/source/_static/noaacsp_using_2.png b/docs/source/_static/noaacsp_using_2.png
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -25,6 +25,7 @@
 # The full version, including alpha/beta/rc tags
 release = '0.1'
 
+numfig = True
 
 # -- General configuration ---------------------------------------------------
 
@@ -42,7 +43,7 @@
     'sphinx.ext.viewcode',
     'sphinx.ext.githubpages',
     'sphinx.ext.napoleon',
-    'sphinxcontrib.bibtex'
+    'sphinxcontrib.bibtex',
 ]
 
 bibtex_bibfiles = ['references.bib']
@@ -120,3 +121,4 @@ def setup(app):
 
 # Output file base name for HTML help builder.
 htmlhelp_basename = 'Global-Workflow'
+
diff --git a/docs/source/index.rst b/docs/source/index.rst
@@ -41,5 +41,6 @@ Table of Contents
    hpc.rst
    output.rst
    run.rst
+   wave.rst
    noaa_csp.rst
    errors_faq.rst
diff --git a/docs/source/noaa_csp.rst b/docs/source/noaa_csp.rst
diff --git a/docs/source/references.bib b/docs/source/references.bib
diff --git a/parm/config/gefs/config.base b/parm/config/gefs/config.base
@@ -248,6 +248,10 @@ export FHOUT_WAV=3
 export FHMAX_HF_WAV=120
 export FHOUT_HF_WAV=1
 export FHMAX_WAV=${FHMAX_GFS}
+export FHMAX_WAV_GFS=${FHMAX_GFS}
+export FHMAX_HF_GFS=$(( FHMAX_HF_GFS > FHMAX_GFS ? FHMAX_GFS : FHMAX_HF_GFS ))
+export FHMAX_WAV_GFS=$(( FHMAX_WAV_GFS > FHMAX_GFS ? FHMAX_GFS : FHMAX_WAV_GFS ))
+export FHMAX_HF_WAV=$(( FHMAX_HF_WAV > FHMAX_WAV_GFS ? FHMAX_WAV_GFS : FHMAX_HF_WAV ))
 export ILPOST=1           # gempak output frequency up to F120
 
 export FHMIN_ENKF=${FHMIN_GFS}

diff --git a/parm/config/gfs/config.base b/parm/config/gfs/config.base
@@ -311,6 +311,10 @@ export FHMAX_HF_WAV=120
 export FHOUT_HF_WAV=1
 export FHMAX_WAV=${FHMAX:-9}
 export FHMAX_WAV_GFS=${FHMAX_GFS}
+export FHMAX_HF_GFS=$(( FHMAX_HF_GFS > FHMAX_GFS ? FHMAX_GFS : FHMAX_HF_GFS ))
+export FHMAX_WAV=$(( FHMAX_WAV > FHMAX ? FHMAX : FHMAX_WAV ))
+export FHMAX_WAV_GFS=$(( FHMAX_WAV_GFS > FHMAX_GFS ? FHMAX_GFS : FHMAX_WAV_GFS ))
+export FHMAX_HF_WAV=$(( FHMAX_HF_WAV > FHMAX_WAV_GFS ? FHMAX_WAV_GFS : FHMAX_HF_WAV ))
 
 # TODO: Change gempak to use standard out variables (#2348)
 export ILPOST=${FHOUT_HF_GFS}           # gempak output frequency up to F120