Merge for release 1.3.0 (#1318)

* Add discretization of volumes

* Change lambda for more realistic thermal wave propagation

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/i1227_SimplePipeVolume/plots/ [skip ci]

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/i1227_SimplePipeVolume/plots/ [skip ci]

* [skip ci]

* #784 plot script for unit test has been added

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue784_AhuWithHydraulicModules/plots/ [skip ci]

* push latest changes

* chore: wall names

* refactor airload, fix names and extend walls

* Fixes wrong connection of fluid ports

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue1123_partialHOMModels/plots/ [skip ci]

* Adds moisture balance to partial room model.

* temp cmt

* Adds documentation for PartialRoom.mo

* Make four room partial model more dynamic and extend all relevant examples from it.

* add documentation #1123

* Revert changes

* Reverts change on port connection to airLoad (happened accidently)

* Make parameters optional

* Revert "Issue784 ahu with hydraulic modules"

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/revert-1039-issue784_AhuWithHydraulicModules/plots/ [skip ci]

* #784 changed parameter in DynamicHX.mo Gc1 and Gc2 to type thermal coductance + use admix as predefined circuit in RegisterModule.mo

* "ci_regression_test"

* Add fitting description [skip ci] #1215

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue1215_internalGainsOuput/plots/ [skip ci]

* chore: trigger change

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/development_update/plots/ [skip ci]

* chore: trigger pipeline again

* Fix Regression errors

* feat: move NCDataReader to obsolete

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/development_update/plots/ [skip ci]

* feat: remove submodule for NetCFD reader as NCdatareader is now obsolete

* Fix conditional case

* Remove failing examples due to obsolete models #1179

* rm unwanted mos and ref-results

* Delete results to trigger update

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue1123_partialHOMModels/plots/ [skip ci]

* trigger pipeline

* Fix energyDynamics of old model

* Fix init problem in OFDHeatLoad.mo

* fix initial conditions, this time for real

* rm reference result to update

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue1123_partialHOMModels/plots/ [skip ci]

* Changed documentation slightly to trigger CI

* Deletes parameter ´ratioConvectiveHeat´, updates ´ThermalZone´

For #1248

* [skip-ci] Add conversion script and increase AixLib-version

For #1248

* Delete reference results to trigger update

* Correct typo in package.mo

* Create github-action-slack.yml

* #784 add modular AHU model and controller models after revert

* #784 plot scripts for modular ahu added

* #784 plot script setup modified of GenericAHU.mos

* #784 genericAHU: typo in annotations fixed

* #784 start values for m_flow nominal in generic ahu to avoid warnings

* Update Templates, Script: IBPSA Merge with Image Dymola 2020 with MSL 4.0

* Update IBPSA Merge template

* Update validatetest script

* Update WhiteList_CheckModel.txt and HTML_IBPSA_WhiteList.txt

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* fix errors manually

* Fix errors manually

* fix errors manually

* fix errors manually

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/ [skip ci]

* ci_regression_test

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/ [skip ci]

* ci_regression_test

* ci_regression_test

* ci_regression_test

* ci_regression_test

* Fix script annotation

* Trigger IBPSA Merge

* Update WhiteList_CheckModel.txt and HTML_IBPSA_WhiteList.txt

* fix errors manually

* ci_check

* ci_check

* ci_check

* Update Slack Scripts

* #784 plot script GenericAHU.mos modified

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue784_AhuWithHydraulicModules/plots/ [skip ci]

* fix errors manually

* fix errors manually

* fix errors manually

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue784_AhuWithHydraulicModules/plots/ [skip ci]

* #784 temperatures in AHUbus renamed

* #784 bug fix in plot script due to renaming of air temperatures

* #784 reference results updated

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/issue784_AhuWithHydraulicModules/plots/ [skip ci]

* Add Issue Tracker

* Fix in github action script

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* ci_regression_test

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* ci_regression_test

* lower case for simlate and plot script command

* lower case for simlate and plot script command

* Update WhiteList_CheckModel.txt and HTML_IBPSA_WhiteList.txt

* fix errors manually

* ci_update_ref

* ci_update_ref

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* ci_update_ref

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* ci_update_ref

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* ci_regression_test

* ci_regression_test

* ci_regression_test

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* ci_regression_test

* ci_simulate

* ci_regression_test

* remove .github/README.md

* remove ci_slack_branch_inactive_list.txt

* ci_regression_test

* ci_regression_test

* ci_update_ref

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* ci_regression_test

* ci_regression_test

* ci_regression_test

* ci_regression_test

* ci_regression_test

* #1122 default for natural infiltration equals default for mechanical ventilation for conversion [scip ci]

* ci_regression_test

* #1122 Correct connections [scip ci]

* #1122 Change affected examples [scip ci]

* ci_regression_test

* ci_regression_test

* ci_regression_test

* #1122 add conversion script

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* Update google_charts.py script

* #1122 fix errors in multizone and apply equivalent changes as in thermal zone

* fix errors

* #1122 remove unnecessary comments [scip ci]

* #1122 change parameter description [scip ci]

* #1122 changed version specifier to 1.0.4 [scip ci]

* #1122 correction of annotations

* Change Templates

* fix errors manually

* fix errors manually

remove AixLib.Systems.HydraulicModules.Example.Pump from whitelist as it should be fixed

* ci_regression_test

* ci_regression_test

* ci_regression_test

* ci_regression_test

* ci_regression_test

* ci_regression_test

* ci_regression_test

* Update templates: Change to xvfb-run -n 77

* Update templates: Change to xvfb-run -n 77

* Update templates: Change to xvfb-run -n 77

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* ci_update_ref

* ci_update_ref

* Automatic push of CI with updated or new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/IBPSA_Merge/plots/

* temp deactivate issue tracker workflow 

This currently leads to problems with doubled branches  because automatic creation of branches might create doubled branches (case sensitivity)

* Delete issue-tracker.yml

Disabling does not work and results in error emails to people who push content.

* Add script, move to obsolete #978

* Fix gitlab templates

* Change command convertClass to ConvertModifiers

* Add new development stage in gitlab tempaltes

* Change in template check_model

* Actually delete files

* Test Changes in regression templates

* Test Changes in regression templates

* Automatic push of CI with new regression reference files.Please pull the new files before push again. Plottet Results https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib/Issue1313_fix_RegressionTest_Check_References/plots/

* Added a medium choice in PartialRoom (HOM) (#1303)

* Added a medium choice in PartialRoom (HOM)

Furthermore a model for air with co2 was added to the selection in PartialRoom

* Reverted not necessary changes

* Minor Changes

- changed the name of the new medium parameter
- deleted unused medium parameters (Water and Glycol/Water mixture)

Co-authored-by: fabian.wuellhorst <[email protected]>

* Update version to 1.3.0 for new release

Co-authored-by: FelixStege <[email protected]>
Co-authored-by: ebc-aixlib-bot <[email protected]>
Co-authored-by: FelixStege <[email protected]>
Co-authored-by: Alexander Kümpel <[email protected]>
Co-authored-by: A. Kuempel <[email protected]>
Co-authored-by: fabian.wuellhorst <[email protected]>
Co-authored-by: Martin Kremer <[email protected]>
Co-authored-by: David Jansen <[email protected]>
Co-authored-by: David <[email protected]>
Co-authored-by: FWuellhorst <[email protected]>
Co-authored-by: SvenHinrichs <[email protected]>
Co-authored-by: SvenHinrichs <[email protected]>
Co-authored-by: Martin Kremer <[email protected]>
Co-authored-by: tobinfiedler <[email protected]>

.gitconfig

@@ -0,0 +1 @@
+anw = !git diff -U0 -w --no-color -- \"$@\" | git apply --cached --ignore-whitespace --unidiff-zero "#"

.github/issue-branch.yml

@@ -0,0 +1,10 @@
+# configuration file for automatic issue branch creation
+branchName: 'Issue${issue.number}_${issue.title}'
+silent: false
+autoCloseIssue: true
+gitSafeReplacementChar: '_'
+defaultBranch: 'development'
+
+branches:
+  - label: question
+    skip: true

.github/workflows/github-action-slack.yml

@@ -0,0 +1,21 @@
+name: github-action-slack
+on:
+  schedule:
+    # * is a special character in YAML so you have to quote this string
+    - cron:  '0 18 1 * *'
+
+
+jobs:
+  slack_message_job:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        # in this example, there is a newer version already installed, 3.7.7, so the older version will be downloaded
+        python-version: ['3.10']
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: '3.11.0-alpha.1'
+      - run:  pip install requests datetime argparse slack_sdk
+      - run:  python bin/CITests/04_api_script/api_slack.py --github-token ${{ secrets.GIT_TOKEN }} --slack-token ${{ secrets.SLACK_BOT_TOKEN }} --github-repo "RWTH-EBC/AixLib" --base-branch "development"

.gitlab-ci.yml

@@ -1,58 +1,39 @@
-#!/bin/bash
-image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:miniconda-latest
-
-stages:
-    - deleteBranch
-    - IBPSA_Merge
-    - Update_WhiteList
-    - Release
-    - SetSettings
-    - CheckSettings
-    - Ref_Check
-    - Ref_Update
-    - Dif_Ref
-    - build
-    - HTMLCheck
-    - deploy
-    - openMR
-    - post
-    - ChangedModels
-    - StyleCheck
-    - Check
-    - Simulate
-    - RegressionTest
-
-
-variables:
-    Praefix_Branch: "Correct_HTML_"
-    TARGET_BRANCH: $CI_COMMIT_REF_NAME
-    Newbranch: ${Praefix_Branch}${CI_COMMIT_REF_NAME}
-    Github_Repository : RWTH-EBC/AixLib
-
-include:
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/CheckConfiguration/check_settings.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/deploy/deploy_ref.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/UnitTests/development_check.gitlab-ci.yml' 
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/deploy/IBPSA_Merge.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/UnitTests/regression_ref_check.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/SyntaxTests/html_check.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/SyntaxTests/style_check.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/UnitTests/check_model.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/UnitTests/regression_test.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/UnitTests/simulate_model.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/UnitTests/changed_simulate_model.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file:  'modelica-ci-tests/UnitTests/changed_check_model.gitlab-ci.yml'
-  - project: 'EBC/EBC_all/gitlab_ci/templates'
-    file: 'modelica-ci-tests/UnitTests/changed_regression_test.gitlab-ci.yml'
+
+image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
+
+stages:
+    - check_setting
+    - build_templates
+    - Ref_Check
+    - build
+    - HTML_Check
+    - IBPSA_Merge
+    - create_html_whitelist
+    - Update_WhiteList
+    - Release
+    - StyleCheck
+    - check
+    - openMR
+    - post
+    - create_whitelist
+    - simulate
+    - RegressionTest
+    - Update_Ref
+    - plot_ref
+    - prepare
+    - deploy
+    
+variables:
+    Github_Repository: RWTH-EBC/AixLib
+    GITLAB_Page: https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib
+    
+include:
+    - 'bin/templates/03_ci_templates/01_deploy/gitlab_pages.gitlab-ci.yml'  
+    - 'bin/templates/03_ci_templates/01_deploy/IBPSA_Merge.gitlab-ci.yml'  
+    - 'bin/templates/03_ci_templates/02_UnitTests/check_model.gitlab-ci.yml'  
+    - 'bin/templates/03_ci_templates/02_UnitTests/regression_test.gitlab-ci.yml'  
+    - 'bin/templates/03_ci_templates/02_UnitTests/simulate_model.gitlab-ci.yml'  
+    - 'bin/templates/03_ci_templates/03_SyntaxTest/html_check.gitlab-ci.yml'  
+    - 'bin/templates/03_ci_templates/03_SyntaxTest/style_check.gitlab-ci.yml'  
+    - 'bin/templates/03_ci_templates/04_CleanUpScript/ci_setting.gitlab-ci.yml'  
+

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "netCDF-DataReader"]
-	path = netCDF-DataReader
-	url = https://github.com/modelica-3rdparty/netCDF-DataReader
-	branch = master