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.

Sign up for GitHub

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

Updates the UFS hash and global-workflow for CICE fixes #2505

Closed
wants to merge 14 commits into from
Closed

Updates the UFS hash and global-workflow for CICE fixes #2505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6cfc0bb
Update hash.
HenryRWinterbottom Apr 15, 2024
e7d737d
Merge branch 'develop' of https://github.com/HenryWinterbottom-NOAA/g…
HenryRWinterbottom Apr 16, 2024
9c6ee54
Merge branch 'develop' of https://github.com/HenryWinterbottom-NOAA/g…
HenryRWinterbottom Apr 18, 2024
d4c54fd
Updated UFS hash.
HenryRWinterbottom Apr 18, 2024
84e44ca
Updates for WCOSS2 CICE restart and history formats and ufs_model.fd …
HenryRWinterbottom Apr 19, 2024
2536938
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2490
HenryRWinterbottom Apr 19, 2024
5a26423
Merge branch 'develop' into feature/gfsv17_issue_2490
aerorahul Apr 22, 2024
009b13e
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2490
HenryRWinterbottom Apr 22, 2024
4506935
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2490
HenryRWinterbottom Apr 23, 2024
a2e10e0
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2490
HenryRWinterbottom Apr 23, 2024
db88c83
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2490
HenryRWinterbottom Apr 23, 2024
9cb32bf
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2490
HenryRWinterbottom Apr 26, 2024
6a4d77f
Merge branch 'develop' into feature/gfsv17_issue_2490
aerorahul Apr 26, 2024
56a9f2a
Merge branch 'NOAA-EMC:develop' into feature/gfsv17_issue_2490
HenryRWinterbottom Apr 29, 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
2 changes: 2 additions & 0 deletions env/WCOSS2.env
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,8 @@ elif [[ "${step}" = "eupd" ]]; then

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

