Skip to content

Commit

Permalink
updated README.md (taken from master)
Browse files Browse the repository at this point in the history
  • Loading branch information
DirkOlivie committed May 8, 2021
1 parent 237f296 commit a1bd013
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,27 @@ CAM code is stored in this repository on branches other than master. The detail
Please see the [wiki](https://github.com/ESCOMP/CAM/wiki) for complete documentation on CAM, getting started with git and how to contribute to CAM's development.

This repository has three CAM branches:
* master - contains this readme and the Code of Conduct information
* cam_cesm2_1_release - contains the current CESM2.1 CAM code
* cam_development - contains the current CAM development code (see the important note below before using this branch)
* **master** - contains this readme and the Code of Conduct information
* **cam_cesm2_1_release** - contains the current CESM2.1 CAM code
* **cam_development** - contains the current CAM development code (see the important note below before using this branch)

# CAM-Nor: CAM version in the Norwegian Earth System Model

This repository has the following CAM-Nor branches:

* cam_cesm2_1_rel_05-Nor - contains the CAM6-Nor code, based on CESM2.1 CAM code. Contains aerotab and further changes as described by Seland et al. 2020, with tags
* **cam_cesm2_1_rel_05-Nor** - contains the CAM6-Nor code, based on CESM2.1 CAM code. Contains aerotab and further changes as described by Seland et al. 2020, with tags

- cam_cesm2_1_rel_05-Nor_v1.0.1 -- CAM6-Nor version, initial preliminary release of CMIP6 version, May 11 2020

- cam_cesm2_1_rel_05-Nor_v1.0.2 -- CAM6-Nor version, CMIP6 bit-identical version (if used on fram, and as MM), June 2020

* cam_cesm2_1_rel_05-Nor-SpAer - based on cam_cesm2_1_rel_05-Nor, about to contain simple plume aerosol model code
* **cam_cesm2_1_rel_05-Nor-SpAer** - based on cam_cesm2_1_rel_05-Nor, about to contain simple plume aerosol model code

* **cam_cesm2_1_rel_05-Nor_v1.0.2_keyClim-withoutanthraer** - based on cam_cesm2_1_rel_05-Nor (branched off at tag cam_cesm2_1_rel_05-Nor_v1.0.2) : related to version used in project KeyClim for simulation without anthropogenic aerosol (only natural aerosol)

* **cam-Nor-dev** - based on cam_cesm2_1_rel_05-Nor (branched off at tag cam_cesm2_1_rel_05-Nor_v1.0.2) : post-CMIP6 development version of CAM6-Nor (including bugfixes, new developments, answer-changes modifications, ...)

* **feature-hamocc-vsls** - based on cam_cesm2_1_rel_05-Nor (branched off at tag cam_cesm2_1_rel_05-Nor_v1.0.2) : related to version developed in project KeyClim for simulation of Very Short Lived Spiecies (VSLS) in ocean and atmosphere.

### CAM-Nor and NorESM documentation https://noresm-docs.readthedocs.io/en/noresm2/

Expand Down Expand Up @@ -48,3 +54,4 @@ git checkout cam6_2_000
### CAM Documentation - https://ncar.github.io/CAM/doc/build/html/index.html

### CAM6 namelist settings - http://www.cesm.ucar.edu/models/cesm2/settings/current/cam_nml.html

0 comments on commit a1bd013

Please sign in to comment.