forked from E3SM-Project/E3SM
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'e3sm/master' into MALI-Dev/develop
Primary purpose is to get updates for Chicoma builds from E3SM-Project#6705 * e3sm/master: (904 commits) Add overrun qos for pm-cpu/pm-gpu Update gcc and nvidia to newer versions Revert chicoma-gpu changes (for now) Add GNU_CRAY_LDFLAGS flag to MPAS standalone builds Update nvidia modules Updates to get E3SM working on chicoma-cpu Add latest cmake Update chicoma-cpu modules revert removing <env name="FI_CXI_RX_MATCH_MODE">software</env> as I hit merge conflict remove kdreg2 change as it's already on master bump nvidia compiler version on pm-cpu Fix for bad leaf C:N ratios during transient land simulations load Core/24.07 module and remove versions from git, submodule, and zlib modules remove special flags for gnu builds as kdreg2 seems to fix the issue For pm-cpu, update compiler versions for GCC, nvidia, AMD compilers. For those compilers, update other module versions to now be same as Intel uses. Various updates to muller-cpu/muller-gpu/alvarez. rename gh/ci-w to gh-w/ci add concurrency check for standalone updates to miniforge settings upgrades and fixes to workflows Upgrade NetCDF modules for Intel and GNU compilers on Chrysalis ...
- Loading branch information
Showing
649 changed files
with
24,209 additions
and
7,333 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
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
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,88 @@ | ||
| name: mkatmsrffile | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ master ] | ||
| pull_request: | ||
| branches: [ master ] | ||
| paths: | ||
| - 'components/eam/tools/mkatmsrffile/mkatmsrffile.py' | ||
| schedule: | ||
| - cron: '00 15 * * 2' | ||
| workflow_dispatch: | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
| mkatmsrffile-test: | ||
| if: ${{ github.repository == 'E3SM-Project/E3SM' }} | ||
| runs-on: ubuntu-latest | ||
| defaults: | ||
| run: | ||
| shell: bash -l {0} | ||
| outputs: | ||
| event_name: ${{ github.event_name }} | ||
| steps: | ||
| - | ||
| name: Repository checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| show-progress: false | ||
| submodules: false | ||
| - | ||
| name: Conda setup | ||
| uses: conda-incubator/setup-miniconda@v3 | ||
| with: | ||
| activate-environment: "envmkatmsrffile" | ||
| miniforge-version: latest | ||
| channel-priority: strict | ||
| auto-update-conda: true | ||
| python-version: 3.11 | ||
| - | ||
| name: Install dependencies | ||
| run: | | ||
| echo $CONDA_PREFIX | ||
| conda install -y nco xarray numba numpy netcdf4 -c conda-forge | ||
| - | ||
| name: Run tests | ||
| working-directory: components/eam/tools/mkatmsrffile | ||
| run: | | ||
| echo $CONDA_PREFIX | ||
| wget https://web.lcrc.anl.gov/public/e3sm/inputdata/atm/cam/chem/trop_mozart/dvel/clim_soilw.nc | ||
| wget https://web.lcrc.anl.gov/public/e3sm/inputdata/atm/cam/chem/trop_mozart/dvel/regrid_vegetation.nc | ||
| wget https://web.lcrc.anl.gov/public/e3sm/inputdata/atm/cam/chem/trop_mozart/dvel/map_1x1_to_ne30pg2_traave_c20240903.nc | ||
| python mkatmsrffile.py --map_file=map_1x1_to_ne30pg2_traave_c20240903.nc --vegetation_file=regrid_vegetation.nc --soil_water_file=clim_soilw.nc --dst_grid=ne30pg2 | ||
| mkatmsrffile-notify: | ||
| needs: mkatmsrffile-test | ||
| if: ${{ failure() && needs.mkatmsrffile-test.outputs.event_name != 'pull_request' }} | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Create issue | ||
| run: | | ||
| previous_issue_number=$(gh issue list \ | ||
| --label "$LABELS" \ | ||
| --json number \ | ||
| --jq '.[0].number') | ||
| if [[ -n $previous_issue_number ]]; then | ||
| gh issue comment "$previous_issue_number" \ | ||
| --body "$BODY" | ||
| else | ||
| gh issue create \ | ||
| --title "$TITLE" \ | ||
| --assignee "$ASSIGNEES" \ | ||
| --label "$LABELS" \ | ||
| --body "$BODY" | ||
| fi | ||
| env: | ||
| GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
| GH_REPO: ${{ github.repository }} | ||
| TITLE: mkatmsrffile test failure | ||
| ASSIGNEES: whannah1 | ||
| LABELS: bug,notify-mkatmsrffile-gh-action | ||
| BODY: | | ||
| Workflow failed! There's likely an issue in the mkatmsrffile tool! For more information, please see: | ||
| - Workflow URL: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }} (number ${{ github.run_number }}, attempt ${{ github.run_attempt }}) | ||
| - Workflow SHA: ${{ github.sha }} |
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,60 @@ | ||
| name: gh-standalone | ||
|
|
||
| on: | ||
| pull_request: | ||
| branches: [ master ] | ||
| paths: | ||
| # first, yes to these | ||
| - '.github/workflows/eamxx-gh-ci-standalone.yml' | ||
| - 'cime_config/machine/config_machines.xml' | ||
| - 'components/eamxx/**' | ||
| - 'components/homme/**' | ||
| # second, no to these | ||
| - '!components/eamxx/docs/**' | ||
| - '!components/eamxx/mkdocs.yml' | ||
|
|
||
| workflow_dispatch: | ||
|
|
||
| concurrency: | ||
| group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }} | ||
| cancel-in-progress: true | ||
|
|
||
| jobs: | ||
|
|
||
| ci: | ||
| if: ${{ github.repository == 'E3SM-Project/E3SM' }} | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| test: | ||
| - sp | ||
| - opt | ||
| - dbg | ||
| - fpe | ||
| container: | ||
| image: ghcr.io/e3sm-project/containers-standalone-ghci:standalone-ghci-0.1.0 | ||
|
|
||
| steps: | ||
| - | ||
| name: Checkout | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| show-progress: false | ||
| submodules: recursive | ||
| - | ||
| name: standalone | ||
| env: | ||
| SHELL: sh | ||
| run: | | ||
| # TODO: get rid of this extra line if we can? | ||
| git config --global safe.directory '*' | ||
| ./components/eamxx/scripts/test-all-scream -m ghci-oci -t ${{ matrix.test }} -c BUILD_SHARED_LIBS=ON | ||
| - | ||
| name: Artifacts | ||
| uses: actions/upload-artifact@v4 | ||
| if: ${{ always() }} | ||
| with: | ||
| name: ${{ matrix.test }} | ||
| path: | | ||
| components/eamxx/ctest-build/*/Testing/Temporary/Last*.log |
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
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 |
|---|---|---|
|
|
@@ -22,8 +22,8 @@ | |
| branch = scorpio_classic | ||
| [submodule "cosp2"] | ||
| path = components/eam/src/physics/cosp2/external | ||
| url = [email protected]:CFMIP/COSPv2.0.git | ||
| branch = CESM_v2.1.4 | ||
| url = [email protected]:bartgol/COSPv2.0.git | ||
| branch = bartgol/fix-cosp_optical_inputs | ||
| [submodule "cime"] | ||
| path = cime | ||
| url = [email protected]:ESMCI/cime.git | ||
|
|
||
Oops, something went wrong.