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

Update CICE6 to allow WW3-CICE6 coupling; add a cdeps test using C-grid for sea ice dynamics (was #1390) #1381

Merged
merged 21 commits into from
Aug 30, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
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 CICE-interface/CICE
Submodule CICE updated 146 files
1,263 changes: 638 additions & 625 deletions tests/RegressionTests_acorn.intel.log

Large diffs are not rendered by default.

422 changes: 211 additions & 211 deletions tests/RegressionTests_cheyenne.gnu.log

Large diffs are not rendered by default.

1,357 changes: 685 additions & 672 deletions tests/RegressionTests_cheyenne.intel.log

Large diffs are not rendered by default.

1,966 changes: 983 additions & 983 deletions tests/RegressionTests_gaea.intel.log

Large diffs are not rendered by default.

426 changes: 213 additions & 213 deletions tests/RegressionTests_hera.gnu.log

Large diffs are not rendered by default.

1,415 changes: 714 additions & 701 deletions tests/RegressionTests_hera.intel.log

Large diffs are not rendered by default.

1,313 changes: 669 additions & 644 deletions tests/RegressionTests_jet.intel.log

Large diffs are not rendered by default.

1,407 changes: 709 additions & 698 deletions tests/RegressionTests_orion.intel.log

Large diffs are not rendered by default.

986 changes: 499 additions & 487 deletions tests/RegressionTests_wcoss2.intel.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,7 @@ export DLAT=0.03

# shel.inp
export INPUT_CURFLD='C F Currents'
export INPUT_ICEFLD='C F Ice concentrations'
export INPUT_ICEFLD='F F Ice concentrations'
# input.nml
export CPL_IMP_MRG=.true.

Expand Down
2 changes: 0 additions & 2 deletions tests/parm/ice_in_template
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@
restart_FY = .false.
tr_lvl = .true.
restart_lvl = .false.
tr_pond_cesm = .false.
restart_pond_cesm = .false.
tr_pond_topo = .false.
restart_pond_topo = .false.
tr_pond_lvl = .true.
Expand Down
1 change: 1 addition & 0 deletions tests/rt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ RUN | datm_cdeps_restart_cfsr
RUN | datm_cdeps_control_gefs | - wcoss2.intel | fv3 |
RUN | datm_cdeps_iau_gefs | - wcoss2.intel | fv3 |
RUN | datm_cdeps_stochy_gefs | - wcoss2.intel | fv3 |
RUN | datm_cdeps_ciceC_cfsr | - wcoss2.intel | fv3 |

RUN | datm_cdeps_bulk_cfsr | - wcoss2.intel | fv3 |
RUN | datm_cdeps_bulk_gefs | - wcoss2.intel | fv3 |
Expand Down
2 changes: 1 addition & 1 deletion tests/rt.sh
Original file line number Diff line number Diff line change
Expand Up @@ -443,7 +443,7 @@ if [[ $TESTS_FILE =~ '35d' ]] || [[ $TESTS_FILE =~ 'weekly' ]]; then
TEST_35D=true
fi

BL_DATE=20220805
BL_DATE=20220829

RTPWD=${RTPWD:-$DISKNM/NEMSfv3gfs/develop-${BL_DATE}/${RT_COMPILER^^}}

Expand Down
24 changes: 24 additions & 0 deletions tests/tests/datm_cdeps_ciceC_cfsr
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#
# DATM_CDEPS_MOM6_CICE_CMEPS_CFSR test
#

export TEST_DESCR="DATM_CDEPS-MOM6-CICE-CMEPS_CFSR - CICE-C-grid"

export CNTL_DIR="datm_cdeps_ciceC_cfsr"

export LIST_FILES="RESTART/MOM.res.nc \
RESTART/iced.2011-10-02-00000.nc \
RESTART/DATM_CFSR.cpl.r.2011-10-02-00000.nc"

export_datm_cdeps
export DATM_SRC="CFSR"
export FILENAME_BASE='cfsr.'
export IATM=1760
export JATM=880
export RESTART_N=12
export eps_imesh='2.5e-1'
export TOPOEDITS=ufs.topo_edits_011818.nc
export MOM6_ALLOW_LANDMASK_CHANGES=True
export GRIDICE=C

export FV3_RUN=cpld_datm_cdeps.IN
2 changes: 2 additions & 0 deletions tests/tests/hafs_regional_atm_wav
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,8 @@ export CPLWAV=.true.
export CPLWAV2ATM=.true.
export CPL_IMP_MRG=.true.

# shel.inp
export INPUT_CURFLD='F F Currents'
export DTFLD="10800"
export DTPNT="10800"
export GOFILETYPE=""
Expand Down