Merge develop, address conflicts in gfs_cycled and gfs_tasks

ci/cases/gfsv17/ocnanal.yaml

@@ -16,7 +16,7 @@ base:
   FHMAX_GFS: 240
   ACCOUNT: {{ 'HPC_ACCOUNT' | getenv }}
 
-ocnanal:
+marineanl:
   SOCA_INPUT_FIX_DIR: {{ HOMEgfs }}/fix/gdas/soca/1440x1080x75/soca
   SOCA_OBS_LIST: {{ HOMEgfs }}/sorc/gdas.cd/parm/soca/obs/obs_list.yaml
   SOCA_NINNER: 100

ci/cases/pr/C96C48_ufs_hybatmDA.yaml

@@ -11,7 +11,7 @@ arguments:
   expdir: {{ 'RUNTESTS' | getenv }}/EXPDIR
   icsdir: {{ 'ICSDIR_ROOT' | getenv }}/C96C48/20240610
   idate: 2024022318
-  edate: 2024022400
+  edate: 2024022406
   nens: 2
   gfs_cyc: 1
   start: warm

docs/note_fixfield.txt

@@ -4,7 +4,7 @@ They are saved locally on all platforms
 
 Hera: /scratch1/NCEPDEV/global/glopara/fix
 Orion/Hercules: /work/noaa/global/glopara/fix
-Jet: /mnt/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix
+Jet: /mnt/lfs5/HFIP/hfv3gfs/glopara/FIX/fix
 S4: /data/prod/glopara/fix
 
 ------------------------------------------------------------------------------

docs/source/components.rst

@@ -59,7 +59,7 @@ Observation data, also known as dump data, is prepared in production and then ar
 
 * Hera: ``/scratch1/NCEPDEV/global/glopara/dump``
 * Orion/Hercules: ``/work/noaa/rstprod/dump``
-* Jet: ``/mnt/lfs4/HFIP/hfv3gfs/glopara/dump``
+* Jet: ``/mnt/lfs5/HFIP/hfv3gfs/glopara/dump``
 * WCOSS2: ``/lfs/h2/emc/global/noscrub/emc.global/dump``
 * S4: ``/data/prod/glopara/dump``
 

docs/source/init.rst

@@ -111,7 +111,7 @@ Warm-start cycled w/ coupled (S2S) model C48 atmosphere C48 enkf (80 members) 5
    Hera: /scratch1/NCEPDEV/global/glopara/data/ICSDIR/C48C48mx500
    Orion/Hercules: /work/noaa/global/glopara/data/ICSDIR/C48C48mx500
    WCOSS2: /lfs/h2/emc/global/noscrub/emc.global/data/ICSDIR/C48C48mx500
-   Jet: /lfs4/HFIP/hfv3gfs/glopara/data/ICSDIR/C48C48mx500
+   Jet: /lfs5/HFIP/hfv3gfs/glopara/data/ICSDIR/C48C48mx500
    AWS: https://noaa-nws-global-pds.s3.amazonaws.com/index.html#data/ICSDIR/C48C48mx500
 
 Start date = 2021032312
@@ -227,7 +227,7 @@ Forecast-only P8 prototype initial conditions are made available to users on sup
     WCOSS2: /lfs/h2/emc/global/noscrub/emc.global/IC/COUPLED
     HERA: /scratch1/NCEPDEV/climate/role.ufscpara/IC
     ORION/Hercules: /work/noaa/global/glopara/data/ICSDIR/prototype_ICs
-    JET: /mnt/lfs4/HFIP/hfv3gfs/glopara/data/ICSDIR/prototype_ICs
+    JET: /mnt/lfs5/HFIP/hfv3gfs/glopara/data/ICSDIR/prototype_ICs
     S4: /data/prod/glopara/coupled_ICs
 
 These locations are known within the workflow via paths set in ``parm/config/config.coupled_ic``.

env/CONTAINER.env

@@ -26,7 +26,7 @@ ulimit -s unlimited
 ulimit -a
 
 
-if [ "${step}" = "ocnanalrun" ]; then
+if [ "${step}" = "marineanlvar" ]; then
     export NTHREADS_OCNANAL=1
-    export APRUN_OCNANAL="${launcher} -n 2"
+    export APRUN_MARINEANLVAR="${launcher} -n 2"
 fi

env/HERA.env

