Skip to content

Commit

Permalink
Merge pull request #1 from ESCOMP/master
Browse files Browse the repository at this point in the history
update my ctsm fork to latest
  • Loading branch information
jtruesdal authored May 7, 2020
2 parents 08a4b8d + 8265b77 commit 751a2ce
Show file tree
Hide file tree
Showing 342 changed files with 49,280 additions and 16,512 deletions.
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
*.svg filter=lfs diff=lfs merge=lfs -text
*.png filter=lfs diff=lfs merge=lfs -text
*.jpg filter=lfs diff=lfs merge=lfs -text
*.jpeg filter=lfs diff=lfs merge=lfs -text
*.gif filter=lfs diff=lfs merge=lfs -text
*.pdf filter=lfs diff=lfs merge=lfs -text
36 changes: 0 additions & 36 deletions .github/ISSUE_TEMPLATE/02_support_needed.md

This file was deleted.

File renamed without changes.
5 changes: 5 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
blank_issues_enabled: true
contact_links:
- name: CESM forums
url: https://xenforo.cgd.ucar.edu/cesm/
about: For support with model use, troubleshooting, etc., please use the CTSM forum
20 changes: 20 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,23 @@ manage_externals.log
*.swp
*~

# vim files (from https://github.com/github/gitignore/blob/master/Global/Vim.gitignore)
# Swap
[._]*.s[a-v][a-z]
[._]*.sw[a-p]
[._]s[a-rt-v][a-z]
[._]ss[a-gi-z]
[._]sw[a-p]
# Session
Session.vim
# Temporary
.netrwhist
# (removed *~ because it is listed above)
# Auto-generated tag files
tags
# Persistent undo
[._]*.un~

# mac files
.DS_Store

Expand Down Expand Up @@ -73,6 +90,9 @@ clm.input_data_list
clm.input_data_list.previous
*.stdout.txt.o*

# mksurfdata unit tests
unit_test_build

# Tools executables
/tools/mksurfdata_map/mksurfdata_map
/tools/mkprocdata_map/mkprocdata_map
Expand Down
2 changes: 2 additions & 0 deletions .lfsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[lfs]
fetchexclude = *
75 changes: 0 additions & 75 deletions Copyright

This file was deleted.

12 changes: 6 additions & 6 deletions Externals.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@ required = True
[cism]
local_path = components/cism
protocol = git
repo_url = https://github.com/ESCOMP/cism-wrapper
repo_url = https://github.com/ESCOMP/CISM-wrapper
tag = cism2_1_68
externals = Externals_CISM.cfg
required = True

[rtm]
local_path = components/rtm
protocol = git
repo_url = https://github.com/ESCOMP/rtm
tag = rtm1_0_70
repo_url = https://github.com/ESCOMP/RTM
tag = rtm1_0_71
required = True

[mosart]
local_path = components/mosart
protocol = git
repo_url = https://github.com/ESCOMP/mosart
tag = mosart1_0_35
repo_url = https://github.com/ESCOMP/MOSART
tag = mosart1_0_36
required = True

[cime]
local_path = cime
protocol = git
repo_url = https://github.com/ESMCI/cime
tag = cime5.8.15
tag = cime5.8.19
externals = ../Externals_cime.cfg
required = True

Expand Down
8 changes: 4 additions & 4 deletions Externals_CLM.cfg
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
[fates]
local_path = src/fates
protocol = git
repo_url = https://github.com/NCAR/fates-release
tag = fates_s1.8.1_a3.0.0_rev2
repo_url = https://github.com/NGEET/fates
tag = sci.1.30.0_api.8.0.0
required = True

[PTCLM]
local_path = tools/PTCLM
protocol = git
repo_url = https://github.com/ESCOMP/ptclm
tag = PTCLM2_180611
repo_url = https://github.com/ESCOMP/PTCLM
tag = PTCLM2_20200121
required = True

[externals_description]
Expand Down
2 changes: 1 addition & 1 deletion Externals_cime.cfg
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[cmeps]
hash = 181ff1ed9dfb279e619e8a2173f43baf7bf1dce3
hash = 253f612acae07b2b1dc73c84f1bb30b8e1b86ddd
protocol = git
repo_url = https://github.com/ESCOMP/CMEPS.git
local_path = src/drivers/nuopc/
Expand Down
4 changes: 4 additions & 0 deletions README
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,10 @@ tools/ncl_scripts ------------ Directory of NCL and perl scripts to do various
tasks. Most notably to plot perturbation error growth
testing and to extract regional information from
global datasets for single-point/regional simulations.
tools/contrib ----------------- Miscellansous useful scripts for pre and post processing
as well as case management of CTSM. These scripts are
contributed by users and may not be as well tested or
supported as other tools.


=============================================================================================
Expand Down
8 changes: 8 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
CTSM
====

.. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.3739617.svg
:target: https://doi.org/10.5281/zenodo.3739617

The Community Terrestrial Systems Model.

This includes the Community Land Model (CLM5.0 and CLM4.5) of the Community Earth System Model.
Expand All @@ -23,6 +26,11 @@ and

https://github.com/ESCOMP/ctsm/wiki/Recommended-git-setup

For support with model use, troubleshooting, etc., please use the CTSM forum (or other
appropriate forum) here:

https://xenforo.cgd.ucar.edu/cesm/

To get updates on CTSM tags and important notes on CTSM developments
join our low traffic email list:

Expand Down
Loading

0 comments on commit 751a2ce

Please sign in to comment.