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

Clone, build, and run C48_ATM and C48_S2SW on Gaea C5 and C6 #3106

Merged
merged 41 commits into from
Jan 22, 2025
Merged
Show file tree
Hide file tree
Changes from 38 commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
e97d26d
Updates for setup_expt and setup_xml workflow on Gaea C5 and C6
DavidBurrows-NCO Oct 25, 2024
ecb706c
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Nov 12, 2024
d7e2398
update submodules and some files to run on C5/C6
DavidBurrows-NCO Nov 14, 2024
3dbc625
modulefile updates for C6
DavidBurrows-NCO Nov 15, 2024
a8d2720
merge conflicts
DavidBurrows-NCO Nov 15, 2024
296b5c3
module file updates
DavidBurrows-NCO Nov 15, 2024
16d1ff4
update C5 resources
DavidBurrows-NCO Nov 15, 2024
5973d8c
enable C5 and C6 build_all and load modules
DavidBurrows-NCO Nov 15, 2024
3c946e3
update ufs_utils hash to develop
DavidBurrows-NCO Nov 15, 2024
fc56219
remove data in path for C5 fix files to be consistent with other systems
DavidBurrows-NCO Nov 15, 2024
ad28704
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Nov 18, 2024
7e4e168
merging gdas.cd conflict
DavidBurrows-NCO Nov 20, 2024
55c3755
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Nov 22, 2024
9da291a
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Nov 25, 2024
8e9c574
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Nov 26, 2024
5912489
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Dec 2, 2024
8ee25a5
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Dec 3, 2024
3f89329
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Dec 4, 2024
c24c122
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Dec 9, 2024
a654df2
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Dec 10, 2024
38eb76b
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Dec 12, 2024
5bddc10
update ufs_model hash
DavidBurrows-NCO Dec 17, 2024
1843beb
adjust C6 directory paths
DavidBurrows-NCO Dec 17, 2024
c96c16a
add space in hosts.py
DavidBurrows-NCO Dec 18, 2024
6d0c7c9
syndat path updates
DavidBurrows-NCO Dec 18, 2024
0024182
update fit2obs path
DavidBurrows-NCO Dec 18, 2024
1f89d7e
fix aero input path
DavidBurrows-NCO Dec 18, 2024
438a06c
revert defaults.yaml
DavidBurrows-NCO Dec 18, 2024
8553d54
point ufs_model to develop
DavidBurrows-NCO Dec 18, 2024
0eab54c
Merge branch 'develop' into gw_c5OSc6
DavidBurrows-NCO Dec 19, 2024
73cc6bf
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Dec 23, 2024
3f85c59
committing conflicts
DavidBurrows-NCO Dec 30, 2024
9ad705e
remove COMROOT from gaeac5.yaml
DavidBurrows-NCO Dec 30, 2024
e22f7e7
Merge branch 'develop' into gw_c5OSc6
DavidBurrows-NCO Jan 3, 2025
2ae073b
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Jan 6, 2025
97c8936
updating conflicts and submods
DavidBurrows-NCO Jan 21, 2025
9c043e4
Merge branch 'NOAA-EMC:develop' into gw_c5OSc6
DavidBurrows-NCO Jan 21, 2025
7e81dc7
Merge branch 'develop' into gw_c5OSc6
DavidBurrows-NCO Jan 22, 2025
78c4e08
update submodule hashes
DavidBurrows-NCO Jan 22, 2025
387e20f
Merge branch 'gw_c5OSc6' of github.com:DavidBurrows-NCO/global-workfl…
DavidBurrows-NCO Jan 22, 2025
ab93c5f
add gaeac5/c6 to module loads for da
DavidBurrows-NCO Jan 22, 2025
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
15 changes: 11 additions & 4 deletions env/GAEA.env → env/GAEAC5.env
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,19 @@ if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-
NTHREADS1=${threads_per_task:-1}
[[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
[[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
# This may be useful when Gaea is fully ported, so ignore SC warning
# This may be useful when GaeaC5 is fully ported, so ignore SC warning
# shellcheck disable=SC2034
APRUN_default="${launcher} -n ${ntasks}"
else
echo "ERROR config.resources must be sourced before sourcing GAEA.env"
echo "ERROR config.resources must be sourced before sourcing GAEAC5.env"
exit 2
fi

if [[ "${step}" = "prep" ]]; then

export POE="NO"
export BACK="NO"
export sys_tp="GAEA"
export sys_tp="GAEAC5"
export launcher_PREP="srun"

elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then
Expand Down Expand Up @@ -86,7 +86,7 @@ elif [[ "${step}" = "upp" ]]; then

elif [[ "${step}" = "atmos_products" ]]; then

export USE_CFP="YES" # Use MPMD for downstream product generation on Gaea
export USE_CFP="YES" # Use MPMD for downstream product generation on GaeaC5

elif [[ "${step}" = "oceanice_products" ]]; then

Expand All @@ -98,4 +98,11 @@ elif [[ "${step}" = "fit2obs" ]]; then
export NTHREADS_FIT2OBS=${NTHREADS1}
export MPIRUN="${APRUN_default} --cpus-per-task=${NTHREADS_FIT2OBS}"

elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then

export CFP_MP="YES"
if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
export wavempexec=${launcher}
export wave_mpmd=${mpmd_opt}

fi
108 changes: 108 additions & 0 deletions env/GAEAC6.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
#! /usr/bin/env bash

if [[ $# -ne 1 ]]; then

echo "Must specify an input argument to set runtime environment variables!"
exit 1

fi

step=$1

export launcher="srun -l --export=ALL"
export mpmd_opt="--multi-prog --output=mpmd.%j.%t.out"

export OMP_STACKSIZE=2048000
export NTHSTACK=1024000000

ulimit -s unlimited
ulimit -a

# Calculate common variables
# Check first if the dependent variables are set
if [[ -n "${ntasks:-}" && -n "${max_tasks_per_node:-}" && -n "${tasks_per_node:-}" ]]; then
max_threads_per_task=$((max_tasks_per_node / tasks_per_node))
NTHREADSmax=${threads_per_task:-${max_threads_per_task}}
NTHREADS1=${threads_per_task:-1}
[[ ${NTHREADSmax} -gt ${max_threads_per_task} ]] && NTHREADSmax=${max_threads_per_task}
[[ ${NTHREADS1} -gt ${max_threads_per_task} ]] && NTHREADS1=${max_threads_per_task}
# This may be useful when GaeaC6 is fully ported, so ignore SC warning
# shellcheck disable=SC2034
APRUN_default="${launcher} -n ${ntasks}"
else
echo "ERROR config.resources must be sourced before sourcing GAEAC6.env"
exit 2
fi

if [[ "${step}" = "prep" ]]; then

export POE="NO"
export BACK="NO"
export sys_tp="GAEAC6"
export launcher_PREP="srun"

elif [[ "${step}" = "anal" ]] || [[ "${step}" = "analcalc" ]]; then

export MKL_NUM_THREADS=4
export MKL_CBWR=AUTO

export CFP_MP=${CFP_MP:-"YES"}
export USE_CFP=${USE_CFP:-"YES"}
export APRUNCFP="${launcher} -n \$ncmd ${mpmd_opt}"

export NTHREADS_GSI=${NTHREADSmax}
export APRUN_GSI="${APRUN_default} --cpus-per-task=${NTHREADS_GSI}"

export NTHREADS_CALCINC=${threads_per_task_calcinc:-1}
[[ ${NTHREADS_CALCINC} -gt ${max_threads_per_task} ]] && export NTHREADS_CALCINC=${max_threads_per_task}
export APRUN_CALCINC="${launcher} \$ncmd --cpus-per-task=${NTHREADS_CALCINC}"

export NTHREADS_CYCLE=${threads_per_task_cycle:-12}
[[ ${NTHREADS_CYCLE} -gt ${max_tasks_per_node} ]] && export NTHREADS_CYCLE=${max_tasks_per_node}
ntasks_cycle=${ntiles:-6}
export APRUN_CYCLE="${launcher} -n ${ntasks_cycle} --cpus-per-task=${NTHREADS_CYCLE}"

export NTHREADS_GAUSFCANL=1
ntasks_gausfcanl=${ntasks_gausfcanl:-1}
export APRUN_GAUSFCANL="${launcher} -n ${ntasks_gausfcanl} --cpus-per-task=${NTHREADS_GAUSFCANL}"

elif [[ "${step}" = "sfcanl" ]]; then

export NTHREADS_CYCLE=${threads_per_task:-14}
export APRUN_CYCLE="${APRUN_default} --cpus-per-task=${NTHREADS_CYCLE}"

elif [[ "${step}" = "fcst" ]]; then

(( nnodes = (ntasks+tasks_per_node-1)/tasks_per_node ))
(( ufs_ntasks = nnodes*tasks_per_node ))
# With ESMF threading, the model wants to use the full node
export APRUN_UFS="${launcher} -n ${ufs_ntasks}"
unset nnodes ufs_ntasks

elif [[ "${step}" = "upp" ]]; then

export NTHREADS_UPP=${NTHREADS1}
export APRUN_UPP="${APRUN_default} --cpus-per-task=${NTHREADS_UPP}"

elif [[ "${step}" = "atmos_products" ]]; then

export USE_CFP="YES" # Use MPMD for downstream product generation on GaeaC6

elif [[ "${step}" = "oceanice_products" ]]; then

export NTHREADS_OCNICEPOST=${NTHREADS1}
export APRUN_OCNICEPOST="${launcher} -n 1 --cpus-per-task=${NTHREADS_OCNICEPOST}"

elif [[ "${step}" = "fit2obs" ]]; then

export NTHREADS_FIT2OBS=${NTHREADS1}
export MPIRUN="${APRUN_default} --cpus-per-task=${NTHREADS_FIT2OBS}"

elif [[ "${step}" = "waveinit" ]] || [[ "${step}" = "waveprep" ]] || [[ "${step}" = "wavepostsbs" ]] || [[ "${step}" = "wavepostbndpnt" ]] || [[ "${step}" = "wavepostbndpntbll" ]] || [[ "${step}" = "wavepostpnt" ]]; then

export CFP_MP="YES"
if [[ "${step}" = "waveprep" ]]; then export MP_PULSE=0 ; fi
export wavempexec=${launcher}
export wave_mpmd=${mpmd_opt}

fi
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
help([[
Load environment to run GFS on Gaea
Load environment to run GFS on Gaea C5
]])

local spack_mod_path=(os.getenv("spack_mod_path") or "None")
Expand Down
47 changes: 47 additions & 0 deletions modulefiles/module_base.gaeac6.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
help([[
Load environment to run GFS on Gaea C6
]])

local spack_mod_path=(os.getenv("spack_mod_path") or "None")
prepend_path("MODULEPATH", spack_mod_path)

load(pathJoin("stack-intel", (os.getenv("stack_intel_ver") or "None")))
load(pathJoin("stack-cray-mpich", (os.getenv("stack_cray_mpich_ver") or "None")))
load(pathJoin("python", (os.getenv("python_ver") or "None")))

load(pathJoin("jasper", (os.getenv("jasper_ver") or "None")))
load(pathJoin("libpng", (os.getenv("libpng_ver") or "None")))
load(pathJoin("cdo", (os.getenv("cdo_ver") or "None")))
load(pathJoin("hdf5", (os.getenv("hdf5_ver") or "None")))
load(pathJoin("netcdf-c", (os.getenv("netcdf_c_ver") or "None")))
load(pathJoin("netcdf-fortran", (os.getenv("netcdf_fortran_ver") or "None")))
load(pathJoin("perlbrew", (os.getenv("perl_ver") or "None")))

load(pathJoin("nco", (os.getenv("nco_ver") or "None")))
load(pathJoin("prod_util", (os.getenv("prod_util_ver") or "None")))
load(pathJoin("grib-util", (os.getenv("grib_util_ver") or "None")))
load(pathJoin("g2tmpl", (os.getenv("g2tmpl_ver") or "None")))
load(pathJoin("gsi-ncdiag", (os.getenv("gsi_ncdiag_ver") or "None")))
load(pathJoin("crtm", (os.getenv("crtm_ver") or "None")))
load(pathJoin("bufr", (os.getenv("bufr_ver") or "None")))
load(pathJoin("wgrib2", (os.getenv("wgrib2_ver") or "None")))
load(pathJoin("py-netcdf4", (os.getenv("py_netcdf4_ver") or "None")))
load(pathJoin("py-f90nml", (os.getenv("py_f90nml_ver") or "None")))
load(pathJoin("py-pyyaml", (os.getenv("py_pyyaml_ver") or "None")))
load(pathJoin("py-jinja2", (os.getenv("py_jinja2_ver") or "None")))
load(pathJoin("py-pandas", (os.getenv("py_pandas_ver") or "None")))
load(pathJoin("py-python-dateutil", (os.getenv("py_python_dateutil_ver") or "None")))
load(pathJoin("met", (os.getenv("met_ver") or "None")))
load(pathJoin("metplus", (os.getenv("metplus_ver") or "None")))
load(pathJoin("py-xarray", (os.getenv("py_xarray_ver") or "None")))

setenv("WGRIB2","wgrib2")
setenv("UTILROOT",(os.getenv("prod_util_ROOT") or "None"))

prepend_path("MODULEPATH", pathJoin("/gpfs/f6/bil-fire8/world-shared/global/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("/gpfs/f6/bil-fire8/world-shared/global/glopara/git/Fit2Obs/v" .. (os.getenv("fit2obs_ver") or "None"), "modulefiles"))
load(pathJoin("fit2obs", (os.getenv("fit2obs_ver") or "None")))

whatis("Description: GFS run setup environment")
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
help([[
Load environment to run GFS workflow setup scripts on Gaea
Load environment to run GFS workflow setup scripts on Gaea C5
]])

prepend_path("MODULEPATH", "/ncrc/proj/epic/rocoto/modulefiles")
load(pathJoin("rocoto"))

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

local stack_intel_ver=os.getenv("stack_intel_ver") or "2023.1.0"
local stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
local python_ver=os.getenv("python_ver") or "3.10.13"

load(pathJoin("stack-intel", stack_intel_ver))
Expand Down
20 changes: 20 additions & 0 deletions modulefiles/module_gwsetup.gaeac6.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
help([[
Load environment to run GFS workflow setup scripts on Gaea C6
]])

prepend_path("MODULEPATH", "/ncrc/proj/epic/rocoto/modulefiles")
load(pathJoin("rocoto"))

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

local stack_intel_ver=os.getenv("stack_intel_ver") or "2023.2.0"
local python_ver=os.getenv("python_ver") or "3.10.13"

load(pathJoin("stack-intel", stack_intel_ver))
load(pathJoin("python", python_ver))
load("py-jinja2")
load("py-pyyaml")
load("py-numpy")
load("git-lfs")

whatis("Description: GFS run setup environment")
7 changes: 6 additions & 1 deletion parm/config/gfs/config.resources
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,16 @@ case ${machine} in
# shellcheck disable=SC2034
mem_node_max="96GB"
;;
"GAEA")
"GAEAC5")
max_tasks_per_node=128
# shellcheck disable=SC2034
mem_node_max="251GB"
;;
"GAEAC6")
max_tasks_per_node=192
# shellcheck disable=SC2034
mem_node_max="384GB"
;;
"ORION")
max_tasks_per_node=40
# shellcheck disable=SC2034
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /usr/bin/env bash

# Gaea-specific job resources
# GaeaC5-specific job resources

case ${step} in
"prep")
Expand All @@ -26,6 +26,8 @@ case ${step} in

esac

export FI_VERBS_PREFER_XRC=0
KateFriedman-NOAA marked this conversation as resolved.
Show resolved Hide resolved

unset memory
# shellcheck disable=SC2312
for mem_var in $(env | grep '^memory_' | cut -d= -f1); do
Expand Down
9 changes: 9 additions & 0 deletions parm/config/gfs/config.resources.GAEAC6
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#! /usr/bin/env bash

# GaeaC6-specific job resources

unset memory
# shellcheck disable=SC2312
for mem_var in $(env | grep '^memory_' | cut -d= -f1); do
unset "${mem_var}"
done
2 changes: 1 addition & 1 deletion sorc/gdas.cd
Submodule gdas.cd updated 53 files
+0 −24 .github/pull_request_template.md
+0 −6 ci/ci_tests.sh
+47 −123 ci/driver.sh
+169 −0 ci/gw_driver.sh
+0 −1 ci/hera.sh
+0 −13 ci/hercules.sh
+1 −3 ci/orion.sh
+10 −64 ci/run_ci.sh
+80 −0 ci/run_gw_ci.sh
+32 −41 ci/stable_driver.sh
+31 −68 modulefiles/GDAS/wcoss2.intel.lua
+9 −3 parm/aero/jcb-base.yaml.j2
+10 −6 parm/io/fv3jedi_fieldmetadata_history.yaml
+1 −1 parm/jcb-algorithms
+1 −1 parm/jcb-gdas
+2 −10 parm/soca/marine-jcb-base.yaml
+0 −3 parm/soca/obsprep/obsprep_config.yaml
+1 −1 prototypes/gen_prototype.sh
+1 −1 sorc/da-utils
+1 −1 sorc/fv3-jedi
+1 −1 sorc/ioda
+1 −1 sorc/iodaconv
+1 −1 sorc/oops
+1 −1 sorc/saber
+1 −1 sorc/soca
+1 −1 sorc/ufo
+1 −1 sorc/vader
+3 −3 test/atm/global-workflow/CMakeLists.txt
+4 −5 test/atm/global-workflow/jjob_ens_init_split.sh
+4 −8 test/gw-ci/CMakeLists.txt
+0 −3 test/gw-ci/create_exp.sh
+17 −17 test/testreference/C96C48_ufs_hybatmDA_3dvar-fv3inc.ref
+34 −34 test/testreference/C96C48_ufs_hybatmDA_3dvar.ref
+4 −4 test/testreference/C96C48_ufs_hybatmDA_lgetkf_observer.ref
+8 −8 test/testreference/C96C48_ufs_hybatmDA_lgetkf_solver.ref
+33 −30 test/testreference/atm_jjob_3dvar.ref
+65 −65 test/testreference/atm_jjob_lgetkf.ref
+29 −29 test/testreference/atm_jjob_lgetkf_observer.ref
+48 −48 test/testreference/atm_jjob_lgetkf_solver.ref
+0 −2 ush/module-setup.sh
+20 −37 ush/soca/prep_ocean_obs.py
+12 −19 ush/soca/prep_ocean_obs_utils.py
+1 −1 utils/chem/chem_diagb.h
+1 −1 utils/fv3jedi/fv3jedi_fv3inc.h
+1 −1 utils/ioda_example/gdas_meanioda.h
+1 −1 utils/land/land_ensrecenter.h
+1 −1 utils/obsproc/applications/gdas_obsprovider2ioda.h
+1 −1 utils/soca/gdas_ens_handler.h
+8 −14 utils/soca/gdas_incr_handler.h
+18 −26 utils/soca/gdas_postprocincr.h
+1 −1 utils/soca/gdas_soca_diagb.h
+1 −1 utils/soca/gdas_socahybridweights.h
+1 −1 utils/soca/gdassoca_obsstats.h
3 changes: 2 additions & 1 deletion sorc/link_workflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ case "${machine}" in
"hercules") FIX_DIR="/work/noaa/global/glopara/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" ;;
"gaeac5") FIX_DIR="/gpfs/f5/ufs-ard/world-shared/global/glopara/data/fix" ;;
"gaeac6") FIX_DIR="/gpfs/f6/bil-fire8/world-shared/global/glopara/fix" ;;
"noaacloud") FIX_DIR="/contrib/global-workflow-shared-data/fix" ;;
*)
echo "FATAL: Unknown target machine ${machine}, couldn't set FIX_DIR"
Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Submodule ufs_model.fd updated 85 files
+2 −3 .github/pull_request_template.md
+1 −1 CDEPS-interface/CDEPS
+1 −1 FV3
+2 −7 tests-dev/ufs_test_utils.sh
+1 −1 tests/bl_date.conf
+112 −115 tests/default_vars.sh
+1 −2 tests/fv3_conf/fv3_qsub.IN_acorn
+1 −2 tests/fv3_conf/fv3_qsub.IN_wcoss2
+0 −2 tests/fv3_conf/fv3_slurm.IN_hercules
+385 −1 tests/logs/OpnReqTests_control_p8_hera.log
+12 −12 tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
+15 −15 tests/logs/OpnReqTests_regional_control_hera.log
+246 −246 tests/logs/RegressionTests_acorn.log
+280 −279 tests/logs/RegressionTests_derecho.log
+295 −296 tests/logs/RegressionTests_gaeac5.log
+277 −277 tests/logs/RegressionTests_gaeac6.log
+378 −379 tests/logs/RegressionTests_hera.log
+382 −443 tests/logs/RegressionTests_hercules.log
+236 −236 tests/logs/RegressionTests_jet.log
+291 −290 tests/logs/RegressionTests_orion.log
+232 −232 tests/logs/RegressionTests_wcoss2.log
+0 −0 tests/parm/params_grib2_tbl_new
+1 −2 tests/parm/ufs.configure.atm.IN
+27 −0 tests/parm/ufs.configure.atm_esmf.IN
+1 −1 tests/parm/ufs.configure.atm_lm4.IN
+1 −1 tests/parm/ufs.configure.atm_lnd.IN
+1 −3 tests/parm/ufs.configure.atmaero.IN
+40 −0 tests/parm/ufs.configure.atmaero_esmf.IN
+1 −1 tests/parm/ufs.configure.atmaq.IN
+1 −1 tests/parm/ufs.configure.atmw.IN
+1 −1 tests/parm/ufs.configure.blocked_atm_wav.IN
+1 −1 tests/parm/ufs.configure.blocked_atm_wav_2way.IN
+1 −1 tests/parm/ufs.configure.cpld_atm_fbh.IN
+1 −1 tests/parm/ufs.configure.datm_cdeps.IN
+1 −1 tests/parm/ufs.configure.hafs_atm.IN
+1 −1 tests/parm/ufs.configure.hafs_atm_docn.IN
+1 −1 tests/parm/ufs.configure.hafs_atm_ocn.IN
+1 −1 tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
+1 −1 tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
+1 −1 tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
+1 −1 tests/parm/ufs.configure.hafs_atm_wav.IN
+1 −3 tests/parm/ufs.configure.leapfrog_atm_wav.IN
+41 −0 tests/parm/ufs.configure.leapfrog_atm_wav_esmf.IN
+1 −19 tests/parm/ufs.configure.s2s.IN
+1 −1 tests/parm/ufs.configure.s2s_aoflux_esmf.IN
+139 −0 tests/parm/ufs.configure.s2s_esmf.IN
+1 −6 tests/parm/ufs.configure.s2sa.IN
+137 −0 tests/parm/ufs.configure.s2sa_esmf.IN
+3 −6 tests/parm/ufs.configure.s2sw.IN
+149 −0 tests/parm/ufs.configure.s2sw_esmf.IN
+1 −1 tests/parm/ufs.configure.s2sw_fast_esmf.IN
+1 −7 tests/parm/ufs.configure.s2swa.IN
+161 −0 tests/parm/ufs.configure.s2swa_esmf.IN
+1 −2 tests/parm/ufs.configure.s2swa_fast_esmf.IN
+1 −5 tests/rt.sh
+5 −121 tests/rt_utils.sh
+3 −16 tests/run_test.sh
+0 −86 tests/test_changes.list
+1 −1 tests/tests/atm_ds2s_docn_dice
+1 −1 tests/tests/atm_ds2s_docn_pcice
+1 −1 tests/tests/atmaero_control_p8
+1 −1 tests/tests/atmaero_control_p8_rad
+1 −1 tests/tests/atmaero_control_p8_rad_micro
+0 −3 tests/tests/control_2threads_p8
+0 −3 tests/tests/conus13km_2threads
+0 −3 tests/tests/conus13km_debug_2threads
+1 −8 tests/tests/cpld_2threads_p8
+1 −4 tests/tests/cpld_control_c192_p8
+1 −1 tests/tests/cpld_control_c48
+2 −2 tests/tests/cpld_control_noaero_p8
+1 −1 tests/tests/cpld_control_noaero_p8_agrid
+1 −3 tests/tests/cpld_control_nowave_noaero_p8
+1 −1 tests/tests/cpld_control_pdlib_p8
+1 −1 tests/tests/cpld_debug_noaero_p8
+2 −2 tests/tests/cpld_debug_pdlib_p8
+1 −1 tests/tests/cpld_mpi_pdlib_p8
+1 −1 tests/tests/cpld_restart_c48
+1 −1 tests/tests/cpld_restart_pdlib_p8
+1 −1 tests/tests/cpld_s2sa_p8
+1 −1 tests/tests/cpld_warmstart_c48
+0 −5 tests/tests/hrrr_control_2threads
+0 −5 tests/tests/hrrr_control_2threads_dyn32_phy32
+0 −8 tests/tests/rap_2threads
+0 −6 tests/tests/rap_2threads_dyn32_phy32
+0 −3 tests/tests/regional_2threads
16 changes: 11 additions & 5 deletions ush/detect_machine.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,11 @@ case $(hostname -f) in
dlogin0[1-9].dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood01-9
dlogin10.dogwood.wcoss2.ncep.noaa.gov) MACHINE_ID=wcoss2 ;; ### dogwood10

