-
Notifications
You must be signed in to change notification settings - Fork 55
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #3010 from E3SM-Project/jgfouca/mappy_rebuild
upstream merge 20240919: Get mappy working again
- Loading branch information
Showing
193 changed files
with
6,531 additions
and
1,074 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
| 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 }} |
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
Submodule cime
updated
71 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
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,14 +1,5 @@ | ||
|
|
||
| set(CPPDEFS "${CPPDEFS} -DMPAS_OPENMP_OFFLOAD") | ||
| list(APPEND MPAS_ADD_ACC_FLAGS | ||
| ${CMAKE_BINARY_DIR}/core_seaice/shared/mpas_seaice_mesh_pool.f90 | ||
| ${CMAKE_BINARY_DIR}/core_seaice/shared/mpas_seaice_velocity_solver_variational.f90 | ||
| ${CMAKE_BINARY_DIR}/core_seaice/shared/mpas_seaice_velocity_solver.f90 | ||
| ) | ||
|
|
||
| foreach(ITEM IN LISTS MPAS_ADD_ACC_FLAGS) | ||
| e3sm_add_flags("${ITEM}" "-fiopenmp -fopenmp-targets=spir64") | ||
| endforeach() | ||
|
|
||
| # compile mpas_seaice_core_interface.f90 with ifort, not ifx | ||
| e3sm_add_flags("${CMAKE_BINARY_DIR}/core_seaice/model_forward/mpas_seaice_core_interface.f90" "-fc=ifort") | ||
| if (NOT MPILIB STREQUAL "openmpi") | ||
| e3sm_add_flags("${CMAKE_BINARY_DIR}/core_seaice/model_forward/mpas_seaice_core_interface.f90" "-fc=ifort") | ||
| endif() |
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.