From f7d431b31a21911116ccd924f9b67d551866274e Mon Sep 17 00:00:00 2001 From: huitang-earth Date: Wed, 28 Apr 2021 13:54:35 +0200 Subject: [PATCH 1/7] adding information about the branches in NorESMhub/CTSM repository --- README.md | 17 +++++++++++++++++ README.rst | 31 ------------------------------- 2 files changed, 17 insertions(+), 31 deletions(-) create mode 100644 README.md delete mode 100644 README.rst diff --git a/README.md b/README.md new file mode 100644 index 0000000000..8425984da9 --- /dev/null +++ b/README.md @@ -0,0 +1,17 @@ +# Branches in NorESMhub/CTSM + +This repository has the following CTSM branches working with NorESM2: + +- *master* - keep track with the master branch of [ESCOMP/CTSM](https://github.com/ESCOMP/CTSM). + - This branch is used by [NorESMhub/NorESM_LandSites_Platform](https://github.com/NorESMhub/NorESM_LandSites_Platform) + - This branch can be used for running the most recent version of [FATES](https://github.com/NGEET/fates) + +- *release-clm5.0.14-Nor* - The working branch used by NorESM2. Currently, all the pull requests should be sent to this branch. + - Tags being developed from this branch are: + - release-clm5.0.14-Nor_v1.0.2 - the tag working with NorESM2 master branch and tags: release-noresm2.0.4, release-noresm2.0.3 + - release-clm5.0.14-Nor_v1.0.1 - the tag working with NorESM2 tags: release-noresm2.0.2 + - release-clm5.0.14-Nor_v1.0.0 - the tag working with NorESM2 tags: release-noresm2.0.1, release-noresm2.0.0 + +- *release-cesm2.2.01-Nor* - The branch used for the next phase of NorESM2 (under development). + +- If you have problems with using this repository, please use [issue](https://github.com/NorESMhub/CTSM/issues) to send your questions. diff --git a/README.rst b/README.rst deleted file mode 100644 index 6569f5f809..0000000000 --- a/README.rst +++ /dev/null @@ -1,31 +0,0 @@ -==== -CTSM -==== - -The Community Terrestrial Systems Model. - -This includes the Community Land Model (CLM5.0 and CLM4.5) of the Community Earth System Model. - -For documentation, quick start, diagnostics, model output and -references, see - -http://www.cesm.ucar.edu/models/cesm2.0/land/ - -and - -https://escomp.github.io/ctsm-docs/ - -For help with how to work with CTSM in git, see - -https://github.com/ESCOMP/ctsm/wiki/Getting-started-with-CTSM-in-git - -and - -https://github.com/ESCOMP/ctsm/wiki/Recommended-git-setup - -To get updates on CTSM tags and important notes on CTSM developments -join our low traffic email list: - -https://groups.google.com/a/ucar.edu/forum/#!forum/ctsm-dev - -(Send email to ctsm-software@ucar.edu if you have problems with any of this) From 5aa630df56d4275a8a13b58c041fbfc7995c5c51 Mon Sep 17 00:00:00 2001 From: huitang-earth Date: Wed, 28 Apr 2021 14:05:05 +0200 Subject: [PATCH 2/7] modify the font in README.md --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 8425984da9..a6cc0714d4 100644 --- a/README.md +++ b/README.md @@ -2,16 +2,16 @@ This repository has the following CTSM branches working with NorESM2: -- *master* - keep track with the master branch of [ESCOMP/CTSM](https://github.com/ESCOMP/CTSM). +- **master** - keep track with the master branch of [ESCOMP/CTSM](https://github.com/ESCOMP/CTSM). - This branch is used by [NorESMhub/NorESM_LandSites_Platform](https://github.com/NorESMhub/NorESM_LandSites_Platform) - This branch can be used for running the most recent version of [FATES](https://github.com/NGEET/fates) -- *release-clm5.0.14-Nor* - The working branch used by NorESM2. Currently, all the pull requests should be sent to this branch. +- **release-clm5.0.14-Nor** - The working branch used by NorESM2. Currently, all the pull requests should be sent to this branch. - Tags being developed from this branch are: - release-clm5.0.14-Nor_v1.0.2 - the tag working with NorESM2 master branch and tags: release-noresm2.0.4, release-noresm2.0.3 - release-clm5.0.14-Nor_v1.0.1 - the tag working with NorESM2 tags: release-noresm2.0.2 - release-clm5.0.14-Nor_v1.0.0 - the tag working with NorESM2 tags: release-noresm2.0.1, release-noresm2.0.0 -- *release-cesm2.2.01-Nor* - The branch used for the next phase of NorESM2 (under development). +- **release-cesm2.2.01-Nor** - The branch used for the next phase of NorESM2 (under development). - If you have problems with using this repository, please use [issue](https://github.com/NorESMhub/CTSM/issues) to send your questions. From a60d9c7f518a80d07168a03bc8b2e3849f8bdc27 Mon Sep 17 00:00:00 2001 From: huitang-earth Date: Thu, 29 Apr 2021 21:06:26 +0200 Subject: [PATCH 3/7] Update README.md Co-authored-by: Michael Schulz --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a6cc0714d4..d55a46fcf6 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Branches in NorESMhub/CTSM -This repository has the following CTSM branches working with NorESM2: +This repository has the following CTSM branches intended to facilitate working with NorESM2: - **master** - keep track with the master branch of [ESCOMP/CTSM](https://github.com/ESCOMP/CTSM). - This branch is used by [NorESMhub/NorESM_LandSites_Platform](https://github.com/NorESMhub/NorESM_LandSites_Platform) From a79c0042109fccca0fdec0c956ed6c96f61e0b67 Mon Sep 17 00:00:00 2001 From: huitang-earth Date: Thu, 29 Apr 2021 21:06:42 +0200 Subject: [PATCH 4/7] Update README.md Co-authored-by: Michael Schulz --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d55a46fcf6..ab9490a5d1 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ This repository has the following CTSM branches intended to facilitate working w - This branch is used by [NorESMhub/NorESM_LandSites_Platform](https://github.com/NorESMhub/NorESM_LandSites_Platform) - This branch can be used for running the most recent version of [FATES](https://github.com/NGEET/fates) -- **release-clm5.0.14-Nor** - The working branch used by NorESM2. Currently, all the pull requests should be sent to this branch. +- **release-clm5.0.14-Nor** - The working branch used by NorESM2. Non-answer changing (with respect to NorESM2s CMIP6 version) pull requests should be sent to this branch. For other changes, new branches discuss with CTSM and NorESM core teams. - Tags being developed from this branch are: - release-clm5.0.14-Nor_v1.0.2 - the tag working with NorESM2 master branch and tags: release-noresm2.0.4, release-noresm2.0.3 - release-clm5.0.14-Nor_v1.0.1 - the tag working with NorESM2 tags: release-noresm2.0.2 From 3203ebe79c353d1647ed9e3c5c246ba4b522f221 Mon Sep 17 00:00:00 2001 From: huitang-earth Date: Thu, 29 Apr 2021 21:07:09 +0200 Subject: [PATCH 5/7] Update README.md Co-authored-by: Michael Schulz --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ab9490a5d1..592e752901 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ This repository has the following CTSM branches intended to facilitate working w - **release-clm5.0.14-Nor** - The working branch used by NorESM2. Non-answer changing (with respect to NorESM2s CMIP6 version) pull requests should be sent to this branch. For other changes, new branches discuss with CTSM and NorESM core teams. - Tags being developed from this branch are: - - release-clm5.0.14-Nor_v1.0.2 - the tag working with NorESM2 master branch and tags: release-noresm2.0.4, release-noresm2.0.3 + - release-clm5.0.14-Nor_v1.0.2 - the tag working with NorESM2 noresm2 tags: release-noresm2.0.4, release-noresm2.0.3 - release-clm5.0.14-Nor_v1.0.1 - the tag working with NorESM2 tags: release-noresm2.0.2 - release-clm5.0.14-Nor_v1.0.0 - the tag working with NorESM2 tags: release-noresm2.0.1, release-noresm2.0.0 From d330768813bcc5576f4f9880ca22430d044763d5 Mon Sep 17 00:00:00 2001 From: huitang-earth Date: Thu, 29 Apr 2021 21:07:41 +0200 Subject: [PATCH 6/7] Update README.md Co-authored-by: Michael Schulz --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 592e752901..f8b1bdc4d4 100644 --- a/README.md +++ b/README.md @@ -12,6 +12,7 @@ This repository has the following CTSM branches intended to facilitate working w - release-clm5.0.14-Nor_v1.0.1 - the tag working with NorESM2 tags: release-noresm2.0.2 - release-clm5.0.14-Nor_v1.0.0 - the tag working with NorESM2 tags: release-noresm2.0.1, release-noresm2.0.0 +- **release-cesm2.2** - Copy of ESCOMP branch, base for release-cesm2.2.01-Nor branch. - **release-cesm2.2.01-Nor** - The branch used for the next phase of NorESM2 (under development). - If you have problems with using this repository, please use [issue](https://github.com/NorESMhub/CTSM/issues) to send your questions. From 5ff8722731b7a07a2a2a02eb82b101ff0dd72fa4 Mon Sep 17 00:00:00 2001 From: huitang-earth Date: Thu, 29 Apr 2021 21:08:01 +0200 Subject: [PATCH 7/7] Update README.md Co-authored-by: Michael Schulz --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f8b1bdc4d4..3019f33162 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ This repository has the following CTSM branches intended to facilitate working w - This branch can be used for running the most recent version of [FATES](https://github.com/NGEET/fates) - **release-clm5.0.14-Nor** - The working branch used by NorESM2. Non-answer changing (with respect to NorESM2s CMIP6 version) pull requests should be sent to this branch. For other changes, new branches discuss with CTSM and NorESM core teams. - - Tags being developed from this branch are: + - Tags in this branch help identifying the link to the NorESM2 releases: - release-clm5.0.14-Nor_v1.0.2 - the tag working with NorESM2 noresm2 tags: release-noresm2.0.4, release-noresm2.0.3 - release-clm5.0.14-Nor_v1.0.1 - the tag working with NorESM2 tags: release-noresm2.0.2 - release-clm5.0.14-Nor_v1.0.0 - the tag working with NorESM2 tags: release-noresm2.0.1, release-noresm2.0.0