Merge branch 'release' into fix/pinned_version

esm-tools · Aug 21, 2023 · c052ca7 · c052ca7
2 parents cc521ef + a8a0410
commit c052ca7
Show file tree

Hide file tree

Showing 318 changed files with 15,977 additions and 4,086 deletions.
diff --git a/.github/ISSUE_TEMPLATE/support_request.md b/.github/ISSUE_TEMPLATE/support_request.md
@@ -21,7 +21,7 @@ If applicable, add screenshots to help explain your problem.
 
 **System (please complete the following information):**
  - Supercomputer: [which machine you are on]
- - Version [Please run `esm_versions check`]
+ - Version [Please run `esm_tools --version`]
 
 
 **Additional context**

diff --git a/.github/workflows/approve_esm_tests_changes.yml b/.github/workflows/approve_esm_tests_changes.yml
@@ -24,6 +24,8 @@ jobs:
           computer: ollie1
           update_esm_tests_info: true
           test_flags: -cngu -s True
+        secrets:
+          ESM_TOOLS_BOT: ${{ secrets.ESM_TOOLS_BOT }}
   levante:
         # Run this workflow ONLY if the `issue_comment` is in a pull-request and the comment text contains `#approve-changes`
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '#approve-changes') }}
@@ -32,6 +34,8 @@ jobs:
           computer: levante1
           update_esm_tests_info: true
           test_flags: -cngu -s True
+        secrets:
+          ESM_TOOLS_BOT: ${{ secrets.ESM_TOOLS_BOT }}
   juwels:
         # Run this workflow ONLY if the `issue_comment` is in a pull-request and the comment text contains `#approve-changes`
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '#approve-changes') }}
@@ -40,6 +44,8 @@ jobs:
           computer: jwlogin01.juwels
           update_esm_tests_info: true
           test_flags: -cngu -s True
+        secrets:
+          ESM_TOOLS_BOT: ${{ secrets.ESM_TOOLS_BOT }}
   aleph:
         # Run this workflow ONLY if the `issue_comment` is in a pull-request and the comment text contains `#approve-changes`
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '#approve-changes') }}
@@ -48,6 +54,8 @@ jobs:
           computer: elogin1
           update_esm_tests_info: true
           test_flags: -cngu -s True
+        secrets:
+          ESM_TOOLS_BOT: ${{ secrets.ESM_TOOLS_BOT }}
   blogin:
         # Run this workflow ONLY if the `issue_comment` is in a pull-request and the comment text contains `#approve-changes`
         if: ${{ github.event.issue.pull_request && contains(github.event.comment.body, '#approve-changes') }}
@@ -56,3 +64,5 @@ jobs:
           computer: blogin1
           update_esm_tests_info: true
           test_flags: -cngu -s True
+        secrets:
+          ESM_TOOLS_BOT: ${{ secrets.ESM_TOOLS_BOT }}
diff --git a/.github/workflows/esm_tests.yml b/.github/workflows/esm_tests.yml
@@ -27,3 +27,7 @@ jobs:
     uses: ./.github/workflows/esm_tests_computer_workflow.yml
     with:
         computer: blogin1
+  albedo:
+    uses: ./.github/workflows/esm_tests_computer_workflow.yml
+    with:
+        computer: albedo1
diff --git a/.github/workflows/esm_tests_computer_workflow.yml b/.github/workflows/esm_tests_computer_workflow.yml
@@ -16,6 +16,9 @@ on:
       test_flags:
         type: string
         default: "-cngeu -s False"
+    secrets:
+      ESM_TOOLS_BOT:
+        required: false
 
 jobs:
   computer:
@@ -29,21 +32,32 @@ jobs:
     container:
       image: koldunovn/esm_test:latest
       options: --hostname ${{ inputs.computer }}
+
+    steps:
+    # Checkout PR-branch (I could not find an easier way to do this and it seems
+    # many people are struggling with the same problem when your event is triggered
+    # by `issue_comment`)
+    - name: PR branch
+      run: |
+        apt install -y jq;
+        PR_URL="${{ github.event.issue.pull_request.url }}";
+        BRANCH=$(wget -qO - ${PR_URL} | jq .head.ref | xargs);
+        echo "::set-output name=this_branch::${BRANCH}"
+      id: this_branch
+
+    - name: deleteme
+      run: |
+        echo ${THIS_BRANCH}
+      env:
+        THIS_BRANCH: ${{ steps.this_branch.outputs.this_branch }}
 
     # Service containers to run with `gfortran_ubuntu`
-    steps:
     - uses: actions/checkout@v3
       with:
         submodules: true
         fetch-depth: 0
         token: ${{ secrets.GITHUB_TOKEN }}
-
-#    - name: checkout esm_tests_info
-#      uses: actions/checkout@v3
-#      with:
-#        repository: esm-tools/esm_tests_info
-#        path: src/esm_tests/resources
-#        token: ${{ secrets.GITHUB_TOKEN }}
+        ref: ${{ steps.this_branch.outputs.this_branch }}
 
     - name: add to the path
       run: |
@@ -53,16 +67,48 @@ jobs:
         ./install.sh
     - name: run esm_tests
       run: |
+        git status;
         yes Y | esm_tests ${{ inputs.test_flags }}
+        
+#    - name: store last tested in a different directory
+#      if: ${{ inputs.update_esm_tests_info }}
+#      run: |
+#        cp -r src/esm_tests/resources /__w/esm_tests_info;
+#        ls /__w/esm_tests_info;
+#    - name: checkout esm_tests_info
+#      if: ${{ inputs.update_esm_tests_info }}
+#      uses: actions/checkout@v3
+#      with:
+#        repository: esm-tools/esm_tests_info
+#        token: ${{ secrets.GITHUB_TOKEN }}
     - name: update esm_tests info
       if: ${{ inputs.update_esm_tests_info }}
