Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/ufs-community/ufs-weathe…
Browse files Browse the repository at this point in the history 
…r-model into develop

* 'develop' of https://github.com/ufs-community/ufs-weather-model:
  update mom6 to its main repo. 20240824 commit (FMA) (ufs-community#2412)
  Update CMEPS; fix aux history functionality for float variable type; Switch to using Aux history files in atm_ds2s_docn_dice test; Remove IFI tests (was ufs-community#2417) (ufs-community#2395)
  Combination for CCPP-physics ufs-community#213 and ufs-community#218 (H2O scheme refactor and C3/SAS/MYNN fix) (ufs-community#2408)
  Unify CDEPS gfs, cfsr, and gefs datm datamodes + Improve error checking in rt.sh (2388) + Add ability to read increment files on native cubed sphere grid (2304) (ufs-community#2389)
  sync with head of NOAA-EMC UPP develop (ufs-community#2326)
  Allow use of downscaled warmstart files for cpld_control_sfs test (ufs-community#2375)
  update to MOM6 main 20240729 commit (gfdl-to-main-2024-05-31) (ufs-community#2381)
  • Loading branch information
@DavidHuber-NOAA
DavidHuber-NOAA committed Sep 9, 2024
2 parents 454d7b9 + 6a4e09e commit fb22998
Show file tree
Hide file tree
Showing 113 changed files with 16,994 additions and 6,256 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/aux.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Share helper id
run: echo -n ${{ github.run_id }} >~/id_file

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: ~/id_file
key: helperid-${{ github.event.workflow_run.id }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_test.yml → .github/workflows/build_test._yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ jobs:
current: ${{ steps.check.outputs.current }}

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Wait for caching source
run: sleep 30

- uses: actions/cache@v2
- uses: actions/cache@v4
with:
path: ~/id_file
key: helperid-${{ github.run_id }}
Expand Down
2 changes: 1 addition & 1 deletion CDEPS-interface/CDEPS
Submodule CDEPS updated 5 files
+0 −3 datm/CMakeLists.txt
+0 −64 datm/atm_comp_nuopc.F90
+0 −256 datm/datm_datamode_cfsr_mod.F90
+0 −230 datm/datm_datamode_gfs_hafs_mod.F90
+0 −255 datm/datm_datamode_gfs_mod.F90
3 changes: 0 additions & 3 deletions CDEPS-interface/cdeps_files.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion CMEPS-interface/CMEPS
Submodule CMEPS updated 14 files
+3 −0 cesm/driver/esm.F90
+68 −10 cime_config/config_component_cesm.xml
+61 −2 cime_config/namelist_definition_drv.xml
+4 −1 mediator/esmFldsExchange_cesm_mod.F90
+10 −0 mediator/fd_cesm.yaml
+3 −4 mediator/med.F90
+15 −7 mediator/med_diag_mod.F90
+69 −30 mediator/med_io_mod.F90
+2 −2 mediator/med_methods_mod.F90
+4 −3 mediator/med_phases_aofluxes_mod.F90
+15 −7 mediator/med_phases_history_mod.F90
+38 −17 mediator/med_phases_post_rof_mod.F90
+2 −1 mediator/med_phases_prep_atm_mod.F90
+37 −16 mediator/med_phases_prep_ocn_mod.F90
2 changes: 1 addition & 1 deletion MOM6-interface/MOM6
Submodule MOM6 updated 171 files
2 changes: 2 additions & 0 deletions MOM6-interface/mom6_files.cmake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ list(APPEND mom6_src_files
MOM6/src/core/MOM_continuity_PPM.F90
MOM6/src/core/MOM_density_integrals.F90
MOM6/src/core/MOM_dynamics_split_RK2.F90
MOM6/src/core/MOM_dynamics_split_RK2b.F90
MOM6/src/core/MOM_dynamics_unsplit.F90
MOM6/src/core/MOM_dynamics_unsplit_RK2.F90
MOM6/src/core/MOM_forcing_type.F90
Expand All @@ -59,6 +60,7 @@ list(APPEND mom6_src_files
MOM6/src/diagnostics/MOM_sum_output.F90
MOM6/src/diagnostics/MOM_wave_speed.F90

MOM6/src/equation_of_state/MOM_EOS_base_type.F90
MOM6/src/equation_of_state/MOM_EOS.F90
MOM6/src/equation_of_state/MOM_EOS_Jackett06.F90
MOM6/src/equation_of_state/MOM_EOS_Roquet_SpV.F90
Expand Down
17 changes: 5 additions & 12 deletions build.sh
View file
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}
Expand All @@ -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:-}"
7 changes: 3 additions & 4 deletions modulefiles/ufs_common.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ local ufs_modules = {
{["fms"] = "2023.04"},
{["bacio"] = "2.4.1"},
{["crtm"] = "2.4.0.1"},
{["g2"] = "3.4.9"},
{["g2tmpl"] = "1.10.2"},
{["g2"] = "3.5.1"},
{["g2tmpl"] = "1.13.0"},
{["ip"] = "5.0.0"},
{["sp"] = "2.5.0"},
{["w3emc"] = "2.10.0"},
{["gftl-shared"] = "1.9.0"},
{["mapl"] = "2.46.2-esmf-8.6.1"},
{["mapl"] = "2.46.3-esmf-8.6.1"},
{["scotch"] = "7.0.4"},
}

Expand Down
2 changes: 1 addition & 1 deletion modulefiles/ufs_derecho.gnu.lua
View file
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
View file
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
View file
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
View file
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
4 changes: 4 additions & 0 deletions modulefiles/ufs_hera.intel.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ help([[
loads UFS Model prerequisites for Hera/Intel
]])

<<<<<<< HEAD
prepend_path("MODULEPATH", '/scratch1/NCEPDEV/nems/Alexander.Richert/spack-stack-py311-aug24/envs/test/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")
>>>>>>> 6a4e09e94773ffa39ce7ab6a54a885efada91f21

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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
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
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
export BL_DATE=20240730
export BL_DATE=20240904
18 changes: 8 additions & 10 deletions tests/ci/Jenkinsfile.combined
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>"

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

Expand Down Expand Up @@ -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
}
}
Expand Down
10 changes: 2 additions & 8 deletions tests/compile.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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

# ----------------------------------------------------------------------
Expand Down
Loading

0 comments on commit fb22998

Please sign in to comment.