Skip to content

Commit

Permalink
Merge branch 'E3SM-Project:master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
pbosler authored Sep 26, 2024
2 parents 3ab5296 + fc02007 commit 3823417
Show file tree
Hide file tree
Showing 332 changed files with 14,941 additions and 5,566 deletions.
32 changes: 14 additions & 18 deletions .github/workflows/e3sm-gh-ci-cime-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@ on:
branches: [ master ]
paths:
# first, yes to these
- '.github/workflows/e3sm-gh-ci-cime-tests.yml'
- 'cime_config/**'
- 'components/eam/**'
- 'components/eamxx/**'
- 'components/elm/**'
- 'driver-moab/**'
- 'driver-mct/**'
# second, no to these
- '!components/eam/docs/**'
- '!components/eam/mkdocs.yml'
- '!components/eamxx/docs/**'
- '!components/eamxx/mkdocs.yml'
- '!components/elm/docs/**'
- '!components/elm/mkdocs.yml'

Expand All @@ -26,17 +30,13 @@ jobs:
strategy:
fail-fast: false
matrix:
test:
- SMS_D_P4.ne4pg2_oQU480.F2010.singularity_gnu
- SMS_P4.ne4pg2_oQU480.F2010.singularity_gnu
- REP_P4.ne4pg2_oQU480.F2010.singularity_gnu
- ERS_P4.ne4pg2_oQU480.F2010.singularity_gnu
- ERS_P4.ne4pg2_oQU480.F2010.singularity_gnu.eam-wcprod_F2010
- ERP_P4.ne4pg2_oQU480.F2010.singularity_gnu
- PET_P4.ne4pg2_oQU480.F2010.singularity_gnu
- PEM_P4.ne4pg2_oQU480.F2010.singularity_gnu
test:
- SMS_D_Ln5_P4.ne4pg2_oQU480.F2010.ghci-oci_gnu
- ERS_Ld5_P4.ne4pg2_oQU480.F2010.ghci-oci_gnu.eam-wcprod_F2010
- SMS_D_Ln5_P4.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.ghci-oci_gnu
- ERS_Ld5_P4.ne4pg2_oQU480.F2010-SCREAMv1-MPASSI.ghci-oci_gnu.eamxx-prod
container:
image: ghcr.io/mahf708/e3sm-imgs:v0.0.6
image: ghcr.io/e3sm-project/containers-ghci:ghci-0.1.0

