diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml index 5ef21529a0..a3e0e3a432 100644 --- a/.github/workflows/github-actions.yml +++ b/.github/workflows/github-actions.yml @@ -6,14 +6,14 @@ 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 @@ -21,12 +21,12 @@ jobs: 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 \ No newline at end of file + run: make test-dymola PACKAGE=\"IDEAS.Examples.TwinHouses\" INTERACTIVE=false diff --git a/.gitignore b/.gitignore index 4baf7b6183..e99d8de1b0 100644 --- a/.gitignore +++ b/.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 diff --git a/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo b/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo index b0b0e4bdcd..d6a29efe78 100644 --- a/IDEAS/Airflow/Multizone/BaseClasses/DoorDiscretized.mo +++ b/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="