Merge branch 'master' of github.com:gem/oq-engine into whatsnew

gem · Oct 20, 2023 · d8c330c · d8c330c
2 parents 0282608 + 4012f9e
commit d8c330c
Show file tree

Hide file tree

Showing 38 changed files with 710 additions and 385 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -62,6 +62,8 @@ on:
   push:
     branches: [master, 'engine-*', moster, 'ongine-*']
 
+  pull_request:
+
 jobs:
   docs:
     runs-on: ubuntu-latest
@@ -100,6 +102,7 @@ jobs:
           pip install -U pip
           pip install -r ./requirements-py38-linux64.txt
           pip install sphinx==6.2 pydata-sphinx-theme
+          pip install --upgrade myst-parser
       - name: Install oq engine
         run: |
           pip install -e .[dev]
@@ -171,8 +174,13 @@ jobs:
               PDF_VER="(master)"
           elif [ "$BUILD" == "dev" ]; then
               DOCS_BASE="${DOCS_BASE}.dev/"
-              TARGET="oq-engine/$GITHUB_REF_NAME/"
-              PDF_VER="($GITHUB_REF_NAME)"
+              if echo "$GITHUB_REF_NAME" | grep -q '[0-9]\+/merge'; then
+                  TARGET="oq-engine/$GITHUB_HD_REF/"
+                  PDF_VER="($GITHUB_HD_REF)"
+              else
+                  TARGET="oq-engine/$GITHUB_REF_NAME/"
+                  PDF_VER="($GITHUB_REF_NAME)"
+              fi
               PDFDOCS="manuals/"
           else
               echo "BUILD [$BUILD] not recognized"

diff --git a/.github/workflows/engine_nightly_test.yml b/.github/workflows/engine_nightly_test.yml
@@ -22,7 +22,6 @@ jobs:
         python-version: [3.8, 3.9, "3.10"]
     env:
       GITHUB_HEAD_REF:  ${{ github.head_ref }}
