forked from ESCOMP/CAM
-
Notifications
You must be signed in to change notification settings - Fork 20
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #94 from gold2718/UpdateNoresmBranch
Summary: Update noresm_develop branch to cam6_3_123 Contributors: gold2718 Reviewers: oyvindseland Purpose of changes: Aid in the implementation of the new Oslo chemistry and aerosol package by bring in relevant changes from ESCOMP/CAM Github PR URL: #94 Changes made to build system: None Changes made to the namelist: New defaults for (prototype) CAM7 and new options for Frierson gray radiation Changes to the defaults for the boundary datasets: None Substantial timing or memory changes: None Almost all of these changes are changes made to ESCOMP/CAM between cam6_3_112 and cam6_3_123. Below is a list of the files that differ from cam6_3_123 - .gitignore - Ignore HEMCO source - Externals.cfg - Externals_CAM.cfg - NorESM externals including CAM-Nor-phys - bld/config_files/definition.xml - bld/configure - Changes for CAM-Nor-phys (NF compsts). - bld/namelist_files/namelist_defaults_cam.xml - bld/namelist_files/namelist_definition.xml - Addition of low-res compset data for testing - Conversion of input files to CDF5 format - cime_config/config_component.xml - Configuration options for NF compsets - cime_config/config_compsets.xml - Addition of NF compsets, remove incorrect `science_support` tags. - cime_config/testdefs/testlist_cam.xml - NorESM-specific testlist including for NF compsets. Tests: - aux_cam: Every test had (expected) namelist and baseline changes but were otherwise fine Issues addressed by this PR: closes #88
- Loading branch information
Showing
106 changed files
with
9,457 additions
and
4,537 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,72 +1,80 @@ | ||
[chem_proc] | ||
local_path = chem_proc | ||
protocol = git | ||
repo_url = https://github.com/ESCOMP/CHEM_PREPROCESSOR.git | ||
tag = chem_proc5_0_05 | ||
repo_url = https://github.com/ESCOMP/CHEM_PREPROCESSOR.git | ||
local_path = chem_proc | ||
required = True | ||
|
||
[carma] | ||
local_path = src/physics/carma/base | ||
protocol = git | ||
repo_url = https://github.com/ESCOMP/CARMA_base.git | ||
tag = carma4_00 | ||
repo_url = https://github.com/ESCOMP/CARMA_base.git | ||
local_path = src/physics/carma/base | ||
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 | ||
repo_url = https://github.com/CFMIP/COSPv2.0/tags/ | ||
local_path = src/physics/cosp2/src | ||
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_20230330_branchtag/src/CLUBB_core | ||
repo_url = https://github.com/larson-group/clubb_release/tags/ | ||
local_path = src/physics/clubb | ||
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_20230330_branchtag/src/SILHS | ||
repo_url = https://github.com/larson-group/clubb_release/tags/ | ||
local_path = src/physics/silhs | ||
required = True | ||
|
||
[pumas] | ||
local_path = src/physics/pumas | ||
protocol = git | ||
repo_url = https://github.com/ESCOMP/PUMAS | ||
tag = pumas_cam-release_v1.29 | ||
repo_url = https://github.com/ESCOMP/PUMAS | ||
local_path = src/physics/pumas | ||
required = True | ||
|
||
[pumas-frozen] | ||
local_path = src/physics/pumas-frozen | ||
protocol = git | ||
repo_url = https://github.com/ESCOMP/PUMAS | ||
tag = pumas_cam-release_v1.17_rename | ||
repo_url = https://github.com/ESCOMP/PUMAS | ||
local_path = src/physics/pumas-frozen | ||
required = True | ||
|
||
[ali_arms] | ||
local_path = src/physics/ali_arms | ||
protocol = git | ||
tag = ALI_ARMS_v1.0.1 | ||
repo_url = https://github.com/ESCOMP/ALI-ARMS | ||
tag = ALI_ARMS_v1.0.0 | ||
local_path = src/physics/ali_arms | ||
required = True | ||
|
||
[atmos_phys] | ||
tag = atmos_phys0_00_011 | ||
protocol = git | ||
tag = atmos_phys0_00_011 | ||
repo_url = https://github.com/NCAR/atmospheric_physics | ||
required = True | ||
local_path = src/atmos_phys | ||
required = True | ||
|
||
[camnor_phys] | ||
tag = camnor_noresm_v0.0.1 | ||
protocol = git | ||
tag = camnor_noresm_v0.0.3 | ||
repo_url = https://github.com/NorESMhub/CAM-Nor-physics | ||
required = True | ||
local_path = src/physics/camnor_phys | ||
required = True | ||
|
||
[hemco] | ||
protocol = git | ||
tag = hemco-cesm1_2_0_hemco3_6_2_cesm | ||
repo_url = https://github.com/ESCOMP/HEMCO_CESM.git | ||
local_path = src/hemco | ||
required = True | ||
externals = Externals_HCO.cfg | ||
|
||
[externals_description] | ||
schema_version = 1.0.0 | ||
schema_version = 1.0.01 |
Oops, something went wrong.