Skip to content
Open
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
7 changes: 3 additions & 4 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1662,12 +1662,11 @@ export_fire_behavior() {
}


# Defaults for the coupled 5-component
# Defaults for the global coupled
export_cmeps() {
export UFS_CONFIGURE=ufs.configure.s2swa_fast.IN
export UFS_CONFIGURE=ufs.configure.s2sw_fast.IN
export med_model=cmeps
export atm_model=fv3
export chm_model=gocart
export ocn_model=mom6
export ice_model=cice6
export wav_model=ww3
Expand Down Expand Up @@ -1860,7 +1859,7 @@ export CPL=.true.
export CPLWAV=.true.
export CPLWAV2ATM=.true.
export USE_MED_FLUX=.false.
export CPLCHM=.true.
export CPLCHM=.false.
export CPLLND=.false.

# for FV3: default values will be changed if doing a warm-warm restart
Expand Down
710 changes: 357 additions & 353 deletions tests/logs/RegressionTests_hercules.log

Large diffs are not rendered by default.

863 changes: 402 additions & 461 deletions tests/logs/RegressionTests_ursa.log

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion tests/rt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RUN | cpld_debug_sfs | - noaacloud
COMPILE | s2sw_32bit_pdlib_debug | intel | -DAPP=S2SW -D32BIT=ON -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_ugwpv1 -DPDLIB=ON -DDEBUG=ON | - noaacloud | fv3 |
RUN | cpld_debug_gfsv17 | - noaacloud | baseline |

COMPILE | s2swa | intel | -DAPP=S2SWA -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 |
COMPILE | s2sw | intel | -DAPP=S2SW -DCCPP_SUITES=FV3_GFS_v17_coupled_p8,FV3_GFS_v17_coupled_p8_ugwpv1 | | fv3 |
RUN | cpld_control_p8 | - noaacloud | baseline |
RUN | cpld_control_p8.v2.sfc | - noaacloud | baseline |
RUN | cpld_restart_p8 | - noaacloud | | cpld_control_p8
Expand Down
16 changes: 11 additions & 5 deletions tests/test_changes.list
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
hafs_regional_atm_wav intel
hafs_regional_docn intel
hafs_regional_docn_oisst intel
hafs_regional_storm_following_1nest_atm_ocn_wav_mom6 intelllvm
hafs_regional_storm_following_1nest_atm_ocn_wav_mom6_debug intelllvm
cpld_control_p8 intel
cpld_control_p8.v2.sfc intel
cpld_restart_p8 intel
cpld_2threads_p8 intel
cpld_decomp_p8 intel
cpld_mpi_p8 intel
cpld_control_ciceC_p8 intel
cpld_control_c192_p8 intel
cpld_restart_c192_p8 intel
control_wam intel
datm_cdeps_stochy_gefs intel
1 change: 0 additions & 1 deletion tests/tests/atm_ds2s_docn_dice
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,6 @@ export_ugwpv1
export_cpl

#Component settings
export CPLCHM=.false.
export DNATS=0
export CPLWAV=.false.
export CPLWAV2ATM=.false.
Expand Down
1 change: 0 additions & 1 deletion tests/tests/atm_ds2s_docn_pcice
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export_fv3
export_cpl

#Component settings
export CPLCHM=.false.
export DNATS=0
export CPLWAV=.false.
export CPLWAV2ATM=.false.
Expand Down
10 changes: 5 additions & 5 deletions tests/tests/control_wam
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ export TEST_DESCR="fv3 wam test"

export CNTL_DIR=control_wam

export LIST_FILES="sfcf024.nc \
atmf024.nc"
export LIST_FILES="sfcf06.nc \
atmf06.nc"

export_fv3
export_tiled
Expand All @@ -21,11 +21,11 @@ export SYEAR=2021
export SMONTH=3
export SDAY=22
export SHOUR=6
export FHMAX=24
export FHMAX=6
export OUTPUT_GRID='gaussian_grid'
export FHROT=0
export OUTPUT_FH='24 -1'
export OUTPUT_FH='6 -1'

#WAM settings
export TAU=1.0
export D2_BG_K1=0.0
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/cpld_2threads_p8
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# cpld_2threads P8 test
#

export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 - 2 threads"
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - 2 threads"

export CNTL_DIR=cpld_control_p8

Expand All @@ -18,7 +18,6 @@ export LIST_FILES="sfcf024.tile1.nc \
atmf024.tile4.nc \
atmf024.tile5.nc \
atmf024.tile6.nc \
gocart.inst_aod.20210323_0600z.nc4 \
RESTART/20210323.060000.coupler.res \
RESTART/20210323.060000.fv_core.res.nc \
RESTART/20210323.060000.fv_core.res.tile1.nc \
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_control_c1152_v17
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,6 @@ export WW3_OUTPARS='WND CUR ICE HS T01 T02 DIR FP DP PHS PTP PDIR CHA'
export WW3_DTFLD=3600
export WW3_DTPNT=3600

export CPLCHM=.false.
export DNATS=0

export DOMAINS_STACK_SIZE=16000000
Expand Down
2 changes: 0 additions & 2 deletions tests/tests/cpld_control_c12_9deg
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,6 @@ export FNMSKH="'global_slmask.t62.192.94.grb'"
export CDMBGWD=0.0,0.0,0.0,0.0
export DT_INNER=${DT_ATMOS}

export CPLCHM=.false.

export eps_imesh=1.0e0

export FIELD_TABLE=field_table_gfsv16
Expand Down
5 changes: 2 additions & 3 deletions tests/tests/cpld_control_c192_p8
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# cpld_control_c192_p8 test
#
export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C192 MX050 - P8 test"
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C192 MX050 - P8 test"

export CNTL_DIR=cpld_control_c192_p8

Expand All @@ -17,7 +17,6 @@ export LIST_FILES="sfcf030.tile1.nc \
atmf030.tile4.nc \
atmf030.tile5.nc \
atmf030.tile6.nc \
gocart.inst_aod.20210323_1200z.nc4 \
RESTART/20210323.120000.coupler.res \
RESTART/20210323.120000.fv_core.res.nc \
RESTART/20210323.120000.fv_core.res.tile1.nc \
Expand Down Expand Up @@ -125,7 +124,7 @@ export CICE_MASK=kmtu_cice_NEMS_mx${OCNRES}.nc
export MOM6_CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc
export MOM6_FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc
export MOM6_RIVER_RUNOFF=True
export MOM6_GUST_CONST=0.0
export MOM6_GUST_CONST=0.0

export FNALBC="'C192.snowfree_albedo.tileX.nc'"
export FNALBC2="'C192.facsf.tileX.nc'"
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_control_c24_5deg
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,6 @@ export FNMSKH="'global_slmask.t62.192.94.grb'"
export CDMBGWD=0.0,0.0,0.0,0.0
export DT_INNER=${DT_ATMOS}

export CPLCHM=.false.

export eps_imesh=4.0e-1

Expand Down
2 changes: 0 additions & 2 deletions tests/tests/cpld_control_c24_9deg
Original file line number Diff line number Diff line change
Expand Up @@ -153,8 +153,6 @@ export FNMSKH="'global_slmask.t62.192.94.grb'"
export CDMBGWD=0.0,0.0,0.0,0.0
export DT_INNER=${DT_ATMOS}

export CPLCHM=.false.

export eps_imesh=1.0e0

export FIELD_TABLE=field_table_gfsv16
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_control_c48_5deg
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ export FNMSKH="'global_slmask.t62.192.94.grb'"
export CDMBGWD=${CDMBGWD_c48}
export DT_INNER=${DT_ATMOS}

export CPLCHM=.false.
export eps_imesh=4.0e-1

export FIELD_TABLE=field_table_thompson_noaero_tke
Expand Down
4 changes: 1 addition & 3 deletions tests/tests/cpld_control_ciceC_p8
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#
# cpld_control CICE C-grid P8 test
#

export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 - CICE6 Cgrid"
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - CICE6 Cgrid"

export CNTL_DIR=cpld_control_ciceC_p8

Expand Down Expand Up @@ -30,7 +29,6 @@ export LIST_FILES="sfcf021.tile1.nc \
atmf024.tile4.nc \
atmf024.tile5.nc \
atmf024.tile6.nc \
gocart.inst_aod.20210323_0600z.nc4 \
RESTART/20210323.060000.coupler.res \
RESTART/20210323.060000.fv_core.res.nc \
RESTART/20210323.060000.fv_core.res.tile1.nc \
Expand Down
6 changes: 5 additions & 1 deletion tests/tests/cpld_control_gefs
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,7 @@ export ATM_IGNORE_RST_CKSUM=.true.
export CICE_RUNTYPE=continue
export CICE_USE_RESTART_TIME=.true.
export MOM6_RESTART_SETTING=r
export MOM6_GUST_CONST=0.0
export MOM6_GUST_CONST=0.0
#WW3
export WW3_user_histname='true'
export WW3_historync='true'
Expand Down Expand Up @@ -258,6 +258,10 @@ export DOGP_LWSCAT=.false.
#but no aerosol radiative feedback, as in gefs reforecast
export IAER=1011

# Aerosols on
export CPLCHM=.true.
export chm_model=gocart

#model configurations
export FV3_RUN=cpld_control_run.IN
export CCPP_SUITE=FV3_GFS_v17_coupled_p8_ugwpv1
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_control_gfsv17
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ export_fv3
export_ugwpv1
export_cpl

export CPLCHM=.false.
export DNATS=0

export RESTART_N=3
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_control_gfsv17_iau
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ export_fv3
export_ugwpv1
export_cpl

export CPLCHM=.false.
export DNATS=0
export OUTPUT_GRID="gaussian_grid"
export WRITE_DOPOST=.true.
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_control_noaero_p8_agrid
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ export RESTART_N_SEC=$((RESTART_N*3600))
export RESTART_INTERVAL="${RESTART_N} -1"
export OUTPUT_FH='0 21 24'

export CPLCHM=.false.
export DNATS=0
export CPLWAV=.false.
export CPLWAV2ATM=.false.
Expand Down
4 changes: 1 addition & 3 deletions tests/tests/cpld_control_p8
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#
# cpld_control P8 test
#

export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100"
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100"

export CNTL_DIR=cpld_control_p8

Expand Down Expand Up @@ -30,7 +29,6 @@ export LIST_FILES="sfcf021.tile1.nc \
atmf024.tile4.nc \
atmf024.tile5.nc \
atmf024.tile6.nc \
gocart.inst_aod.20210323_0600z.nc4 \
RESTART/20210323.060000.coupler.res \
RESTART/20210323.060000.fv_core.res.nc \
RESTART/20210323.060000.fv_core.res.tile1.nc \
Expand Down
4 changes: 1 addition & 3 deletions tests/tests/cpld_control_p8.v2.sfc
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
#
# cpld_control P8 v2 surface file test
#

export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 with v2 sfc file"
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 with v2 sfc file"

export CNTL_DIR=cpld_control_p8.v2.sfc

Expand Down Expand Up @@ -30,7 +29,6 @@ export LIST_FILES="sfcf021.tile1.nc \
atmf024.tile4.nc \
atmf024.tile5.nc \
atmf024.tile6.nc \
gocart.inst_aod.20210323_0600z.nc4 \
RESTART/20210323.060000.coupler.res \
RESTART/20210323.060000.fv_core.res.nc \
RESTART/20210323.060000.fv_core.res.tile1.nc \
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_control_p8_lnd
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ export LIST_FILES="sfcf021.tile1.nc \

export CPLLND=.true.
export CPLLND2ATM=.true.
export CPLCHM=.false.
export UFS_CONFIGURE=ufs.configure.s2swl_fast.IN
export lnd_model=noahmp
export LND_tasks=144
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_control_sfs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,6 @@ export DT_INNER=${DT_INNER_c192}
export MAX_OUTPUT_FIELDS=300
export UPDATE_FULL_OMEGA=.false.
export DDDMP=0.
export CPLCHM=.false.
export CPLWAV=.false.
export CPLWAV2ATM=.false.

Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_debug_gfsv17
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ WAV_tasks="$(($WAV_tasks_cpl_unstr + 18))"
export atm_omp_num_threads=$THRD_cpl_unstr
export med_omp_num_threads=$atm_omp_num_threads

export CPLCHM=.false.
export DNATS=0
export MOM6_TOPOEDITS=ufs.topo_edits_011818.nc
export MOM6_ALLOW_LANDMASK_CHANGES=True
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_debug_noaero_p8
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ export DAYS=0.125
export RESTART_N=${FHMAX}
export OUTPUT_FH="3 -1"

export CPLCHM=.false.
export DNATS=0
export MOM6_TOPOEDITS=ufs.topo_edits_011818.nc
export MOM6_ALLOW_LANDMASK_CHANGES=True
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/cpld_debug_p8
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# cpld_debug_p8 test
#

export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 P8 debug"
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 P8 debug"

export CNTL_DIR=cpld_debug_p8

Expand All @@ -18,7 +18,6 @@ export LIST_FILES="sfcf003.tile1.nc \
atmf003.tile4.nc \
atmf003.tile5.nc \
atmf003.tile6.nc \
gocart.inst_aod.20210322_0900z.nc4 \
RESTART/20210322.090000.coupler.res \
RESTART/20210322.090000.fv_core.res.nc \
RESTART/20210322.090000.fv_core.res.tile1.nc \
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/cpld_decomp_p8
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# cpld_control P8 test
#

export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 - decomp test"
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 - decomp test"

export CNTL_DIR=cpld_control_p8

Expand All @@ -18,7 +18,6 @@ export LIST_FILES="sfcf024.tile1.nc \
atmf024.tile4.nc \
atmf024.tile5.nc \
atmf024.tile6.nc \
gocart.inst_aod.20210323_0600z.nc4 \
RESTART/20210323.060000.coupler.res \
RESTART/20210323.060000.fv_core.res.nc \
RESTART/20210323.060000.fv_core.res.tile1.nc \
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_mpi_gfsv17
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ export_fv3
export_ugwpv1
export_cpl

export CPLCHM=.false.
export DNATS=0

export RESTART_N=3
Expand Down
3 changes: 1 addition & 2 deletions tests/tests/cpld_mpi_p8
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# cpld_mpi P8 test
#

export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C96MX100 MPI-task test"
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C96MX100 MPI-task test"

export CNTL_DIR=cpld_control_p8

Expand All @@ -18,7 +18,6 @@ export LIST_FILES="sfcf024.tile1.nc \
atmf024.tile4.nc \
atmf024.tile5.nc \
atmf024.tile6.nc \
gocart.inst_aod.20210323_0600z.nc4 \
RESTART/20210323.060000.coupler.res \
RESTART/20210323.060000.fv_core.res.nc \
RESTART/20210323.060000.fv_core.res.tile1.nc \
Expand Down
1 change: 0 additions & 1 deletion tests/tests/cpld_restart_c12_9deg
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ export CICE_USE_RESTART_TIME=.true.
# MOM6 warm start
export MOM6_RESTART_SETTING=r

export CPLCHM=.false.

export eps_imesh=1.0e0

Expand Down
5 changes: 2 additions & 3 deletions tests/tests/cpld_restart_c192_p8
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#
# cpld_restart_c192_p8 test
#
export TEST_DESCR="Fully coupled FV3-CCPP-GOCART-MOM6-CICE-CMEPS-WW3 system - C192 MX050 - P8 test"
export TEST_DESCR="Fully coupled FV3-CCPP-MOM6-CICE-CMEPS-WW3 system - C192 MX050 - P8 test"

export CNTL_DIR=cpld_control_c192_p8

Expand All @@ -17,7 +17,6 @@ export LIST_FILES="sfcf030.tile1.nc \
atmf030.tile4.nc \
atmf030.tile5.nc \
atmf030.tile6.nc \
gocart.inst_aod.20210323_1200z.nc4 \
RESTART/20210323.120000.coupler.res \
RESTART/20210323.120000.fv_core.res.nc \
RESTART/20210323.120000.fv_core.res.tile1.nc \
Expand Down Expand Up @@ -126,7 +125,7 @@ export CICE_MASK=kmtu_cice_NEMS_mx${OCNRES}.nc
export MOM6_CHLCLIM=seawifs-clim-1997-2010.${NX_GLB}x${NY_GLB}.v20180328.nc
export MOM6_FRUNOFF=runoff.daitren.clim.${NX_GLB}x${NY_GLB}.v20180328.nc
export MOM6_RIVER_RUNOFF=True
export MOM6_GUST_CONST=0.0
export MOM6_GUST_CONST=0.0

export FNALBC="'C192.snowfree_albedo.tileX.nc'"
export FNALBC2="'C192.facsf.tileX.nc'"
Expand Down
Loading
Loading