-
Notifications
You must be signed in to change notification settings - Fork 360
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'jgfouca/scream_downstream_04_11_24' into master (PR #6343)
Bring latest EAMxx and other changes from scream repo. Non-eamxx changes: 1) Change GitHub CI to skip E3SM CI for eamxx (for now) 2) Add an eamxx-specific workflow in the CI to ensure default input files for SCREAM are available and downloadable 3) ELM config changes: new namelist defaults added for ne256pg2 and ne1024pg2 land configurations to support F20TR compsets with these resolutions 4) EAM changes: scream/micro_p3.F90 updates/fixes. Should only impact SCREAM stuff. Also, there's a fix for DP SCREAM output coordinate issue where x-coordinates should be assocated with spherep lon values and y-coordinates should be associated with lat values 5) Change kokkos build to ensure cxx17 standard On mappy, this PR is non-BFB for these cases, which I think is expected: DIFF ERS_D.ne4pg2_oQU480.F2010.mappy_gnu.eam-hommexx (phase BASELINE) DIFF SMS_Ln9_P24x1.ne4_ne4.FDPSCREAM-ARM97.mappy_gnu (phase BASELINE) DIFF SMS_R_Ld5.ne4_ne4.FSCM-ARM97.mappy_gnu.eam-scm (phase BASELINE) [non-BFB] for HOMMExx cases.
- Loading branch information
Showing
412 changed files
with
14,163 additions
and
10,904 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 |
|---|---|---|
|
|
@@ -11,3 +11,5 @@ updates: | |
| reviewers: | ||
| - "mahf708" | ||
| - "bartgol" | ||
| labels: | ||
| - "AT: Integrate Without Testing" | ||
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,62 @@ | ||
| name: inputdata | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ master ] | ||
| pull_request: | ||
| branches: [ master ] | ||
| schedule: | ||
| - cron: '00 00 * * *' | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
| scream-defaults: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| event_name: ${{ github.event_name }} | ||
| steps: | ||
| - name: Check out the repository | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| show-progress: false | ||
| submodules: false | ||
| - name: Set up Python 3.11 | ||
| uses: actions/[email protected] | ||
| with: | ||
| python-version: "3.11" | ||
| - name: Run unit tests | ||
| working-directory: components/eamxx/cime_config/ | ||
| run: | | ||
| python -m unittest tests/eamxx_default_files.py -v | ||
| notify-scream-defaults: | ||
| needs: scream-defaults | ||
| if: ${{ failure() && needs.scream-defaults.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: Inputdata server file missing | ||
| ASSIGNEES: mahf708,bartgol | ||
| LABELS: bug,input file,notify-file-gh-action | ||
| BODY: | | ||
| Workflow failed! There's likely a missing file specified in the configs! 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
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
Oops, something went wrong.