Skip to content

Commit

Permalink
Update to CICE master
Browse files Browse the repository at this point in the history
  • Loading branch information
dabail10 committed Jun 27, 2018
2 parents 7cb653a + 360c474 commit 017fdf6
Show file tree
Hide file tree
Showing 222 changed files with 7,347 additions and 5,064 deletions.
Binary file removed .DS_Store
Binary file not shown.
21 changes: 13 additions & 8 deletions .github/PULL_REQUEST_TEMPLATE
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
[Remove this and add a short summary line]:
Developer(s):
Are the code changes bit for bit, different at roundoff level, or more substantial?
Is the documentation being updated with this PR? (Y/N)
If not, does the documentation need to be updated separately? (Y/N)
"Documentation" includes information on the wiki and .rst files in doc/source/,
which are used to create the online technical docs at https://cice-consortium.github.io/CICE/
Please suggest code reviewers in the column at right.
Other Relevant Details:

- Developer(s):

- Please suggest code Pull Request reviewers in the column at right.

- Are the code changes bit for bit, different at roundoff level, or more substantial?

- Is the documentation being updated with this PR? (Y/N)
If not, does the documentation need to be updated separately at a later time? (Y/N)
Note: "Documentation" includes information on the wiki and .rst files in doc/source/,
which are used to create the online technical docs at https://readthedocs.org/projects/cice-consortium-cice/.

- Other Relevant Details:
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@
# Ignore doc/build
# these are stored in gh-pages orphan branch
doc/build

# Ignore macOS cache files
.DS_Store
45 changes: 45 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
language: cpp

sudo: false

addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- tcsh
- pkg-config
- netcdf-bin libnetcdf-dev #libnetcdff-dev (only required on Debian)
- gfortran
- openmpi-bin libopenmpi-dev
- wget
#- lftp

install:
# Fetch CICE grid files and initial conditions
- "wget ftp://ftp.cgd.ucar.edu/archive/Model-Data/CICE/CICE_data_ic_grid.tar.gz &&
tar xvfz CICE_data_ic_grid.tar.gz -C ~"

# Fetch forcing data
- "wget ftp://ftp.cgd.ucar.edu/archive/Model-Data/CICE/CICE_data_forcing_gx3_all.tar.gz &&
tar xvfz CICE_data_forcing_gx3_all.tar.gz -C ~"

# Mirror entire data folder
#- "lftp ftp://anonymous:travis@travis-ci.org@ftp.cgd.ucar.edu
#-e 'mirror /archive/Model-Data/CICE/ ~/ICEPACK_INPUTDATA; quit'"

script:
- "./cice.setup --suite travis_suite --testid travisCItest
--mach travisCI --env gnu;
cd testsuite.travisCItest &&
./results.csh"

notifications:
email: false

after_failure:
- "for runlog in $TRAVIS_BUILD_DIR/travis_suite.travisCItest/*.travisCItest/logs/cice.runlog.*; do
echo \"### Contents of $runlog ###\" && tail -n 100 $runlog; done"
#- "git config --global user.email 'travis@travis-ci.org' &&
#git config --global user.name 'ciceconsortium' &&
#./report_results.csh --travisCI"
39 changes: 11 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,39 +1,22 @@
[![Build Status](https://travis-ci.org/CICE-Consortium/CICE.svg?branch=master)](https://travis-ci.org/CICE-Consortium/CICE)
[![Documentation Status](https://readthedocs.org/projects/cice-consortium-cice/badge/?version=master)](http://cice-consortium-cice.readthedocs.io/en/master/?badge=master)

## Overview

This repository contains files needed to run versions 6 and higher of the sea ice model CICE, which is now maintained by the CICE Consortium. Versions prior to v6 are found in the [CICE-svn-trunk repository](https://github.com/CICE-Consortium/CICE-svn-trunk).
This repository contains the files and code needed to run the CICE sea ice numerical model starting with version 6. CICE is maintained by the CICE Consortium. Versions prior to v6 are found in the [CICE-svn-trunk repository](https://github.com/CICE-Consortium/CICE-svn-trunk).

CICE consists of a top level driver and dynamical core plus the Icepack column physics code, which is included in CICE as a git submodule. Because Icepack is a submodule of CICE, Icepack and CICE development are handled independently with respect to the github repositories even though development and testing may be done together.

## Obtaining CICE

If you expect to make any changes to the code, we recommend that you first fork both the CICE and Icepack repositories. Basic instructions for working with CICE and Icepack are found in the [Git Workflow Guidance](https://github.com/CICE-Consortium/About-Us/wiki/Git-Workflow-Guidance), linked from the wikis in the primary code repositories
https://github.com/CICE-Consortium/CICE/wiki
https://github.com/CICE-Consortium/Icepack/wiki

CICE may be obtained in several different ways: [not yet tested]
1. clone the full repository
See [Git Workflow Guidance](https://github.com/CICE-Consortium/About-Us/wiki/Git-Workflow-Guidance)
2. check out only a particular branch, version or tag
In the workflow for step 1 above, substitute
git clone -b branch_name --single-branch --recursive https://github.com/CICE-Consortium/CICE.git local_directory_name
or use svn
svn co https://github.com/CICE-Consortium/CICE/branch_name
where "branch name" can also be a version name
3. download a tarball for a particular version
[how]
If you expect to make any changes to the code, we recommend that you first fork both the CICE and Icepack repositories. Basic instructions for working with CICE and Icepack are found in the Git Workflow Guidance, linked from the Resource Index (below).

## More information
## Useful links
* **CICE wiki**: https://github.com/CICE-Consortium/CICE/wiki

Detailed and searchable online documentation of CICE can be found at https://cice-consortium.github.io/CICE/. In this documentation, a [“Quick Start”](https://cice-consortium.github.io/CICE/cice_1_introduction.html#quick-start-guide) subsection is available with instructions for running the model. A [“Testing”](https://cice-consortium.github.io/CICE/cice_3_user_guide.html#testing-cice) subsection with instructions for setting up standard tests (e.g. regression, restart) is also available.
Information about the CICE model

In-progress documentation (not yet merged into the main repo): https://duvivier.github.io/CICE/
* **CICE Version Index**: https://github.com/CICE-Consortium/CICE/wiki/CICE-Version-Index

The [wiki](https://github.com/CICE-Consortium/CICE/wiki) pages for each repository contain links to additional information, e.g.
- complete documentation
- larger files such as the gx1 grid, land mask, and forcing files
- testing data
Numbered CICE releases since version 6 with associated documentation and DOIs.

Test results for both CICE and Icepack can be found in the ["Test-Results" repository](https://github.com/CICE-Consortium/Test-Results).
* **Resource Index**: https://github.com/CICE-Consortium/About-Us/wiki/Resource-Index

The ["About-Us" repository](https://github.com/CICE-Consortium/About-Us) includes background and supporting information about the CICE Consortium, including how to interact with it.
List of resources for information about the Consortium and its repositories as well as model documentation, testing, and development.
Loading

0 comments on commit 017fdf6

Please sign in to comment.