Skip to content

Commit

Permalink
Merge pull request #208 from bartnijssen/master
Browse files Browse the repository at this point in the history
Merge develop into master for Version 2.0
  • Loading branch information
bartnijssen committed May 31, 2017
2 parents a7e3f14 + c6ea355 commit e5810dd
Show file tree
Hide file tree
Showing 104 changed files with 21,990 additions and 11,591 deletions.
47 changes: 47 additions & 0 deletions .github.com/CONTRIBUTING.md
@@ -0,0 +1,47 @@
# Contributing

SUMMA is Open Source software. This means that the code is made available for free, but also that development, maintenance and support are intended to be community efforts. Our rationale for moving SUMMA model development to an open source model is that we want:

- to encourage other researchers and developers to contribute to SUMMA development, and
- to facilitate transparent development and use of the model.

## Support

There is no official support for the SUMMA model, other than the SUMMA documentation, the SUMMA source code archive and the description of the model in the literature. Any additional support relies on volunteer efforts by the SUMMA development community. The following resources are available:

- [SUMMA web site](https://www.ral.ucar.edu/projects/summa): General background, SUMMA resources, and test data sets.
- [SUMMA Source code repository](https://github.com/NCAR/SUMMA) : Source code distribution, coordination of model development, bug fixes, and releases.

We expect that the user comes prepared with some understanding of the model and scientific computing. As such, these items are specifically not supported by the SUMMA development community:

- Building and running the SUMMA model on platforms other than LINUX, UNIX, and OSX.
- Using LINUX, UNIX, or OSX operating systems.
- Development of project specific features.
- Configuring individual model applications.

## Submitting Issues
#### Submitting Bug Reports

If you think you have found a bug in SUMMA, please check whether an issue has been filed on [SUMMA's Github page](https://github.com/NCAR/SUMMA/issues). If not, go please go ahead and create an issue and include the following information in your bug report:

- Version of SUMMA that you are using (e.g. SUMMA 1.0 - even better if you can provide the specific tag or commit)
- Name and version of the fortran compiler you are using
- Operating system
- A description of relevant model settings
- A summary of the bug or error message you are getting

If you can provide more information that is great. If you know how to run the model in a debugger, you may be able to pinpoint where the problem occurs.

#### Proposing New Features

SUMMA is under active development. If you would like to propose a new feature, driver, or extension to SUMMA, please file an issue on [SUMMA's Github page](https://github.com/NCAR/SUMMA/issues). Also, because SUMMA is an open source model with no official support for general-purpose development, be prepared to contribute to the implementation of your feature request. Features that are only of interest to you are unlikely to be implemented in the main source code repo (although you are of course free to modify the code in any way you see fit).

## Contributing to SUMMA
#### Git Workflow
We have developed some documentation to help you get started if you are new to Git but want to contribute to VIC:

- [Working with Git](https://github.com/NCAR/summa/blob/master/docs/howto/git_howto.md)
- [Git Workflow](https://github.com/NCAR/summa/blob/master/docs/howto/summa_git_workflow.md)

#### Coding Conventions
We have some simple [https://github.com/NCAR/summa/blob/master/docs/howto/summa_coding_conventions.md](coding conventions) that we would like anyone who contributes code to SUMMA to follow.
16 changes: 16 additions & 0 deletions .github.com/ISSUE_TEMPLATE.md
@@ -0,0 +1,16 @@
#### Bug Reports
<!--- please provide the following information for bug reports --->

- Version of SUMMA that you are using (e.g. SUMMA 1.0 - even better if you can provide the specific tag or commit)
- Name and version of the fortran compiler you are using
- Operating system
- A description of relevant model settings
- A summary of the bug or error message you are getting

#### Feature Requests
<!--- please provide the following information for feature requests --->

- Description of feature
- Description of the problem the feature addresses
- Will the proposed feature be backward compatible?
- Will the proposed feature change the science results of SUMMA?
8 changes: 8 additions & 0 deletions .github.com/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,8 @@
Make sure all the relevant boxes are checked (and only check the box if you actually completed the step):

- [ ] closes #xxx (identify the issue associated with this PR)
- [ ] tests passed
- [ ] new tests added
- [ ] science test figures
- [ ] checked that the new code conforms to the [SUMMA coding conventions](https://github.com/NCAR/summa/blob/master/docs/howto/summa_coding_conventions.md)
- [ ] ReleaseNotes entry
14 changes: 13 additions & 1 deletion .gitignore 100644 → 100755
Expand Up @@ -19,4 +19,16 @@ summa.exe
*cscope*
.tags*
# OS X .DS_Store files
.DS_Store
.DS_Store
*-local
*_local
*log
*.cbp
*.layout
gmon.out
summa.exe.dSYM*
# makefile
make.out
Makefile-*
# backup files
*.backup
Empty file modified .travis.yml 100644 → 100755
Empty file.
Empty file modified COPYING 100644 → 100755
Empty file.
29 changes: 29 additions & 0 deletions Dockerfile
@@ -0,0 +1,29 @@
# use the zesty distribution, which has gcc-6
FROM ubuntu:zesty

# install only the packages that are needed
RUN apt-get update && \
apt-get install -y --no-install-recommends \
git \
make \
gfortran-6 \
libnetcdff-dev \
liblapack-dev \
&& apt-get clean

# set environment variables for docker build
ENV F_MASTER /code
ENV FC gfortran
ENV FC_EXE gfortran
ENV FC_ENV gfortran-6-docker

# add code directory
WORKDIR /code
ADD . /code

# build summa
RUN make -C build/ -f Makefile

# run summa when running the docker image
WORKDIR bin
ENTRYPOINT ["./summa.exe"]

0 comments on commit e5810dd

Please sign in to comment.