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 the coupled_sprint branch with recent changes from feature/coupled-crow #409

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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/checkout.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ echo ufs-weather-model checkout ...
if [[ ! -d ufs_model.fd ]] ; then
git clone https://github.com/ufs-community/ufs-weather-model ufs_model.fd >> ${logdir}/checkout-ufs_model.log 2>&1
cd ufs_model.fd
git checkout ${ufs_model_hash:-22613e8}
git checkout ${ufs_model_hash:-9bbb6d466368d46797e2c72a9d08955fda39cf33}
git submodule update --init --recursive
cd ${topdir}
else
Expand Down
4 changes: 2 additions & 2 deletions ush/forecast_postdet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -856,8 +856,8 @@ CICE_postdet() {
cice_hist_avg=${cice_hist_avg:-".true."}

FRAZIL_FWSALT=${FRAZIL_FWSALT:-".true."}
ktherm=${ktherm:-1}
tfrz_option=${tfrz_option:-"linear_salt"}
ktherm=${ktherm:-2}
tfrz_option=${tfrz_option:-"mushy"}
tr_pond_lvl=${tr_pond_lvl:-".true."} # Use level melt ponds tr_pond_lvl=true

# restart_pond_lvl (if tr_pond_lvl=true):
Expand Down
7 changes: 6 additions & 1 deletion ush/nems_configure.sh
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ CHMPETS=${CHMPETS:-${ATMPETS}}

USE_MOMMESH=${USE_MOMMESH:-"true"}

if [[ $OCNRES = "100" ]]; then
EPS_IMESH='2.5e-1'
else
EPS_IMESH='1.0e-1'
fi

rm -f $DATA/nems.configure

Expand Down Expand Up @@ -83,7 +88,7 @@ if [ $cplflx = .true. ]; then
sed -i -e "s;@\[coupling_interval_fast_sec\];$CPL_FAST;g" tmp1
sed -i -e "s;@\[RESTART_N\];$restart_interval_nems;g" tmp1
sed -i -e "s;@\[use_mommesh\];$USE_MOMMESH;g" tmp1
sed -i -e "s;@\[eps_imesh\];$ICERESdec;g" tmp1
sed -i -e "s;@\[eps_imesh\];$EPS_IMESH;g" tmp1
fi
if [ $cplwav = .true. ]; then
sed -i -e "s;@\[wav_model\];ww3;g" tmp1
Expand Down
13 changes: 2 additions & 11 deletions ush/parsing_model_configure_FV3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,13 @@ start_day: ${tPDY:6:2}
start_hour: ${tcyc}
start_minute: 0
start_second: 0
fhrot: ${IAU_FHROT:-0}
nhours_fcst: $FHMAX
RUN_CONTINUE: ${RUN_CONTINUE:-".false."}
ENS_SPS: ${ENS_SPS:-".false."}
fhrot: ${IAU_FHROT:-0}

dt_atmos: $DELTIM
output_1st_tstep_rst: .false.
calendar: ${calendar:-'julian'}
cpl: ${cpl:-".false."}
memuse_verbose: ${memuse_verbose:-".false."}
atmos_nthreads: $NTHREADS_FV3
use_hyper_thread: ${hyperthread:-".false."}
ncores_per_node: $cores_per_node
restart_interval: $restart_interval
output_1st_tstep_rst: .false.

quilting: $QUILTING
write_groups: ${WRITE_GROUP:-1}
Expand All @@ -57,8 +50,6 @@ jchunk3d: ${jchunk3d:-0}
kchunk3d: ${kchunk3d:-0}
ideflate: ${ideflate:-1}
nbits: ${nbits:-14}
write_nemsioflip: $WRITE_NEMSIOFLIP
write_fsyncflag: $WRITE_FSYNCFLAG
imo: $LONB_IMO
jmo: $LATB_JMO

Expand Down
5 changes: 0 additions & 5 deletions ush/parsing_namelists_FV3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -55,11 +55,6 @@ cat > input.nml <<EOF
chksum_debug = $chksum_debug
dycore_only = $dycore_only
ccpp_suite = '$CCPP_SUITE'
fdiag = $FDIAG
fhmax = $FHMAX
fhout = $FHOUT
fhmaxhf = $FHMAX_HF
fhouthf = $FHOUT_HF
$atmos_model_nml
/

Expand Down