gaea5[1-8]) MACHINE_ID=gaea ;; ### gaea51-58
gaea5[1-8].ncrc.gov) MACHINE_ID=gaea ;; ### gaea51-58
gaea5[1-8]) MACHINE_ID=gaeac5 ;; ### gaea51-58
gaea5[1-8].ncrc.gov) MACHINE_ID=gaeac5 ;; ### gaea51-58

gaea6[1-8]) MACHINE_ID=gaeac6 ;; ### gaea61-68
gaea6[1-8].ncrc.gov) MACHINE_ID=gaeac6 ;; ### gaea61-68

hfe0[1-9]) MACHINE_ID=hera ;; ### hera01-09
hfe1[0-2]) MACHINE_ID=hera ;; ### hera10-12
Expand Down Expand Up @@ -81,9 +84,12 @@ elif [[ -d /work ]]; then
else
MACHINE_ID=orion
fi
elif [[ -d /gpfs && -d /ncrc ]]; then
# We are on GAEA.
MACHINE_ID=gaea
elif [[ -d /gpfs/f5 ]]; then
# We are on GAEAC5.
MACHINE_ID=gaeac5
elif [[ -d /gpfs/f6 ]]; then
# We are on GAEAC6.
MACHINE_ID=gaeac6
elif [[ -d /data/prod ]]; then
# We are on SSEC's S4
MACHINE_ID=s4
Expand Down
2 changes: 1 addition & 1 deletion ush/load_fv3gfs_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ source "${HOMEgfs}/versions/run.ver"
module use "${HOMEgfs}/modulefiles"

