Merge branch 'open-ideas:master' into master

Author: kldjonge

.github/workflows/github-actions.yml

@@ -6,40 +6,46 @@ on:
   pull_request:
 jobs:
   build:
-    runs-on: self-hosted
+    runs-on: blizz
     steps:
       - run: echo "🎉 The job was automatically triggered by a ${{ github.event_name }} event"
       - run: echo "🐧 This job is now running on a ${{ runner.os }} server called tony-de-rekenpony hosted by The Sysis team at KU Leuven"
       - run: echo "🔎 The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}"
       - run: echo "The following commands are used to remove files inside container to ensure cleanup and avoid permission errors"
       - run: docker stop dymimg > /dev/null 2>&1 || true 
-      - run: docker run --name dymimg --detach=true --rm -v /home/actions-runner/_work/IDEAS/IDEAS:/home/developer/IDEAS -w /home/developer/IDEAS -it dymimg
+      - run: docker run --name dymimg --detach=true --rm -v /home/u0148284/actions-runner/_work/IDEAS/IDEAS:/home/developer/IDEAS -w /home/developer/IDEAS -it dymimg
       - run: docker exec -t dymimg /bin/bash -c "rm -rf IDEAS && exit"
       - run: docker stop dymimg > /dev/null 2>&1 || true
       - name: Check out repository code
         uses: actions/checkout@v3
         with:
           clean: true
       - name: Change permissions of repository folder
-        run: chmod -R 777 /home/actions-runner/_work
+        run: chmod -R 777 /home/u0148284/actions-runner/_work
       - name: List of files in the repository
         run: | 
          ls ${{ github.workspace }}
   test:
-    runs-on: self-hosted
+    runs-on: blizz
     needs: build
     defaults:
       run:
         working-directory: IDEAS/Resources/Scripts/tests
     steps:
       - name: Test IDEAS.Airflow
         run: make test-dymola PACKAGE=\"IDEAS.Airflow\" INTERACTIVE=false
+      - name: Test IDEAS.BoundaryConditions
+        run: make test-dymola PACKAGE=\"IDEAS.BoundaryConditions\" INTERACTIVE=false
       - name: Test IDEAS.Buildings.Components
         run: make test-dymola PACKAGE=\"IDEAS.Buildings.Components\" INTERACTIVE=false
       - name: Test IDEAS.Buildings.Examples
         run: make test-dymola PACKAGE=\"IDEAS.Buildings.Examples\" INTERACTIVE=false
       - name: Test IDEAS.Buildings.Validation
         run: make test-dymola PACKAGE=\"IDEAS.Buildings.Validation\" INTERACTIVE=false
+      - name: Test IDEAS.Controls
+        run: make test-dymola PACKAGE=\"IDEAS.Controls\" INTERACTIVE=false
+      - name: Test IDEAS.Electrical
+        run: make test-dymola PACKAGE=\"IDEAS.Electrical\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Actuators
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Actuators\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.BaseClasses
@@ -52,12 +58,18 @@ jobs:
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Examples\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.FixedResistances
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.FixedResistances\" INTERACTIVE=false
+      - name: Test IDEAS.Fluid.FMI
+        run: make test-dymola PACKAGE=\"IDEAS.Fluid.FMI.Adaptors\" INTERACTIVE=false 
+            && make test-dymola PACKAGE=\"IDEAS.Fluid.FMI.Conversion\" INTERACTIVE=false
+            && make test-dymola PACKAGE=\"IDEAS.Fluid.FMI.Validation\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Geothermal
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Geothermal\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.HeatExchangers
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.HeatExchangers\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.HeatPumps
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.HeatPumps\" INTERACTIVE=false
+      - name: Test IDEAS.Fluid.Humidifiers
+        run: make test-dymola PACKAGE=\"IDEAS.Fluid.Humidifiers\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Interfaces
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Interfaces\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.MassExchangers
@@ -68,29 +80,27 @@ jobs:
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Movers\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Sensors
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Sensors\" INTERACTIVE=false
+      - name: Test IDEAS.Fluid.SolarCollectors
+        run: make test-dymola PACKAGE=\"IDEAS.Fluid.SolarCollectors\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Sources
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Sources\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Storage
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Storage\" INTERACTIVE=false
       - name: Test IDEAS.Fluid.Taps
         run: make test-dymola PACKAGE=\"IDEAS.Fluid.Taps\" INTERACTIVE=false
