Skip to content

Commit

Permalink
merge commit
Browse files Browse the repository at this point in the history
  • Loading branch information
@jedwards4b
jedwards4b committed Jul 23, 2024
2 parents 50f5782 + 153905a commit dd74438
Show file tree
Hide file tree
Showing 4 changed files with 256 additions and 78 deletions.
109 changes: 54 additions & 55 deletions .gitmodules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,128 +27,127 @@
#

[submodule "ccs_config"]
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
path = ccs_config
url = https://github.com/ESMCI/ccs_config_cesm.git
fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
fxtag = ccs_config_cesm1.0.0
fxrequired = ToplevelRequired

[submodule "cime"]
path = cime
url = https://github.com/ESMCI/cime
fxDONOTUSEurl = https://github.com/ESMCI/cime
path = cime
url = https://github.com/ESMCI/cime
fxDONOTUSEurl = https://github.com/ESMCI/cime
fxtag = cime6.1.0
fxrequired = ToplevelRequired

[submodule "fms"]
path = libraries/FMS
url = https://github.com/ESCOMP/FMS_interface
fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
path = libraries/FMS
url = https://github.com/ESCOMP/FMS_interface
fxDONOTUSEurl = https://github.com/ESCOMP/FMS_interface
fxrequired = ToplevelRequired
fxtag = fi_240516

[submodule "share"]
path = share
url = https://github.com/ESCOMP/CESM_share
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
path = share
url = https://github.com/ESCOMP/CESM_share
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_share
fxtag = share1.1.2
fxrequired = ToplevelRequired

[submodule "cam"]
path = components/cam
url = https://www.github.com/ESCOMP/CAM
fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM
path = components/cam
url = https://www.github.com/ESCOMP/CAM
fxDONOTUSEurl = https://www.github.com/ESCOMP/CAM
fxtag = cam6_4_014
fxrequired = ToplevelRequired

[submodule "clm"]
path = components/clm
url = https://github.com/ESCOMP/CTSM
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
path = components/clm
url = https://github.com/ESCOMP/CTSM
fxDONOTUSEurl = https://github.com/ESCOMP/CTSM
fxrequired = ToplevelRequired
fxtag = ctsm5.2.009

[submodule "cice"]
path = components/cice
url = https://github.com/ESCOMP/CESM_CICE
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
path = components/cice
url = https://github.com/ESCOMP/CESM_CICE
fxDONOTUSEurl = https://github.com/ESCOMP/CESM_CICE
fxrequired = ToplevelRequired
fxtag = cesm_cice6_5_0_12

[submodule "mom"]
path = components/mom
url = https://github.com/ESCOMP/MOM_interface
fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface
path = components/mom
url = https://github.com/ESCOMP/MOM_interface
fxDONOTUSEurl = https://github.com/ESCOMP/MOM_interface
fxrequired = ToplevelRequired
fxtag = mi_240705

[submodule "cism"]
path = components/cism
url = https://github.com/ESCOMP/cism-wrapper.git
fxDONOTUSEurl = https://github.com/ESCOMP/cism-wrapper.git
path = components/cism
url = https://github.com/ESCOMP/cism-wrapper.git
fxDONOTUSEurl = https://github.com/ESCOMP/cism-wrapper.git
fxtag = cismwrap_2_2_002
fxrequired = ToplevelRequired

[submodule "cdeps"]
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS
path = components/cdeps
url = https://github.com/ESCOMP/CDEPS
fxDONOTUSEurl = https://github.com/ESCOMP/CDEPS
fxrequired = ToplevelRequired
fxtag = cdeps1.0.43

[submodule "cmeps"]
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
path = components/cmeps
url = https://github.com/ESCOMP/CMEPS.git
fxDONOTUSEurl = https://github.com/ESCOMP/CMEPS.git
fxrequired = ToplevelRequired
fxtag = cmeps1.0.2

