Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

sync with head of NOAA-EMC UPP develop #2326

Merged
merged 94 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
3ac971f
point to number-concentration branch of fv3atm
SamuelTrahanNOAA Jun 12, 2024
61e1b34
Merge remote-tracking branch 'origin/develop' into number-concentration
SamuelTrahanNOAA Jun 12, 2024
c2bebf7
inline post works again
SamuelTrahanNOAA Jun 13, 2024
8dad494
FV3/upp: remove GSD_NC synonyms and rename GSD_NC fields instead
SamuelTrahanNOAA Jun 13, 2024
a4aea05
upgrade g2tmpl library to 1.12.0 for UPP
SamuelTrahanNOAA Jun 13, 2024
8319f3c
hera: point to alternative location with new hera libraries
SamuelTrahanNOAA Jun 13, 2024
c72d094
allow tests to specify which postxconfig files to use
SamuelTrahanNOAA Jun 13, 2024
765e5fa
update params_grib2_tbl_new
SamuelTrahanNOAA Jun 13, 2024
fee193f
update upp hash
SamuelTrahanNOAA Jun 13, 2024
e220c16
upp: correct pressure levels for hafs-ar postxconfig files
SamuelTrahanNOAA Jun 14, 2024
1c64770
sync regression test hafs-ar postxconfig with new upp version of file
SamuelTrahanNOAA Jun 14, 2024
c1e93f6
dedicated itag file for gnv1_nested
SamuelTrahanNOAA Jun 14, 2024
f18d84a
Updated postxconfig*txt files from @WenMeng-NOAA for all except hafs_ar
SamuelTrahanNOAA Jun 14, 2024
574245f
bugfix: fixed_sfc2_type defaults to fixed_sfc1_type
SamuelTrahanNOAA Jun 17, 2024
be8f9c1
merge upp upstream/develop to branch
SamuelTrahanNOAA Jun 17, 2024
690916c
update upp hash
SamuelTrahanNOAA Jun 19, 2024
65cbbeb
crtm fix files are mandatory in some post jobs
SamuelTrahanNOAA Jun 20, 2024
9ef8904
point to authoritative UPP
SamuelTrahanNOAA Jun 20, 2024
4ab9421
Merge remote-tracking branch 'upstream/develop' into number-concentra…
SamuelTrahanNOAA Jun 20, 2024
002571c
another update to postxconfig txt files
SamuelTrahanNOAA Jun 21, 2024
baf4f20
bug fix to post crtm file copier
SamuelTrahanNOAA Jun 21, 2024
3879a34
alternative location for hera gnu modules
SamuelTrahanNOAA Jun 21, 2024
7c6316c
restore error checking to workflow and tweak some jobs to fail, to te…
SamuelTrahanNOAA Jun 21, 2024
4c07573
make linter happy
SamuelTrahanNOAA Jun 21, 2024
c7cbada
job-failing functionality (for test purposes) moved to right script
SamuelTrahanNOAA Jun 21, 2024
325c261
ignore some regression test system flag and temporary files that shou…
SamuelTrahanNOAA Jun 21, 2024
7660ed4
do not link crtm fix files
SamuelTrahanNOAA Jun 21, 2024
7bb328c
use pipefail to detect if job card fails
SamuelTrahanNOAA Jun 21, 2024
0b02542
regression tests pass against new baselines
SamuelTrahanNOAA Jun 21, 2024
b0d76f3
tests changed by UPP update
SamuelTrahanNOAA Jun 22, 2024
fd212fc
Merge remote-tracking branch 'upstream/develop' into error-checking
SamuelTrahanNOAA Jun 27, 2024
bae897a
make linter happy
SamuelTrahanNOAA Jun 27, 2024
05835b8
try again to make linter happy
SamuelTrahanNOAA Jun 27, 2024
eef6e73
set pipefail again for linter
SamuelTrahanNOAA Jun 27, 2024
b8ba251
run_compile.sh: do not duplicate redirect_out_err
SamuelTrahanNOAA Jun 27, 2024
e536905
correct a comment
SamuelTrahanNOAA Jun 27, 2024
b4edbb7
alternative location for gaea modules
SamuelTrahanNOAA Jun 27, 2024
02a22db
update upp hash
SamuelTrahanNOAA Jul 5, 2024
68f1de5
merge upstream develop
SamuelTrahanNOAA Jul 5, 2024
d785c18
merge develop
SamuelTrahanNOAA Jul 11, 2024
7571f9e
merge develop again
SamuelTrahanNOAA Jul 11, 2024
9ded9e6
update upp hash
SamuelTrahanNOAA Jul 11, 2024
d1339f4
merge develop
SamuelTrahanNOAA Jul 18, 2024
e291a01
update FV3 hash
SamuelTrahanNOAA Jul 19, 2024
7f42e3e
merge upstream develop
SamuelTrahanNOAA Aug 8, 2024
7b6481b
update to head of UPP develop
SamuelTrahanNOAA Aug 8, 2024
54e0e46
new modulefile paths on some machines
SamuelTrahanNOAA Aug 8, 2024
3d17203
Update bl_date.conf
zach1221 Aug 8, 2024
51a1548
alternative gnu compiler version on hera
SamuelTrahanNOAA Aug 8, 2024
4aa5dd8
Merge branch 'number-concentration' of ssh://github.com/SamuelTrahanN…
SamuelTrahanNOAA Aug 8, 2024
e8c5239
hera tests passed
SamuelTrahanNOAA Aug 9, 2024
d3a3fdb
use upp-addon-env on S4
InnocentSouopgui-NOAA Aug 13, 2024
4c591d3
solve the problem loading nco on S4
InnocentSouopgui-NOAA Aug 13, 2024
8a61c01
merge upstream develop
SamuelTrahanNOAA Aug 13, 2024
78892e6
Merge branch 'SamuelTrahanNOAA:number-concentration' into number-conc…
InnocentSouopgui-NOAA Aug 13, 2024
a10c18f
update to latest upp
SamuelTrahanNOAA Aug 14, 2024
6dd52fa
update g2 and g2tmpl versions
SamuelTrahanNOAA Aug 14, 2024
bce2d10
Regression Test Log for S4
InnocentSouopgui-NOAA Aug 14, 2024
1bf9aa8
Merge branch 'SamuelTrahanNOAA:number-concentration' into number-conc…
InnocentSouopgui-NOAA Aug 14, 2024
d3a2ab6
Revert local S4 change
InnocentSouopgui-NOAA Aug 14, 2024
283c9db
Merge pull request #5 from InnocentSouopgui-NOAA/number-concentration
SamuelTrahanNOAA Aug 14, 2024
df1729c
test changes
SamuelTrahanNOAA Aug 14, 2024
6955721
Merge branch 'number-concentration' of ssh://github.com/SamuelTrahanN…
SamuelTrahanNOAA Aug 14, 2024
dd9ab30
hercules tests passed
SamuelTrahanNOAA Aug 15, 2024
aa1b10f
FV3: update spack package list
SamuelTrahanNOAA Aug 16, 2024
24f1e98
update wcoss2 module versions for g2 & g2tmpl
SamuelTrahanNOAA Aug 16, 2024
1e9d123
FV3/ci/spack.yaml: remove unneeded libraries & sync versions with ufs…
SamuelTrahanNOAA Aug 16, 2024
5307934
move some paths on jet from /lfs4 to either /lfs5 or contrib
SamuelTrahanNOAA Aug 19, 2024
c645246
merge upstream develop
SamuelTrahanNOAA Aug 19, 2024
19167a0
remove two more lfs4 paths
SamuelTrahanNOAA Aug 19, 2024
b3a1ed9
replace more lfs4 paths with lfs5
SamuelTrahanNOAA Aug 19, 2024
a12c09a
Jet: move /lfs4 python paths to /contrib
SamuelTrahanNOAA Aug 19, 2024
73a5761
incorrect path in jet module
SamuelTrahanNOAA Aug 20, 2024
3fed0eb
new paths on jet
SamuelTrahanNOAA Aug 20, 2024
339e302
correct jet paths for RT
SamuelTrahanNOAA Aug 21, 2024
0b72676
jet tests passed on new baseline
SamuelTrahanNOAA Aug 21, 2024
aa241d5
merge develop
SamuelTrahanNOAA Aug 21, 2024
3df9dd2
Update bl_date.conf
FernandoAndrade-NOAA Aug 21, 2024
32b4f1e
jet tests passed with ecflow
SamuelTrahanNOAA Aug 21, 2024
97b1ccd
merge remote branch
SamuelTrahanNOAA Aug 21, 2024
92e5b9b
add gaaea RT log passed
FernandoAndrade-NOAA Aug 21, 2024
0ad7c5d
turn off build_test gitaction yml
jkbk2004 Aug 22, 2024
7cc12a8
add hera RT log passed
FernandoAndrade-NOAA Aug 22, 2024
6d5c45e
add control_p8_gnu ORT logs: passed
zach1221 Aug 22, 2024
f080fbb
add cpld_control_gnu ORT logs: passed
zach1221 Aug 22, 2024
6ccfb11
add regional_control_gnu ORT logs: passed
zach1221 Aug 22, 2024
d6c52bd
add orion RT logs: passed
zach1221 Aug 22, 2024
990d8d8
add derecho RT logs: passed
zach1221 Aug 22, 2024
3a250e4
add hercules RT logs: passed
zach1221 Aug 22, 2024
b8d9265
WCOSS2 Log; Passed
BrianCurtis-NOAA Aug 22, 2024
b9f2da8
add jet RT log passed
FernandoAndrade-NOAA Aug 22, 2024
5510e86
Acorn RT Log: Pass (whew)
BrianCurtis-NOAA Aug 23, 2024
fa15675
point to head of FV3
SamuelTrahanNOAA Aug 23, 2024
e1836a9
revert gitmodules
SamuelTrahanNOAA Aug 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 3 files
+8 −5 ci/spack.yaml
+188 −33 io/post_fv3.F90
+1 −1 upp
4 changes: 2 additions & 2 deletions modulefiles/ufs_common.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ local ufs_modules = {
{["fms"] = "2023.04"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["g2"] = "3.4.5"},
{["g2tmpl"] = "1.10.2"},
{["g2"] = "3.5.1"},
{["g2tmpl"] = "1.13.0"},
{["ip"] = "4.3.0"},
{["sp"] = "2.5.0"},
{["w3emc"] = "2.10.0"},
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_derecho.gnu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ load("mysql/8.0.33")

setenv("LMOD_TMOD_FIND_FIRST","yes")
prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

unload("ncarcompilers")
stack_gnu_ver=os.getenv("stack_gnu_ver") or "12.2.0"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_derecho.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ load("mysql/8.0.33")

setenv("LMOD_TMOD_FIND_FIRST","yes")
prepend_path("MODULEPATH", "/lustre/desc1/scratch/epicufsrt/contrib/modulefiles_extra")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/glade/work/epicufsrt/contrib/spack-stack/derecho/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

unload("ncarcompilers")
stack_intel_ver=os.getenv("stack_intel_ver") or "2021.10.0"
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_gaea.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ help([[

whatis([===[Loads libraries needed for building the UFS Weather Model on Gaea ]===])

prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/ncrc/proj/epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_hera.gnu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ loads UFS Model prerequisites for Hera/GNU

prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/gnu/modulefiles")
prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/installs/openmpi/modulefiles")
prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/spack-stack/spack-stack-1.6.0_gnu13/envs/ufs-wm-srw-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch2/NCEPDEV/stmp1/role.epic/spack-stack/spack-stack-1.6.0_gnu13/envs/upp-addon-env/install/modulefiles/Core")

stack_gnu_ver=os.getenv("stack_gnu_ver") or "13.3.0"
load(pathJoin("stack-gcc", stack_gnu_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_hera.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
loads UFS Model prerequisites for Hera/Intel
]])

prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/scratch1/NCEPDEV/nems/role.epic/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_hercules.gnu.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
loads UFS Model prerequisites for Hercules/GNU
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")
-- for mvapich2, need:
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/modulefiles")

Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_hercules.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
loads UFS Model prerequisites for Hercules/Intel
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/hercules/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_jet.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
loads UFS Model prerequisites for Jet/Intel
]])

