Skip to content

Commit

Permalink
Merge branch 'master' into cosima
Browse files Browse the repository at this point in the history
  • Loading branch information
micaeljtoliveira committed Aug 17, 2023
2 parents b7995b6 + 064022e commit 9fbdf91
Show file tree
Hide file tree
Showing 27 changed files with 4,097 additions and 2,445 deletions.
2,109 changes: 2,109 additions & 0 deletions ChangeLog

Large diffs are not rendered by default.

42 changes: 28 additions & 14 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local_path = ccs_config
required = True

[cam]
tag = cam6_3_078
tag = cam6_3_119
protocol = git
repo_url = https://github.com/ESCOMP/CAM
local_path = components/cam
Expand All @@ -21,42 +21,49 @@ local_path = components/cice5
required = True

[cice6]
tag = cesm_cice6_2_0_34
tag = cesm_cice6_4_1_9
protocol = git
repo_url = https://github.com/ESCOMP/CESM_CICE
local_path = components/cice
externals = Externals.cfg
required = True

[cmeps]
tag = cmeps0.13.78
tag = cmeps0.14.35
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
local_path = components/cmeps
required = True

[cdeps]
tag = cdeps0.12.65
tag = cdeps1.0.19
protocol = git
repo_url = https://github.com/ESCOMP/CDEPS.git
local_path = components/cdeps
externals = Externals_CDEPS.cfg
required = True

[cpl7]
tag = cpl7.0.14
tag = cpl77.0.5
protocol = git
repo_url = https://github.com/ESCOMP/CESM_CPL7andDataComps
local_path = components/cpl7
required = True

[share]
tag = share1.0.13
tag = share1.0.17
protocol = git
repo_url = https://github.com/ESCOMP/CESM_share
local_path = share
required = True

[SLIM]
tag = slim0.4.002_cesm2_3_beta15
protocol = git
repo_url = https://github.com/ESCOMP/SimpleLand
local_path = components/slim
required = True

[mct]
tag = MCT_2.11.0
protocol = git
Expand All @@ -65,29 +72,29 @@ local_path = libraries/mct
required = True

[parallelio]
tag = pio2_5_9
tag = pio2_5_10
protocol = git
repo_url = https://github.com/NCAR/ParallelIO
local_path = libraries/parallelio
required = True

[cime]
tag = cime6.0.64
tag = cime6.0.149
protocol = git
repo_url = https://github.com/ESMCI/cime
local_path = cime
required = True

[cism]
tag = cismwrap_2_1_95
tag = cismwrap_2_1_96
protocol = git
repo_url = https://github.com/ESCOMP/CISM-wrapper
local_path = components/cism
externals = Externals_CISM.cfg
required = True

[clm]
tag = ctsm5.1.dev107
tag = ctsm5.1.dev130
protocol = git
repo_url = https://github.com/ESCOMP/CTSM
local_path = components/clm
Expand All @@ -102,6 +109,13 @@ local_path = libraries/FMS
externals = Externals_FMS.cfg
required = False

[mizuRoute]
tag = cesm-coupling.n01_v2.1.0
protocol = git
repo_url = https://github.com/ESCOMP/mizuRoute
local_path = components/mizuroute
required = True

[mom]
tag = cosima
protocol = git
Expand All @@ -111,14 +125,14 @@ externals = Externals.cfg
required = False

[mosart]
tag = mosart1_0_45
tag = mosart1_0_48
protocol = git
repo_url = https://github.com/ESCOMP/MOSART
local_path = components/mosart
required = True

[pop]
tag = cesm_pop_2_1_20220322
tag = cesm_pop_2_1_20230511
protocol = git
repo_url = https://github.com/ESCOMP/POP2-CESM
local_path = components/pop
Expand All @@ -140,14 +154,14 @@ local_path = components/rtm
required = True

[ww3]
tag = ww3_220322
tag = ww3_221108
protocol = git
repo_url = https://github.com/ESCOMP/WW3-CESM
local_path = components/ww3
required = True

[ww3dev]
tag = main_0.0.4
tag = main_0.0.10
protocol = git
repo_url = https://github.com/ESCOMP/WW3_interface
local_path = components/ww3dev
Expand Down
5 changes: 5 additions & 0 deletions cime_config/config_compsets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,11 @@
<lname>1850_CAM60_CLM50%BGC-CROP_CICE_POP2%ECO_MOSART_CISM2%GRIS-NOEVOLVE_WW3_BGC%BDRD</lname>
</compset>

<compset>
<alias>BLT1850_v0c</alias>
<lname>1850_CAM%DEV%LT%GHGMAM4_CLM51%BGC-CROP_CICE_MOM6_MOSART_CISM2%GRIS-NOEVOLVE_WW3</lname>
</compset>

<compset>
<alias>BW1850</alias>
<lname>1850_CAM60%WCTS_CLM50%BGC-CROP_CICE_POP2%ECO%NDEP_MOSART_CISM2%GRIS-NOEVOLVE_WW3</lname>
Expand Down
Loading

0 comments on commit 9fbdf91

Please sign in to comment.