Skip to content
Closed
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
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,5 @@
branch = develop
[submodule "CDEPS"]
path = CDEPS-interface/CDEPS
url = https://github.com/NOAA-EMC/CDEPS
branch = emc/develop
url = https://github.com/binli2337/CDEPS
branch = feature/data_files
1 change: 1 addition & 0 deletions tests/default_vars.sh
Original file line number Diff line number Diff line change
Expand Up @@ -912,6 +912,7 @@ export FILENAME_BASE='cfsr.'
export mesh_file="cfsr_mesh.nc"
export MESH_ATM="DATM_INPUT/${mesh_file}"
export atm_datamode=${DATM_SRC}
export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"

# MOM6 defaults; 1 degree
export MOM_INPUT=MOM_input_template_100
Expand Down
4 changes: 2 additions & 2 deletions tests/parm/datm.streams.IN
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ taxmode01: cycle
mapalgo01: bilinear
tInterpAlgo01: linear
readMode01: single
dtlimit01: 1.5
dtlimit01: 1.0
stream_offset01: 0
yearFirst01: 2011
yearLast01: 2011
yearAlign01: 2011
stream_vectors01: "u:v"
stream_mesh_file01: @[MESH_ATM]
stream_lev_dimname01: null
stream_data_files01: "DATM_INPUT/@[FILENAME_BASE]201110.nc"
stream_data_files01: @[stream_files]
stream_data_variables01: "slmsksfc Sa_mask" "DSWRF Faxa_swdn" "DLWRF Faxa_lwdn" "vbdsf_ave Faxa_swvdr" "vddsf_ave Faxa_swvdf" "nbdsf_ave Faxa_swndr" "nddsf_ave Faxa_swndf" "u10m Sa_u10m" "v10m Sa_v10m" "hgt_hyblev1 Sa_z" "psurf Sa_pslv" "tmp_hyblev1 Sa_tbot" "spfh_hyblev1 Sa_shum" "ugrd_hyblev1 Sa_u" "vgrd_hyblev1 Sa_v" "q2m Sa_q2m" "t2m Sa_t2m" "pres_hyblev1 Sa_pbot" "precp Faxa_rain" "fprecp Faxa_snow"
2 changes: 2 additions & 0 deletions tests/rt.conf
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,8 @@ RUN | datm_cdeps_bulk_gefs
RUN | datm_cdeps_mx025_cfsr | - wcoss_cray gaea.intel | fv3 |
RUN | datm_cdeps_mx025_gefs | - wcoss_cray | fv3 |

RUN | datm_cdeps_multiple_files_cfsr | - wcoss_cray | fv3 |

COMPILE | APP=DATM DEBUG=Y | - wcoss_cray | fv3 |
RUN | datm_cdeps_debug_cfsr | - wcoss_cray | fv3 |

Expand Down
1 change: 1 addition & 0 deletions tests/tests/datm_cdeps_bulk_gefs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export DATM_SRC="GEFS"
export FILENAME_BASE='gefs.'
export mesh_file="gefs_mesh.nc"
export MESH_ATM="DATM_INPUT/${mesh_file}"
export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"

export RESTART_N=12
export flux_scheme='-1'
Expand Down
1 change: 1 addition & 0 deletions tests/tests/datm_cdeps_control_gefs
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ export DATM_SRC="GEFS"
export FILENAME_BASE='gefs.'
export mesh_file="gefs_mesh.nc"
export MESH_ATM="DATM_INPUT/${mesh_file}"
export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"
export RESTART_N=12
export FV3_RUN=cpld_datm_cdeps.IN
18 changes: 18 additions & 0 deletions tests/tests/datm_cdeps_multiple_files_cfsr
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#
# DATM_CDEPS_MOM6_CICE_CMEPS_CFSR test
#

export TEST_DESCR="DATM_CDEPS-MOM6-CICE-CMEPS_CFSR - multiple input files "

export CNTL_DIR="datm_cdeps_control_cfsr"

export LIST_FILES="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 stream_files="DATM_INPUT/cfsr.2011100100.nc DATM_INPUT/cfsr.2011100106.nc DATM_INPUT/cfsr.2011100112.nc DATM_INPUT/cfsr.2011100118.nc DATM_INPUT/cfsr.2011100200.nc"
export FV3_RUN=cpld_datm_cdeps.IN
1 change: 1 addition & 0 deletions tests/tests/datm_cdeps_mx025_gefs
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export DATM_SRC="GEFS"
export FILENAME_BASE='gefs.'
export mesh_file="gefs_mesh.nc"
export MESH_ATM="DATM_INPUT/${mesh_file}"
export stream_files="DATM_INPUT/${FILENAME_BASE}201110.nc"

export TASKS=$TASKS_cdeps_025
export TPN=$TPN_cdeps_025
Expand Down