steps:
-
Expand All @@ -49,10 +49,6 @@ jobs:
name: CIME
working-directory: cime/scripts
run: |
mkdir -p $HOME/projects/e3sm/cesm-inputdata/atm/cam/physprops/
wget https://web.lcrc.anl.gov/public/e3sm/inputdata/atm/cam/physprops/p3_lookup_table_1.dat-v4.1.2
mv p3_lookup_table_1.dat-v4.1.2 $HOME/projects/e3sm/cesm-inputdata/atm/cam/physprops/
export USER=test
./create_test ${{ matrix.test }} --wait --debug
-
name: Artifacts
Expand All @@ -61,7 +57,7 @@ jobs:
with:
name: ${{ matrix.test }}
path: |
~/projects/e3sm/scratch/${{ matrix.test }}*/TestStatus.log
~/projects/e3sm/scratch/${{ matrix.test }}*/bld/*.bldlog.*
~/projects/e3sm/scratch/${{ matrix.test }}*/run/*.log.*
~/projects/e3sm/scratch/${{ matrix.test }}*/run/*.cprnc.out
/projects/e3sm/scratch/${{ matrix.test }}*/TestStatus.log
/projects/e3sm/scratch/${{ matrix.test }}*/bld/*.bldlog.*
/projects/e3sm/scratch/${{ matrix.test }}*/run/*.log.*
/projects/e3sm/scratch/${{ matrix.test }}*/run/*.cprnc.out
27 changes: 9 additions & 18 deletions .github/workflows/e3sm-gh-ci-w-cime-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,16 @@ on:
jobs:

ci-w:
if: ${{ github.event.repository.name == 'e3sm' }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
test:
- SMS_D_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
- SMS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
- REP_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
- ERS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
- ERS_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu.allactive-wcprod_1850
- ERP_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
- PET_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
- PEM_P8.ne4pg2_oQU480.WCYCL2010NS.singularity_gnu
test:
- SMS_D_Ld1_P8.ne4pg2_oQU480.WCYCL2010NS.ghci-oci_gnu
- ERS_Ld3_P8.ne4pg2_oQU480.WCYCL2010NS.ghci-oci_gnu.allactive-wcprod_1850
container:
image: ghcr.io/mahf708/e3sm-imgs:v0.0.6
image: ghcr.io/e3sm-project/containers-ghci:ghci-0.1.0

steps:
-
Expand All @@ -41,10 +36,6 @@ jobs:
name: CIME
working-directory: cime/scripts
run: |
mkdir -p $HOME/projects/e3sm/cesm-inputdata/atm/cam/physprops/
wget https://web.lcrc.anl.gov/public/e3sm/inputdata/atm/cam/physprops/p3_lookup_table_1.dat-v4.1.2
mv p3_lookup_table_1.dat-v4.1.2 $HOME/projects/e3sm/cesm-inputdata/atm/cam/physprops/
export USER=test
./create_test ${{ matrix.test }} --wait --debug
-
name: Artifacts
Expand All @@ -53,7 +44,7 @@ jobs:
with:
name: ${{ matrix.test }}
path: |
~/projects/e3sm/scratch/${{ matrix.test }}*/TestStatus.log
~/projects/e3sm/scratch/${{ matrix.test }}*/bld/*.bldlog.*
~/projects/e3sm/scratch/${{ matrix.test }}*/run/*.log.*
~/projects/e3sm/scratch/${{ matrix.test }}*/run/*.cprnc.out
/projects/e3sm/scratch/${{ matrix.test }}*/TestStatus.log
/projects/e3sm/scratch/${{ matrix.test }}*/bld/*.bldlog.*
/projects/e3sm/scratch/${{ matrix.test }}*/run/*.log.*
/projects/e3sm/scratch/${{ matrix.test }}*/run/*.cprnc.out
4 changes: 2 additions & 2 deletions .github/workflows/e3sm-gh-md-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: tj-actions/changed-files@v44
- uses: tj-actions/changed-files@v45
id: changed-files
with:
files: '**/*.md'
separator: ","
- uses: DavidAnson/markdownlint-cli2-action@v16
- uses: DavidAnson/markdownlint-cli2-action@v17
if: steps.changed-files.outputs.any_changed == 'true'
with:
config: 'docs/.markdownlint.json'
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e3sm-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@ jobs:
submodules: true
- name: Show action trigger
run: echo "= The job was automatically triggered by a ${{github.event_name}} event on repo ${{github.event.repository.name}}."
- name: Set up Python 3.10
uses: actions/setup-python@v5.1.0
- name: Set up Python 3.11
uses: actions/setup-python@v5
with:
python-version: "3.10"
python-version: "3.11"
- name: Install python deps
run: python3 -m pip install mkdocs-material pymdown-extensions mkdocs-monorepo-plugin mdutils mkdocs-bibtex
# build every time (PR or push to master)
Expand Down
86 changes: 86 additions & 0 deletions .github/workflows/e3sm-gh-tools-mkatmsrffile-test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
name: mkatmsrffile

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
paths:
- 'components/eam/tools/mkatmsrffile/mkatmsrffile.py'
schedule:
- cron: '00 15 * * 2'
workflow_dispatch:

