Skip to content

Commit

Permalink
Merge branch 'develop' into feature/ufs_fire_cpl
Browse files Browse the repository at this point in the history
grantfirl committed Sep 10, 2024
2 parents c2bf76f + 6a4e09e commit 6c89586
Showing 101 changed files with 16,346 additions and 5,837 deletions.
File renamed without changes.
3 changes: 0 additions & 3 deletions CDEPS-interface/cdeps_files.cmake
Original file line number Diff line number Diff line change
@@ -41,14 +41,11 @@ list(APPEND cdeps_dshr_files

list(APPEND cdeps_datm_files
CDEPS/datm/atm_comp_nuopc.F90
CDEPS/datm/datm_datamode_cfsr_mod.F90
CDEPS/datm/datm_datamode_clmncep_mod.F90
CDEPS/datm/datm_datamode_core2_mod.F90
CDEPS/datm/datm_datamode_cplhist_mod.F90
CDEPS/datm/datm_datamode_era5_mod.F90
CDEPS/datm/datm_datamode_gefs_mod.F90
CDEPS/datm/datm_datamode_gfs_mod.F90
CDEPS/datm/datm_datamode_gfs_hafs_mod.F90
CDEPS/datm/datm_datamode_jra_mod.F90
CDEPS/datm/datm_datamode_simple_mod.F90
)
2 changes: 1 addition & 1 deletion FV3
Submodule FV3 updated 51 files
+1 −1 atmos_cubed_sphere
+2 −2 atmos_model.F90
+7 −2 ccpp/config/ccpp_prebuild_config.py
+31 −15 ccpp/data/GFS_typedefs.F90
+25 −1 ccpp/data/GFS_typedefs.meta
+1 −1 ccpp/physics
+1 −1 ccpp/suites/suite_FV3_GFS_v15_thompson_mynn_lam3km.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v15p2.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_csawmg.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_flake.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_fv3wam.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v16_ras.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_c3.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_sfcocn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_coupled_p8_ugwpv1.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_c3.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_mynn.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_rrtmgp.xml
+1 −1 ccpp/suites/suite_FV3_GFS_v17_p8_ugwpv1.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_gfdlmp_tedmf_nonsst.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson_nonsst.xml
+1 −1 ccpp/suites/suite_FV3_HAFS_v1_thompson_tedmf_gfdlsf.xml
+1 −1 ccpp/suites/suite_FV3_HRRR.xml
+1 −1 ccpp/suites/suite_FV3_HRRR_c3.xml
+1 −1 ccpp/suites/suite_FV3_HRRR_gf.xml
+1 −1 ccpp/suites/suite_FV3_HRRR_gf_nogwd.xml
+1 −1 ccpp/suites/suite_FV3_RAP.xml
+1 −1 ccpp/suites/suite_FV3_RAP_cires_ugwp.xml
+1 −1 ccpp/suites/suite_FV3_RAP_clm_lake.xml
+1 −1 ccpp/suites/suite_FV3_RAP_flake.xml
+1 −1 ccpp/suites/suite_FV3_RAP_noah.xml
+1 −1 ccpp/suites/suite_FV3_RAP_noah_sfcdiff_cires_ugwp.xml
+1 −1 ccpp/suites/suite_FV3_RAP_sfcdiff.xml
+1 −1 ccpp/suites/suite_FV3_RAP_unified_ugwp.xml
+1 −1 ccpp/suites/suite_FV3_RRFS_v1beta.xml
+1 −1 ccpp/suites/suite_FV3_RRFS_v1nssl.xml
+1 −1 ccpp/suites/suite_FV3_WoFS_v0.xml
+1 −1 ccpp/suites/suite_FV3_global_nest_v1.xml
+1 −1 ccpp/suites/suite_RRFSens_phy1.xml
+1 −1 ccpp/suites/suite_RRFSens_phy2.xml
+1 −1 ccpp/suites/suite_RRFSens_phy3.xml
+1 −1 ccpp/suites/suite_RRFSens_phy4.xml
+1 −1 ccpp/suites/suite_RRFSens_phy5.xml
+8 −5 ci/spack.yaml
+188 −33 io/post_fv3.F90
+1 −1 upp
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Submodule MOM6 updated 54 files
+7 −7 config_src/drivers/FMS_cap/MOM_surface_forcing_gfdl.F90
+10 −10 config_src/drivers/STALE_mct_cap/mom_surface_forcing_mct.F90
+10 −10 config_src/drivers/nuopc_cap/mom_surface_forcing_nuopc.F90
+28 −28 config_src/drivers/solo_driver/MOM_surface_forcing.F90
+2 −2 config_src/drivers/solo_driver/user_surface_forcing.F90
+4 −4 src/ALE/regrid_edge_values.F90
+42 −42 src/core/MOM_CoriolisAdv.F90
+6 −6 src/core/MOM_PressureForce_Montgomery.F90
+51 −51 src/core/MOM_barotropic.F90
+9 −9 src/core/MOM_continuity_PPM.F90
+102 −102 src/core/MOM_density_integrals.F90
+5 −5 src/core/MOM_forcing_type.F90
+5 −3 src/core/MOM_grid.F90
+6 −6 src/core/MOM_isopycnal_slopes.F90
+16 −16 src/core/MOM_open_boundary.F90
+6 −6 src/core/MOM_stoch_eos.F90
+4 −0 src/core/MOM_transcribe_grid.F90
+16 −16 src/diagnostics/MOM_diagnostics.F90
+1 −1 src/diagnostics/MOM_sum_output.F90
+24 −24 src/equation_of_state/MOM_EOS_Wright.F90
+24 −24 src/equation_of_state/MOM_EOS_Wright_full.F90
+24 −24 src/equation_of_state/MOM_EOS_Wright_red.F90
+20 −20 src/equation_of_state/MOM_EOS_linear.F90
+6 −3 src/framework/MOM_dyn_horgrid.F90
+2 −2 src/ice_shelf/MOM_marine_ice.F90
+10 −3 src/initialization/MOM_fixed_initialization.F90
+1 −1 src/initialization/MOM_state_initialization.F90
+13 −13 src/parameterizations/lateral/MOM_MEKE.F90
+16 −20 src/parameterizations/lateral/MOM_Zanna_Bolton.F90
+136 −136 src/parameterizations/lateral/MOM_hor_visc.F90
+2 −2 src/parameterizations/lateral/MOM_interface_filter.F90
+35 −35 src/parameterizations/lateral/MOM_internal_tides.F90
+44 −44 src/parameterizations/lateral/MOM_lateral_mixing_coeffs.F90
+2 −2 src/parameterizations/lateral/MOM_mixed_layer_restrat.F90
+31 −30 src/parameterizations/lateral/MOM_thickness_diffuse.F90
+1 −1 src/parameterizations/vertical/MOM_CVMix_KPP.F90
+1 −1 src/parameterizations/vertical/MOM_CVMix_shear.F90
+5 −5 src/parameterizations/vertical/MOM_bulk_mixed_layer.F90
+10 −10 src/parameterizations/vertical/MOM_diabatic_aux.F90
+1 −1 src/parameterizations/vertical/MOM_energetic_PBL.F90
+20 −20 src/parameterizations/vertical/MOM_kappa_shear.F90
+18 −18 src/parameterizations/vertical/MOM_set_diffusivity.F90
+28 −28 src/parameterizations/vertical/MOM_set_viscosity.F90
+4 −4 src/parameterizations/vertical/MOM_vert_friction.F90
+4 −4 src/tracer/MOM_tracer_advect.F90
+4 −4 src/tracer/MOM_tracer_hor_diff.F90
+2 −2 src/tracer/advection_test_tracer.F90
+15 −15 src/user/Idealized_Hurricane.F90
+7 −7 src/user/MOM_wave_interface.F90
+4 −4 src/user/Neverworld_initialization.F90
+1 −1 src/user/SCM_CVMix_tests.F90
+3 −3 src/user/basin_builder.F90
+1 −1 src/user/circle_obcs_initialization.F90
+1 −1 src/user/seamount_initialization.F90
17 changes: 5 additions & 12 deletions build.sh
Original file line number Diff line number Diff line change
@@ -1,17 +1,10 @@
#!/bin/bash
set -eu
uname_s=$(uname -s)
if [[ ${uname_s} == Darwin ]]; then
UFS_MODEL_DIR=$(greadlink -f -n "${BASH_SOURCE[0]}")
UFS_MODEL_DIR=$(dirname "${UFS_MODEL_DIR}")
UFS_MODEL_DIR=$(cd "${UFS_MODEL_DIR}" && pwd -P)
else
UFS_MODEL_DIR=$(readlink -f -n "${BASH_SOURCE[0]}")
UFS_MODEL_DIR=$(dirname "${UFS_MODEL_DIR}")
UFS_MODEL_DIR=$(cd "${UFS_MODEL_DIR}" && pwd -P)
fi
echo "UFS MODEL DIR: ${UFS_MODEL_DIR}"

SCRIPT_REALPATH=$(realpath "${BASH_SOURCE[0]}")
UFS_MODEL_DIR=$(dirname "${SCRIPT_REALPATH}")
readonly UFS_MODEL_DIR
echo "UFS MODEL DIR: ${UFS_MODEL_DIR}"

export CC=${CC:-mpicc}
export CXX=${CXX:-mpicxx}
@@ -26,4 +19,4 @@ for i in ${CMAKE_FLAGS}; do ARR_CMAKE_FLAGS+=("${i}") ; done
cmake "${UFS_MODEL_DIR}" "${ARR_CMAKE_FLAGS[@]}"
# Turn off OpenMP threading for parallel builds
# to avoid exhausting the number of user processes
OMP_NUM_THREADS=1 make -j "${BUILD_JOBS:-4}" "VERBOSE=${BUILD_VERBOSE:-}"
OMP_NUM_THREADS=1 make -j "${BUILD_JOBS:-4}" "VERBOSE=${BUILD_VERBOSE:-}"
4 changes: 2 additions & 2 deletions modulefiles/ufs_common.lua
Original file line number Diff line number Diff line change
@@ -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"},
2 changes: 1 addition & 1 deletion modulefiles/ufs_derecho.gnu.lua
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion modulefiles/ufs_derecho.intel.lua
Original file line number Diff line number Diff line change
@@ -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"
2 changes: 1 addition & 1 deletion modulefiles/ufs_gaea.intel.lua
Original file line number Diff line number Diff line change
@@ -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))
2 changes: 1 addition & 1 deletion modulefiles/ufs_hera.gnu.lua
Original file line number Diff line number Diff line change
@@ -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))
2 changes: 1 addition & 1 deletion modulefiles/ufs_hera.intel.lua
Original file line number Diff line number Diff line change
@@ -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))
2 changes: 1 addition & 1 deletion modulefiles/ufs_hercules.gnu.lua
Original file line number Diff line number Diff line change
@@ -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")

