avaframe 2.0rc3__tar.gz → 2.1__tar.gz

{avaframe-2.0rc3 → avaframe-2.1}/.coveragerc

@@ -8,3 +8,4 @@ omit = */test_*
        */__init__.py
        */run*
        */out3Plot/out*
+       */com9MoTVoellmy/_buildMoTVoellmy.py

{avaframe-2.0rc3 → avaframe-2.1}/.github/workflows/buildAndUploadPyPi.yml

@@ -1,5 +1,6 @@
 # Deploy to pypi for all plattforms
 
+
 name: Build and upload to PyPI
 
 on:
@@ -29,6 +30,14 @@ jobs:
         env:
           CIBW_PLATFORM: ${{ matrix.platform || 'auto' }}
           # CIBW_BUILD_FRONTEND: "build[uv]"
+          CIBW_BEFORE_BUILD_LINUX: >
+            python {package}/avaframe/com9MoTVoellmy/_buildMoTVoellmy.py
+          CIBW_BEFORE_BUILD_WINDOWS: >
+            choco install mingw -y &&
+            python {package}/avaframe/com9MoTVoellmy/_buildMoTVoellmy.py
+          CIBW_BEFORE_BUILD_MACOS: >
+            python {package}/avaframe/com9MoTVoellmy/_buildMoTVoellmy.py
+          CIBW_ENVIRONMENT: GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
 
       - uses: actions/upload-artifact@v7
         with:
@@ -51,12 +60,14 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install numpy cython build
-#      - name: Compile cython code
-#        run: |
-#          python setup.py build_ext --inplace
-#      - name: Install avaframe
-#        run: |
-#          pip install .
+      - name: Compile MoT-Voellmy binaries
+        run: |
+          python avaframe/com9MoTVoellmy/_buildMoTVoellmy.py
+          sudo apt-get install -y gcc-mingw-w64-x86-64
+          C_FILE=$(ls avaframe/com9MoTVoellmy/MoT-Voellmy.*.c 2>/dev/null | head -1)
+          if [ -n "$C_FILE" ]; then
+            x86_64-w64-mingw32-gcc -Wall -pedantic -o avaframe/com9MoTVoellmy/MoT-Voellmy_win.exe "$C_FILE" -lm
+          fi
       - name: create source distribution
         run: python -m build
 #      - name: Build sdist

{avaframe-2.0rc3 → avaframe-2.1}/.github/workflows/runTestSinglePython.yml

@@ -23,11 +23,12 @@ jobs:
       - uses: actions/checkout@v5
         with:
           fetch-depth: 0
-      - uses: prefix-dev/setup-pixi@v0.9.1
+      - uses: prefix-dev/setup-pixi@v0.9.6
         with:
           cache: false
       - name: Pixi run pytest
         run: |
+          pixi run compilemot
           pixi run pytest -ra --cov --cov-report=xml --cov-report lcov:cov.info --cov-config=.coveragerc
       - uses: qltysh/qlty-action/coverage@main
         with:

{avaframe-2.0rc3 → avaframe-2.1}/.gitignore

@@ -44,6 +44,11 @@ avaframe/com1DFA/*.so
 
 /.pixi/
 
+# MoT-Voellmy compiled binaries and downloaded sources
+avaframe/com9MoTVoellmy/MoT-Voellmy_linux.exe
+avaframe/com9MoTVoellmy/MoT-Voellmy_win.exe
+avaframe/com9MoTVoellmy/MoT-Voellmy.*.c
+
 # auxilliary geodata .xml files (created by GIS software packages)
 *.aux.xml
 

{avaframe-2.0rc3 → avaframe-2.1}/MANIFEST.in

@@ -3,6 +3,7 @@ include avaframe/version.py
 include avaframe/in3Utils/logging.conf
 include avaframe/com1DFA/*.pyx
 include avaframe/com9MoTVoellmy/MoT-Voellmy*.exe
+include avaframe/com9MoTVoellmy/_buildMoTVoellmy.py
 recursive-include avaframe *Cfg.ini
 global-exclude local_*Cfg.ini
 prune benchmarks

{avaframe-2.0rc3 → avaframe-2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: avaframe
-Version: 2.0rc3
+Version: 2.1
 Summary: The Open Avalanche Framework
 Author-email: AvaFrame Contributors <felix@avaframe.org>
 License-Expression: EUPL-1.2

avaframe-2.1/avaframe/RELEASE-VERSION.txt

@@ -0,0 +1 @@
+2.1

{avaframe-2.0rc3 → avaframe-2.1}/avaframe/ana1Tests/energyLineTestCfg.ini

@@ -30,7 +30,7 @@ simTypeList = null
 
 #+++++++++++++ Output++++++++++++
 # desired result Parameters (ppr, pft, pfv, pta, FT, FV, P, Vx, Vy, Vz, TA, particles) - separated by |
-resType = FT|FV|FM|particles
+resType = FT|FV|FM|particles|pfv
 # saving time step, i.e.  time in seconds (first and last time step are always saved)
 # option 1: give an interval with start:interval in seconds (tStep = 0:5 - this will save desired results every 5 seconds for the full simulation)
 # option 2: explicitly list all desired time steps (closest to actual computational time step) separated by | (example tSteps = 1|50.2|100)

{avaframe-2.0rc3 → avaframe-2.1}/avaframe/ana3AIMEC/aimecTools.py

@@ -1219,7 +1219,7 @@ def computeRunOut(
     resAnalysisDF.loc[simRowHash, "zRelease"] = zThalweg[cUpper]
     resAnalysisDF.loc[simRowHash, "elevRel"] = zThalweg[cUpper]
     resAnalysisDF.loc[simRowHash, "deltaZ"] = zThalweg[cUpper] - zThalweg[cLower]
-    resAnalysisDF.loc[simRowHash, "runoutFound"] = runoutFound
+    resAnalysisDF.loc[simRowHash, "runoutFound"] = str(runoutFound)
 
     return resAnalysisDF
 
@@ -1520,11 +1520,11 @@ def analyzeArea(
     if (
         simRowHash != refSimRowHash
         and cfgPlots.getboolean("extraPlots")
-        and resAnalysisDF.loc[simRowHash, "runoutFound"]
+        and resAnalysisDF.loc[simRowHash, "runoutFound"].lower() == "true"
     ):
         # only plot comparisons of simulations to reference
         compPlotPath = outAimec.visuComparison(rasterTransfo, inputs, pathDict)
-    elif not resAnalysisDF.loc[simRowHash, "runoutFound"] and cfgPlots.getboolean("extraPlots"):
+    elif not resAnalysisDF.loc[simRowHash, "runoutFound"].lower() == "true" and cfgPlots.getboolean("extraPlots"):
         log.warning(
             "ContourComparisonToReference plot not generated as only 0 values for comparison simulation: %s"
             % resAnalysisDF.loc[simRowHash, "simName"]