case "${MACHINE_ID}" in
"wcoss2" | "hera" | "orion" | "hercules" | "gaea" | "jet" | "s4" | "noaacloud")
"wcoss2" | "hera" | "orion" | "hercules" | "gaeac5" | "gaeac6" | "jet" | "s4" | "noaacloud")
module load "module_base.${MACHINE_ID}"
;;
*)
Expand Down
2 changes: 1 addition & 1 deletion ush/load_ufsda_modules.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ case "${MACHINE_ID}" in
NETCDF=$( echo "${ncdump}" | cut -d " " -f 3 )
export NETCDF
;;
("jet" | "gaea" | "s4" | "acorn")
("jet" | "s4" | "acorn")
aerorahul marked this conversation as resolved.
Show resolved Hide resolved
echo WARNING: UFSDA NOT SUPPORTED ON THIS PLATFORM
;;
*)
Expand Down
File renamed without changes.
3 changes: 0 additions & 3 deletions versions/run.gaea.ver → versions/build.gaeac6.ver
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
export stack_intel_ver=2023.1.0
export stack_cray_mpich_ver=8.1.25
export spack_env=gsi-addon-dev

export perl_ver=5.38.2

source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
8 changes: 8 additions & 0 deletions versions/run.gaeac5.ver
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export stack_intel_ver=2023.2.0
export stack_cray_mpich_ver=8.1.28
export spack_env=gsi-addon-dev

export perl_ver=5.38.2

source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/ncrc/proj/epic/spack-stack/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
8 changes: 8 additions & 0 deletions versions/run.gaeac6.ver
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export stack_intel_ver=2023.2.0
export stack_cray_mpich_ver=8.1.29
export spack_env=gsi-addon

export perl_ver=5.38.2

source "${HOMEgfs:-}/versions/spack.ver"
export spack_mod_path="/ncrc/proj/epic/spack-stack/c6/spack-stack-${spack_stack_ver}/envs/${spack_env}/install/modulefiles/Core"
Loading