2 changes: 1 addition & 1 deletion modulefiles/ufs_hercules.intel.lua
Original file line number Diff line number Diff line change
@@ -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))
2 changes: 1 addition & 1 deletion modulefiles/ufs_jet.intel.lua
Original file line number Diff line number Diff line change
@@ -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))
2 changes: 1 addition & 1 deletion modulefiles/ufs_orion.intel.lua
Original file line number Diff line number Diff line change
@@ -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))
11 changes: 10 additions & 1 deletion modulefiles/ufs_s4.intel.lua
Original file line number Diff line number Diff line change
@@ -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")
4 changes: 2 additions & 2 deletions modulefiles/ufs_wcoss2.intel.lua
Original file line number Diff line number Diff line change
@@ -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"},
6 changes: 3 additions & 3 deletions tests/auto-jenkins/jobs/bl.py
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 1 addition & 1 deletion tests/auto-jenkins/jobs/rt.py
Original file line number Diff line number Diff line change
@@ -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':
4 changes: 2 additions & 2 deletions tests/auto-jenkins/rt_auto_jenkins.py
Original file line number Diff line number Diff line change
@@ -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':
@@ -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'
8 changes: 4 additions & 4 deletions tests/auto-jenkins/start_rt_auto_jenkins.sh
Original file line number Diff line number Diff line change
@@ -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
6 changes: 3 additions & 3 deletions tests/auto/jobs/bl.py
Original file line number Diff line number Diff line change
@@ -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'
2 changes: 1 addition & 1 deletion tests/auto/jobs/rt.py
Original file line number Diff line number Diff line change
@@ -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':
4 changes: 2 additions & 2 deletions tests/auto/start_rt_auto.sh
Original file line number Diff line number Diff line change
@@ -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
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=20240904
18 changes: 8 additions & 10 deletions tests/ci/Jenkinsfile.combined
Original file line number Diff line number Diff line change
@@ -312,14 +312,6 @@ def generateStage(nodeLabel) {
echo "Testing concluded...removing labels for $machine from $GIT_URL"
git remote -v | grep -w sshorigin > /dev/null 2>&1 && git remote remove sshorigin > /dev/null 2>&1
git remote add sshorigin $SSH_ORIGIN > /dev/null 2>&1

if [[ -f $WORKSPACE/tests/logs/RT-run-$machine.log ]] ; then
git add $WORKSPACE/tests/logs/RT-run-$machine.log
fi
git commit --allow-empty -m "[AutoRT] $machine Job Failed!\n\n\n on-behalf-of @ufs-community <ecc.platform@noaa.gov>"

git pull sshorigin $FORK_BRANCH
git push sshorigin HEAD:$FORK_BRANCH

tar --create --gzip --verbose --dereference --file "${machine_name_logs}.tgz" ${WORKSPACE}/tests/logs/*.log

@@ -351,12 +343,18 @@ pipeline {
GIT_URL = 'https://github.com/ufs-community/ufs-weather-model.git'
}
stages {
stage('Run SonarQube Testing') {
stage('Launch SonarQube') {
steps {
script {
echo "BRANCH_NAME=${env.CHANGE_BRANCH}"
echo "FORK_NAME=${env.CHANGE_FORK}"
echo "CHANGE_URL=${env.CHANGE_URL}"
echo "CHANGE_ID=${env.CHANGE_ID}"
build job: '/ufs-weather-model/ufs-wm-sonarqube', parameters: [
string(name: 'BRANCH_NAME', value: env.CHANGE_BRANCH ?: 'develop'),
string(name: 'FORK_NAME', value: env.CHANGE_FORK ?: '')
string(name: 'FORK_NAME', value: env.CHANGE_FORK ?: ''),
string(name: 'CHANGE_URL', value: env.CHANGE_URL ?: ''),
string(name: 'CHANGE_ID', value: env.CHANGE_ID ?: '')
], wait: false
}
}
10 changes: 2 additions & 8 deletions tests/compile.sh
Original file line number Diff line number Diff line change
@@ -12,14 +12,8 @@ function trim {

SECONDS=0

uname_s=$(uname -s)
if [[ ${uname_s} == Darwin ]]; then
greadlnk=$(greadlink -f -n "${BASH_SOURCE[0]}" )
MYDIR=$(cd "$(dirname "${greadlnk}" )" && pwd -P)
else
readlnk=$(readlink -f -n "${BASH_SOURCE[0]}" )
MYDIR=$(cd "$(dirname "${readlnk}" )" && pwd -P)
fi
SCRIPT_REALPATH=$(realpath "${BASH_SOURCE[0]}")
MYDIR=$(dirname "${SCRIPT_REALPATH}")
readonly MYDIR

# ----------------------------------------------------------------------
13 changes: 9 additions & 4 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
@@ -494,6 +494,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
@@ -557,6 +561,7 @@ export MODEL_INITIALIZATION=false
export WARM_START=.false.
export READ_INCREMENT=.false.
export RES_LATLON_DYNAMICS="''"
export INCREMENT_FILE_ON_NATIVE_GRID=.false.
export NGGPS_IC=.true.
export EXTERNAL_IC=.true.
export MAKE_NH=.true.
@@ -1350,10 +1355,10 @@ export_datm_cdeps ()
export INPUT_NML=input.mom6.nml.IN
export DIAG_TABLE=diag_table_template
export DATM_SRC=CFSR
export FILENAME_BASE=cfsr.
export MESH_ATM=${FILENAME_BASE//.}_mesh.nc
export atm_datamode=${DATM_SRC}
export stream_files=INPUT/${FILENAME_BASE}201110.nc
export FILEBASE_DATM=cfsr
export MESH_ATM=${FILEBASE_DATM}_mesh.nc
export atm_datamode=GEFS
export stream_files=INPUT/${FILEBASE_DATM}.201110.nc
export EXPORT_ALL=.false.
export STREAM_OFFSET=0

3 changes: 3 additions & 0 deletions tests/error-test.conf
Original file line number Diff line number Diff line change
@@ -11,6 +11,9 @@ COMPILE | atm_dyn32 | intel | -DAPP=ATM -DCCPP_SUITES=FV3_GFS_v16,FV3_GFS_v16_fl
# This should succeed
RUN | control_c48.v2.sfc | | baseline |

# This should fail due to wall clock timeout
RUN | control_c48.v2.sfc_timeout | | baseline |

# These tests should always fail, and prevent the workflow from completing.
RUN | fail_to_copy | | baseline |
RUN | fail_to_run | | baseline |
6 changes: 3 additions & 3 deletions tests/fv3_conf/control_run.IN
Original file line number Diff line number Diff line change
@@ -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

Loading

0 comments on commit 6c89586

Please sign in to comment.