[submodule "rtm"]
path = components/rtm
url = https://github.com/ESCOMP/RTM
fxDONOTUSEurl = https://github.com/ESCOMP/RTM
path = components/rtm
url = https://github.com/ESCOMP/RTM
fxDONOTUSEurl = https://github.com/ESCOMP/RTM
fxrequired = ToplevelRequired
fxtag = rtm1_0_80

[submodule "ww3"]
path = components/ww3
url = https://github.com/ESCOMP/WW3_interface
fxDONOTUSEurl = https://github.com/ESCOMP/WW3_interface
path = components/ww3
url = https://github.com/ESCOMP/WW3_interface
fxDONOTUSEurl = https://github.com/ESCOMP/WW3_interface
fxtag = ww3i_0.0.2
fxrequired = ToplevelRequired

[submodule "mizuroute"]
path = components/mizuroute
url = https://github.com/ESCOMP/mizuRoute
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
path = components/mizuroute
url = https://github.com/ESCOMP/mizuRoute
fxDONOTUSEurl = https://github.com/ESCOMP/mizuRoute
fxrequired = ToplevelRequired
fxtag = cesm-coupling.n02_v2.1.3

[submodule "mosart"]
path = components/mosart
url = https://github.com/ESCOMP/MOSART
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
path = components/mosart
url = https://github.com/ESCOMP/MOSART
fxDONOTUSEurl = https://github.com/ESCOMP/MOSART
fxrequired = ToplevelRequired
fxtag = mosart1.1.02

[submodule "parallelio"]
path = libraries/parallelio
url = https://github.com/NCAR/ParallelIO
fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
path = libraries/parallelio
url = https://github.com/NCAR/ParallelIO
fxDONOTUSEurl = https://github.com/NCAR/ParallelIO
fxrequired = ToplevelRequired
fxtag = pio2_6_2

[submodule "mpi-serial"]
path = libraries/mpi-serial
url = https://github.com/ESMCI/mpi-serial
fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial
path = libraries/mpi-serial
url = https://github.com/ESMCI/mpi-serial
fxDONOTUSEurl = https://github.com/ESMCI/mpi-serial
fxtag = MPIserial_2.5.0
fxrequired = ToplevelRequired

[submodule "pysect"]
path = tools/statistical_ensemble_test/pyCECT
url = https://github.com/NCAR/PyCECT
fxDONOTUSEurl = https://github.com/NCAR/PyCECT
path = tools/statistical_ensemble_test/pyCECT
url = https://github.com/NCAR/PyCECT
fxDONOTUSEurl = https://github.com/NCAR/PyCECT
fxrequired = ToplevelRequired
fxtag = 3.2.2

200 changes: 200 additions & 0 deletions ChangeLog
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,203 @@
==============================================================
Tag name: cesm3_0_alpha02a
Originator(s): CSEG
Date: 16 July 2024
One-line Summary: First set of changes from components in preparation for the science capability freeze.

components/cam https://github.com/ESCOMP/CAM/cam6_4_001 **
components/cice https://github.com/ESCOMP/CESM_CICE/tree/cesm_cice6_5_0_9 --
cime https://github.com/ESMCI/cime/tree/cime6.1.0 **
share https://github.com/ESCOMP/CESM_share/tree/share1.1.2 **
ccs_config https://github.com/ESMCI/ccs_config_cesm/tree/ccs_config_cesm1.0.0 **
components/cmeps https://github.com/ESCOMP/CMEPS/tree/cmeps1.0.2 **
components/cdeps https://github.com/ESCOMP/CDEPS/tree/cdeps1.0.43 **
components/cism https://github.com/ESCOMP/cism-wrapper/tree/cismwrap_2_2_002 **
components/clm https://github.com/ESCOMP/ctsm/tree/ctsm5.2.009 **
components/fms https://github.com/ESCOMP/FMS_interface/tree/fi_240516 --
components/mizuroute https://github.com/ESCOMP/mizuRoute/tree/cesm-coupling.n02_v2.1.3 **
components/mom https://github.com/ESCOMP/MOM_interface/mi_240705 **
components/mosart https://github.com/ESCOMP/mosart/tree/mosart1_1_02 **
components/rtm https://github.com/ESCOMP/rtm/tree/rtm1_0_80 **
components/ww3 https://github.com/ESCOMP/WW3-CESM/tree/ww3i_0.0.2 --
libraries/parallelio https://github.com/NCAR/ParallilIO/tree/pio2_6_2 --

