Skip to content

February 2026 upstream updates #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anton-seaice merged 4 commits into from
Mar 3, 2026
Merged

February 2026 upstream updates #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ec8767f
changing over to our forks for CMEPS, CDEPS and CESM_share
chrisb13 Jan 16, 2026
9abc13e
Update to CESM_share 1.1.18
anton-seaice Jan 21, 2026
7ce8720
Update to CMEPS1.1.35
anton-seaice Feb 23, 2026
2da9387
Use CDEPS 1.0.92 with ACCESS commits
anton-seaice Feb 25, 2026
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
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[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
[submodule "share/genf90"]
path = share/genf90
url = https://github.com/PARALLELIO/genf90.git
2 changes: 1 addition & 1 deletion CDEPS/CDEPS
Open in desktop
Submodule CDEPS updated 95 files
+5 −5 .github/workflows/extbuild.yml
+1 −1 .gitmodules
+61 −5 cime_config/stream_cdeps.py
+5 −1 datm/CMakeLists.txt
+162 −204 datm/atm_comp_nuopc.F90
+1 −1 datm/cime_config/buildnml
+1 −1 datm/cime_config/config_archive.xml
+43 −36 datm/cime_config/config_component.xml
+24 −19 datm/cime_config/namelist_definition_datm.xml
+445 −275 datm/cime_config/stream_definition_datm.xml
+67 −11 datm/cime_config/testdefs/testlist_datm.xml
+223 −274 datm/datm_datamode_clmncep_mod.F90
+97 −100 datm/datm_datamode_core2_mod.F90
+152 −74 datm/datm_datamode_cplhist_mod.F90
+194 −47 datm/datm_datamode_era5_mod.F90
+136 −42 datm/datm_datamode_gefs_mod.F90
+101 −81 datm/datm_datamode_jra_mod.F90
+6 −19 datm/datm_datamode_simple_mod.F90
+172 −0 datm/datm_pres_aero_mod.F90
+98 −0 datm/datm_pres_co2_mod.F90
+113 −0 datm/datm_pres_ndep_mod.F90
+70 −0 datm/datm_pres_o3_mod.F90
+1 −1 dglc/cime_config/config_archive.xml
+6 −8 dglc/cime_config/namelist_definition_dglc.xml
+0 −2 dglc/cime_config/stream_definition_dglc.xml
+15 −7 dglc/cime_config/testdefs/testlist_dglc.xml
+15 −16 dglc/dglc_datamode_noevolve_mod.F90
+21 −85 dglc/glc_comp_nuopc.F90
+5 −3 dice/cime_config/config_archive.xml
+4 −6 dice/cime_config/namelist_definition_dice.xml
+0 −2 dice/cime_config/stream_definition_dice.xml
+16 −2 dice/cime_config/testdefs/testlist_dice.xml
+179 −34 dice/dice_datamode_cplhist_mod.F90
+25 −13 dice/dice_datamode_ssmi_mod.F90
+2 −2 dice/dice_flux_atmice_mod.F90
+51 −117 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 −6 dlnd/cime_config/namelist_definition_dlnd.xml
+101 −3 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
+276 −0 dlnd/dlnd_datamode_rof_forcing_mod.F90
+86 −191 dlnd/lnd_comp_nuopc.F90
+7 −1 doc/source/datm.rst
+36 −15 doc/source/docn.rst
+6 −0 doc/source/drof.rst
+3 −3 docn/CMakeLists.txt
+1 −1 docn/cime_config/config_archive.xml
+21 −3 docn/cime_config/config_component.xml
+23 −29 docn/cime_config/namelist_definition_docn.xml
+91 −3 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
+2 −2 docn/docn_datamode_aquaplanet_mod.F90
+66 −20 docn/docn_datamode_cplhist_mod.F90
+0 −172 docn/docn_datamode_iaf_mod.F90
+162 −0 docn/docn_datamode_multilev_cplhist_mod.F90
+26 −29 docn/docn_datamode_multilev_mod.F90
+49 −46 docn/docn_datamode_multilev_sstdata_mod.F90
+74 −33 docn/docn_datamode_som_mod.F90
+35 −31 docn/docn_datamode_sstdata_mod.F90
+2 −2 docn/docn_import_data_mod.F90
+152 −204 docn/ocn_comp_nuopc.F90
+3 −1 drof/CMakeLists.txt
+1 −1 drof/cime_config/config_archive.xml
+46 −35 drof/cime_config/config_component.xml
+9 −7 drof/cime_config/namelist_definition_drof.xml
+40 −5 drof/cime_config/stream_definition_drof.xml
+9 −1 drof/cime_config/testdefs/testlist_drof.xml
+6 −0 drof/cime_config/testdefs/testmods_dirs/drof/cplhist_noresm/shell_commands
+123 −0 drof/drof_datamode_copyall_mod.F90
+198 −0 drof/drof_datamode_cplhist_mod.F90
+113 −109 drof/rof_comp_nuopc.F90
+17 −16 dshr/dshr_dfield_mod.F90
+3 −3 dshr/dshr_fldlist_mod.F90
+59 −59 dshr/dshr_mod.F90
+2 −1 dwav/CMakeLists.txt
+1 −1 dwav/cime_config/config_archive.xml
+0 −2 dwav/cime_config/namelist_definition_dwav.xml
+0 −2 dwav/cime_config/stream_definition_dwav.xml
+108 −0 dwav/dwav_datamode_copyall_mod.F90
+143 −200 dwav/wav_comp_nuopc.F90
+1 −1 fox
+7 −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
+641 −310 streams/dshr_strdata_mod.F90
+399 −265 streams/dshr_stream_mod.F90
16 changes: 11 additions & 5 deletions CDEPS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,19 @@ target_link_libraries(ACCESS3_cdeps_datm
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_simple_mod.F90
extra_sources/datm_datamode_jra55do_mod.F90
CDEPS/datm/datm_pres_aero_mod.F90
CDEPS/datm/datm_pres_co2_mod.F90
CDEPS/datm/datm_pres_ndep_mod.F90
CDEPS/datm/datm_pres_o3_mod.F90
)
add_patched_source(ACCESS3_cdeps_datm CDEPS/datm/atm_comp_nuopc.F90)

## DOCN
add_fortran_library(ACCESS3_cdeps_docn mod/docn STATIC)
Expand All @@ -49,14 +52,14 @@ target_link_libraries(ACCESS3_cdeps_docn
)
target_sources(ACCESS3_cdeps_docn PRIVATE
CDEPS/docn/docn_datamode_aquaplanet_mod.F90
CDEPS/docn/docn_datamode_copyall_mod.F90
CDEPS/docn/docn_datamode_cplhist_mod.F90
CDEPS/docn/docn_datamode_multilev_mod.F90
CDEPS/docn/docn_datamode_multilev_dom_mod.F90
CDEPS/docn/docn_datamode_iaf_mod.F90
CDEPS/docn/docn_datamode_multilev_sstdata_mod.F90
CDEPS/docn/docn_datamode_som_mod.F90
CDEPS/docn/docn_datamode_sstdata_mod.F90
CDEPS/docn/docn_import_data_mod.F90
CDEPS/docn/ocn_comp_nuopc.F90
CDEPS/docn/docn_datamode_multilev_cplhist_mod.F90
)

## DICE
Expand All @@ -81,6 +84,7 @@ target_link_libraries(ACCESS3_cdeps_dwav
PRIVATE Access3::cdeps_common Access3::share
)
target_sources(ACCESS3_cdeps_dwav PRIVATE
CDEPS/dwav/dwav_datamode_copyall_mod.F90
CDEPS/dwav/wav_comp_nuopc.F90
)

Expand All @@ -92,6 +96,8 @@ target_link_libraries(ACCESS3_cdeps_drof
PRIVATE Access3::cdeps_common Access3::share
)
target_sources(ACCESS3_cdeps_drof PRIVATE
CDEPS/drof/drof_datamode_copyall_mod.F90
CDEPS/drof/drof_datamode_cplhist_mod.F90
CDEPS/drof/rof_comp_nuopc.F90
)

Expand Down
287 changes: 0 additions & 287 deletions CDEPS/extra_sources/datm_datamode_jra55do_mod.F90
View file
Open in desktop

This file was deleted.

Loading
Loading