From 0ecf76b57bbe6a43bdeec99e96abc2746d4d483c Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Thu, 29 Aug 2024 13:45:50 +0000 Subject: [PATCH 01/23] Move to contrib spack-stack on Jet --- modulefiles/module_base.jet.lua | 4 ++-- modulefiles/module_gwsetup.jet.lua | 2 +- versions/build.jet.ver | 4 ++-- versions/run.jet.ver | 4 ++-- workflow/hosts/jet.yaml | 22 +++++++++++----------- 5 files changed, 18 insertions(+), 18 deletions(-) diff --git a/modulefiles/module_base.jet.lua b/modulefiles/module_base.jet.lua index 76320688b0..56735a2057 100644 --- a/modulefiles/module_base.jet.lua +++ b/modulefiles/module_base.jet.lua @@ -49,10 +49,10 @@ setenv("WGRIB2","wgrib2") setenv("WGRIB","wgrib") setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None")) -prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")) +prepend_path("MODULEPATH", pathJoin("/lfs5/HFIP/hfv3gfs/glopara/git/prepobs/v" .. (os.getenv("prepobs_run_ver") or "None"), "modulefiles")) load(pathJoin("prepobs", (os.getenv("prepobs_run_ver") or "None"))) -prepend_path("MODULEPATH", pathJoin("/lfs4/HFIP/hfv3gfs/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles")) +prepend_path("MODULEPATH", pathJoin("/lfs5/HFIP/hfv3gfs/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles")) load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None"))) whatis("Description: GFS run environment") diff --git a/modulefiles/module_gwsetup.jet.lua b/modulefiles/module_gwsetup.jet.lua index bc14b19a79..a722c812a5 100644 --- a/modulefiles/module_gwsetup.jet.lua +++ b/modulefiles/module_gwsetup.jet.lua @@ -4,7 +4,7 @@ Load environment to run GFS workflow setup scripts on Jet load(pathJoin("rocoto")) -prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/gsi-addon-dev-rocky8/install/modulefiles/Core") +prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/gsi-addon-intel/install/modulefiles/Core") local stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0" local python_ver=os.getenv("python_ver") or "3.11.6" diff --git a/versions/build.jet.ver b/versions/build.jet.ver index 55c0ea0bd1..35b779c249 100644 --- a/versions/build.jet.ver +++ b/versions/build.jet.ver @@ -1,5 +1,5 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 -export spack_env=gsi-addon-dev +export spack_env=gsi-addon-intel source "${HOMEgfs:-}/versions/build.spack.ver" -export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" +export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/versions/run.jet.ver b/versions/run.jet.ver index 3aa586ee42..6743b99286 100644 --- a/versions/run.jet.ver +++ b/versions/run.jet.ver @@ -1,6 +1,6 @@ export stack_intel_ver=2021.5.0 export stack_impi_ver=2021.5.1 -export spack_env=gsi-addon-dev-rocky8 +export spack_env=gsi-addon-intel export hpss_ver= export ncl_ver=6.6.2 @@ -11,4 +11,4 @@ export gempak_ver=7.4.2 export perl_ver=5.38.0 source "${HOMEgfs:-}/versions/run.spack.ver" -export spack_mod_path="/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" +export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" diff --git a/workflow/hosts/jet.yaml b/workflow/hosts/jet.yaml index 21e815c9b2..f42eeb7b06 100644 --- a/workflow/hosts/jet.yaml +++ b/workflow/hosts/jet.yaml @@ -1,11 +1,11 @@ -BASE_GIT: '/lfs4/HFIP/hfv3gfs/glopara/git' -DMPDIR: '/lfs4/HFIP/hfv3gfs/glopara/dump' -BASE_IC: '/mnt/lfs4/HFIP/hfv3gfs/glopara/data/ICSDIR' -PACKAGEROOT: '/lfs4/HFIP/hfv3gfs/glopara/nwpara' -COMINsyn: '/lfs4/HFIP/hfv3gfs/glopara/com/gfs/prod/syndat' -HOMEDIR: '/lfs4/HFIP/hfv3gfs/${USER}' -STMP: '/lfs4/HFIP/hfv3gfs/${USER}/stmp' -PTMP: '/lfs4/HFIP/hfv3gfs/${USER}/ptmp' +BASE_GIT: '/lfs5/HFIP/hfv3gfs/glopara/git' +DMPDIR: '/lfs5/HFIP/hfv3gfs/glopara/dump' +BASE_IC: '/mnt/lfs5/HFIP/hfv3gfs/glopara/data/ICSDIR' +PACKAGEROOT: '/lfs5/HFIP/hfv3gfs/glopara/nwpara' +COMINsyn: '/lfs5/HFIP/hfv3gfs/glopara/com/gfs/prod/syndat' +HOMEDIR: '/lfs5/HFIP/hfv3gfs/${USER}' +STMP: '/lfs5/HFIP/hfv3gfs/${USER}/stmp' +PTMP: '/lfs5/HFIP/hfv3gfs/${USER}/ptmp' NOSCRUB: $HOMEDIR ACCOUNT: hfv3gfs SCHEDULER: slurm @@ -24,6 +24,6 @@ ATARDIR: '/NCEPDEV/${HPSS_PROJECT}/1year/${USER}/${machine}/scratch/${PSLOT}' MAKE_NSSTBUFR: 'NO' MAKE_ACFTBUFR: 'NO' SUPPORTED_RESOLUTIONS: ['C384', 'C192', 'C96', 'C48'] -COMINecmwf: /mnt/lfs4/HFIP/hfv3gfs/glopara/data/external_gempak/ecmwf -COMINnam: /mnt/lfs4/HFIP/hfv3gfs/glopara/data/external_gempak/nam -COMINukmet: /mnt/lfs4/HFIP/hfv3gfs/glopara/data/external_gempak/ukmet +COMINecmwf: /mnt/lfs5/HFIP/hfv3gfs/glopara/data/external_gempak/ecmwf +COMINnam: /mnt/lfs5/HFIP/hfv3gfs/glopara/data/external_gempak/nam +COMINukmet: /mnt/lfs5/HFIP/hfv3gfs/glopara/data/external_gempak/ukmet From af590f0d82c550a3aee8acfea13b810b6266bfe4 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Thu, 29 Aug 2024 19:36:14 +0000 Subject: [PATCH 02/23] Adjust detection of jet to use lfs5 --- ush/detect_machine.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh index b049a6040e..c75af34a05 100755 --- a/ush/detect_machine.sh +++ b/ush/detect_machine.sh @@ -67,7 +67,7 @@ if [[ -d /lfs/h3 ]]; then elif [[ -d /lfs/h1 && ! -d /lfs/h3 ]]; then # We are on NOAA TDS Acorn MACHINE_ID=acorn -elif [[ -d /mnt/lfs1 ]]; then +elif [[ -d /mnt/lfs55555 ]]; then # We are on NOAA Jet MACHINE_ID=jet elif [[ -d /scratch1 ]]; then From 8b9dde9fd4ae11a5cee77281dce2c28a0ad074f8 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Thu, 29 Aug 2024 19:59:40 +0000 Subject: [PATCH 03/23] Detect Jet with /lfs5 --- ush/detect_machine.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/detect_machine.sh b/ush/detect_machine.sh index c75af34a05..8ad217140a 100755 --- a/ush/detect_machine.sh +++ b/ush/detect_machine.sh @@ -67,7 +67,7 @@ if [[ -d /lfs/h3 ]]; then elif [[ -d /lfs/h1 && ! -d /lfs/h3 ]]; then # We are on NOAA TDS Acorn MACHINE_ID=acorn -elif [[ -d /mnt/lfs55555 ]]; then +elif [[ -d /mnt/lfs5 ]]; then # We are on NOAA Jet MACHINE_ID=jet elif [[ -d /scratch1 ]]; then From da18d03a9a0098a3b9fe10f933f0a41091ccd2bd Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Thu, 29 Aug 2024 20:16:16 +0000 Subject: [PATCH 04/23] Fix paths to use lfs5 instead of lfs4 --- docs/note_fixfield.txt | 2 +- docs/source/components.rst | 2 +- docs/source/init.rst | 4 ++-- parm/config/gfs/config.aero | 2 +- sorc/link_workflow.sh | 2 +- workflow/hosts.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/note_fixfield.txt b/docs/note_fixfield.txt index a7a4001561..d50a0b1d56 100644 --- a/docs/note_fixfield.txt +++ b/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/git/fv3gfs/fix S4: /data/prod/glopara/fix ------------------------------------------------------------------------------ diff --git a/docs/source/components.rst b/docs/source/components.rst index 869ef89bab..f5a60a96af 100644 --- a/docs/source/components.rst +++ b/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`` diff --git a/docs/source/init.rst b/docs/source/init.rst index e1cabdc8e0..aa71e4e294 100644 --- a/docs/source/init.rst +++ b/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``. diff --git a/parm/config/gfs/config.aero b/parm/config/gfs/config.aero index 2fae019574..f49593a439 100644 --- a/parm/config/gfs/config.aero +++ b/parm/config/gfs/config.aero @@ -24,7 +24,7 @@ case ${machine} in AERO_INPUTS_DIR="/gpfs/f5/epic/proj-shared/global/glopara/data/gocart_emissions" ;; "JET") - AERO_INPUTS_DIR="/lfs4/HFIP/hfv3gfs/glopara/data/gocart_emissions" + AERO_INPUTS_DIR="/lfs5/HFIP/hfv3gfs/glopara/data/gocart_emissions" ;; *) echo "FATAL ERROR: Machine ${machine} unsupported for aerosols" diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh index ae30e7a645..6159137fac 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -73,7 +73,7 @@ case "${machine}" in "hera") FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix" ;; "orion") FIX_DIR="/work/noaa/global/glopara/fix" ;; "hercules") FIX_DIR="/work/noaa/global/glopara/fix" ;; - "jet") FIX_DIR="/lfs4/HFIP/hfv3gfs/glopara/git/fv3gfs/fix" ;; + "jet") FIX_DIR="/lfs5/HFIP/hfv3gfs/glopara/git/fv3gfs/fix" ;; "s4") FIX_DIR="/data/prod/glopara/fix" ;; "gaea") FIX_DIR="/gpfs/f5/ufs-ard/world-shared/global/glopara/data/fix" ;; "noaacloud") FIX_DIR="/contrib/global-workflow-shared-data/fix" ;; diff --git a/workflow/hosts.py b/workflow/hosts.py index 6244cf564e..805df38dd2 100644 --- a/workflow/hosts.py +++ b/workflow/hosts.py @@ -42,7 +42,7 @@ def detect(cls): machine = 'HERA' elif os.path.exists('/work/noaa'): machine = socket.gethostname().split("-", 1)[0].upper() - elif os.path.exists('/lfs4/HFIP'): + elif os.path.exists('/lfs5/HFIP'): machine = 'JET' elif os.path.exists('/lfs/f1'): machine = 'WCOSS2' From 43650a68e8b9a91c5270839309fb6dfcabd8623d Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Fri, 30 Aug 2024 14:11:27 +0000 Subject: [PATCH 05/23] fix few paths --- docs/note_fixfield.txt | 2 +- sorc/link_workflow.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/note_fixfield.txt b/docs/note_fixfield.txt index d50a0b1d56..32e44b9d98 100644 --- a/docs/note_fixfield.txt +++ b/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/lfs5/HFIP/hfv3gfs/glopara/git/fv3gfs/fix +Jet: /mnt/lfs5/HFIP/hfv3gfs/glopara/FIX/fix S4: /data/prod/glopara/fix ------------------------------------------------------------------------------ diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh index 6159137fac..1c7ea5c50e 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -73,7 +73,7 @@ case "${machine}" in "hera") FIX_DIR="/scratch1/NCEPDEV/global/glopara/fix" ;; "orion") FIX_DIR="/work/noaa/global/glopara/fix" ;; "hercules") FIX_DIR="/work/noaa/global/glopara/fix" ;; - "jet") FIX_DIR="/lfs5/HFIP/hfv3gfs/glopara/git/fv3gfs/fix" ;; + "jet") FIX_DIR="/lfs5/HFIP/hfv3gfs/glopara/FIX/fix" ;; "s4") FIX_DIR="/data/prod/glopara/fix" ;; "gaea") FIX_DIR="/gpfs/f5/ufs-ard/world-shared/global/glopara/data/fix" ;; "noaacloud") FIX_DIR="/contrib/global-workflow-shared-data/fix" ;; From 0b2e488c3189f669502a235b00d9639b2ff0dcde Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Fri, 30 Aug 2024 19:28:56 +0000 Subject: [PATCH 06/23] Adjust for re-rganization and renaming of UPP parm files --- sorc/link_workflow.sh | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/sorc/link_workflow.sh b/sorc/link_workflow.sh index 1c7ea5c50e..f0245ca42b 100755 --- a/sorc/link_workflow.sh +++ b/sorc/link_workflow.sh @@ -162,15 +162,31 @@ cd "${HOMEgfs}/parm/ufs" || exit 1 ${LINK_OR_COPY} "${HOMEgfs}/sorc/ufs_model.fd/tests/parm/noahmptable.tbl" . cd "${HOMEgfs}/parm/post" || exit 1 -for file in postxconfig-NT-GEFS-F00.txt postxconfig-NT-GEFS.txt postxconfig-NT-GEFS-WAFS.txt \ - postxconfig-NT-GEFS-F00-aerosol.txt postxconfig-NT-GEFS-aerosol.txt \ - postxconfig-NT-GFS-ANL.txt postxconfig-NT-GFS-F00.txt postxconfig-NT-GFS-FLUX-F00.txt \ - postxconfig-NT-GFS.txt postxconfig-NT-GFS-FLUX.txt postxconfig-NT-GFS-GOES.txt \ - postxconfig-NT-GFS-F00-TWO.txt postxconfig-NT-GFS-TWO.txt \ - params_grib2_tbl_new post_tag_gfs128 post_tag_gfs65 nam_micro_lookup.dat +#for file in postxconfig-NT-GEFS-F00.txt postxconfig-NT-GEFS.txt postxconfig-NT-GEFS-WAFS.txt \ +# postxconfig-NT-GEFS-F00-aerosol.txt postxconfig-NT-GEFS-aerosol.txt \ +# postxconfig-NT-GFS-ANL.txt postxconfig-NT-GFS-F00.txt postxconfig-NT-GFS-FLUX-F00.txt \ +# postxconfig-NT-GFS.txt postxconfig-NT-GFS-FLUX.txt postxconfig-NT-GFS-GOES.txt \ +# postxconfig-NT-GFS-F00-TWO.txt postxconfig-NT-GFS-TWO.txt \ +# params_grib2_tbl_new post_tag_gfs128 post_tag_gfs65 nam_micro_lookup.dat +#do +# ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/${file}" . +#done +for file in nam_micro_lookup.dat params_grib2_tbl_new do ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/${file}" . done +for file in postxconfig-NT-gefs-f00.txt postxconfig-NT-gefs.txt postxconfig-NT-gefs-wafs.txt \ + postxconfig-NT-gefs-f00-aerosol.txt postxconfig-NT-gefs-aerosol.txt +do + ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/gefs/${file}" . +done +for file in postxconfig-NT-gfs-anl.txt postxconfig-NT-gfs-f00.txt postxconfig-NT-gfs-flux-f00.txt \ + postxconfig-NT-gfs.txt postxconfig-NT-gfs-flus.txt postxconfig-NT-gfs-goes.txt \ + postxconfig-NT-gfs-f00-two.txt postxconfig-NT-gfs-two.txt post_tag_gfs128 post_tag_gfs65 \ + +do + ${LINK_OR_COPY} "${HOMEgfs}/sorc/upp.fd/parm/gfs/${file}" . +done for file in optics_luts_DUST.dat optics_luts_DUST_nasa.dat optics_luts_NITR_nasa.dat \ optics_luts_SALT.dat optics_luts_SALT_nasa.dat optics_luts_SOOT.dat optics_luts_SOOT_nasa.dat \ optics_luts_SUSO.dat optics_luts_SUSO_nasa.dat optics_luts_WASO.dat optics_luts_WASO_nasa.dat From 4aec4bbb05fb621a511084bc4b7cb0a72c94b3f7 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Fri, 30 Aug 2024 19:51:37 +0000 Subject: [PATCH 07/23] Account for new file names from UPP --- ush/forecast_predet.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh index d1a332716a..448fb8e92b 100755 --- a/ush/forecast_predet.sh +++ b/ush/forecast_predet.sh @@ -537,10 +537,17 @@ FV3_predet(){ # Inline UPP fix files if [[ "${WRITE_DOPOST:-}" == ".true." ]]; then ${NCP} "${PARMgfs}/post/post_tag_gfs${LEVS}" "${DATA}/itag" - ${NCP} "${FLTFILEGFS:-${PARMgfs}/post/postxconfig-NT-GFS-TWO.txt}" "${DATA}/postxconfig-NT.txt" - ${NCP} "${FLTFILEGFSF00:-${PARMgfs}/post/postxconfig-NT-GFS-F00-TWO.txt}" "${DATA}/postxconfig-NT_FH00.txt" + ${NCP} "${FLTFILEGFS:-${PARMgfs}/post/postxconfig-NT-gfs-two.txt}" "${DATA}/postxconfig-NT.txt" + ${NCP} "${FLTFILEGFSF00:-${PARMgfs}/post/postxconfig-NT-gfs-f00-TWO.txt}" "${DATA}/postxconfig-NT_FH00.txt" ${NCP} "${POSTGRB2TBL:-${PARMgfs}/post/params_grib2_tbl_new}" "${DATA}/params_grib2_tbl_new" fi +# # before +# if [[ "${WRITE_DOPOST:-}" == ".true." ]]; then +# ${NCP} "${PARMgfs}/post/post_tag_gfs${LEVS}" "${DATA}/itag" +# ${NCP} "${FLTFILEGFS:-${PARMgfs}/post/postxconfig-NT-GFS-TWO.txt}" "${DATA}/postxconfig-NT.txt" +# ${NCP} "${FLTFILEGFSF00:-${PARMgfs}/post/postxconfig-NT-GFS-F00-TWO.txt}" "${DATA}/postxconfig-NT_FH00.txt" +# ${NCP} "${POSTGRB2TBL:-${PARMgfs}/post/params_grib2_tbl_new}" "${DATA}/params_grib2_tbl_new" +# fi } From 9f873fcbf21cd1bf5428e2d5d850a043cc9f59aa Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Fri, 30 Aug 2024 20:21:07 +0000 Subject: [PATCH 08/23] Account for new file names from UPP --- ush/forecast_predet.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh index 448fb8e92b..17733f0d22 100755 --- a/ush/forecast_predet.sh +++ b/ush/forecast_predet.sh @@ -538,7 +538,7 @@ FV3_predet(){ if [[ "${WRITE_DOPOST:-}" == ".true." ]]; then ${NCP} "${PARMgfs}/post/post_tag_gfs${LEVS}" "${DATA}/itag" ${NCP} "${FLTFILEGFS:-${PARMgfs}/post/postxconfig-NT-gfs-two.txt}" "${DATA}/postxconfig-NT.txt" - ${NCP} "${FLTFILEGFSF00:-${PARMgfs}/post/postxconfig-NT-gfs-f00-TWO.txt}" "${DATA}/postxconfig-NT_FH00.txt" + ${NCP} "${FLTFILEGFSF00:-${PARMgfs}/post/postxconfig-NT-gfs-f00-two.txt}" "${DATA}/postxconfig-NT_FH00.txt" ${NCP} "${POSTGRB2TBL:-${PARMgfs}/post/params_grib2_tbl_new}" "${DATA}/params_grib2_tbl_new" fi # # before From 43bce73f25f313a903ef65749f5cc9d51e0cda36 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Fri, 30 Aug 2024 23:08:12 +0000 Subject: [PATCH 09/23] Adjust file name to new names from UPP --- parm/post/upp.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/parm/post/upp.yaml b/parm/post/upp.yaml index a39e2be877..aa6768f8f6 100644 --- a/parm/post/upp.yaml +++ b/parm/post/upp.yaml @@ -18,7 +18,7 @@ analysis: rdaod: True data_in: copy: - - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-ANL.txt", "{{ DATA }}/postxconfig-NT.txt"] + - ["{{ PARMgfs }}/post/postxconfig-NT-gfs-anl.txt", "{{ DATA }}/postxconfig-NT.txt"] - ["{{ COM_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmanl.nc", "{{ DATA }}/{{ atmos_filename }}"] - ["{{ COM_ATMOS_ANALYSIS }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcanl.nc", "{{ DATA }}/{{ flux_filename }}"] data_out: @@ -32,9 +32,9 @@ forecast: data_in: copy: {% if forecast_hour == 0 %} - - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-F00-TWO.txt", "{{ DATA }}/postxconfig-NT.txt"] + - ["{{ PARMgfs }}/post/postxconfig-NT-gfs-f00-two.txt", "{{ DATA }}/postxconfig-NT.txt"] {% else %} - - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-TWO.txt", "{{ DATA }}/postxconfig-NT.txt"] + - ["{{ PARMgfs }}/post/postxconfig-NT-gfs-two.txt", "{{ DATA }}/postxconfig-NT.txt"] {% endif %} - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"] - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"] @@ -81,7 +81,7 @@ goes: {% endfor %} - ["{{ 'CRTM_FIX' | getenv }}/AerosolCoeff.bin", "{{ DATA }}/"] - ["{{ 'CRTM_FIX' | getenv }}/CloudCoeff.bin", "{{ DATA }}/"] - - ["{{ PARMgfs }}/post/postxconfig-NT-GFS-GOES.txt", "{{ DATA }}/postxconfig-NT.txt"] + - ["{{ PARMgfs }}/post/postxconfig-NT-gfs-goes.txt", "{{ DATA }}/postxconfig-NT.txt"] - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.atmf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ atmos_filename }}"] - ["{{ COM_ATMOS_HISTORY }}/{{ RUN }}.t{{ current_cycle | strftime('%H') }}z.sfcf{{ '%03d' % forecast_hour }}.nc", "{{ DATA }}/{{ flux_filename }}"] data_out: From 2ab8d850c852a6e92af1397cf667efb1c3b57821 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Thu, 5 Sep 2024 21:01:04 +0000 Subject: [PATCH 10/23] update GSI_UTILS --- sorc/gsi_utils.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd index 9382fd01c2..25d4f79607 160000 --- a/sorc/gsi_utils.fd +++ b/sorc/gsi_utils.fd @@ -1 +1 @@ -Subproject commit 9382fd01c2a626c8934c3f553d420a45de2b4dec +Subproject commit 25d4f79607ba378f9bfd3d2e70e77f4c92234fc8 From 6d9c872971b9353019dcc8d369c53e9cc924a6f5 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Thu, 5 Sep 2024 21:16:31 +0000 Subject: [PATCH 11/23] Update GSI_MONITOR to use the updated paths on JET --- sorc/gsi_monitor.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gsi_monitor.fd b/sorc/gsi_monitor.fd index e1f9f21af1..278ee629e8 160000 --- a/sorc/gsi_monitor.fd +++ b/sorc/gsi_monitor.fd @@ -1 +1 @@ -Subproject commit e1f9f21af16ce912fdc2cd75c5b27094a550a0c5 +Subproject commit 278ee629e87558822e8d13b3fb3b0e16006aa856 From 7874b4581e4476b851648eb7e4168142b4bdc2e2 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Fri, 6 Sep 2024 13:24:42 +0000 Subject: [PATCH 12/23] Update GFS_UTILS to use updated path on JET --- sorc/gfs_utils.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gfs_utils.fd b/sorc/gfs_utils.fd index 279bbf2097..a00cc0949e 160000 --- a/sorc/gfs_utils.fd +++ b/sorc/gfs_utils.fd @@ -1 +1 @@ -Subproject commit 279bbf2097d87321294436d17bf5b73c4c07ab4a +Subproject commit a00cc0949e2f901e73b58d54834517743916c69a From a6890fbf4ff8bf2427f517386f6698ee88b6260c Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Fri, 6 Sep 2024 13:35:42 +0000 Subject: [PATCH 13/23] Update GSI to use updated path on JET --- sorc/gsi_enkf.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gsi_enkf.fd b/sorc/gsi_enkf.fd index 529bb796be..9f44c8798c 160000 --- a/sorc/gsi_enkf.fd +++ b/sorc/gsi_enkf.fd @@ -1 +1 @@ -Subproject commit 529bb796bea0e490f186729cd168a91c034bb12d +Subproject commit 9f44c8798c2087aca06df8f629699632e57df431 From 3fa56dc5700fac9eab6b9ddc4340eb74db6a4509 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Mon, 9 Sep 2024 15:58:44 +0000 Subject: [PATCH 14/23] Update UFS_UTILS to use updated paths on Jet --- sorc/ufs_utils.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd index 3ef2e6bd72..06eec5b6f6 160000 --- a/sorc/ufs_utils.fd +++ b/sorc/ufs_utils.fd @@ -1 +1 @@ -Subproject commit 3ef2e6bd725d2662fd6ee95897cb7bac222e5144 +Subproject commit 06eec5b6f636123835e2dfd9fc5229980c006735 From b434a8416403387ac91a0a7e958b1ebe7f9b41e2 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Mon, 9 Sep 2024 17:28:55 +0000 Subject: [PATCH 15/23] Update ufs model hash --- sorc/ufs_model.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index c12760125c..94a3cd7f6a 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit c12760125ce7c5a85e8ced92d7f37c9ad6a59afe +Subproject commit 94a3cd7f6afa1091bad6b8f57cdc5b7712849dfb From ed363b9fe1b04e7f568260cbf60212c0fe66bdb4 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Mon, 9 Sep 2024 20:33:46 +0000 Subject: [PATCH 16/23] Update UGFS model to the latest --- sorc/gdas.cd | 2 +- sorc/ufs_model.fd | 2 +- versions/run.jet.ver | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index faa95efb18..f3fa26d4d6 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit faa95efb18f0f52acab2cf09b17f78406f9b48b1 +Subproject commit f3fa26d4d6693fcf451184d5ecabb86c1b4190ca diff --git a/sorc/ufs_model.fd b/sorc/ufs_model.fd index 94a3cd7f6a..6a4e09e947 160000 --- a/sorc/ufs_model.fd +++ b/sorc/ufs_model.fd @@ -1 +1 @@ -Subproject commit 94a3cd7f6afa1091bad6b8f57cdc5b7712849dfb +Subproject commit 6a4e09e94773ffa39ce7ab6a54a885efada91f21 diff --git a/versions/run.jet.ver b/versions/run.jet.ver index 6743b99286..a5be18e167 100644 --- a/versions/run.jet.ver +++ b/versions/run.jet.ver @@ -12,3 +12,8 @@ export perl_ver=5.38.0 source "${HOMEgfs:-}/versions/run.spack.ver" export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" +# overwrite localy on Jet +export obsproc_run_ver=1.2.0 +export prepobs_run_ver=1.1.0 +#export ens_tracker_ver=feature-GFSv17_com_reorg +export fit2obs_ver=1.1.3 From 6409f70a0f4c303fc679c994d565b50bdac1e047 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Mon, 9 Sep 2024 20:43:19 +0000 Subject: [PATCH 17/23] Update submodules hash to the latest --- sorc/gsi_utils.fd | 2 +- sorc/ufs_utils.fd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd index 25d4f79607..bb0138d02a 160000 --- a/sorc/gsi_utils.fd +++ b/sorc/gsi_utils.fd @@ -1 +1 @@ -Subproject commit 25d4f79607ba378f9bfd3d2e70e77f4c92234fc8 +Subproject commit bb0138d02aeb4a39a6eb2b82b0451fb5399ace79 diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd index 06eec5b6f6..0426bf7930 160000 --- a/sorc/ufs_utils.fd +++ b/sorc/ufs_utils.fd @@ -1 +1 @@ -Subproject commit 06eec5b6f636123835e2dfd9fc5229980c006735 +Subproject commit 0426bf793051530794ec8f182e04f5cf129d0a90 From e4c68fa857406614c2b3363dc13c6b115909df82 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Tue, 10 Sep 2024 13:36:23 +0000 Subject: [PATCH 18/23] revert local change --- versions/run.jet.ver | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/versions/run.jet.ver b/versions/run.jet.ver index a5be18e167..de1217fd62 100644 --- a/versions/run.jet.ver +++ b/versions/run.jet.ver @@ -12,8 +12,4 @@ export perl_ver=5.38.0 source "${HOMEgfs:-}/versions/run.spack.ver" export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" -# overwrite localy on Jet -export obsproc_run_ver=1.2.0 -export prepobs_run_ver=1.1.0 -#export ens_tracker_ver=feature-GFSv17_com_reorg -export fit2obs_ver=1.1.3 + From f0993498f700e1e7e6a3d52ed6d6b739975d9434 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Tue, 10 Sep 2024 13:43:49 +0000 Subject: [PATCH 19/23] Update Hash for UFS_UTILS --- sorc/ufs_utils.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/ufs_utils.fd b/sorc/ufs_utils.fd index 0426bf7930..06eec5b6f6 160000 --- a/sorc/ufs_utils.fd +++ b/sorc/ufs_utils.fd @@ -1 +1 @@ -Subproject commit 0426bf793051530794ec8f182e04f5cf129d0a90 +Subproject commit 06eec5b6f636123835e2dfd9fc5229980c006735 From 17512c993493e20d22b8aca0f3c4d4767ff577b7 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Mon, 16 Sep 2024 13:10:06 +0000 Subject: [PATCH 20/23] Remove commented code --- ush/forecast_predet.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/ush/forecast_predet.sh b/ush/forecast_predet.sh index 72bcc00ff9..1fdd58afba 100755 --- a/ush/forecast_predet.sh +++ b/ush/forecast_predet.sh @@ -548,14 +548,6 @@ FV3_predet(){ ${NCP} "${PARMgfs}/post/gefs/postxconfig-NT-gefs-f00.txt" "${DATA}/postxconfig-NT_FH00.txt" fi fi -# # before -# if [[ "${WRITE_DOPOST:-}" == ".true." ]]; then -# ${NCP} "${PARMgfs}/post/post_tag_gfs${LEVS}" "${DATA}/itag" -# ${NCP} "${FLTFILEGFS:-${PARMgfs}/post/postxconfig-NT-GFS-TWO.txt}" "${DATA}/postxconfig-NT.txt" -# ${NCP} "${FLTFILEGFSF00:-${PARMgfs}/post/postxconfig-NT-GFS-F00-TWO.txt}" "${DATA}/postxconfig-NT_FH00.txt" -# ${NCP} "${POSTGRB2TBL:-${PARMgfs}/post/params_grib2_tbl_new}" "${DATA}/params_grib2_tbl_new" -# fi - } # Disable variable not used warnings From d103a1e8b71deed2261aba03291236e9d9420b36 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Mon, 16 Sep 2024 14:00:34 +0000 Subject: [PATCH 21/23] update GDAS App hash to match the develop branch --- sorc/gdas.cd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gdas.cd b/sorc/gdas.cd index f3fa26d4d6..faa95efb18 160000 --- a/sorc/gdas.cd +++ b/sorc/gdas.cd @@ -1 +1 @@ -Subproject commit f3fa26d4d6693fcf451184d5ecabb86c1b4190ca +Subproject commit faa95efb18f0f52acab2cf09b17f78406f9b48b1 From d2c784e1a752b16858cdec7ee502dcc090ce82d8 Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Thu, 19 Sep 2024 17:07:07 +0000 Subject: [PATCH 22/23] Update gsi_utils to include latest fix --- sorc/gsi_utils.fd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sorc/gsi_utils.fd b/sorc/gsi_utils.fd index bb0138d02a..a6ea311e5c 160000 --- a/sorc/gsi_utils.fd +++ b/sorc/gsi_utils.fd @@ -1 +1 @@ -Subproject commit bb0138d02aeb4a39a6eb2b82b0451fb5399ace79 +Subproject commit a6ea311e5c82369d255e3afdc99c1bce0c9a3014 From cdd4b0cca90935b5dcd1b2f6f99fffd6a4def26d Mon Sep 17 00:00:00 2001 From: Innocent Souopgui Date: Tue, 24 Sep 2024 13:13:28 +0000 Subject: [PATCH 23/23] Add local version for JET --- versions/run.jet.ver | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/versions/run.jet.ver b/versions/run.jet.ver index 692451d007..90553fb277 100644 --- a/versions/run.jet.ver +++ b/versions/run.jet.ver @@ -12,3 +12,7 @@ export perl_ver=5.38.0 source "${HOMEgfs:-}/versions/spack.ver" export spack_mod_path="/contrib/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core" + +# Local version of TC_tracker +export ens_tracker_ver=v1.1.15.7 +