cam
Cheryl Craig 2024-06-24 - cam6_4_001 - components/cam (cesm3_0_alpha02a)
https://github.com/ESCOMP/CAM/tags/cam6_4_001

For Brian Eaton-

Change cam_dev to CAM7

Requires cmeps0.14.67


ccs_config
James Edwards 2024-06-28 - ccs_config_cesm1.0.0 - ccs_config (cesm3_0_alpha02a)
https://github.com/ESMCI/ccs_config_cesm/tags/ccs_config1.1.0

ccs_config_cesm1.0.0: Fix cmake for github workflow, remove mapping files that are no longer used.
ccs_config_cesm0.0.113: Fix cmake for github workflow
ccs_config_cesm0.0.112: Add Cidadinho test site
ccs_config_cesm0.0.111: Removal of mapping files that are no longer needed for cism->mosart
ccs_config_cesm0.0.110: Add a PFUNIT for github workflow of cesm_share
ccs_config_cesm0.0.109: Making additions to Depends.nvhpc to enable GPU compilation of clubb code.


cdeps
James Edwards 2024-06-28 - cdeps1.0.43 - components/cdeps (cesm3_0_alpha02a)
https://github.com/ESCOMP/CDEPS/tags/cdeps1.0.43

cdeps1.0.43: Add dglc
cdeps1.0.42: Fix initialization of dglc import/export pointers
cdeps1.0.41: Add changes to exchange between SOM and WW3DEV.
cdeps1.0.40: Updates the fox build since the directory now always exists
cdeps1.0.39: Allow input of stream on unstructured mesh (e.g. mpas)
cdeps1.0.38: Update stream_definition_datm.xml to include longer time period in files


cesm
James Edwards 2024-06-26 - cesm3.0-alphabranch - (cesm3_0_alpha02a)
https://github.com/ESCOMP/cesm/tags/cesm3.0-alphabranch

updates git-fleximod subtree, updates testmods for mosart


cime
James Edwards 2024-06-26 - cime6.1.0 - cime (cesm3_0_alpha02a)
https://github.com/ESMCI/cime/tags/cime5.7.0

cime6.1.0: Update Makefile, remove mct from build.
cime6.0.251: Remove mct for cesm
cime6.0.250: Remove esmf wrf timemanager
cime6.0.249: Remove broken unsupported tool
cime6.0.248: The xmlchange tool should not raise an exception when a diff is detected.
cime6.0.247: More robust approach to waiting for many threads
cime6.0.246: Remove reference to cice5 and ww3dev, no longer required


cism
James Edwards 2024-06-26 - cismwrap_2_2_002 - components/cism (cesm3_0_alpha02a)
https://github.com/ESCOMP/cism-wrapper/tags/cismwrap_2_2_002

GLC->mosart runoff


clm
Erik Kluzek 2024-06-28 - ctsm5.2.009 - components/clm (cesm3_0_alpha02a)
https://github.com/ESCOMP/ctsm/tags/ctsm5.2.009

Add support for CAM7 in CTSM. Also allow for "C" and "E" after period in long compset names.
Fix a couple bugs related to these changes.

Changes answers for the: clm45cam4LndTuningModeZDustSoilErod, clm50cam5LndTuningModeZDustSoilErod
test mods

This is required for: cam6_4_001


Erik Kluzek 2024-06-06 - ctsm5.2.008 - components/clm (cesm3_0_alpha02a)
https://github.com/ESCOMP/ctsm/tags/ctsm5.2.008

Updates along our temporary branch

b4b-dev changes: fix prescribed crop calendar test add more checking for it, dust emission to OO
Update git-fleximod