# Set the CICE history and restart file output formats.
export CICE_IO_FORMAT="hdf5"
if [[ "${CDUMP}" =~ "gfs" ]]; then
nprocs="npe_${step}_gfs"
ppn="npe_node_${step}_gfs" || ppn="npe_node_${step}"
Expand Down
2 changes: 1 addition & 1 deletion sorc/ufs_model.fd
Open in desktop
Submodule ufs_model.fd updated 76 files
+24 −17 .github/workflows/aux.yml
+37 −0 .github/workflows/superlinter.yml
+16 −0 .shellcheckrc
+1 −1 CICE-interface/CICE
+1 −1 CICE-interface/CMakeLists.txt
+1 −1 CMEPS-interface/CMEPS
+1 −1 FV3
+1 −1 MOM6-interface/MOM6
+4 −3 NOAHMP-interface/CMakeLists.txt
+1 −1 NOAHMP-interface/noahmp
+1 −1 WW3
+16 −8 build.sh
+7 −1 cmake/Intel.cmake
+1 −1 doc/UsersGuide/requirements.txt
+624 −5 doc/UsersGuide/source/Configurations.rst
+13 −13 doc/UsersGuide/source/FAQ.rst
+1 −1 doc/UsersGuide/source/InputsOutputs.rst
+3 −1 doc/UsersGuide/source/Introduction.rst
+6 −3 doc/UsersGuide/source/conf.py
+1 −1 stochastic_physics
+76 −8 tests/atparse.bash
+1 −1 tests/bl_date.conf
+103 −101 tests/ci/repo_check.sh
+49 −48 tests/compile.sh
+1,582 −1,431 tests/default_vars.sh
+10 −7 tests/fv3_conf/compile_slurm.IN_hera
+13 −9 tests/fv3_conf/fv3_slurm.IN_hera
+24 −24 tests/logs/OpnReqTests_control_p8_hera.log
+12 −12 tests/logs/OpnReqTests_cpld_control_nowave_noaero_p8_hera.log
+12 −12 tests/logs/OpnReqTests_regional_control_hera.log
+285 −262 tests/logs/RegressionTests_acorn.log
+339 −276 tests/logs/RegressionTests_derecho.log
+274 −286 tests/logs/RegressionTests_gaea.log
+369 −369 tests/logs/RegressionTests_hera.log
+364 −454 tests/logs/RegressionTests_hercules.log
+242 −254 tests/logs/RegressionTests_jet.log
+276 −366 tests/logs/RegressionTests_orion.log
+233 −247 tests/logs/RegressionTests_wcoss2.log
+11 −11 tests/module-setup.sh
+1 −1 tests/opnReqTest
+57 −44 tests/parm/ice_in.IN
+5 −4 tests/parm/ufs.configure.atm_lnd.IN
+2 −2 tests/parm/ufs.configure.atmw.IN
+3 −2 tests/parm/ufs.configure.hafs_atm_docn.IN
+3 −2 tests/parm/ufs.configure.hafs_atm_ocn.IN
+3 −2 tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
+3 −2 tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
+2 −1 tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
+3 −2 tests/parm/ufs.configure.hafs_atm_wav.IN
+2 −2 tests/parm/ufs.configure.s2s.IN
+2 −2 tests/parm/ufs.configure.s2s_aoflux_esmf.IN
+2 −2 tests/parm/ufs.configure.s2s_esmf.IN
+2 −2 tests/parm/ufs.configure.s2sa.IN
+2 −2 tests/parm/ufs.configure.s2sa_esmf.IN
+2 −2 tests/parm/ufs.configure.s2sw.IN
+2 −2 tests/parm/ufs.configure.s2sw_esmf.IN
+2 −2 tests/parm/ufs.configure.s2sw_fast_esmf.IN
+2 −2 tests/parm/ufs.configure.s2swa.IN
+2 −2 tests/parm/ufs.configure.s2swa_esmf.IN
+2 −2 tests/parm/ufs.configure.s2swa_fast_esmf.IN
+1 −1 tests/rt.conf
+751 −571 tests/rt.sh
+374 −300 tests/rt_utils.sh
+32 −37 tests/run_compile.sh
+162 −144 tests/run_test.sh
+0 −1 tests/tests/atmwav_control_noaero_p8
+0 −1 tests/tests/cpld_bmark_p8
+0 −1 tests/tests/cpld_bmark_p8_35d
+0 −2 tests/tests/cpld_control_c192_p8
+0 −1 tests/tests/cpld_control_c48
+1 −1 tests/tests/cpld_debug_pdlib_p8
+0 −1 tests/tests/cpld_restart_bmark_p8
+0 −1 tests/tests/cpld_restart_c192_p8
+0 −1 tests/tests/cpld_restart_c48
+0 −1 tests/tests/cpld_warmstart_c48
+1 −0 tests/tests/regional_atmaq_debug
15 changes: 15 additions & 0 deletions ush/parsing_namelists_CICE.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,13 @@ local CICE_RUNID="unknown"
local CICE_USE_RESTART_TIME=${use_restart_time}
local CICE_RESTART_DIR="./CICE_RESTART/"
local CICE_RESTART_FILE="cice_model.res"
local CICE_RESTART_DEFLATE=0
local CICE_RESTART_CHUNK=0,0
local CICE_RESTART_STRIDE=-99
local CICE_RESTART_ROOT=-99
local CICE_RESTART_REARR="box"
local CICE_RESTART_IOTASKS=-99
local CICE_RESTART_FORMAT=${CICE_IO_FORMAT:-"pnetcdf2"}
local CICE_DUMPFREQ="y" # "h","d","m" or "y" for restarts at intervals of "hours", "days", "months" or "years"
local CICE_DUMPFREQ_N=10000 # Set this to a really large value, as cice, mom6 and cmeps restart interval is controlled by ufs.configure
local CICE_DIAGFREQ=$(( 86400 / DT_CICE )) # frequency of diagnostic output in timesteps, recommended for 1x per day
Expand All @@ -68,8 +75,16 @@ if [[ "${RUN}" =~ "gdas" ]]; then
else
local CICE_HIST_AVG=".true., .true., .true., .true., .true." # GFS long forecaset wants averaged over CICE_HISTFREQ_N
fi
local CICE_HISTORY_FORMAT=${CICE_IO_FORMAT:-"pnetcdf2"}
local CICE_HISTORY_DIR="./CICE_OUTPUT/"
local CICE_INCOND_DIR="./CICE_OUTPUT/"
local CICE_HISTORY_IOTASKS=-99
local CICE_HISTORY_REARR="box"
local CICE_HISTORY_ROOT=-99
local CICE_HISTORY_STRIDE=-99
local CICE_HISTORY_CHUNK=0,0
local CICE_HISTORY_DEFLATE=0
local CICE_HISTORY_PREC=4
# grid_nml section
# CICE_GRID
# CICE_MASK
Expand Down
Loading