Skip to content

Update cdeps with cam7 nextsw cday changes #2900

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
ekluzek merged 8 commits into from
Dec 18, 2024
Merged

Update cdeps with cam7 nextsw cday changes #2900

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
de9bcc0
update(submodules): Bring in cdeps1.0.57 that has a change for cplhis…
ekluzek Dec 4, 2024
c416479
Update direcotries for submodule update
ekluzek Dec 4, 2024
7df2c84
Update cam7 tuning to use the radsw of -1 and nextsw_cday to be the c…
ekluzek Dec 4, 2024
5347b48
Update share to bring in needed updates for nuopc_shr_methods.F90 whi…
ekluzek Dec 17, 2024
e55a154
Correct test
ekluzek Dec 18, 2024
d5991c0
Start changelog
ekluzek Dec 18, 2024
de84a0d
Update expected fails
ekluzek Dec 18, 2024
4f59c76
Finish Change log
ekluzek Dec 18, 2024
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
4 changes: 2 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,15 +92,15 @@ fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS.git
fxtag = cdeps1.0.53
fxtag = cdeps1.0.57
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS.git

[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
fxtag = share1.1.2
fxtag = share1.1.6
fxrequired = ToplevelRequired
# Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
Expand Down
2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/clm50cam7LndTuningMode/user_nl_datm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
iradsw = -1
nextsw_cday_calc = "cam7"
2 changes: 2 additions & 0 deletions cime_config/testdefs/testmods_dirs/clm/clm60cam7LndTuningMode/user_nl_datm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
iradsw = -1
nextsw_cday_calc = "cam7"
2 changes: 1 addition & 1 deletion components/cdeps
Open in desktop
Submodule cdeps updated 33 files
+3 −0 cime_config/stream_cdeps.py
+61 −77 datm/atm_comp_nuopc.F90
+4 −2 datm/cime_config/config_component.xml
+37 −7 datm/cime_config/namelist_definition_datm.xml
+284 −7 datm/cime_config/stream_definition_datm.xml
+0 −40 datm/datm_datamode_cfsr_mod.F90
+0 −38 datm/datm_datamode_clmncep_mod.F90
+0 −39 datm/datm_datamode_core2_mod.F90
+2 −41 datm/datm_datamode_cplhist_mod.F90
+2 −40 datm/datm_datamode_era5_mod.F90
+0 −39 datm/datm_datamode_gefs_mod.F90
+0 −39 datm/datm_datamode_jra_mod.F90
+0 −39 datm/datm_datamode_simple_mod.F90
+13 −3 dglc/cime_config/testdefs/testlist_dglc.xml
+7 −12 dglc/dglc_datamode_noevolve_mod.F90
+10 −6 dglc/glc_comp_nuopc.F90
+12 −9 dice/dice_datamode_ssmi_mod.F90
+12 −6 dice/ice_comp_nuopc.F90
+18 −9 dlnd/lnd_comp_nuopc.F90
+0 −39 docn/docn_datamode_copyall_mod.F90
+0 −39 docn/docn_datamode_cplhist_mod.F90
+0 −44 docn/docn_datamode_iaf_mod.F90
+0 −43 docn/docn_datamode_multilev_dom_mod.F90
+0 −43 docn/docn_datamode_multilev_mod.F90
+10 −9 docn/docn_datamode_som_mod.F90
+33 −33 docn/ocn_comp_nuopc.F90
+4 −2 drof/cime_config/config_component.xml
+2 −1 drof/cime_config/namelist_definition_drof.xml
+32 −0 drof/cime_config/stream_definition_drof.xml
+16 −9 drof/rof_comp_nuopc.F90
+16 −19 dshr/dshr_mod.F90
+16 −8 dwav/wav_comp_nuopc.F90
+160 −2 share/nuopc_shr_methods.F90
2 changes: 1 addition & 1 deletion share
Open in desktop
Submodule share updated 2 files
+73 −100 src/nuopc_shr_methods.F90
+2 −1 src/shr_reprosum_mod.F90