Skip to content

Commit

Permalink
Merge branch 'cam_development' into Kate/new_clubb_112923
Browse files Browse the repository at this point in the history
  • Loading branch information
Katetc committed Mar 28, 2024
2 parents ad1c08e + 61b739e commit ede290d
Show file tree
Hide file tree
Showing 117 changed files with 17,799 additions and 10,868 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,11 @@ src/physics/carma/base
src/physics/clubb
src/physics/cosp2/src
src/physics/silhs
src/chemistry/geoschem/geoschem_src
src/physics/pumas
src/physics/pumas-frozen
src/physics/rrtmgp/data
src/physics/rrtmgp/ext
src/dynamics/fv3/atmos_cubed_sphere
libraries/FMS
libraries/mct
Expand Down
12 changes: 6 additions & 6 deletions Externals.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[ccs_config]
tag = ccs_config_cesm0.0.82
tag = ccs_config_cesm0.0.85
protocol = git
repo_url = https://github.com/ESMCI/ccs_config_cesm
local_path = ccs_config
Expand All @@ -21,14 +21,14 @@ externals = Externals.cfg
required = True

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

[cdeps]
tag = cdeps1.0.24
tag = cdeps1.0.26
protocol = git
repo_url = https://github.com/ESCOMP/CDEPS.git
local_path = components/cdeps
Expand All @@ -43,7 +43,7 @@ local_path = components/cpl7
required = True

[share]
tag = share1.0.17
tag = share1.0.18
protocol = git
repo_url = https://github.com/ESCOMP/CESM_share
local_path = share
Expand All @@ -64,7 +64,7 @@ local_path = libraries/parallelio
required = True

[cime]
tag = cime6.0.175
tag = cime6.0.217_httpsbranch02
protocol = git
repo_url = https://github.com/ESMCI/cime
local_path = cime
Expand All @@ -79,7 +79,7 @@ externals = Externals_CISM.cfg
required = True

[clm]
tag = ctsm5.1.dev142
tag = ctsm5.1.dev145
protocol = git
repo_url = https://github.com/ESCOMP/CTSM
local_path = components/clm
Expand Down
23 changes: 22 additions & 1 deletion Externals_CAM.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ tag = ALI_ARMS_v1.0.1
required = True

[atmos_phys]
tag = atmos_phys0_01_000
tag = atmos_phys0_02_000
protocol = git
repo_url = https://github.com/ESCOMP/atmospheric_physics
required = True
Expand All @@ -71,6 +71,13 @@ sparse = ../.mpas_sparse_checkout
hash = b8c33daa
required = True

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

[hemco]
local_path = src/hemco
tag = hemco-cesm1_2_1_hemco3_6_3_cesm
Expand All @@ -79,5 +86,19 @@ repo_url = https://github.com/ESCOMP/HEMCO_CESM.git
required = True
externals = Externals_HCO.cfg

[rte-rrtmgp]
local_path = src/physics/rrtmgp/ext
protocol = git
repo_url = https://github.com/earth-system-radiation/rte-rrtmgp.git
tag = v1.7
required = True

[rrtmgp-data]
local_path = src/physics/rrtmgp/data
protocol = git
repo_url = https://github.com/earth-system-radiation/rrtmgp-data.git
tag = v1.8
required = True

[externals_description]
schema_version = 1.0.0
49 changes: 0 additions & 49 deletions README_EXTERNALS

This file was deleted.

Loading

0 comments on commit ede290d

Please sign in to comment.