Merge pull request #163 from mvertens/feature/UpdateNoresmBranch

Update CAM code to cam6_3_158

Summary: Update noresm_develop CAM code to cam6_3_158 and point to updated oslo-aero changes as well

Contributors: mvertens, gold2718

Reviewers: gold2718

Updated OSLO Aero and camnor_phys to be compatible with CAM changes

Updated aux_cam_noresm test was run and new baselines are at /cluster/shared/noresm/noresm_baselines/cam_develop/noresm2_5_alpha04

Analysis here: https://ns2345k.web.sigma2.no/datalake/olivie/noresm2.5/atm.noresm2.5_atm.v1.0.pdf

.gitignore

@@ -11,8 +11,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
 src/hemco
 libraries/FMS

Externals.cfg

@@ -4,7 +4,7 @@
 
 [parallelio]
 protocol = git
-tag = pio2_5_10
+tag = pio2_6_2
 repo_url = https://github.com/NCAR/ParallelIO
 local_path = libraries/parallelio
 required = True

Externals_CAM.cfg

@@ -7,7 +7,7 @@ required = True
 
 [carma]
 protocol = git
-tag = carma4_00
+tag = carma4_01
 repo_url = https://github.com/ESCOMP/CARMA_base.git
 local_path = src/physics/carma/base
 required = True
@@ -22,15 +22,15 @@ required = True
 
 [clubb]
 protocol = git
-tag = clubb_4ncar_20221129_59cb19f_20230330_branchtag
+tag = clubb_4ncar_20231115_5406350
 repo_url = https://github.com/larson-group/clubb_release
 local_path = src/physics/clubb
 sparse = ../.clubb_sparse_checkout
 required = True
 
 [pumas]
 protocol = git
-tag = pumas_cam-release_v1.29
+tag = pumas_cam-release_v1.35
 repo_url = https://github.com/ESCOMP/PUMAS
 local_path = src/physics/pumas
 required = True
@@ -51,32 +51,46 @@ required = True
 
 [atmos_phys]
 protocol = git
-tag = atmos_phys0_00_011
+tag = atmos_phys0_02_006
 repo_url = https://github.com/NCAR/atmospheric_physics
 local_path = src/atmos_phys
 required = True
 
 [camnor_phys]
 protocol = git
-tag = 2aad4ca
+hash = 1f23c7c
 repo_url = https://github.com/NorESMhub/CAM-Nor-physics
 local_path = src/physics/camnor_phys
 required = True
 
 [oslo_aero]
 protocol = git
-tag = noresm_oslo_aero_v1
+hash = 87f76b3
 repo_url = https://github.com/NorESMhub/OSLO_AERO
 local_path = src/chemistry/oslo_aero
 required = True
 
 [hemco]
 protocol = git
-tag = hemco-cesm1_2_0_hemco3_6_2_cesm
+tag = hemco-cesm1_2_1_hemco3_6_3_cesm
 repo_url = https://github.com/ESCOMP/HEMCO_CESM.git
 local_path = src/hemco
 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.01