-
Notifications
You must be signed in to change notification settings - Fork 127
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into column_model_pr
- Loading branch information
Showing
84 changed files
with
5,911 additions
and
474 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| name: docs | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ master ] | ||
| paths: | ||
| - '.github/workflows/docs.yml' | ||
| - 'docs/**' | ||
| - 'src/**' | ||
|
|
||
| env: | ||
| GFDL_BASE: ${{ github.workspace }} | ||
| GFDL_ENV: "ubuntu_conda" | ||
| GFDL_WORK: "$HOME/gfdl_work" | ||
| GFDL_DATA: "$HOME/gfdl_data" | ||
| GFDL_PYDIR: "${{ github.workspace }}/src/extra/python" | ||
|
|
||
| jobs: | ||
| docs: | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] | ||
| python-version: ['3.9'] | ||
|
|
||
| steps: | ||
| - name: Checkout source | ||
| uses: actions/checkout@v2 | ||
| with: | ||
| fetch-depth: 0 | ||
|
|
||
| # - name: Check environment variables | ||
| # run: | | ||
| # echo "Testing" | ||
| # echo $PWD | ||
| # echo $GFDL_BASE | ||
| # echo $GFDL_PYDIR | ||
| # echo $GITHUB_WORKSPACE | ||
| # echo $GITHUB_SERVER_URL/$GITHUB_REPOSITORY/actions/runs/$GITHUB_RUN_ID | ||
|
|
||
| - name: Setup Conda Environment | ||
| uses: conda-incubator/setup-miniconda@v2 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| environment-file: docs/environment.yml | ||
| miniforge-variant: Mambaforge | ||
| miniforge-version: "latest" | ||
| use-mamba: true | ||
| activate-environment: isca_docs | ||
| auto-activate-base: false | ||
|
|
||
| - name: List installed packages | ||
| shell: bash -l {0} | ||
| run: conda list | ||
|
|
||
| - name: Install | ||
| shell: bash -l {0} | ||
| run: | | ||
| cd $GFDL_PYDIR | ||
| python -m pip install -e . | ||
| cd $GFDL_BASE | ||
| - name: Build docs | ||
| shell: bash -l {0} | ||
| run: | | ||
| cd docs/ | ||
| make html -e | ||
| - name: Commit documentation changes | ||
| run: | | ||
| git clone https://github.com/$GITHUB_REPOSITORY.git --branch gh-pages --single-branch gh-pages | ||
| cp -r docs/_build/html/* gh-pages/ | ||
| cd gh-pages | ||
| git config --local user.email "[email protected]" | ||
| git config --local user.name "GitHub Action" | ||
| git add . | ||
| git commit -m "Update documentation" -a || true | ||
| # The above command will fail if no changes were present, so we ignore that. | ||
| - name: Push changes | ||
| uses: ad-m/github-push-action@master | ||
| with: | ||
| branch: gh-pages | ||
| directory: gh-pages | ||
| github_token: ${{ secrets.GITHUB_TOKEN }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,70 @@ | ||
| name: tests | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ master ] | ||
| paths: | ||
| - '.github/workflows/tests.yml' | ||
| - 'bin/**' | ||
| - 'bin/**' | ||
| - 'ci/**' | ||
| - 'exp/**' | ||
| - 'input/**' | ||
| - 'src/**' | ||
| - 'test/**' | ||
| pull_request: | ||
| branches: [ master ] | ||
| paths: | ||
| - '.github/workflows/tests.yml' | ||
| - 'bin/**' | ||
| - 'ci/**' | ||
| - 'exp/**' | ||
| - 'input/**' | ||
| - 'src/**' | ||
| - 'test/**' | ||
|
|
||
| env: | ||
| GFDL_BASE: ${{ github.workspace }} | ||
| GFDL_ENV: "ubuntu_conda" | ||
| GFDL_WORK: "${{ github.workspace }}/../gfdl_work" | ||
| GFDL_DATA: "${{ github.workspace }}/../gfdl_data" | ||
| GFDL_PYDIR: "${{ github.workspace }}/src/extra/python" | ||
|
|
||
| jobs: | ||
| test: | ||
| runs-on: ${{ matrix.os }} | ||
| strategy: | ||
| matrix: | ||
| os: [ubuntu-latest] # , macos-latest] | ||
| python-version: ['3.9'] | ||
|
|
||
| steps: | ||
| - name: Checkout source | ||
| uses: actions/checkout@v2 | ||
|
|
||
| - name: Setup Conda for OS ${{ matrix.os }} and Python ${{ matrix.python-version }} | ||
| uses: conda-incubator/setup-miniconda@v2 | ||
| with: | ||
| python-version: ${{ matrix.python-version }} | ||
| environment-file: ci/environment-py${{ matrix.python-version }}.yml | ||
| miniforge-variant: Mambaforge | ||
| miniforge-version: "latest" | ||
| use-mamba: true | ||
| activate-environment: isca_env | ||
| auto-activate-base: false | ||
|
|
||
| - name: Install | ||
| shell: bash -l {0} | ||
| run: | | ||
| cd $GFDL_PYDIR | ||
| python -m pip install -e . | ||
| cd $GFDL_BASE | ||
| - name: List installed packages | ||
| shell: bash -l {0} | ||
| run: conda list | ||
|
|
||
| - name: Run tests | ||
| shell: bash -l {0} | ||
| run: | | ||
| python -m pytest |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,6 +26,7 @@ src/atmos_param/socrates/src/trunk* | |
| ~* | ||
| nohup.out | ||
| Makefile | ||
| !docs/Makefile | ||
| *.DS_Store | ||
| ._* | ||
| *.mod | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| cff-version: 1.1.0 | ||
| authors: | ||
| - family-names: Vallis | ||
| given-names: Geoffrey K. | ||
| orcid: https://orcid.org/0000-0002-5971-8995 | ||
| - family-names: Colyer | ||
| given-names: Greg | ||
| - family-names: Geen | ||
| given-names: Ruth | ||
| - family-names: Gerber | ||
| given-names: Edwin | ||
| orcid: https://orcid.org/0000-0002-6010-6638 | ||
| - family-names: Jucker | ||
| given-names: Martin | ||
| orcid: https://orcid.org/0000-0002-4227-315X | ||
| - family-names: Maher | ||
| given-names: Penelope | ||
| orcid: https://orcid.org/0000-0001-8513-8700 | ||
| - family-names: Paterson | ||
| given-names: Alexander | ||
| - family-names: Pietschnig | ||
| given-names: Marianne | ||
| orcid: https://orcid.org/0000-0002-7405-5536 | ||
| - family-names: Penn | ||
| given-names: James | ||
| - family-names: Thomson | ||
| given-names: Stephen I. | ||
| orcid: https://orcid.org/0000-0002-4775-3259 | ||
| title: "Isca, v1.0: a framework for the global modelling of the atmospheres of Earth and other planets at varying levels of complexity" | ||
| journal: Geoscientific Model Development | ||
| volume: 11 | ||
| year: 2018 | ||
| number: 3 | ||
| pages: 843--859 | ||
| version: v1.0 | ||
| doi: 10.5194/gmd-11-843-2018 | ||
| url: https://gmd.copernicus.org/articles/11/843/2018/ | ||
| date-released: 2018-03-06 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -12,7 +12,7 @@ dependencies: | |
| - numpy | ||
| - openmpi | ||
| - pandas | ||
| - python=3.7 | ||
| - python=3.9 | ||
| - pip | ||
| - pytest | ||
| - sh | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Files in this directory will be deleted in the next release. |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Minimal makefile for Sphinx documentation | ||
| # | ||
|
|
||
| # You can set these variables from the command line. | ||
| SPHINXOPTS = -d _build/doctrees | ||
| SPHINXBUILD = sphinx-build | ||
| SOURCEDIR = source | ||
| BUILDDIR = _build | ||
|
|
||
| # Put it first so that "make" without argument is like "make help". | ||
| help: | ||
| @$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) | ||
|
|
||
| .PHONY: help Makefile | ||
|
|
||
| # Catch-all target: route all unknown targets to Sphinx using the new | ||
| # "make mode" option. $(O) is meant as a shortcut for $(SPHINXOPTS). | ||
| %: Makefile | ||
| @$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,7 @@ dependencies: | |
| - numpy | ||
| - openmpi | ||
| - pandas | ||
| - python=3.7 | ||
| - python=3.9 | ||
| - pip | ||
| - pytest | ||
| - sh | ||
|
|
||
Oops, something went wrong.