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

Jump to bottom

Update ufs model hash to 20240625 #2729

Merged
merged 7 commits into from
Jul 4, 2024
Merged

Update ufs model hash to 20240625 #2729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8f86208
updates for CICE with model update
JessicaMeixner-NOAA Jun 26, 2024
b390395
add variable for ufs.configure
JessicaMeixner-NOAA Jun 27, 2024
68dc5c7
update ufs hash
JessicaMeixner-NOAA Jun 27, 2024
6a912ca
Merge branch 'NOAA-EMC:develop' into updateufs20240625
JessicaMeixner-NOAA Jul 1, 2024
eb40c85
Merge branch 'NOAA-EMC:develop' into updateufs20240625
JessicaMeixner-NOAA Jul 1, 2024
8e60919
fix error for one of the ufs config file
JessicaMeixner-NOAA Jul 1, 2024
467b0a8
Merge branch 'NOAA-EMC:develop' into updateufs20240625
JessicaMeixner-NOAA Jul 3, 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: 1 addition & 1 deletion sorc/ufs_model.fd
Open in desktop
Submodule ufs_model.fd updated 82 files
+1 −1 CDEPS-interface/CDEPS
+1 −0 CDEPS-interface/cdeps_files.cmake
+1 −1 CICE-interface/CICE
+7 −1 CICE-interface/CMakeLists.txt
+19 −0 CICE-interface/cice_files.cmake
+3 −2 CMakeLists.txt
+1 −1 FV3
+1 −1 HYCOM-interface/HYCOM
+15 −0 cmake/configure_apps.cmake
+1 −0 cmake/configure_noaacloud.intel.cmake
+1 −3 doc/UsersGuide/requirements.txt
+3 −2 doc/UsersGuide/source/CodeOverview.rst
+20 −0 driver/UFSDriver.F90
+3 −3 modulefiles/ufs_derecho.gnu.lua
+3 −3 modulefiles/ufs_derecho.intel.lua
+6 −7 modulefiles/ufs_gaea.intel.lua
+3 −0 modulefiles/ufs_jet.intel.lua
+3 −3 modulefiles/ufs_orion.intel.lua
+7 −9 modulefiles/ufs_wcoss2.intel.lua
+1 −1 tests/bl_date.conf
+20 −2 tests/default_vars.sh
+2 −1 tests/detect_machine.sh
+5 −2 tests/fv3_conf/control_run.IN
+15 −0 tests/fv3_conf/cpld_docn_dice.IN
+4 −0 tests/fv3_conf/cpld_docn_pcice.IN
+86 −7 tests/fv3_conf/wam_run.IN
+545 −0 tests/logs/OpnReqTests_atm_ds2s_docn_dice_hera.log
+545 −0 tests/logs/OpnReqTests_atm_ds2s_docn_pcice_hera.log
+24 −24 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
+267 −264 tests/logs/RegressionTests_acorn.log
+282 −272 tests/logs/RegressionTests_derecho.log
+280 −274 tests/logs/RegressionTests_gaea.log
+372 −550 tests/logs/RegressionTests_hera.log
+375 −461 tests/logs/RegressionTests_hercules.log
+251 −245 tests/logs/RegressionTests_jet.log
+282 −277 tests/logs/RegressionTests_orion.log
+235 −232 tests/logs/RegressionTests_wcoss2.log
+4 −7 tests/module-setup.sh
+38 −0 tests/parm/diag_table/diag_additional_ldiag3d_ugwp
+19 −10 tests/parm/diag_table/diag_table_wam
+1 −1 tests/parm/docn_in.IN
+23 −13 tests/parm/field_table/field_table_wam_noaer
+15 −0 tests/parm/global_dice.streams.IN
+13 −0 tests/parm/global_dice_in.IN
+15 −0 tests/parm/global_docn.streams.IN
+12 −0 tests/parm/global_docn_in.IN
+13 −1 tests/parm/ice_in.IN
+396 −0 tests/parm/input_global_nest.nml.IN
+406 −0 tests/parm/input_global_parent.nml.IN
+53 −0 tests/parm/model_configure_gnv1.IN
+1 −0 tests/parm/ufs.configure.datm_cdeps.IN
+1 −0 tests/parm/ufs.configure.hafs_atm_docn.IN
+1 −0 tests/parm/ufs.configure.hafs_atm_ocn.IN
+1 −0 tests/parm/ufs.configure.hafs_atm_ocn_wav.IN
+1 −0 tests/parm/ufs.configure.hafs_atm_ocn_wav_inline.IN
+1 −0 tests/parm/ufs.configure.hafs_atm_ocn_wav_mom6.IN
+1 −0 tests/parm/ufs.configure.hafs_atm_wav.IN
+1 −0 tests/parm/ufs.configure.s2s.IN
+1 −0 tests/parm/ufs.configure.s2s_aoflux_esmf.IN
+5 −0 tests/parm/ufs.configure.s2s_esmf.IN
+1 −0 tests/parm/ufs.configure.s2sa.IN
+1 −0 tests/parm/ufs.configure.s2sa_esmf.IN
+1 −0 tests/parm/ufs.configure.s2sw.IN
+1 −0 tests/parm/ufs.configure.s2sw_esmf.IN
+1 −0 tests/parm/ufs.configure.s2sw_fast_esmf.IN
+1 −0 tests/parm/ufs.configure.s2swa.IN
+1 −0 tests/parm/ufs.configure.s2swa_esmf.IN
+1 −0 tests/parm/ufs.configure.s2swa_fast_esmf.IN
+0 −331 tests/parm/wam.nml.IN
+434 −0 tests/parm/wam_v17.nml.IN
+13 −7 tests/rt.conf
+3 −4 tests/rt.sh
+9 −0 tests/run_test.sh
+2 −37 tests/test_changes.list
+121 −0 tests/tests/atm_ds2s_docn_dice
+128 −0 tests/tests/atm_ds2s_docn_pcice
+91 −26 tests/tests/control_wam
+94 −30 tests/tests/control_wam_debug
+1 −0 tests/tests/cpld_control_nowave_noaero_p8
+293 −178 tests/tests/gnv1_nested
7 changes: 7 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,7 @@ 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_ICE_IC='cice_model.res.nc'
local CICE_RESTART_DEFLATE=0
local CICE_RESTART_CHUNK=0,0
local CICE_RESTART_STRIDE=-99
Expand Down Expand Up @@ -117,6 +118,12 @@ local CICE_NPROC=${ntasks_cice6}
local CICE_BLCKX=${block_size_x}
local CICE_BLCKY=${block_size_y}
local CICE_DECOMP=${processor_shape}
# ice_prescribed_nml section
local CICE_PRESCRIBED="false"
local MESH_DICE="none"
local stream_files_dice="none"



# Ensure the template exists
local template=${CICE_TEMPLATE:-"${PARMgfs}/ufs/ice_in.IN"}
Expand Down
3 changes: 3 additions & 0 deletions ush/parsing_ufs_configure.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,8 @@ if [[ "${cpl}" = ".true." ]]; then
local coupling_interval_slow_sec="${CPL_SLOW}"
fi

local WRITE_ENDOFRUN_RESTART=.false.

if [[ "${cplflx}" = ".true." ]]; then

local use_coldstart=${use_coldstart:-".false."}
Expand All @@ -56,6 +58,7 @@ if [[ "${cplflx}" = ".true." ]]; then
local ATMTILESIZE="${CASE:1}"
local ocean_albedo_limit=0.06
local pio_rearranger=${pio_rearranger:-"box"}
local MED_history_n=1000000
fi

if [[ "${cplice}" = ".true." ]]; then
Expand Down
Loading