Project itz fixes v2

.github/workflows/github-actions.yml

@@ -6,27 +6,27 @@ 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:
@@ -93,4 +93,4 @@ jobs:
       - 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,40 @@
-*.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/strobe/*.txt
-!/IDEAS/Resources/ReferenceResults/Dymola/*txt
-/IDEAS/Resources/drawings.pptx
-/*.mm
-/IDEAS/*.pyc
-systemScript.py
-/IDEAS/Inputs
+!/IDEAS/Resources/ReferenceResults/Dymola/*.txt

IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo

@@ -17,9 +17,9 @@ partial model DoorDiscretized
   Modelica.Units.SI.Velocity vTop "Velocity at top of opening from A to B";
   Modelica.Units.SI.Velocity vBot "Velocity at bottom of opening from A to B";
 
-protected
-  parameter Modelica.Units.SI.Length dh=hOpe/nCom "Height of each compartment";
 
+  input Modelica.Units.SI.Length dh=hOpe/nCom "Height of each compartment";
+protected
   parameter Medium.ThermodynamicState sta_default=Medium.setState_pTX(
       T=Medium.T_default,
       p=Medium.p_default,
@@ -28,11 +28,11 @@ protected
   parameter Modelica.Units.SI.Density rho_default=Medium.density(sta_default)
     "Density, used to compute fluid volume";
 
-  parameter Real hAg[nCom](each unit="m2/s2")=
+  input Real hAg[nCom](each unit="m2/s2")=
     {Modelica.Constants.g_n*(hA - (i - 0.5)*dh) for i in 1:nCom}
     "Product g*h_i for each compartment";
 
-  parameter Real hBg[nCom](each unit="m2/s2")=
+  input Real hBg[nCom](each unit="m2/s2")=
     {Modelica.Constants.g_n*(hB - (i - 0.5)*dh) for i in 1:nCom}
     "Product g*h_i for each compartment";
   Modelica.Units.SI.AbsolutePressure pA[nCom](each nominal=101325)
@@ -118,6 +118,10 @@ using the model for a door that can be open or closed.
 revisions="<html>
 <ul>
 <li>
+October 29, 2024, by Klaas De Jonge:<br/>
+Unprotected <code>dh</code> and changed prefixes of <code>dh</code>,<code>hAg</code> and <code>hBg</code> to <code>input</code>. This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1935\">#1935</a>.
+</li>
+<li>
 January 8, 2019, by Michael Wetter:<br/>
 Moved parameter <code>CD</code> from
 <a href=\"modelica://IDEAS.Airflow.Multizone.BaseClasses.DoorDiscretized\">

IDEAS/Airflow/Multizone/Examples/TrickleVentIDEAS.mo

@@ -2,27 +2,27 @@ within IDEAS.Airflow.Multizone.Examples;
 model TrickleVentIDEAS
   "Model with a trickle vent modelled using the models with flow based on tabulated data"
   extends IDEAS.Airflow.Multizone.Examples.TrickleVent(west(nPorts=2), east(nPorts=2));
- 
+
   IDEAS.Airflow.Multizone.TrickleVent vent(
     redeclare package Medium = Medium,
-    dp_nominal = 10, 
-    m_flow_nominal = 0.02614, 
-    use_y = true) 
-    "Analytic trickle vent implementation"  annotation(
+    dp_nominal = 10,
+    m_flow_nominal = 0.02614,
+    use_y = true)
+    "Analytic trickle vent implementation"  annotation (
     Placement(visible = true, transformation(origin = {20, -70}, extent = {{-10, 10}, {10, -10}}, rotation = 0)));
   Modelica.Blocks.Sources.Ramp ramp(
-    duration = 1e6, 
-    height = -1, 
-    offset = 1, 
-    startTime = 1592000)  
-    "Step control signal" annotation(
+    duration = 1e6,
+    height = -1,
+    offset = 1,
+    startTime = 1592000)
+    "Step control signal" annotation (
     Placement(visible = true, transformation(origin = {-90, -88}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
-   connect(vent.port_a, east.ports[2]) annotation(
+   connect(vent.port_a, east.ports[2]) annotation (
     Line(points = {{10, -70}, {-25, -70}, {-25, -30}, {-30, -30}}, color = {0, 127, 255}));
-  connect(vent.port_b, west.ports[2]) annotation(
+  connect(vent.port_b, west.ports[2]) annotation (
     Line(points = {{30, -70}, {65, -70}, {65, -30}, {70, -30}}, color = {0, 127, 255}));
-  connect(ramp.y, vent.y) annotation(
+  connect(ramp.y, vent.y) annotation (
     Line(points = {{-79, -88}, {20.5, -88}, {20.5, -82}, {20, -82}}, color = {0, 0, 127}));
   annotation (__Dymola_Commands(file="modelica://IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/Examples/TrickleVentIDEAS.mos"
         "Simulate and plot"),
@@ -37,9 +37,7 @@ This model illustrates the use of the models
 IDEAS.Airflow.Multizone.Table_V_flow</a>, 
 which is an analytic alternative to the table implementation of
 <a href=\"modelica://IDEAS.Airflow.Multizone.Table_m_flow\">
-IDEAS.Airflow.Multizone.Table_m_flow</a> for
-
-modelling self regulating inlet vents.
+IDEAS.Airflow.Multizone.Table_m_flow</a> for modelling self regulating inlet vents.
 </p>
 </html>", revisions="<html>
 <ul>
@@ -50,4 +48,4 @@ First implementation.
 </ul>
 </html>"),
  Diagram);
-end TrickleVentIDEAS;
+end TrickleVentIDEAS;

IDEAS/Airflow/Multizone/ReversibleDensityColumn.mo → IDEAS/Airflow/Multizone/MediumColumnReversible.mo

@@ -1,13 +1,13 @@
 within IDEAS.Airflow.Multizone;
-model ReversibleDensityColumn
+model MediumColumnReversible
   "Vertical shaft with no friction and no storage of heat and mass, reversible because it can handle negative column heights"
 
   extends IDEAS.Airflow.Multizone.MediumColumn(
-    h(min=-Modelica.Constants.inf), 
+    h(min=-Modelica.Constants.inf),
     final densitySelection = IDEAS.Airflow.Multizone.Types.densitySelection.fromBottom);
     // by convention, port_b must be connected to a zone instead of a flow element
     // h is allowed to be negative to accomodate for this convention
-  
+
   annotation (
 Icon(graphics={
     Line(
@@ -39,4 +39,4 @@ This makes port_a not nececarilly always the top port.
 </li>
 </ul>
 </html>"));
-end ReversibleDensityColumn;
+end MediumColumnReversible;