Skip to content

Commit 056bb06

Browse files
authored
Merge pull request #29 - February 2026 upstream updates
2 parents 15c9d1b + 2da9387 commit 056bb06

11 files changed

Lines changed: 30 additions & 409 deletions

File tree

.gitmodules

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[submodule "CMEPS/CMEPS"]
22
path = CMEPS/CMEPS
3-
url = https://github.com/ESCOMP/CMEPS
3+
url = https://github.com/access-nri/cmeps
44
[submodule "CDEPS/CDEPS"]
55
path = CDEPS/CDEPS
6-
url = https://github.com/ESCOMP/CDEPS
6+
url = https://github.com/access-nri/cdeps
77
[submodule "share/CESM_share"]
88
path = share/CESM_share
9-
url = https://github.com/ESCOMP/CESM_share.git
9+
url = https://github.com/access-nri/cesm_share
1010
[submodule "share/genf90"]
1111
path = share/genf90
1212
url = https://github.com/PARALLELIO/genf90.git

CDEPS/CDEPS

Submodule CDEPS updated 95 files

CDEPS/CMakeLists.txt

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,16 +29,19 @@ target_link_libraries(ACCESS3_cdeps_datm
2929
PRIVATE Access3::cdeps_common Access3::share
3030
)
3131
target_sources(ACCESS3_cdeps_datm PRIVATE
32+
CDEPS/datm/atm_comp_nuopc.F90
3233
CDEPS/datm/datm_datamode_clmncep_mod.F90
3334
CDEPS/datm/datm_datamode_core2_mod.F90
3435
CDEPS/datm/datm_datamode_cplhist_mod.F90
3536
CDEPS/datm/datm_datamode_era5_mod.F90
3637
CDEPS/datm/datm_datamode_gefs_mod.F90
3738
CDEPS/datm/datm_datamode_jra_mod.F90
3839
CDEPS/datm/datm_datamode_simple_mod.F90
39-
extra_sources/datm_datamode_jra55do_mod.F90
40+
CDEPS/datm/datm_pres_aero_mod.F90
41+
CDEPS/datm/datm_pres_co2_mod.F90
42+
CDEPS/datm/datm_pres_ndep_mod.F90
43+
CDEPS/datm/datm_pres_o3_mod.F90
4044
)
41-
add_patched_source(ACCESS3_cdeps_datm CDEPS/datm/atm_comp_nuopc.F90)
4245

4346
## DOCN
4447
add_fortran_library(ACCESS3_cdeps_docn mod/docn STATIC)
@@ -49,14 +52,14 @@ target_link_libraries(ACCESS3_cdeps_docn
4952
)
5053
target_sources(ACCESS3_cdeps_docn PRIVATE
5154
CDEPS/docn/docn_datamode_aquaplanet_mod.F90
52-
CDEPS/docn/docn_datamode_copyall_mod.F90
5355
CDEPS/docn/docn_datamode_cplhist_mod.F90
5456
CDEPS/docn/docn_datamode_multilev_mod.F90
55-
CDEPS/docn/docn_datamode_multilev_dom_mod.F90
56-
CDEPS/docn/docn_datamode_iaf_mod.F90
57+
CDEPS/docn/docn_datamode_multilev_sstdata_mod.F90
5758
CDEPS/docn/docn_datamode_som_mod.F90
59+
CDEPS/docn/docn_datamode_sstdata_mod.F90
5860
CDEPS/docn/docn_import_data_mod.F90
5961
CDEPS/docn/ocn_comp_nuopc.F90
62+
CDEPS/docn/docn_datamode_multilev_cplhist_mod.F90
6063
)
6164

6265
## DICE
@@ -81,6 +84,7 @@ target_link_libraries(ACCESS3_cdeps_dwav
8184
PRIVATE Access3::cdeps_common Access3::share
8285
)
8386
target_sources(ACCESS3_cdeps_dwav PRIVATE
87+
CDEPS/dwav/dwav_datamode_copyall_mod.F90
8488
CDEPS/dwav/wav_comp_nuopc.F90
8589
)
8690

@@ -92,6 +96,8 @@ target_link_libraries(ACCESS3_cdeps_drof
9296
PRIVATE Access3::cdeps_common Access3::share
9397
)
9498
target_sources(ACCESS3_cdeps_drof PRIVATE
99+
CDEPS/drof/drof_datamode_copyall_mod.F90
100+
CDEPS/drof/drof_datamode_cplhist_mod.F90
95101
CDEPS/drof/rof_comp_nuopc.F90
96102
)
97103

CDEPS/extra_sources/datm_datamode_jra55do_mod.F90

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

0 commit comments

Comments
 (0)