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

remove whitespace #3

Closed
wants to merge 1 commit into from
Closed

remove whitespace #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,9 @@ export MOM6_RESTART_SETTING='n'
export MOM6_RIVER_RUNOFF='False'
export FRUNOFF=""
export CHLCLIM="seawifs_1998-2006_smoothed_2X.nc"
# this must be set False for restart repro
# this must be set False for restart repro
export MOM6_REPRO_LA='False'
# since CPL_SLOW is set to DT_THERM, this should be always be false
# since CPL_SLOW is set to DT_THERM, this should be always be false
export MOM6_THERMO_SPAN='False'
# no WW3
export MOM6_USE_WAVES='False'
Expand Down
4 changes: 2 additions & 2 deletions tests/edit_inputs.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,11 @@ function edit_mom_input {
-e "s/MOM6_USE_WAVES/$MOM6_USE_WAVES/g" \
-e "s/NX_GLB/$NX_GLB/g" \
-e "s/NY_GLB/$NY_GLB/g" \
-e "s/CHLCLIM/$CHLCLIM/g"
-e "s/CHLCLIM/$CHLCLIM/g"
}

function edit_data_table {
sed -e "s/FRUNOFF/$FRUNOFF/g"
sed -e "s/FRUNOFF/$FRUNOFF/g"
}

function edit_diag_table {
Expand Down
3 changes: 1 addition & 2 deletions tests/fv3_conf/cpld_bmark_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mkdir INPUT RESTART history MOM6_OUTPUT
mkdir INPUT RESTART history MOM6_OUTPUT

if [[ $ATMRES == 'C96' ]]; then
FV3_DIR=FV3_input_data
Expand Down Expand Up @@ -58,4 +58,3 @@ cp @[RTPWD]/${FV3_IC}/gfs_data*.nc ./INPUT
cp @[RTPWD]/${MOM6_IC}/MOM*.nc ./INPUT
# the BM ICs are still named cice5 and need to remain so until P5.0 is completed
cp @[RTPWD]/${CICE_IC}/cice5_model_@[ICERES].*.nc ./cice_model.res.nc

2 changes: 1 addition & 1 deletion tests/fv3_conf/cpld_control_run.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mkdir INPUT RESTART history MOM6_OUTPUT
mkdir INPUT RESTART history MOM6_OUTPUT

if [[ $ATMRES == 'C96' ]]; then
FV3_DIR=FV3_input_data
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_ca
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export LIST_FILES="phyf024.tile1.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc \
RESTART/MOM.res.nc \
RESTART/iced.2016-10-04-00000.nc "
RESTART/iced.2016-10-04-00000.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"

export_fv3
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_control
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export LIST_FILES="phyf024.tile1.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc \
RESTART/MOM.res.nc \
RESTART/iced.2016-10-04-00000.nc "
RESTART/iced.2016-10-04-00000.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"

export_fv3
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_control_12h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export LIST_FILES="phyf012.tile1.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc \
RESTART/MOM.res.nc \
RESTART/iced.2016-10-03-43200.nc "
RESTART/iced.2016-10-03-43200.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-03-43200.nc"

export_fv3
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_control_c192
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export LIST_FILES="phyf024.tile1.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc \
RESTART/MOM.res.nc \
RESTART/iced.2016-10-04-00000.nc "
RESTART/iced.2016-10-04-00000.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"

export_fv3
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export LIST_FILES="phyf006.tile1.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc \
RESTART/MOM.res.nc \
RESTART/iced.2016-10-03-21600.nc "
RESTART/iced.2016-10-03-21600.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-03-21600.nc"

export_fv3
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_decomp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export LIST_FILES="phyf024.tile1.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc \
RESTART/MOM.res.nc \
RESTART/iced.2016-10-04-00000.nc "
RESTART/iced.2016-10-04-00000.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"

export_fv3
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_restart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export LIST_FILES="phyf024.tile1.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc \
RESTART/MOM.res.nc \
RESTART/iced.2016-10-04-00000.nc "
RESTART/iced.2016-10-04-00000.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"

export_fv3
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_restart_mx025
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export LIST_FILES="phyf024.tile1.nc \
RESTART/MOM.res_1.nc \
RESTART/MOM.res_2.nc \
RESTART/MOM.res_3.nc \
RESTART/iced.2016-10-04-00000.nc "
RESTART/iced.2016-10-04-00000.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"

export_fv3
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/cpld_satmedmf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ export LIST_FILES="phyf024.tile1.nc \
RESTART/sfc_data.tile5.nc \
RESTART/sfc_data.tile6.nc \
RESTART/MOM.res.nc \
RESTART/iced.2016-10-04-00000.nc "
RESTART/iced.2016-10-04-00000.nc"
#RESTART/ufs.cpld.cpl.r.2016-10-04-00000.nc"

export_fv3
Expand Down