+      env:
+        ESM_TOOLS_BOT: ${{ secrets.ESM_TOOLS_BOT }}
       run: |
         cd src/esm_tests/resources;
-        git config --global user.name "${GITHUB_ACTOR}";
-        git config --global user.email "${GITHUB_ACTOR}@users.noreply.github.com";
+        git config --unset-all "http.https://github.com/.extraheader";
+        git config user.name esmtools-bot;
+        git config user.email [email protected];
+        echo "USER:";
+        git config user.name
+        echo "CURRENT:";
+        ls;
         rm -rf automatic_testing; # cleanup the resources directory from tests
+        echo "PWD:";
+        pwd;
+        git status;
+        git diff;
+        git stash;
+        git pull;
+        git stash pop;
         git add .;
         git commit -m "approved changes from GitHub actions for ${{ inputs.computer }}";
-        git status;
-        git push;
-        
+        git push https://esmtools-bot:${ESM_TOOLS_BOT}@github.com/esm-tools/esm_tests_info.git;
+#    - name: Push changes
+#      if: ${{ inputs.update_esm_tests_info }}
+#      uses: ad-m/github-push-action@master
+#      with:
+#        github_token: ${{ secrets.GITHUB_TOKEN }}
+#        branch: release
+#        repository: esm-tools/esm_tests_info
diff --git a/.github/workflows/esm_tools_actions_novm.yml b/.github/workflows/esm_tools_actions_novm.yml
@@ -13,11 +13,11 @@ jobs:
           LANG: en_US.UTF-8
     strategy:
       matrix:
-        python-version: [ '3.6', '3.7', '3.8', '3.9']
+        python-version: ['3.7', '3.8', '3.9', '3.10']
     name: Python ${{ matrix.python-version }} sample
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v1
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           architecture: x64

diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
@@ -0,0 +1,31 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '00 14 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        days-before-stale: 365
+        stale-before-pr-stale: -1
+        days-before-close: 30
+        days-before-pr-close: -1
+        stale-issue-message: 'This issue has been inactive for the last 365 days. It will now be marked as stale and closed after 30 days of further inactivity. Please add a comment to reset this automatic closing of this issue or close it if solved.'
+        stale-pr-message: 'This pull request has been incative for the last days.'
+        stale-issue-label: 'Stale'
+        stale-pr-label: 'no-pr-activity'
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+# Mac finder files
+.DS_Store
 # Direnv stuff
 .envrc
 .direnv/

diff --git a/.readthedocs.yml b/.readthedocs.yml
@@ -8,6 +8,7 @@ version: 2
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
+  fail_on_warning: false
 
 # Build documentation with MkDocs
 #mkdocs:

diff --git a/README.rst b/README.rst
@@ -29,8 +29,9 @@ glogin.hlrn.de / blogin.hlrn.de::
 
 juwels.fz-juelich.de::
 
+    $ module load Stages/2022
     $ module load git
-    $ module load Python-3.6.8
+    $ module load Python/3.9.6
 
 aleph::
 

diff --git a/configs/components/debm/debm.yaml b/configs/components/debm/debm.yaml
@@ -22,6 +22,7 @@ clean_command: cd Fortran-v1.0; rm -rf build CMakeCache.txt
 comp_command: cd Fortran-v1.0; mkdir -p build; cd build; cmake ..; make -j `nproc --all`
 git-repository: https://github.com/ukrebska/dEBM
 install_bins: Fortran-v1.0/bin/debm
+contact: ukrebska(at)awi.de
 
 metadata:
     Institute: AWI

diff --git a/configs/components/echam/echam.datasets.yaml b/configs/components/echam/echam.datasets.yaml
@@ -81,10 +81,10 @@ forcing_sources:
                 "${forcing_dir}/volcano_aerosols/strat_aerosol_sw_${resolution}_1950.nc"
 
         # greenhouse
-        # TODO: currently only r0008 contains the greenhouse_ssp* files
+        # currently only r0008 contains the greenhouse_ssp* files
         "histgreenh": "${greenhouse_dir}/greenhouse_historical.nc"
         "greenhouse_hist_scenario":
-                "${greenhouse_dir}/greenhouse_historical.nc":
+                "${greenhouse_dir}/${greenhouse_hist_name}.nc":
                         to: 2014
                 "${greenhouse_dir}/greenhouse_${scenario}.nc":
                         from: 2015
@@ -118,6 +118,9 @@ forcing_sources:
                 # scenario: ssp126, ssp119, ssp245, ssp370, ssp585
                 "${forcing_dir}/ozone/${resolution}_ozone_${scenario}_@[email protected]":
                         from: 2015
+                        to: 2099
+                "${forcing_dir}/ozone/${resolution}_ozone_${scenario}_2099.nc":
+                        from: 2100
 
         "1850ozone": "${forcing_dir}/ozone/${resolution}_ozone_historical_1850.nc"
         "1950ozone": "${forcing_dir}/ozone/${resolution}_ozone_historical_1950.nc"
@@ -129,7 +132,14 @@ forcing_sources:
         "MAC-SP": "${input_dir}/MAC-SP.nc"
 
         "MAC-SP_hist_scenario":
-                 "${input_dir}/MAC-SP.nc":
+                 "${input_dir}/${MAC-SP_hist_name}.nc":
                          to: 2014
                  "${input_dir}/MAC-SP_${scenario}.nc":
                          from: 2015
+
+greenhouse_hist_name: "greenhouse_historical"
+MAC-SP_hist_name: "MAC-SP"
+choose_echam.dataset:
+    r0008:
+        greenhouse_hist_name: "greenhouse_ssp245"
+        MAC-SP_hist_name: "MAC-SP_ssp245"