@@ -138,17 +138,15 @@ elif [[ "${step}" = "marinebmat" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
     export APRUN_MARINEBMAT="${APRUN_default}"
 
-elif [[ "${step}" = "ocnanalrun" ]]; then
+elif [[ "${step}" = "marineanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
+    export APRUN_MARINEANLVAR="${APRUN_default}"
 
-    export APRUN_OCNANAL="${APRUN_default}"
-
-elif [[ "${step}" = "ocnanalchkpt" ]]; then
+elif [[ "${step}" = "marineanlchkpt" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd --multi-prog"
-
-    export APRUN_OCNANAL="${APRUN_default}"
+    export APRUN_MARINEANLCHKPT="${APRUN_default}"
 
 elif [[ "${step}" = "ocnanalecen" ]]; then
 

env/HERCULES.env

@@ -133,10 +133,10 @@ case ${step} in
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
     export APRUN_MARINEBMAT="${APRUN_default}"
  ;;
- "ocnanalrun")
+ "marineanlvar")
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-    export APRUN_OCNANAL="${APRUN_default}"
+    export APRUN_MARINEANLVAR="${APRUN_default}"
  ;;
 "ocnanalecen")
 
@@ -148,12 +148,12 @@ case ${step} in
     [[ ${NTHREADS_OCNANALECEN} -gt ${max_threads_per_task} ]] && export NTHREADS_OCNANALECEN=${max_threads_per_task}
     export APRUN_OCNANALECEN="${launcher} -n ${ntasks_ocnanalecen} --cpus-per-task=${NTHREADS_OCNANALECEN}"
 ;;
- "ocnanalchkpt")
+ "marineanlchkpt")
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_OCNANAL=${NTHREADSmax}
-    export APRUN_OCNANAL="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANAL}"
+    export APRUN_MARINEANLCHKPT="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANAL}"
  ;;
  "anal" | "analcalc")
 

env/JET.env

@@ -69,7 +69,7 @@ elif [[ "${step}" = "atmensanlsol" ]]; then
 
     export NTHREADS_ATMENSANLSOL=${NTHREADSmax}
     export APRUN_ATMENSANLSOL="${APRUN_default}"
-	
+
 elif [[ "${step}" = "atmensanlletkf" ]]; then
 
     export NTHREADS_ATMENSANLLETKF=${NTHREADSmax}
@@ -121,10 +121,10 @@ elif [[ "${step}" = "marinebmat" ]]; then
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
     export APRUN_MARINEBMAT="${APRUN_default}"
 
-elif [[ "${step}" = "ocnanalrun" ]]; then
+elif [[ "${step}" = "marineanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
-    export APRUN_OCNANAL="${APRUN_default}"
+    export APRUN_MARINEANLVAR="${APRUN_default}"
 
 elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
 

env/ORION.env

@@ -130,18 +130,19 @@ elif [[ "${step}" = "marinebmat" ]]; then
     export NTHREADS_MARINEBMAT=${NTHREADSmax}
     export APRUN_MARINEBMAT="${APRUN_default}"
 
-elif [[ "${step}" = "ocnanalrun" ]]; then
+elif [[ "${step}" = "marineanlvar" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
-    export APRUN_OCNANAL="${APRUN_default}"
+    export APRUN_MARINEANLVAR="${APRUN_default}"
 
-elif [[ "${step}" = "ocnanalchkpt" ]]; then
+elif [[ "${step}" = "marineanlchkpt" ]]; then
 
     export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"
 
     export NTHREADS_OCNANAL=${NTHREADSmax}
-    export APRUN_OCNANAL="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANAL}"
+
+    export APRUN_MARINEANLCHKPT="${APRUN_default} --cpus-per-task=${NTHREADS_OCNANAL}"
 
 elif [[ "${step}" = "ocnanalecen" ]]; then
 

jobs/JGDAS_GLOBAL_OCEAN_ANALYSIS_VRFY

@@ -1,6 +1,6 @@
 #!/bin/bash
 source "${HOMEgfs}/ush/preamble.sh"
-source "${HOMEgfs}/ush/jjob_header.sh" -e "ocnanalprep" -c "base ocnanal ocnanalprep"
+source "${HOMEgfs}/ush/jjob_header.sh" -e "marineanlinit" -c "base ocnanal marineanlinit"
 
 
 ##############################################