Skip to content

Commit 4daf043

Browse files
committed
Update to CDEPS 1.0.86
1 parent dcbe86b commit 4daf043

File tree

4 files changed

+10
-365
lines changed

4 files changed

+10
-365
lines changed

CDEPS/CDEPS

Submodule CDEPS updated 58 files

CDEPS/CMakeLists.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
## Common library
77
add_fortran_library(ACCESS3_cdeps_common mod/common STATIC)
88
add_library(Access3::cdeps_common ALIAS ACCESS3_cdeps_common)
9+
target_include_directories(ACCESS3_cdeps_common PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
910
target_link_libraries(ACCESS3_cdeps_common
1011
PUBLIC ESMF::ESMF
1112
PRIVATE Access3::share Access3::cmeps Access3::nuopc_cap_share FoX::FoX
@@ -24,25 +25,27 @@ target_sources(ACCESS3_cdeps_common PRIVATE
2425
## DATM
2526
add_fortran_library(ACCESS3_cdeps_datm mod/datm STATIC)
2627
add_library(Access3::cdeps_datm ALIAS ACCESS3_cdeps_datm)
28+
target_include_directories(ACCESS3_cdeps_datm PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
2729
target_link_libraries(ACCESS3_cdeps_datm
2830
PUBLIC ESMF::ESMF
2931
PRIVATE Access3::cdeps_common Access3::share
3032
)
3133
target_sources(ACCESS3_cdeps_datm PRIVATE
34+
CDEPS/datm/atm_comp_nuopc.F90
3235
CDEPS/datm/datm_datamode_clmncep_mod.F90
3336
CDEPS/datm/datm_datamode_core2_mod.F90
3437
CDEPS/datm/datm_datamode_cplhist_mod.F90
3538
CDEPS/datm/datm_datamode_era5_mod.F90
3639
CDEPS/datm/datm_datamode_gefs_mod.F90
3740
CDEPS/datm/datm_datamode_jra_mod.F90
41+
CDEPS/datm/datm_datamode_jra55do_mod.F90
3842
CDEPS/datm/datm_datamode_simple_mod.F90
39-
extra_sources/datm_datamode_jra55do_mod.F90
4043
)
41-
add_patched_source(ACCESS3_cdeps_datm CDEPS/datm/atm_comp_nuopc.F90)
4244

4345
## DOCN
4446
add_fortran_library(ACCESS3_cdeps_docn mod/docn STATIC)
4547
add_library(Access3::cdeps_docn ALIAS ACCESS3_cdeps_docn)
48+
target_include_directories(ACCESS3_cdeps_docn PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
4649
target_link_libraries(ACCESS3_cdeps_docn
4750
PUBLIC ESMF::ESMF
4851
PRIVATE Access3::cdeps_common Access3::share
@@ -57,11 +60,13 @@ target_sources(ACCESS3_cdeps_docn PRIVATE
5760
CDEPS/docn/docn_datamode_som_mod.F90
5861
CDEPS/docn/docn_import_data_mod.F90
5962
CDEPS/docn/ocn_comp_nuopc.F90
63+
CDEPS/docn/docn_datamode_multilev_cplhist_mod.F90
6064
)
6165

6266
## DICE
6367
add_fortran_library(ACCESS3_cdeps_dice mod/dice STATIC)
6468
add_library(Access3::cdeps_dice ALIAS ACCESS3_cdeps_dice)
69+
target_include_directories(ACCESS3_cdeps_dice PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
6570
target_link_libraries(ACCESS3_cdeps_dice
6671
PUBLIC ESMF::ESMF
6772
PRIVATE Access3::cdeps_common Access3::share
@@ -76,6 +81,7 @@ target_sources(ACCESS3_cdeps_dice PRIVATE
7681
## DWAV
7782
add_fortran_library(ACCESS3_cdeps_dwav mod/dwav STATIC)
7883
add_library(Access3::cdeps_dwav ALIAS ACCESS3_cdeps_dwav)
84+
target_include_directories(ACCESS3_cdeps_dwav PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
7985
target_link_libraries(ACCESS3_cdeps_dwav
8086
PUBLIC ESMF::ESMF
8187
PRIVATE Access3::cdeps_common Access3::share
@@ -87,6 +93,7 @@ target_sources(ACCESS3_cdeps_dwav PRIVATE
8793
## DROF
8894
add_fortran_library(ACCESS3_cdeps_drof mod/drof STATIC)
8995
add_library(Access3::cdeps_drof ALIAS ACCESS3_cdeps_drof)
96+
target_include_directories(ACCESS3_cdeps_drof PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/fox/include>)
9097
target_link_libraries(ACCESS3_cdeps_drof
9198
PUBLIC ESMF::ESMF
9299
PRIVATE Access3::cdeps_common Access3::share

CDEPS/extra_sources/datm_datamode_jra55do_mod.F90

Lines changed: 0 additions & 287 deletions
This file was deleted.

0 commit comments

Comments
 (0)