-      GITHUB_REPOSITORY: ${{ github.repository }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python  ${{ matrix.python-version }}
@@ -33,9 +32,9 @@ jobs:
       run: |
         if [[ "$GITHUB_HEAD_REF" != "" ]]
         then
-          python install.py devel --version=$GITHUB_HEAD_REF --repository=$GITHUB_REPOSITORY
+          python install.py devel --version=$GITHUB_HEAD_REF
         else
-          python install.py devel --repository=$GITHUB_REPOSITORY
+          python install.py devel
         fi
     - name: Calculators and documentation tests
       run: |
@@ -63,9 +62,9 @@ jobs:
       run: |
         if [[ "$GITHUB_HEAD_REF" != "" ]]
         then
-          python install.py devel --version=$GITHUB_HEAD_REF --repository=$GITHUB_REPOSITORY
+          python install.py devel --version=$GITHUB_HEAD_REF
         else
-          python install.py devel --repository=$GITHUB_REPOSITORY
+          python install.py devel
         fi
     - name: Hazardlib tests
       run: |
@@ -94,9 +93,9 @@ jobs:
       run: |
         if [[ "$GITHUB_HEAD_REF" != "" ]]
         then
-          python install.py devel --version=$GITHUB_HEAD_REF --repository=$GITHUB_REPOSITORY
+          python install.py devel --version=$GITHUB_HEAD_REF
         else
-          python install.py devel --repository=$GITHUB_REPOSITORY
+          python install.py devel
         fi
     - name: Server 'PUBLIC' mode tests
       run: |
@@ -124,9 +123,9 @@ jobs:
       run: |
         if [[ "$GITHUB_HEAD_REF" != "" ]]
         then
-          python install.py devel --version=$GITHUB_HEAD_REF --repository=$GITHUB_REPOSITORY
+          python install.py devel --version=$GITHUB_HEAD_REF
         else
-          python install.py devel --repository=$GITHUB_REPOSITORY
+          python install.py devel
         fi
     - name: Server 'READ_ONLY' mode tests
       run: |
@@ -154,9 +153,9 @@ jobs:
       run: |
         if [[ "$GITHUB_HEAD_REF" != "" ]]
         then
-          python install.py devel --version=$GITHUB_HEAD_REF --repository=$GITHUB_REPOSITORY
+          python install.py devel --version=$GITHUB_HEAD_REF
         else
-          python install.py devel --repository=$GITHUB_REPOSITORY
+          python install.py devel
         fi
     - name: Server 'AELO' mode tests
       run: |

diff --git a/.github/workflows/engine_pr_test.yml b/.github/workflows/engine_pr_test.yml
@@ -15,7 +15,7 @@ jobs:
         python-version: ["3.10"]
     env:
       GITHUB_HEAD_REF:  ${{ github.head_ref }}
-      GITHUB_REPOSITORY: ${{ github.repository }}
+      FROM_FORK: ${{ github.event.pull_request.head.repo.fork }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python  ${{ matrix.python-version }}
@@ -24,7 +24,11 @@ jobs:
         python-version:  ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python install.py devel --version=$GITHUB_HEAD_REF --repository=$GITHUB_REPOSITORY
+        if [[ $FROM_FORK == "true" ]]; then
+          python install.py devel --version=$GITHUB_HEAD_REF --from_fork
+        else
+          python install.py devel --version=$GITHUB_HEAD_REF
+        fi
     - name: Calculators and documentation tests
       run: |
         set -e
@@ -41,7 +45,7 @@ jobs:
         python-version: ["3.10"]
     env:
       GITHUB_HEAD_REF: ${{ github.head_ref }}
-      GITHUB_REPOSITORY: ${{ github.repository }}
+      FROM_FORK: ${{ github.event.pull_request.head.repo.fork }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python  ${{ matrix.python-version }}
@@ -50,7 +54,11 @@ jobs:
         python-version:  ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python install.py devel --version=$GITHUB_HEAD_REF --repository=$GITHUB_REPOSITORY
+        if [[ $FROM_FORK == "true" ]]; then
+          python install.py devel --version=$GITHUB_HEAD_REF --from_fork
+        else
+          python install.py devel --version=$GITHUB_HEAD_REF
+        fi
     - name: Hazardlib tests
       run: |
         set -e
@@ -69,7 +77,7 @@ jobs:
         python-version: ["3.10"]
     env:
       GITHUB_HEAD_REF:  ${{ github.head_ref }}
-      GITHUB_REPOSITORY: ${{ github.repository }}
+      FROM_FORK: ${{ github.event.pull_request.head.repo.fork }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python  ${{ matrix.python-version }}
@@ -78,7 +86,11 @@ jobs:
         python-version:  ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python install.py devel --version=$GITHUB_HEAD_REF --repository=$GITHUB_REPOSITORY
+        if [[ $FROM_FORK == "true" ]]; then
+          python install.py devel --version=$GITHUB_HEAD_REF --from_fork
+        else
+          python install.py devel --version=$GITHUB_HEAD_REF
+        fi
     - name: Server 'PUBLIC' mode tests
       run: |
         source ~/openquake/bin/activate
@@ -94,7 +106,7 @@ jobs:
         python-version: ["3.10"]
     env:
       GITHUB_HEAD_REF:  ${{ github.head_ref }}
-      GITHUB_REPOSITORY: ${{ github.repository }}
+      FROM_FORK: ${{ github.event.pull_request.head.repo.fork }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python  ${{ matrix.python-version }}
@@ -103,7 +115,11 @@ jobs:
         python-version:  ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python install.py devel --version=$GITHUB_HEAD_REF --repository=$GITHUB_REPOSITORY
+        if [[ $FROM_FORK == "true" ]]; then
+          python install.py devel --version=$GITHUB_HEAD_REF --from_fork
+        else
+          python install.py devel --version=$GITHUB_HEAD_REF
+        fi
     - name: Server 'READ_ONLY' mode tests
       run: |
         source ~/openquake/bin/activate
@@ -119,7 +135,7 @@ jobs:
         python-version: ["3.10"]
     env:
       GITHUB_HEAD_REF:  ${{ github.head_ref }}
-      GITHUB_REPOSITORY: ${{ github.repository }}
+      FROM_FORK: ${{ github.event.pull_request.head.repo.fork }}
     steps:
     - uses: actions/checkout@v2
     - name: Set up Python  ${{ matrix.python-version }}
@@ -128,7 +144,11 @@ jobs:
         python-version:  ${{ matrix.python-version }}
     - name: Install dependencies
       run: |
-        python install.py devel --version=$GITHUB_HEAD_REF --repository=$GITHUB_REPOSITORY
+        if [[ $FROM_FORK == "true" ]]; then
+          python install.py devel --version=$GITHUB_HEAD_REF --from_fork
+        else
+          python install.py devel --version=$GITHUB_HEAD_REF
+        fi
     - name: Server 'AELO' mode tests
       run: |
         source ~/openquake/bin/activate

diff --git a/.github/workflows/macos_intel_install.yml b/.github/workflows/macos_intel_install.yml
@@ -18,7 +18,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-13]
-        python-version: [3.8, 3.9, "3.10"]
+        python-version: ["3.10"]
     steps:
     # This Checkout use git-ref keyword from dispatch
       - name: Clone Repository (Master)

diff --git a/README.md b/README.md
@@ -106,66 +106,71 @@ The OpenQuake Engine is developed by the **[Global Earthquake Model Foundation (
 
 ## Public Partners
 
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/public/nerc.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/public/dpc.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/public/gns_science.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/public/aus.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/public/nrcan.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/public/NTU.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/public/nset.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/public/swiss_1.jpg)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/public/tem.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/public/usaid.jpg)
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Nerc-logo.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/DPC_logo.jpg" width="18%" align="left"  />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Gns-science-logo.jpg" width="14%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Ga@2x.png" width="19%" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Nanyang-Technological-University-NTU.jpg" width="20%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/NSET_logo.png" width="20%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Canada_Wordmark_2c.jpg" width="20%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/USAID-Identity.png" width="20%" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Swiss-logo.jpg" width="22%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Logomark_color_2t_2_rgb.png" width="10%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/TEM_logo.gif" width="10%" />
+
 
 ## Private Partners
 
 #### Governors
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/governors/eucentre.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/governors/FMGlobal.jpg)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/governors/hannoverRe.jpg)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/governors/munichRe.jpg)
-
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/governors/swissRe.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/governors/verisk.png)
-
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Allianz_logo.png" width="20%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Aon_logo.png" width="14%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Eucentre_logo.png" width="20%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Hannover_Re.png" width="20%" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Moodys_RMS.png" width="25%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Munich_Re.png" width="20%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Verisk_New_Logo.png" width="20%" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/MMC_SEO.jpg" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Wtwlogo.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Swiss-re-logo.png" width="12%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Fm-global.png" width="15%" />
 
 #### Advisors
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/advisors/axa.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/advisors/descartes.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/advisors/oneconcern.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/advisors/guycarpenter.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/advisors/partnerRe.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/advisors/safehub.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/private/advisors/wtw.png)
-
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Axa_logo.png" width="15%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Oneconcern-topiqs2020-thumbnail-image.png" width="17%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/CelsiusPro_logo.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Descartes-underwriting-logo.png" width="24%"/>
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/PartnerRe_logo.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Safehub_logo.png" width="18%" />
 
 ## Associate Partners
 
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/apdim.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/cssc.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/EERI_GEM.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/iaee.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/iaspei.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/IRDRICSU.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/istructe.jpg)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/oecd.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/undrr.jpg)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/unesco.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/associate/usgs.jpg)
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/apdim.svg" width="30%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/IASPEI_logo_new_1.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/iaee.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Usgs-logo.jpg" width="18%" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/UNESCO_logo_symbol.png" width="14%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/eeri_logo_vector100x100.png" width="12%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/irdr_icsu_logo_300.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/UNDRR_logo.png" width="30%" />
+
 
 
 ## Project Partners
 
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/project/aon.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/project/sg.jpg)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/project/sura.png)
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Impact-Forecasting.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Servicio-Geol%C3%B3gico-Colombiano.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Sura-new-logos-website.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/edf_governing_board_logo.png" width="18%" />
 
 
 ## Products Distribution Partners
 
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/prod_distr/imagecat.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/prod_distr/nasdaq.png)
-![](https://github.com/gem/oq-infrastructure/raw/master/logos/prod_distr/verisk.png)
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/nasdaq.png" width="15%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Impact-Forecasting.png" width="18%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/Verisk_New_Logo.png" width="20%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/imagecat_logo_transparent_600x162.png" width="22%" />  
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/dClimate_logo_semibold_Logo.jpg" width="15%" align="left" />
+<img src="https://cloud-storage.globalquakemodel.org/public/partners-logo/eigenrisk-logo.png" width="40%" />
 
 ***
 

diff --git a/debian/changelog b/debian/changelog
@@ -1,4 +1,13 @@
   [Michele Simionato]
+  * Required at least Python 3.10.6 on mac and windows
+
+  [Claudio Schill]
+  * Optimized the Kuehn sigma_mu_adjustment calculation by replacing the
+    multi-step interpolation with a single 2D/3D space interpolation
+
+  [Michele Simionato]
+  * Fixed a bug in calculations with a filtered site collection using the
+    HM2018CorrelationModel
   * Internal: raised a clear error message when get_composite_source_model is
    called without passing a datastore in presence of multifault sources
 

diff --git a/demos/risk/EventBasedDamage/job.ini b/demos/risk/EventBasedDamage/job.ini
@@ -29,6 +29,8 @@ ses_per_logic_tree_path = 1000
 minimum_intensity = 0.05
 minimum_magnitude = 5.3
 intensity_measure_types_and_levels = {'PGA': logscale(1e-10, 1.4, 20)}
+collect_rlzs = false
+individual_rlzs = true
 
 [risk_calculation]
 exposure_file = exposure_model.xml
@@ -37,4 +39,3 @@ consequence_file = {'taxonomy': 'consequences_by_taxonomy.csv'}
 asset_hazard_distance = 20
 risk_investigation_time = 1
 discrete_damage_distribution = true
-return_periods = 500
diff --git a/doc/installing/README.md b/doc/installing/README.md
@@ -66,17 +66,17 @@ See instructions for the [universal installer](./universal.md) script. This scri
   The OpenQuake Engine is also available on **[PyPI](https://pypi.python.org/pypi/openquake.engine)** and can be installed in any Python 3 environment via `pip`:
 
     ```
-    $ pip install -r https://raw.githubusercontent.com/gem/oq-engine/master/requirements-py38-linux64.txt openquake.engine
+    $ pip install -r https://raw.githubusercontent.com/gem/oq-engine/master/requirements-py310-linux64.txt openquake.engine
     ```
-  This works for Linux and Python 3.8. You can trivially adapt the command to Python 3.9 and 3.10, and to other operating systems. For instance for Windows and Python 3.8, it would be
+  This works for Linux and Python 3.10. You can trivially adapt the command to other operating systems. For instance for Windows it would be
 
     ```
-    $ pip install -r https://raw.githubusercontent.com/gem/oq-engine/master/requirements-py38-win64.txt openquake.engine
+    $ pip install -r https://raw.githubusercontent.com/gem/oq-engine/master/requirements-py310-win64.txt openquake.engine
     ```
-  and for Mac and Python 3.8, it would be
+  and for Mac it would be
 
     ```
-    $ pip install -r https://raw.githubusercontent.com/gem/oq-engine/master/requirements-py38-macos.txt openquake.engine
+    $ pip install -r https://raw.githubusercontent.com/gem/oq-engine/master/requirements-py310-macos_arm64.txt openquake.engine
     ```
 
 **Cloud**