Hillslope hydrology changes: Changes answer ONLY for hillslope tests


cmeps
William Sacks 2024-07-09 - cmeps1.0.2 - src/drivers/nuopc/ (cesm3_0_alpha02a)
https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.??

https://github.com/ESCOMP/CMEPS/pull/481

This reverts some of the answer changes that came in with cmeps0.14.71, so ideally this PR will be included in the same CESM alpha tag as cmeps0.14.71, but that isn't critical.


James Edwards 2024-07-09 - cmeps1.0.1 - src/drivers/nuopc/ (cesm3_0_alpha02a)
https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.1

Fix for issue with gnu compiler


James Edwards 2024-06-26 - cmeps1.0.0 - src/drivers/nuopc/ (cesm3_0_alpha02a)
https://github.com/ESCOMP/CMEPS/tags/cmeps1.0.0

cmeps1.0.0: Add support for glc->rtm runoff depends on mosart and cism tags.
cmeps0.14.77: Bug fix primarily for usf testing
cmeps0.14.76: New fix for add_gusts
cmeps0.14.75: Bug fix for wav2ocn_map
cmeps0.14.74: Add trigrid capability - ability to run atm and lnd on separate grids
cmeps0.14.73: Add shr_dust_emis_mod to handle options for dust emissions between CTSM and CAM
cmeps0.14.72: Add bilinr_nostd for wav2ice coupling
cmeps0.14.71: Remove negative runoff
cmeps0.14.70: mct_init call is no longer needed
cmeps0.14.69: Fix aoflux for UFS
cmeps0.14.68: Implementation of glc->ocn coupling via going through mosart
cmeps0.14.67: Change CAM%DEV to CAM70 in buildnml
cmeps0.14.66: Replace manage-externals with git-fleximod
cmeps0.14.65: Revert "test github testing in cime PR #4631"
cmeps0.14.64: Test github testing in cime PR #4631


MCT
James Edwards 2024-06-26 - NONE - libraries/mct (cesm3_0_alpha02a)
https://github.com/MCSclimate/MCT/tags/NONE

Remove from DB


mizuRoute
Erik Kluzek 2024-06-20 - cesm-coupling.n02_v2.1.3 - components/mizuroute (cesm3_0_alpha02a)
https://github.com/ESCOMP/mizuRoute/tags/cesm-coupling.n02_v2.1.3

Makefile cleanup, get working on intel-oneapi
Add some new capability for floodplain and other routing methods


mom
James Edwards 2024-07-05 - mi_240705 - components/mom (cesm3_0_alpha02a)
https://github.com/ESCOMP/MOM_interface/tags/mi_240705

fms library path change


mosart
Erik Kluzek 2024-06-20 - mosart1.1.02 - components/mosart (cesm3_0_alpha02a)
https://github.com/ESCOMP/mosart/tags/mosart1.1.02

Starts adding capability to receive runoff from CISM directly.

For the new capability depends on:
CMEPS
CISM


James Edwards 2024-06-07 - mosart1.1.01 - components/mosart (cesm3_0_alpha02a)
https://github.com/ESCOMP/mosart/tags/mosart1.1.01

Brings in changes from nor-esm
Refactoring and halo update capability


rtm
Erik Kluzek 2024-06-21 - rtm1_0_80 - components/rtm (cesm3_0_alpha02a)
https://github.com/ESCOMP/rtm/tags/rtm1_0_80

Correct fluxes by area


share
James Edwards 2024-06-26 - share1.1.2 - share (cesm3_0_alpha02a)
https://github.com/ESCOMP/CESM_share/tags/share1.1.1

share1.1.2: Remove mct and other unused code, add nuopc_shr_methods add github action for unit testing
share1.1.1: Add m_MergeSorts from mpeu for sort routines used in cam
share1.1.0: Add GitHub pfunit tests


==============================================================
Tag name: cesm3_0_beta01
Originator(s): CSEG
Expand Down
Loading

0 comments on commit dd74438

Please sign in to comment.