Skip to content

Release/P7b: Bring in #623 with Mushy Thermodyn setting in RT #628

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

Merged
junwang-noaa merged 2 commits into from
Jun 8, 2021
Merged

Release/P7b: Bring in #623 with Mushy Thermodyn setting in RT #628

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b57495e
Remove non-frac grid coupled tests (Replacement PR, was #584) (#623)
DeniseWorthen Jun 8, 2021
bfea421
Merge remote-tracking branch 'upstream/develop' into mushy_setting
junwang-noaa Jun 8, 2021
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
200 changes: 100 additions & 100 deletions tests/RegressionTests_cheyenne.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,890 changes: 538 additions & 1,352 deletions tests/RegressionTests_cheyenne.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,856 changes: 521 additions & 1,335 deletions tests/RegressionTests_gaea.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

200 changes: 100 additions & 100 deletions tests/RegressionTests_hera.gnu.log
View file
Open in desktop

Large diffs are not rendered by default.

1,898 changes: 542 additions & 1,356 deletions tests/RegressionTests_hera.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,836 changes: 511 additions & 1,325 deletions tests/RegressionTests_jet.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

1,986 changes: 560 additions & 1,426 deletions tests/RegressionTests_orion.intel.log
View file
Open in desktop

Large diffs are not rendered by default.

338 changes: 169 additions & 169 deletions tests/RegressionTests_wcoss_cray.log
View file
Open in desktop

Large diffs are not rendered by default.

1,886 changes: 536 additions & 1,350 deletions tests/RegressionTests_wcoss_dell_p3.log
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 11 additions & 2 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -661,7 +661,7 @@ export coupling_interval_slow_sec=${CPL_SLOW}
export coupling_interval_fast_sec=${CPL_FAST}

export RESTART_N=${FHMAX}
export CPLMODE='nems_orig'
export CPLMODE='nems_frac'
export cap_dbug_flag="0"
export use_coldstart="false"
export use_mommesh="true"
Expand All @@ -672,7 +672,7 @@ export RUNTYPE='startup'
# set frac_grid=.F. but FRAC_GRID_INPUT=.T.
# to repro existing tests set both frac_grid and FRAC_GRID_INPUT to .F.
# to run frac_grid, set both frac_grid and FRAC_GRID_INPUTs to .T.
export FRAC_GRID='.F.'
export FRAC_GRID='.T.'
export FRAC_GRID_INPUT='.T.'
export CCPP_SUITE="FV3_GFS_2017_coupled"
export INPUT_NML=input.mom6_ccpp.nml.IN
Expand Down Expand Up @@ -736,6 +736,9 @@ export RESTART_EXT='.false.'
export FRAZIL_FWSALT='.true.'
# default to write CICE average history files
export CICE_HIST_AVG='.true.'
# default non-mushy thermo
export KTHERM=1
export TFREEZE_OPTION='linear_salt'

#wave
export ww3gline="'glo_1deg' 'no' 'CPL:native' 'CPL:native' 'CPL:native' 'no' 'no' 'no' 1 1 0.00 1.00 F"
Expand Down Expand Up @@ -855,6 +858,9 @@ export RESTART_EXT='.false.'
export FRAZIL_FWSALT='.true.'
# default to write CICE average history files
export CICE_HIST_AVG='.true.'
# default non-mushy thermo
export KTHERM=1
export TFREEZE_OPTION='linear_salt'
export BL_SUFFIX=""
export RT_SUFFIX=""
}
Expand Down Expand Up @@ -967,6 +973,9 @@ export RESTART_EXT='.false.'
export FRAZIL_FWSALT='.true.'
# default to write CICE average history files
export CICE_HIST_AVG='.true.'
# default non-mushy thermo
export KTHERM=1
export TFREEZE_OPTION='linear_salt'
export BL_SUFFIX=""
export RT_SUFFIX=""
}
4 changes: 3 additions & 1 deletion tests/edit_inputs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ function edit_ice_in {
-e "s/USE_RESTART_TIME/$USE_RESTART_TIME/g" \
-e "s/DUMPFREQ_N/$DUMPFREQ_N/g" \
-e "s/DUMPFREQ/$DUMPFREQ/g" \
-e "s/FRAZIL_FWSALT/$FRAZIL_FWSALT/g"
-e "s/FRAZIL_FWSALT/$FRAZIL_FWSALT/g" \
-e "s/TFREEZE_OPTION/$TFREEZE_OPTION/g" \
-e "s/KTHERM/$KTHERM/g"
}

function edit_mom_input {
Expand Down
4 changes: 2 additions & 2 deletions tests/parm/ice_in_template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@

&thermo_nml
kitd = 1
ktherm = 1
ktherm = KTHERM
conduct = 'MU71'
a_rapid_mode = 0.5e-3
Rac_rapid_mode = 10.0
Expand Down Expand Up @@ -150,7 +150,7 @@
fbot_xfer_type = 'constant'
update_ocn_f = FRAZIL_FWSALT
l_mpond_fresh = .false.
tfrz_option = 'linear_salt'
tfrz_option = 'TFREEZE_OPTION'
restart_coszen = .true.
/

Expand Down
320 changes: 0 additions & 320 deletions tests/parm/input.benchmark_ccpp.nml.IN
View file
Open in desktop

This file was deleted.

Loading