prepend_path("MODULEPATH", "/mnt/lfs4/HFIP/hfv3gfs/role.epic/spack-stack/spack-stack-1.6.0/envs/unified-env-rocky8/install/modulefiles/Core")
prepend_path("MODULEPATH", "/contrib/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_orion.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ help([[
loads UFS Model prerequisites for Orion/Intel
]])

prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/unified-env-rocky9/install/modulefiles/Core")
prepend_path("MODULEPATH", "/work/noaa/epic/role-epic/spack-stack/orion/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.9.0"
load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
11 changes: 10 additions & 1 deletion modulefiles/ufs_s4.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,25 @@ help([[
loads UFS Model prerequisites for S4/Intel
]])

prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/unified-env/install/modulefiles/Core")
prepend_path("MODULEPATH", "/data/prod/jedi/spack-stack/spack-stack-1.6.0/envs/upp-addon-env/install/modulefiles/Core")

stack_intel_ver=os.getenv("stack_intel_ver") or "2021.5.0"
load(pathJoin("stack-intel", stack_intel_ver))

stack_impi_ver=os.getenv("stack_impi_ver") or "2021.5.0"
load(pathJoin("stack-intel-oneapi-mpi", stack_impi_ver))

stack_python_ver=os.getenv("stack_python_ver") or "3.10.13"
load(pathJoin("stack-python", stack_python_ver))

cmake_ver=os.getenv("cmake_ver") or "3.23.1"
load(pathJoin("cmake", cmake_ver))

load("ufs_common")

nccmp_ver=os.getenv("nccmp_ver") or "1.9.0.1"
load(pathJoin("nccmp", nccmp_ver))

setenv("CC", "mpiicc")
setenv("CXX", "mpiicpc")
setenv("FC", "mpiifort")
Expand Down
4 changes: 2 additions & 2 deletions modulefiles/ufs_wcoss2.intel.lua
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ local ufs_modules = {
{["fms-C"] = "2023.04"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0"},
{["g2"] = "3.4.5"},
{["g2tmpl"] = "1.10.2"},
{["g2"] = "3.5.1"},
{["g2tmpl"] = "1.13.0"},
{["ip"] = "3.3.3"},
{["sp"] = "2.3.3"},
{["w3emc"] = "2.9.2"},
Expand Down
6 changes: 3 additions & 3 deletions tests/auto-jenkins/jobs/bl.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ def set_directories(job_obj):
rtbldir = '/scratch1/NCEPDEV/stmp4/emc.nemspara/FV3_RT/'\
f'REGRESSION_TEST'
elif job_obj.machine == 'jet':
workdir = '/lfs4/HFIP/h-nems/emc.nemspara/autort/pr'
blstore = '/lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/'
rtbldir = '/lfs4/HFIP/h-nems/emc.nemspara/RT_BASELINE/'\
workdir = '/lfs5/HFIP/hfv3gfs/role.epic/h-nems/autort/pr'
blstore = '/lfs5/HFIP/hfv3gfs/role.epic/RT/NEMSfv3gfs'
rtbldir = '/lfs5/HFIP/hfv3gfs/role.epic/h-nems/RT_BASELINE/'\
f'emc.nemspara/FV3_RT/REGRESSION_TEST'
elif job_obj.machine == 'orion':
workdir = '/work/noaa/epic-ps/role-epic-ps/autort/tests/auto/pr'
Expand Down
2 changes: 1 addition & 1 deletion tests/auto-jenkins/jobs/rt.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def set_directories(job_obj):
if job_obj.machine == 'hera':
workdir = '/scratch1/NCEPDEV/nems/role.epic/autort/pr'
elif job_obj.machine == 'jet':
workdir = '/lfs4/HFIP/hfv3gfs/role.epic/autort/pr'
workdir = '/lfs5/HFIP/hfv3gfs/role.epic/h-nems/autort/pr'
elif job_obj.machine == 'orion':
workdir = '/work/noaa/epic-ps/role-epic-ps/autort/tests/auto/pr'
elif job_obj.machine == 'hercules':
Expand Down
4 changes: 2 additions & 2 deletions tests/auto-jenkins/rt_auto_jenkins.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def delete_pr_dirs(each_pr, machine):
if machine == 'hera':
workdir = '/scratch1/NCEPDEV/nems/role.epic/autort/pr'
elif machine == 'jet':
workdir = '/lfs4/HFIP/hfv3gfs/role.epic/autort/pr'
workdir = '/lfs5/HFIP/hfv3gfs/role.epic/h-nems/autort/pr'
elif machine == 'orion':
workdir = '/work/noaa/epic-ps/role-epic-ps/autort/pr'
elif machine == 'hercules':
Expand Down Expand Up @@ -110,7 +110,7 @@ def delete_rt_dirs(in_dir, machine, workdir):
if machine == 'hera':
rt_dir ='/scratch1/NCEPDEV/stmp4/role.epic/FV3_RT'
elif machine == 'jet':
rt_dir ='/lfs4/HFIP/hfv3gfs/role.epic/RT_BASELINE/'\
rt_dir ='/lfs5/HFIP/hfv3gfs/role.epic/h-nems/RT_BASELINE/'\
f'emc.nemspara/FV3_RT'
elif machine == 'orion':
rt_dir = '/work/noaa/stmp/bcurtis/stmp/bcurtis/FV3_RT'
Expand Down
8 changes: 4 additions & 4 deletions tests/auto-jenkins/start_rt_auto_jenkins.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ elif [[ $HOSTNAME == Hercules-login-* ]]; then
export PATH=/work/noaa/nems/emc.nemspara/soft/miniconda3/bin:$PATH
export PYTHONPATH=/work/noaa/nems/emc.nemspara/soft/miniconda3/lib/python3.8/site-packages
elif [[ $HOSTNAME == fe* ]]; then
export PATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/bin:$PATH
export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/lib/python3.8/site-packages
export PATH=/contrib/spack-stack/miniconda3/23.11.0/envs/ufs-weather-model/bin:/contrib/spack-stack/miniconda3/23.11.0/bin:${PATH}
export PYTHONPATH=/contrib/spack-stack/miniconda3/23.11.0/envs/ufs-weather-model/lib/python3.8/site-packages:/contrib/spack-stack/miniconda3/23.11.0/lib/python3.8/site-packages
elif [[ $HOSTNAME == tfe* ]]; then
export PATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/bin:$PATH
export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/lib/python3.8/site-packages
export PATH=/contrib/spack-stack/miniconda3/23.11.0/envs/ufs-weather-model/bin:/contrib/spack-stack/miniconda3/23.11.0/bin:${PATH}
export PYTHONPATH=/contrib/spack-stack/miniconda3/23.11.0/envs/ufs-weather-model/lib/python3.8/site-packages:/contrib/spack-stack/miniconda3/23.11.0/lib/python3.8/site-packages
elif [[ $HOSTNAME == gaea* ]]; then
export PATH=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/envs/ufs-weather-model/bin:$PATH
export PYTHONPATH=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/lib/python3.8/site-packages
Expand Down
6 changes: 3 additions & 3 deletions tests/auto/jobs/bl.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ def set_directories(job_obj):
rtbldir = '/scratch1/NCEPDEV/stmp4/emc.nemspara/FV3_RT/'\
f'REGRESSION_TEST_{job_obj.compiler.upper()}'
elif job_obj.machine == 'jet':
workdir = '/lfs4/HFIP/h-nems/emc.nemspara/autort/pr'
blstore = '/lfs4/HFIP/h-nems/emc.nemspara/RT/NEMSfv3gfs/'
rtbldir = '/lfs4/HFIP/h-nems/emc.nemspara/RT_BASELINE/'\
workdir = '/lfs5/HFIP/hfv3gfs/role.epic/h-nems/autort/pr'
blstore = '/lfs5/HFIP/hfv3gfs/role.epic/RT/NEMSfv3gfs'
rtbldir = '/lfs5/HFIP/hfv3gfs/role.epic/h-nems/RT_BASELINE/'\
f'emc.nemspara/FV3_RT/REGRESSION_TEST_{job_obj.compiler.upper()}'
elif job_obj.machine == 'orion':
workdir = '/work/noaa/nems/emc.nemspara/autort/pr'
Expand Down
2 changes: 1 addition & 1 deletion tests/auto/jobs/rt.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def set_directories(job_obj):
if job_obj.machine == 'hera':
workdir = '/scratch1/NCEPDEV/nems/emc.nemspara/autort/pr'
elif job_obj.machine == 'jet':
workdir = '/lfs4/HFIP/h-nems/emc.nemspara/autort/pr'
workdir = '/lfs5/HFIP/hfv3gfs/role.epic/h-nems/autort/pr'
elif job_obj.machine == 'orion':
workdir = '/work/noaa/nems/emc.nemspara/autort/pr'
elif job_obj.machine == 'derecho':
Expand Down
4 changes: 2 additions & 2 deletions tests/auto/start_rt_auto.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ elif [[ $HOSTNAME == Orion-login-* ]]; then
export PATH=/work/noaa/nems/emc.nemspara/soft/miniconda3/bin:$PATH
export PYTHONPATH=/work/noaa/nems/emc.nemspara/soft/miniconda3/lib/python3.8/site-packages
elif [[ $HOSTNAME == fe* ]]; then
export PATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/bin:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/bin:$PATH
export PYTHONPATH=/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/envs/ufs-weather-model/lib/python3.8/site-packages:/lfs4/HFIP/hfv3gfs/software/miniconda3/4.8.3/lib/python3.8/site-packages
export PATH=/contrib/spack-stack/miniconda3/23.11.0/envs/ufs-weather-model/bin:/contrib/spack-stack/miniconda3/23.11.0/bin:${PATH}
export PYTHONPATH=/contrib/spack-stack/miniconda3/23.11.0/envs/ufs-weather-model/lib/python3.8/site-packages:/contrib/spack-stack/miniconda3/23.11.0/lib/python3.8/site-packages
elif [[ $HOSTNAME == gaea* ]]; then
export PATH=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/envs/ufs-weather-model/bin:$PATH
export PYTHONPATH=/lustre/f2/pdata/esrl/gsd/contrib/miniconda3/4.8.3/lib/python3.8/site-packages
Expand Down
2 changes: 1 addition & 1 deletion tests/bl_date.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240819
export BL_DATE=20240821
4 changes: 4 additions & 0 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -493,6 +493,10 @@ export UFS_CONFIGURE=ufs.configure.atm_esmf.IN
export MODEL_CONFIGURE=model_configure.IN
export atm_model=fv3

export POST_ITAG=post_itag_gfs
export POSTXCONFIG=postxconfig-NT-gfs.txt
export POSTXCONFIG_FH00=postxconfig-NT-gfs_FH00.txt

export FV3=true
export S2S=false
export HAFS=false
Expand Down
6 changes: 3 additions & 3 deletions tests/fv3_conf/control_run.IN
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@ fi

#inline post
if [[ $POSTAPP = 'global' ]]; then
cp ${PATHRT}/parm/post_itag_gfs itag
cp ${PATHRT}/parm/postxconfig-NT-gfs.txt postxconfig-NT.txt
cp ${PATHRT}/parm/postxconfig-NT-gfs_FH00.txt postxconfig-NT_FH00.txt
cp ${PATHRT}/parm/@[POST_ITAG] itag
cp ${PATHRT}/parm/@[POSTXCONFIG] postxconfig-NT.txt
cp ${PATHRT}/parm/@[POSTXCONFIG_FH00] postxconfig-NT_FH00.txt
cp ${PATHRT}/parm/params_grib2_tbl_new params_grib2_tbl_new
fi

Expand Down
48 changes: 24 additions & 24 deletions tests/logs/OpnReqTests_control_p8_hera.log
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Mon Aug 19 23:31:13 UTC 2024
Wed Aug 21 22:05:02 UTC 2024
Start Operation Requirement Test


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_bit_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_541162/bit_base_bit_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3986824/bit_base_bit_base
Checking test bit_base results ....
Moving baseline bit_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -51,14 +51,14 @@ Moving baseline bit_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 287.839117
0: The maximum resident set size (KB) = 1460536
0: The total amount of wall time = 280.831970
0: The maximum resident set size (KB) = 1448916

Test bit_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_dbg_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_541162/dbg_base_dbg_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3986824/dbg_base_dbg_base
Checking test dbg_base results ....
Moving baseline dbg_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -106,14 +106,14 @@ Moving baseline dbg_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 976.777842
0: The maximum resident set size (KB) = 1413764
0: The total amount of wall time = 992.336985
0: The maximum resident set size (KB) = 1437772

Test dbg_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_541162/dcp_dcp
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3986824/dcp_dcp
Checking test dcp results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -160,14 +160,14 @@ Checking test dcp results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 258.107962
0: The maximum resident set size (KB) = 1430104
0: The total amount of wall time = 255.618968
0: The maximum resident set size (KB) = 1425456

Test dcp PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_541162/mpi_mpi
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3986824/mpi_mpi
Checking test mpi results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -214,14 +214,14 @@ Checking test mpi results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 256.322579
0: The maximum resident set size (KB) = 1419972
0: The total amount of wall time = 250.392410
0: The maximum resident set size (KB) = 1437096

Test mpi PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_541162/rst_rst
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3986824/rst_rst
Checking test rst results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -268,14 +268,14 @@ Checking test rst results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 251.588379
0: The maximum resident set size (KB) = 1423556
0: The total amount of wall time = 257.380091
0: The maximum resident set size (KB) = 1423788

Test rst PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_541162/std_base_std_base
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3986824/std_base_std_base
Checking test std_base results ....
Moving baseline std_base files ....
Moving sfcf000.nc .........OK
Expand Down Expand Up @@ -323,14 +323,14 @@ Moving baseline std_base files ....
Moving RESTART/20210323.060000.sfc_data.tile5.nc .........OK
Moving RESTART/20210323.060000.sfc_data.tile6.nc .........OK

0: The total amount of wall time = 259.349362
0: The maximum resident set size (KB) = 1425980
0: The total amount of wall time = 267.250624
0: The maximum resident set size (KB) = 1421992

Test std_base PASS


baseline dir = /scratch1/NCEPDEV/stmp4/role.epic/FV3_OPNREQ_TEST/OPNREQ_TEST/control_p8_std_base_gnu
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_541162/thr_thr
working dir = /scratch1/NCEPDEV/stmp2/role.epic/FV3_OPNREQ_TEST/opnReqTest_3986824/thr_thr
Checking test thr results ....
Comparing sfcf000.nc .....USING NCCMP......OK
Comparing sfcf021.nc .....USING NCCMP......OK
Expand Down Expand Up @@ -377,11 +377,11 @@ Checking test thr results ....
Comparing RESTART/20210323.060000.sfc_data.tile5.nc .....USING NCCMP......OK
Comparing RESTART/20210323.060000.sfc_data.tile6.nc .....USING NCCMP......OK

0: The total amount of wall time = 271.924255
0: The maximum resident set size (KB) = 1426080
0: The total amount of wall time = 257.163548
0: The maximum resident set size (KB) = 1434436

Test thr PASS

OPERATION REQUIREMENT TEST WAS SUCCESSFUL
Tue Aug 20 00:36:54 UTC 2024
Elapsed time: 01h:05m:42s. Have a nice day!
Wed Aug 21 23:13:54 UTC 2024
Elapsed time: 01h:08m:53s. Have a nice day!
Loading