Skip to content
Merged
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
16 changes: 8 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -178,14 +178,14 @@
[submodule "ccs_config"]
path = ccs_config
url = https://github.com/NorESMhub/ccs_config_noresm.git
fxtag = ccs_config_noresm0.0.61
fxtag = ccs_config_noresm0.0.65
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NorESMhub/ccs_config_noresm.git

[submodule "cime"]
path = cime
url = https://github.com/NorESMhub/cime.git
fxtag = cime6.1.73_noresm_v1
fxtag = cime6.1.173_noresm_v0
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NorESMhub/cime.git

Expand All @@ -196,7 +196,7 @@
[submodule "share"]
path = share
url = https://github.com/NorESMHub/NorESM_share
fxtag = share1.1.9_noresm_v0
fxtag = share1.1.18_noresm_v0
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NorESMHub/NorESM_share

Expand All @@ -207,34 +207,34 @@
[submodule "cdeps"]
path = components/cdeps
url = https://github.com/NorESMHub/CDEPS.git
fxtag = cdeps1.0.70_noresm_v7
fxtag = cdeps1.0.88_noresm_v1
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NorESMHub/CDEPS.git

[submodule "cice6"]
path = components/cice
url = https://github.com/NorESMhub/NorESM_CICE
fxtag = noresm_cice6_6_0_20250522_v2
fxtag = noresm_cice6_6_1_20251129_v2
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NorESMhub/NorESM_CICE

[submodule "clm"]
path = components/clm
url = https://github.com/NorESMhub/CTSM
fxtag = ctsm5.4.002_noresm_v4
fxtag = ctsm5.4.002_noresm_v6
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NorESMhub/CTSM

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/NorESMhub/CMEPS.git
fxtag = cmeps1.0.39_noresm_v8
fxtag = cmeps1.1.41_noresm_v0
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NorESMhub/CMEPS.git

[submodule "mosart"]
path = components/mosart
url = https://github.com/NorESMhub/MOSART
fxtag = mosart1.1.12_noresm_v0
fxtag = mosart1.1.12_noresm_v2
fxrequired = ToplevelRequired
fxDONOTUSEurl = https://github.com/NorESMhub/MOSART
5 changes: 3 additions & 2 deletions bld/namelist_files/namelist_defaults_cam.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2024,8 +2024,9 @@
<stream_ndep_mesh_filename phys="cam7">atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_ESMFmesh_cdf5_c20251211.nc</stream_ndep_mesh_filename>

<stream_ndep_data_filename>lnd/clm2/ndepdata/fndep_clm_hist_b.e21.BWHIST.f09_g17.CMIP6-historical-WACCM.ensmean_1849-2015_monthly_0.9x1.25_c180926.nc</stream_ndep_data_filename>
<stream_ndep_data_filename phys="cam7">atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-1-2_gn_185001-202212_c20251222.nc</stream_ndep_data_filename>
<stream_ndep_data_filename sim_year="1850">lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_ndep_data_filename><stream_ndep_data_filename phys="cam7" sim_year="1850">atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-1-2_gn_185001-185012-clim_c20251222.nc</stream_ndep_data_filename>
<stream_ndep_data_filename sim_year="1850">lnd/clm2/ndepdata/fndep_clm_WACCM6_CMIP6piControl001_y21-50avg_1850monthly_0.95x1.25_c180802.nc</stream_ndep_data_filename>
<stream_ndep_data_filename phys="cam7">atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-2-0_gn_185001-202212_cdf5_c20260409.nc</stream_ndep_data_filename>
<stream_ndep_data_filename phys="cam7" sim_year="1850">atm/ndep/cmip7/ndep_input4MIPs_surfaceFluxes_CMIP_FZJ-CMIP-nitrogen-2-0_gn_185001-185012-clim_cdf5_c20260409.nc</stream_ndep_data_filename>

<stream_ndep_year_first >2000</stream_ndep_year_first>
<stream_ndep_year_first sim_year="1850">1850</stream_ndep_year_first>
Expand Down
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 260 files
7 changes: 4 additions & 3 deletions cime_config/cam.case_setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,14 @@

logger = logging.getLogger(__name__)

if len(sys.argv) != 3:
raise SystemExit(f"Incorrect call to {sys.argv[0]}, need CAM root and case root")
if len(sys.argv) != 4:
raise SystemExit(f"Incorrect call to {sys.argv[0]}, need CAM root, case root, and non-local passed as arguments")
# end if
cam_root = sys.argv[1]
case_root = sys.argv[2]
non_local = sys.argv[3] == 'True'

