-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/master' into jgfouca/upstream_…
…merge_2023_10_02 * upstream/master: (746 commits) Make "column_package" the default column_physics_type for BGC Ascent needs to use static hdf5 libs Don't change submodule Reorg csm_share Depends Clean up csm_share depends files a bit Update bld files to match Registry changes, using automated scripts Move some description changes from bld files to Registry Homme: Fix config.h comment style. Homme: Distinguish between F90 and C++ in HOMMEXX_ENABLE_GPU symbol use. Add missing variable to omp directive Add missing variable to omp directive Update CIME submodule Fix a few things I missed Homme: Comment out two builds that aren't used in ctests. Hommexx: Fix issues related to qsize=0. Hommexx: Remove redundant HOMMEXX_ENABLE_GPU definition. Homme: Fix potential bad access to an array. Homme: Add USE_MPI_RUN_SCRIPT to standalone system. Homme(xx)/SL: Add SL-transport feature to doubly periodic mode. Get rid of last Makefile Depends ...
- Loading branch information
Showing
425 changed files
with
29,361 additions
and
79,965 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
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 |
|---|---|---|
| @@ -1,7 +1,8 @@ | ||
| #!/bin/bash | ||
|
|
||
| wget -t 3 -O e3sm.sif http://portal.nersc.gov/project/e3sm/lukasz/e3sm.sif || \ | ||
| wget -t 3 -O e3sm.sif https://dabdceba-6d04-11e5-ba46-22000b92c6ec.e.globus.org/containers/public/e3sm.sif | ||
| singularity pull e3sm.sif \ | ||
| docker://ghcr.io/mahf708/e3sm-imgs@sha256:d1030a6f4e3a53f682859436a26b30a9477d69423829ae1d9c1b5ab4e255430d | ||
|
|
||
| if [ $? -ne 0 ]; then | ||
| exit -1 | ||
| fi |
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 |
|---|---|---|
| @@ -0,0 +1,50 @@ | ||
| name: Build and deploy gh-pages branch with Mkdocs | ||
|
|
||
| on: | ||
| # Runs every time master branch is updated | ||
| push: | ||
| branches: ["master"] | ||
| # Runs every time a PR is open against master | ||
| pull_request: | ||
| branches: ["master"] | ||
| workflow_dispatch: | ||
|
|
||
| concurrency: | ||
| # Prevent 2+ copies of this workflow from running concurrently | ||
| group: e3sm-docs-action | ||
|
|
||
| jobs: | ||
| Build-and-Deploy-docs: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - uses: actions/checkout@v4 | ||
| with: | ||
| show-progress: false | ||
| fetch-depth: 0 # Needed, or else gh-pages won't be fetched, and push rejected | ||
| submodules: false # speeds up clone and not building anything in submodules | ||
| - name: Show action trigger | ||
| run: echo "= The job was automatically triggered by a ${{github.event_name}} event." | ||
| - name: Set up Python 3.10 | ||
| uses: actions/setup-python@v4.7.0 | ||
| with: | ||
| python-version: "3.10" | ||
| - name: Install python deps | ||
| run: python3 -m pip install mkdocs-material pymdown-extensions mkdocs-monorepo-plugin mdutils | ||
| # build every time (PR or push to master) | ||
| - name: Build | ||
| run: mkdocs build --strict --verbose | ||
| # Only deploy to the main github page when there is a push to master | ||
| - if: ${{ github.event_name == 'push' }} | ||
| name: GitHub Pages action | ||
| uses: JamesIves/github-pages-deploy-action@v4 | ||
| with: | ||
| # Do not remove existing pr-preview pages | ||
| clean-exclude: pr-preview | ||
| folder: ./site/ | ||
| # If it's a PR from within the same repo, deploy to a preview page | ||
| # For security reasons, PRs from forks cannot write into gh-pages for now | ||
| - if: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == github.repository }} | ||
| name: Preview docs | ||
| uses: rossjrw/pr-preview-action@v1 | ||
| with: | ||
| source-dir: ./site/ |
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 |
|---|---|---|
|
|
@@ -24,6 +24,9 @@ buildnmlc | |
| buildlibc | ||
| buildlib_cmakec | ||
|
|
||
| #the site directory | ||
| site | ||
|
|
||
| # Ignore emacs backup files | ||
| *~ | ||
|
|
||
|
|
||
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
Submodule cime
updated
38 files
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
Oops, something went wrong.