Issue NOAA-EMC#3 - sync merge with develop branch

jkhender · Feb 13, 2020 · e46b175 · e46b175
2 parents 4bd0e20 + 0359d34
commit e46b175
Show file tree

Hide file tree

Showing 71 changed files with 197 additions and 1,400 deletions.
diff --git a/docs/doxygen/compile b/docs/doxygen/compile
@@ -3,8 +3,8 @@
 machine=${1:-${machine:-"WCOSS_C"}}
 machine=$(echo $machine | tr '[a-z]' '[A-Z]')
 
-if [ $machine = "THEIA" ]; then
-    doxygen=/scratch3/NCEPDEV/hwrf/save/Samuel.Trahan/doxygen-1.8.10/bin/doxygen
+if [ $machine = "HERA" ]; then
+    doxygen=/usr/bin/doxygen
 elif [ $machine = "WCOSS_C" ]; then
     doxygen=/gpfs/hps3/emc/hwrf/noscrub/soft/doxygen-1.8.10/bin/doxygen
 elif [ $machine = "WCOSS" ]; then

diff --git a/docs/doxygen/mainpage.h b/docs/doxygen/mainpage.h
@@ -21,7 +21,7 @@ This is a very much a work in progress and any issues should be reported back an
 To setup an experiment, a python script <b>\c setup_expt.py</b> (located in <b>\c fv3gfs/ush</b>) can be used:
 
     $> setup_expt.py -h
-    usage: setup_expt.py [-h] [--machine {THEIA,WCOSS_C}] --pslot PSLOT
+    usage: setup_expt.py [-h] [--machine {HERA,WCOSS_C}] --pslot PSLOT
                      [--configdir CONFIGDIR] [--idate IDATE] [--icsdir ICSDIR]
                      [--resdet RESDET] [--resens RESENS] [--comrot COMROT]
                      [--expdir EXPDIR] [--nens NENS] [--cdump CDUMP]

diff --git a/docs/note_fixfield.txt b/docs/note_fixfield.txt
@@ -4,7 +4,7 @@ They are saved locally on all platforms
 
 Venus/Mars:  /gpfs/dell2/emc/modeling/noscrub/emc.glopara/git/fv3gfs/fix
 Surge/Luna: /gpfs/hps3/emc/global/noscrub/emc.glopara/git/fv3gfs/fix
-THEIA: /scratch4/NCEPDEV/global/save/glopara/git/fv3gfs/fix 
+Hera: /scratch1/NCEPDEV/global/glopara/fix 
 
 ------------------------------------------------------------------------------
 09/28/2018

diff --git a/driver/gdas/test_jgdas_verfozn_theia.sh b/driver/gdas/test_jgdas_verfozn_theia.sh
diff --git a/driver/gdas/test_jgdas_verfrad_theia.sh b/driver/gdas/test_jgdas_verfrad_theia.sh
diff --git a/driver/gdas/test_jgdas_vminmon_theia.sh b/driver/gdas/test_jgdas_vminmon_theia.sh
diff --git a/driver/gfs/test_jgfs_vminmon_theia.sh b/driver/gfs/test_jgfs_vminmon_theia.sh
diff --git a/driver/product/run_postsnd.sh b/driver/product/run_postsnd.sh
@@ -46,7 +46,6 @@ export MP_STDOUTMODE=ordered
 
 #export machine="WCOSS_C"
 machine="WCOSS_DELL_P3"
-#machine="THEIA"
 if [ $machine == "WCOSS_C" ]; then
 ##For WCOSS-Cray##################
 export launcher="aprun"

diff --git a/driver/product/run_postsnd.sh.cray b/driver/product/run_postsnd.sh.cray
@@ -39,7 +39,6 @@ export MP_STDOUTMODE=ordered
 
 export machine="WCOSS_C"
 #machine="WCOSS_DELL_P3"
-#machine="THEIA"
 #machine="JET"
 export FHMAX_HF_GFS=120
 export FHOUT_HF_GFS=1

diff --git a/driver/product/run_postsnd.sh.dell b/driver/product/run_postsnd.sh.dell
@@ -46,7 +46,6 @@ export MP_STDOUTMODE=ordered
 
 #export machine="WCOSS_C"
 machine="WCOSS_DELL_P3"
-#machine="THEIA"
 #machine="JET"
 export npe_postsnd=12
 export npe_postsndcfp=10

diff --git a/driver/product/run_postsnd.sh.jet b/driver/product/run_postsnd.sh.jet
@@ -47,7 +47,6 @@ export MP_STDOUTMODE=ordered
 
 #export machine="WCOSS_C"
 #machine="WCOSS_DELL_P3"
-#machine="THEIA"
 machine="JET"
 export npe_postsnd=12
 export npe_postsndcfp=10