with Case(case_root) as case:
with Case(case_root, non_local=non_local) as case:
cam_config = case.get_value('CAM_CONFIG_OPTS')
# Gather case information (from _build_usernl_files in case_setup.py)
comp_interface = case.get_value("COMP_INTERFACE")
Expand Down
2 changes: 1 addition & 1 deletion components/cdeps
Submodule cdeps updated 85 files
+5 −5 .github/workflows/extbuild.yml
+1 −1 .gitmodules
+7 −1 cime_config/stream_cdeps.py
+5 −1 datm/CMakeLists.txt
+159 −205 datm/atm_comp_nuopc.F90
+19 −2 datm/cime_config/buildnml
+1 −1 datm/cime_config/config_archive.xml
+10 −10 datm/cime_config/config_component.xml
+1 −19 datm/cime_config/namelist_definition_datm.xml
+229 −140 datm/cime_config/stream_definition_datm.xml
+40 −0 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
+73 −79 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
+9 −11 dglc/cime_config/namelist_definition_dglc.xml
+0 −2 dglc/cime_config/stream_definition_dglc.xml
+13 −11 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
+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
+1 −1 dlnd/cime_config/config_archive.xml
+3 −13 dlnd/cime_config/config_component.xml
+0 −2 dlnd/cime_config/namelist_definition_dlnd.xml
+0 −2 dlnd/cime_config/stream_definition_dlnd.xml
+87 −79 dlnd/dlnd_datamode_glc_forcing_mod.F90
+156 −92 dlnd/dlnd_datamode_rof_forcing_mod.F90
+60 −68 dlnd/lnd_comp_nuopc.F90
+0 −88 dlnd/stream_definition_dlnd.xml
+36 −15 doc/source/docn.rst
+2 −3 docn/CMakeLists.txt
+1 −1 docn/cime_config/config_archive.xml
+1 −1 docn/cime_config/config_component.xml
+19 −27 docn/cime_config/namelist_definition_docn.xml
+1 −3 docn/cime_config/stream_definition_docn.xml
+2 −2 docn/docn_datamode_aquaplanet_mod.F90
+66 −20 docn/docn_datamode_cplhist_mod.F90
+0 −172 docn/docn_datamode_iaf_mod.F90
+61 −56 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
+118 −188 docn/ocn_comp_nuopc.F90
+3 −1 drof/CMakeLists.txt
+1 −1 drof/cime_config/config_archive.xml
+41 −39 drof/cime_config/config_component.xml
+8 −7 drof/cime_config/namelist_definition_drof.xml
+39 −4 drof/cime_config/stream_definition_drof.xml
+8 −0 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.F90
+198 −0 drof/drof_datamode_cplhist.F90
+113 −109 drof/rof_comp_nuopc.F90
+11 −13 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.F90
+143 −200 dwav/wav_comp_nuopc.F90
+1 −1 fox
+2 −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
+618 −298 streams/dshr_strdata_mod.F90
+399 −265 streams/dshr_stream_mod.F90
2 changes: 1 addition & 1 deletion components/cice
2 changes: 1 addition & 1 deletion components/cmeps
Submodule cmeps updated 82 files
+0 −19 .github/workflows/bumpversion.yml
+7 −7 .github/workflows/extbuild.yml
+49 −34 .github/workflows/srt.yml
+1 −0 CODEOWNERS
+4 −1 cesm/driver/esm.F90
+498 −0 cesm/flux_atmocn/flux_atmocn_COARE_mod.F90
+712 −0 cesm/flux_atmocn/flux_atmocn_Diurnal_mod.F90
+351 −0 cesm/flux_atmocn/flux_atmocn_Large.F90
+522 −0 cesm/flux_atmocn/flux_atmocn_UA_mod.F90
+145 −0 cesm/flux_atmocn/flux_atmocn_driver_mod.F90
+24 −2,311 cesm/flux_atmocn/shr_flux_mod.F90
+4 −5 cesm/nuopc_cap_share/shr_lnd2rof_tracers_mod.F90
+6 −6 cesm/nuopc_cap_share/shr_megan_mod.F90
+18 −0 cesm/share_wrappers/wtracers_mod.F90
+1 −0 cime_config/buildexe
+48 −7 cime_config/buildnml
+5 −4 cime_config/config_archive.xml
+41 −42 cime_config/config_component.xml
+32 −64 cime_config/config_component_cesm.xml
+75 −23 cime_config/namelist_definition_drv.xml
+3 −3 cime_config/testdefs/testlist_drv.xml
+2 −0 cime_config/testdefs/testmods_dirs/drv/interim_restart/shell_commands
+0 −3 doc/source/addendum/fieldnames.rst
+1 −0 med_test_comps/xatm/cime_config/buildlib
+32 −0 med_test_comps/xatm/cime_config/buildnml
+25 −0 med_test_comps/xatm/cime_config/config_component.xml
+529 −0 med_test_comps/xatm/src/atm_comp_nuopc.F90
+1 −0 med_test_comps/xglc/cime_config/buildlib
+32 −0 med_test_comps/xglc/cime_config/buildnml
+26 −0 med_test_comps/xglc/cime_config/config_component.xml
+457 −0 med_test_comps/xglc/src/glc_comp_nuopc.F90
+1 −0 med_test_comps/xice/cime_config/buildlib
+32 −0 med_test_comps/xice/cime_config/buildnml
+26 −0 med_test_comps/xice/cime_config/config_component.xml
+552 −0 med_test_comps/xice/src/ice_comp_nuopc.F90
+1 −0 med_test_comps/xlnd/cime_config/buildlib
+32 −0 med_test_comps/xlnd/cime_config/buildnml
+26 −0 med_test_comps/xlnd/cime_config/config_component.xml
+564 −0 med_test_comps/xlnd/src/lnd_comp_nuopc.F90
+1 −0 med_test_comps/xocn/cime_config/buildlib
+32 −0 med_test_comps/xocn/cime_config/buildnml
+27 −0 med_test_comps/xocn/cime_config/config_component.xml
+475 −0 med_test_comps/xocn/src/ocn_comp_nuopc.F90
+1 −0 med_test_comps/xrof/cime_config/buildlib
+32 −0 med_test_comps/xrof/cime_config/buildnml
+39 −0 med_test_comps/xrof/cime_config/config_component.xml
+473 −0 med_test_comps/xrof/src/rof_comp_nuopc.F90
+39 −0 med_test_comps/xshare/cime_config/buildlib
+853 −0 med_test_comps/xshare/dead_methods_mod.F90
+346 −0 med_test_comps/xshare/dead_nuopc_mod.F90
+1 −0 med_test_comps/xwav/cime_config/buildlib
+32 −0 med_test_comps/xwav/cime_config/buildnml
+26 −0 med_test_comps/xwav/cime_config/config_component.xml
+465 −0 med_test_comps/xwav/src/wav_comp_nuopc.F90
+1 −0 mediator/CMakeLists.txt
+364 −394 mediator/esmFldsExchange_cesm_mod.F90
+63 −1 mediator/esmFldsExchange_hafs_mod.F90
+150 −65 mediator/esmFldsExchange_ufs_mod.F90
+110 −141 mediator/fd_cesm.yaml
+18 −4 mediator/med.F90
+63 −640 mediator/med_diag_mod.F90
+293 −0 mediator/med_field_info_mod.F90
+22 −4 mediator/med_fraction_mod.F90
+25 −7 mediator/med_internalstate_mod.F90
+154 −20 mediator/med_io_mod.F90
+250 −149 mediator/med_map_mod.F90
+318 −181 mediator/med_methods_mod.F90
+59 −82 mediator/med_phases_aofluxes_mod.F90
+0 −1 mediator/med_phases_cdeps_mod.F90
+23 −5 mediator/med_phases_history_mod.F90
+1 −2 mediator/med_phases_ocnalb_mod.F90
+23 −56 mediator/med_phases_post_rof_mod.F90
+61 −3 mediator/med_phases_prep_atm_mod.F90
+78 −55 mediator/med_phases_prep_glc_mod.F90
+217 −35 mediator/med_phases_prep_ocn_mod.F90
+69 −142 mediator/med_phases_prep_rof_mod.F90
+8 −1 mediator/med_phases_prep_wav_mod.F90
+37 −3 mediator/med_phases_restart_mod.F90
+1 −1 ufs/CMakeLists.txt
+8 −0 ufs/ccpp/data/MED_typedefs.F90
+20 −0 ufs/ccpp/data/MED_typedefs.meta
+34 −0 ufs/wtracers_mod.F90
Loading