-      - name: Test IDEAS.ThermalZones
-        run: make test-dymola PACKAGE=\"IDEAS.ThermalZones\" INTERACTIVE=false
-      - name: Test IDEAS.BoundaryConditions
-        run: make test-dymola PACKAGE=\"IDEAS.BoundaryConditions\" INTERACTIVE=false
-      - name: Test IDEAS.Controls
-        run: make test-dymola PACKAGE=\"IDEAS.Controls\" INTERACTIVE=false
       - name: Test IDEAS.Media
         run: make test-dymola PACKAGE=\"IDEAS.Media\" INTERACTIVE=false
-      - name: Test IDEAS.Utilities
-        run: make test-dymola PACKAGE=\"IDEAS.Utilities\" INTERACTIVE=false
       - name: Test IDEAS.Templates
         run: make test-dymola PACKAGE=\"IDEAS.Templates\" INTERACTIVE=false
+      - name: Test IDEAS.ThermalZones
+        run: make test-dymola PACKAGE=\"IDEAS.ThermalZones\" INTERACTIVE=false
+      - name: Test IDEAS.Utilities
+        run: make test-dymola PACKAGE=\"IDEAS.Utilities\" INTERACTIVE=false
       - name: Test IDEAS.Examples.PPD12
         run: make test-dymola PACKAGE=\"IDEAS.Examples.PPD12\" INTERACTIVE=false
       - name: Test IDEAS.Examples.IBPSA
         run: make test-dymola PACKAGE=\"IDEAS.Examples.IBPSA\" INTERACTIVE=false
       - name: Test IDEAS.Examples.Tutorial
         run: make test-dymola PACKAGE=\"IDEAS.Examples.Tutorial\" INTERACTIVE=false
       - name: Test IDEAS.Examples.TwinHouses
-        run: make test-dymola PACKAGE=\"IDEAS.Examples.TwinHouses\" INTERACTIVE=false
+        run: make test-dymola PACKAGE=\"IDEAS.Examples.TwinHouses\" INTERACTIVE=false

.gitignore

@@ -1,33 +1,41 @@
-*.log
+# Files and folders below are ignored
+
 *.aux
+*.bak-mo
+*.dll
+*.DS_Store
+*.exe
+*.exp
+*.fmu
+*.gz
 *.idx
 *.ilg
 *.ind
-*.out
-*.gz
-*.toc
-*.dll
 *.lib
-*.fmu
-*.xml
-*.txt
+*.log
 *.mat
-*.exe
-*.exp
-*.rar
-*.bak-mo
-*.DS_Store
+/*.mm
+*.mof
 *.mos~
+*.out
+*.rar
+*.toc
+*.txt
+*.xml
+systemScript.py
+.idea/
+/IDEAS backup
+/IDEAS/funnel_comp
+/IDEAS/Inputs
+/IDEAS/*.pyc
+/IDEAS/Resources/drawings.pptx
 /Specifications/Specs.synctex
 /Specifications/Specs.tcp
 /Specifications/Specs.tps
-/IDEAS backup
+
+# The files below are not ignored (hence the "!")
 !/Inputs/*.txt
 !/IDEAS/Inputs/*.txt
+!/IDEAS/Resources/Data/**/*.txt
 !/IDEAS/Resources/strobe/*.txt
-!/IDEAS/Resources/ReferenceResults/Dymola/*txt
-/IDEAS/Resources/drawings.pptx
-/*.mm
-/IDEAS/*.pyc
-systemScript.py
-/IDEAS/Inputs
+!/IDEAS/Resources/ReferenceResults/Dymola/*.txt