jobs:
mkatmsrffile-test:
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-variant: Mambaforge
miniforge-version: latest
use-mamba: true
mamba-version: "*"
channel-priority: strict
auto-update-conda: true
python-version: 3.11
-
name: Install dependencies
run: |
echo $CONDA_PREFIX
mamba install -y nco xarray numba numpy netcdf4
-
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 }}
2 changes: 1 addition & 1 deletion .github/workflows/eamxx-gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:
echo "= The job was automatically triggered by a ${{github.event_name}} event."
- name: Set up Python 3.11
uses: actions/setup-python@v5.1.0
uses: actions/setup-python@v5
with:
python-version: "3.11"

Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/eamxx_default_files.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ on:
branches: [ master ]
pull_request:
branches: [ master ]
paths:
- 'components/eamxx/cime_config/namelist_defaults_scream.xml'
schedule:
- cron: '00 00 * * *'
workflow_dispatch:
Expand All @@ -21,7 +23,7 @@ jobs:
show-progress: false
submodules: false
- name: Set up Python 3.11
uses: actions/setup-python@v5.1.0
uses: actions/setup-python@v5
with:
python-version: "3.11"
- name: Run unit tests
Expand Down
2 changes: 1 addition & 1 deletion cime
Submodule cime updated 71 files
+9 −20 .github/workflows/testing.yml
+7 −1 CIME/BuildTools/configure.py
+26 −54 CIME/ParamGen/paramgen.py
+2 −1 CIME/SystemTests/funit.py
+3 −4 CIME/SystemTests/hommebaseclass.py
+4 −4 CIME/SystemTests/mvk.py
+5 −5 CIME/SystemTests/pgn.py
+1 −1 CIME/SystemTests/system_tests_common.py
+4 −4 CIME/SystemTests/tsc.py
+45 −103 CIME/Tools/Makefile
+94 −60 CIME/Tools/list_e3sm_tests
+52 −8 CIME/Tools/xmlchange
+10 −0 CIME/XML/batch.py
+1 −1 CIME/XML/component.py
+22 −0 CIME/XML/compsets.py
+1 −1 CIME/XML/entry_id.py
+3 −5 CIME/XML/env_batch.py
+2 −1 CIME/XML/files.py
+47 −21 CIME/XML/grids.py
+30 −7 CIME/XML/pes.py
+14 −17 CIME/build.py
+5 −4 CIME/build_scripts/buildlib.mpi-serial
+28 −8 CIME/case/case.py
+8 −4 CIME/case/case_cmpgen_namelists.py
+6 −2 CIME/case/case_run.py
+18 −4 CIME/case/case_setup.py
+6 −5 CIME/case/case_st_archive.py
+3 −1 CIME/case/case_submit.py
+2 −1 CIME/case/case_test.py
+1 −1 CIME/code_checker.py
+2 −1 CIME/compare_test_results.py
+13 −1 CIME/config.py
+0 −1 CIME/data/config/cesm/config_files.xml
+77 −0 CIME/data/templates/gitignore.template
+100 −0 CIME/gitinterface.py
+66 −47 CIME/hist_utils.py
+1 −1 CIME/non_py/cprnc
+1 −1 CIME/non_py/src/timing/Makefile
+270 −365 CIME/scripts/query_config.py
+132 −0 CIME/status.py
+1 −2 CIME/test_scheduler.py
+8 −1 CIME/test_status.py
+2 −2 CIME/tests/base.py
+7 −17 CIME/tests/test_sys_create_newcase.py
+1 −1 CIME/tests/test_sys_manage_and_query.py
+25 −3 CIME/tests/test_sys_unittest.py
+1 −1 CIME/tests/test_unit_utils.py
+164 −0 CIME/tests/test_unit_xml_grids.py
+5 −91 CIME/utils.py
+1 −10 CMakeLists.txt
+0 −52 Externals.cfg
+0 −7 Externals_cime.cfg
+19 −74 docker/Dockerfile
+29 −0 docker/cime.yaml
+66 −39 docker/entrypoint.sh
+0 −38 tools/load_balancing_tool/LICENSE.TXT
+0 −13 tools/load_balancing_tool/README
+0 −443 tools/load_balancing_tool/layouts.py
+0 −432 tools/load_balancing_tool/load_balancing_solve.py
+0 −396 tools/load_balancing_tool/load_balancing_submit.py
+0 −388 tools/load_balancing_tool/optimize_model.py
+0 −0 tools/load_balancing_tool/tests/__init__.py
+0 −187 tools/load_balancing_tool/tests/atm_lnd.py
+0 −29 tools/load_balancing_tool/tests/example.json
+0 −335 tools/load_balancing_tool/tests/load_balancing_test.py
+0 −39 tools/load_balancing_tool/tests/test.xml
+0 −187 tools/load_balancing_tool/tests/timing/timing_1
+0 −187 tools/load_balancing_tool/tests/timing/timing_2
+0 −187 tools/load_balancing_tool/tests/timing/timing_3
+3 −3 tools/mapping/gen_mapping_files/runoff_to_ocn/INSTALL
+1 −1 tools/mapping/gen_mapping_files/runoff_to_ocn/tools/makdep.c
Loading

0 comments on commit 3823417

Please sign in to comment.