Skip to content

Commit

Permalink
Merge branch 'CESM-GC_rebased_on_cam6_0_034' into hplin/camchem_fjx_v2
Browse files Browse the repository at this point in the history
  • Loading branch information
jimmielin committed Feb 2, 2024
2 parents 520fef1 + 4442c2a commit 96be57f
Show file tree
Hide file tree
Showing 340 changed files with 33,773 additions and 24,549 deletions.
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ src/physics/clubb
src/physics/cosp2/src
src/physics/silhs
src/chemistry/geoschem/geoschem_src
src/hemco
src/physics/pumas
src/physics/pumas-frozen
src/dynamics/fv3/atmos_cubed_sphere
Expand Down
22 changes: 11 additions & 11 deletions Externals.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ccs_config]
tag = ccs_config_cesm0.0.49
tag = ccs_config_cesm0.0.82
protocol = git
repo_url = https://github.com/ESMCI/ccs_config_cesm
local_path = ccs_config
Expand All @@ -13,37 +13,37 @@ local_path = components/cice5
required = True

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

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

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

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

[share]
tag = share1.0.16
tag = share1.0.17
protocol = git
repo_url = https://github.com/ESCOMP/CESM_share
local_path = share
Expand All @@ -57,29 +57,29 @@ local_path = libraries/mct
required = True

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

[cime]
tag = cime6.0.82
tag = cime6.0.175
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.dev114
tag = ctsm5.1.dev142
protocol = git
repo_url = https://github.com/ESCOMP/CTSM
local_path = components/clm
Expand All @@ -96,7 +96,7 @@ externals = Externals_FMS.cfg
required = True

[mosart]
tag = mosart1_0_47
tag = mosart1_0_48
protocol = git
repo_url = https://github.com/ESCOMP/MOSART
local_path = components/mosart
Expand Down
39 changes: 17 additions & 22 deletions Externals_CAM.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,30 @@ required = True
local_path = src/physics/carma/base
protocol = git
repo_url = https://github.com/ESCOMP/CARMA_base.git
tag = carma4_00
tag = carma4_01
required = True

[cosp2]
local_path = src/physics/cosp2/src
protocol = svn
repo_url = https://github.com/CFMIP/COSPv2.0/tags/
tag = v2.1.4cesm/src
protocol = git
repo_url = https://github.com/CFMIP/COSPv2.0
sparse = ../.cosp_sparse_checkout
tag = v2.1.4cesm
required = True

[clubb]
local_path = src/physics/clubb
protocol = svn
repo_url = https://github.com/larson-group/clubb_release/tags/
tag = clubb_4ncar_20221129_59cb19f/src/CLUBB_core
required = True

[silhs]
local_path = src/physics/silhs
protocol = svn
repo_url = https://github.com/larson-group/clubb_release/tags/
tag = clubb_4ncar_20221129_59cb19f/src/SILHS
protocol = git
repo_url = https://github.com/larson-group/clubb_release
sparse = ../.clubb_sparse_checkout
tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag
required = True

[pumas]
local_path = src/physics/pumas
protocol = git
repo_url = https://github.com/ESCOMP/PUMAS
tag = pumas_cam-release_v1.28
tag = pumas_cam-release_v1.35
required = True

[pumas-frozen]
Expand All @@ -51,13 +46,13 @@ required = True
local_path = src/physics/ali_arms
protocol = git
repo_url = https://github.com/ESCOMP/ALI-ARMS
tag = ALI_ARMS_v1.0.0
tag = ALI_ARMS_v1.0.1
required = True

[atmos_phys]
tag = atmos_phys0_00_011
tag = atmos_phys0_02_000
protocol = git
repo_url = https://github.com/NCAR/atmospheric_physics
repo_url = https://github.com/ESCOMP/atmospheric_physics
required = True
local_path = src/atmos_phys

Expand All @@ -73,19 +68,19 @@ local_path = src/dynamics/mpas/dycore
protocol = git
repo_url = https://github.com/MPAS-Dev/MPAS-Model.git
sparse = ../.mpas_sparse_checkout
hash = ff76a231
hash = b8c33daa
required = True

[geoschem]
tag = 14.1.1
local_path = src/chemistry/geoschem/geoschem_src
protocol = git
repo_url = https://github.com/geoschem/geos-chem.git
local_path = src/chemistry/geoschem/geoschem_src
tag = 14.1.2
required = True

[hemco]
local_path = src/hemco
tag = hemco-cesm1_1_2_hemco3_6_2
tag = hemco-cesm1_2_1_hemco3_6_3_cesm
protocol = git
repo_url = https://github.com/ESCOMP/HEMCO_CESM.git
required = True
Expand Down
Loading

0 comments on commit 96be57f

Please sign in to comment.