Skip to content
Draft
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
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[submodule "CMEPS/CMEPS"]
path = CMEPS/CMEPS
url = https://github.com/ESCOMP/CMEPS
url = https://github.com/access-nri/cmeps
[submodule "CDEPS/CDEPS"]
path = CDEPS/CDEPS
url = https://github.com/ESCOMP/CDEPS
url = https://github.com/access-nri/cdeps
[submodule "share/CESM_share"]
path = share/CESM_share
url = https://github.com/ESCOMP/CESM_share.git
url = https://github.com/access-nri/cesm_share
2 changes: 1 addition & 1 deletion CDEPS/CDEPS
Submodule CDEPS updated 58 files
+5 −5 .github/workflows/extbuild.yml
+1 −1 .gitmodules
+59 −4 cime_config/stream_cdeps.py
+33 −13 datm/atm_comp_nuopc.F90
+1 −1 datm/cime_config/buildnml
+1 −1 datm/cime_config/config_archive.xml
+7 −2 datm/cime_config/config_component.xml
+12 −1 datm/cime_config/namelist_definition_datm.xml
+133 −0 datm/cime_config/stream_definition_datm.xml
+52 −6 datm/cime_config/testdefs/testlist_datm.xml
+16 −9 datm/datm_datamode_cplhist_mod.F90
+287 −0 datm/datm_datamode_jra55do_mod.F90
+1 −1 dglc/cime_config/config_archive.xml
+6 −6 dglc/cime_config/namelist_definition_dglc.xml
+11 −4 dglc/cime_config/testdefs/testlist_dglc.xml
+5 −4 dglc/glc_comp_nuopc.F90
+5 −3 dice/cime_config/config_archive.xml
+16 −2 dice/cime_config/testdefs/testlist_dice.xml
+9 −8 dice/ice_comp_nuopc.F90
+3 −1 dlnd/CMakeLists.txt
+30 −1 dlnd/cime_config/buildnml
+1 −1 dlnd/cime_config/config_archive.xml
+21 −11 dlnd/cime_config/config_component.xml
+7 −4 dlnd/cime_config/namelist_definition_dlnd.xml
+101 −1 dlnd/cime_config/stream_definition_dlnd.xml
+19 −1 dlnd/cime_config/testdefs/testlist_dlnd.xml
+9 −0 dlnd/cime_config/testdefs/testmods_dirs/dlnd/glc_forcing/shell_commands
+7 −0 dlnd/cime_config/testdefs/testmods_dirs/dlnd/rof_forcing/shell_commands
+206 −0 dlnd/dlnd_datamode_glc_forcing_mod.F90
+277 −0 dlnd/dlnd_datamode_rof_forcing_mod.F90
+70 −176 dlnd/lnd_comp_nuopc.F90
+88 −0 dlnd/stream_definition_dlnd.xml
+6 −0 doc/source/drof.rst
+1 −0 docn/CMakeLists.txt
+1 −1 docn/cime_config/config_archive.xml
+20 −2 docn/cime_config/config_component.xml
+5 −3 docn/cime_config/namelist_definition_docn.xml
+90 −0 docn/cime_config/stream_definition_docn.xml
+18 −0 docn/cime_config/testdefs/testlist_docn.xml
+9 −0 docn/cime_config/testdefs/testmods_dirs/docn/multilev_cplhist/shell_commands
+20 −0 docn/cime_config/testdefs/testmods_dirs/docn/multilev_cplhist/user_nl_cpl
+157 −0 docn/docn_datamode_multilev_cplhist_mod.F90
+68 −49 docn/ocn_comp_nuopc.F90
+1 −1 drof/cime_config/config_archive.xml
+19 −8 drof/cime_config/config_component.xml
+1 −0 drof/cime_config/namelist_definition_drof.xml
+33 −1 drof/cime_config/stream_definition_drof.xml
+26 −12 drof/rof_comp_nuopc.F90
+16 −15 dshr/dshr_dfield_mod.F90
+1 −1 dwav/cime_config/config_archive.xml
+9 −8 dwav/wav_comp_nuopc.F90
+1 −1 fox
+1 −0 share/CMakeLists.txt
+55 −3 share/shr_is_restart_fh_mod.F90
+94 −0 share/shr_lnd2rof_tracers_mod.F90
+27 −3 streams/dshr_methods_mod.F90
+613 −291 streams/dshr_strdata_mod.F90
+361 −230 streams/dshr_stream_mod.F90
11 changes: 9 additions & 2 deletions CDEPS/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
## Common library
add_fortran_library(ACCESS3_cdeps_common mod/common STATIC)
add_library(Access3::cdeps_common ALIAS ACCESS3_cdeps_common)
target_include_directories(ACCESS3_cdeps_common PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
target_link_libraries(ACCESS3_cdeps_common
PUBLIC ESMF::ESMF
PRIVATE Access3::share Access3::cmeps Access3::nuopc_cap_share FoX::FoX
Expand All @@ -24,25 +25,27 @@ target_sources(ACCESS3_cdeps_common PRIVATE
## DATM
add_fortran_library(ACCESS3_cdeps_datm mod/datm STATIC)
add_library(Access3::cdeps_datm ALIAS ACCESS3_cdeps_datm)
target_include_directories(ACCESS3_cdeps_datm PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
target_link_libraries(ACCESS3_cdeps_datm
PUBLIC ESMF::ESMF
PRIVATE Access3::cdeps_common Access3::share
)
target_sources(ACCESS3_cdeps_datm PRIVATE
CDEPS/datm/atm_comp_nuopc.F90
CDEPS/datm/datm_datamode_clmncep_mod.F90
CDEPS/datm/datm_datamode_core2_mod.F90
CDEPS/datm/datm_datamode_cplhist_mod.F90
CDEPS/datm/datm_datamode_era5_mod.F90
CDEPS/datm/datm_datamode_gefs_mod.F90
CDEPS/datm/datm_datamode_jra_mod.F90
CDEPS/datm/datm_datamode_jra55do_mod.F90
CDEPS/datm/datm_datamode_simple_mod.F90
extra_sources/datm_datamode_jra55do_mod.F90
)
add_patched_source(ACCESS3_cdeps_datm CDEPS/datm/atm_comp_nuopc.F90)

## DOCN
add_fortran_library(ACCESS3_cdeps_docn mod/docn STATIC)
add_library(Access3::cdeps_docn ALIAS ACCESS3_cdeps_docn)
target_include_directories(ACCESS3_cdeps_docn PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
target_link_libraries(ACCESS3_cdeps_docn
PUBLIC ESMF::ESMF
PRIVATE Access3::cdeps_common Access3::share
Expand All @@ -57,11 +60,13 @@ target_sources(ACCESS3_cdeps_docn PRIVATE
CDEPS/docn/docn_datamode_som_mod.F90
CDEPS/docn/docn_import_data_mod.F90
CDEPS/docn/ocn_comp_nuopc.F90
CDEPS/docn/docn_datamode_multilev_cplhist_mod.F90
)

## DICE
add_fortran_library(ACCESS3_cdeps_dice mod/dice STATIC)
add_library(Access3::cdeps_dice ALIAS ACCESS3_cdeps_dice)
target_include_directories(ACCESS3_cdeps_dice PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
target_link_libraries(ACCESS3_cdeps_dice
PUBLIC ESMF::ESMF
PRIVATE Access3::cdeps_common Access3::share
Expand All @@ -76,6 +81,7 @@ target_sources(ACCESS3_cdeps_dice PRIVATE
## DWAV
add_fortran_library(ACCESS3_cdeps_dwav mod/dwav STATIC)
add_library(Access3::cdeps_dwav ALIAS ACCESS3_cdeps_dwav)
target_include_directories(ACCESS3_cdeps_dwav PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
target_link_libraries(ACCESS3_cdeps_dwav
PUBLIC ESMF::ESMF
PRIVATE Access3::cdeps_common Access3::share
Expand All @@ -87,6 +93,7 @@ target_sources(ACCESS3_cdeps_dwav PRIVATE
## DROF
add_fortran_library(ACCESS3_cdeps_drof mod/drof STATIC)
add_library(Access3::cdeps_drof ALIAS ACCESS3_cdeps_drof)
target_include_directories(ACCESS3_cdeps_drof PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
target_link_libraries(ACCESS3_cdeps_drof
PUBLIC ESMF::ESMF
PRIVATE Access3::cdeps_common Access3::share
Expand Down
287 changes: 0 additions & 287 deletions CDEPS/extra_sources/datm_datamode_jra55do_mod.F90

This file was deleted.

Loading
Loading