Skip to content

Commit 098f613

Browse files
larissakuehnFelixStegeebc-aixlib-botalexanderAKUA. Kuempel
authored
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 <fabian.wuellhorst@rwth-aachen.de> * Update version to 1.3.0 for new release Co-authored-by: FelixStege <felix.stegemerten@rwth-aachen.de> Co-authored-by: ebc-aixlib-bot <hinrichs-sven@gmx.de> Co-authored-by: FelixStege <38731996+FelixStege@users.noreply.github.com> Co-authored-by: Alexander Kümpel <alexander.kuempel@rwth-aachen.de> Co-authored-by: A. Kuempel <AKuempel@eonerc.rwth-aachen.de> Co-authored-by: fabian.wuellhorst <fabian.wuellhorst@rwth-aachen.de> Co-authored-by: Martin Kremer <martin.theodor.kremer@rwth-aachen.de> Co-authored-by: David Jansen <david.jansen@eonerc.rwth-aachen.de> Co-authored-by: David <david.jansen1@rwth-aachen.de> Co-authored-by: FWuellhorst <fabian.wuellhorst@eonerc.rwth-aachen.de> Co-authored-by: SvenHinrichs <40233057+SvenHinrichs@users.noreply.github.com> Co-authored-by: SvenHinrichs <sven.hinrichs@rwth-aachen.de> Co-authored-by: Martin Kremer <48821826+KremerMartin@users.noreply.github.com> Co-authored-by: tobinfiedler <73986053+tobinfiedler@users.noreply.github.com>
1 parent 65e49dd commit 098f613

2,733 files changed

Lines changed: 218374 additions & 95342 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
anw = !git diff -U0 -w --no-color -- \"$@\" | git apply --cached --ignore-whitespace --unidiff-zero "#"

.github/issue-branch.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# configuration file for automatic issue branch creation
2+
branchName: 'Issue${issue.number}_${issue.title}'
3+
silent: false
4+
autoCloseIssue: true
5+
gitSafeReplacementChar: '_'
6+
defaultBranch: 'development'
7+
8+
branches:
9+
- label: question
10+
skip: true
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
name: github-action-slack
2+
on:
3+
schedule:
4+
# * is a special character in YAML so you have to quote this string
5+
- cron: '0 18 1 * *'
6+
7+
8+
jobs:
9+
slack_message_job:
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
# in this example, there is a newer version already installed, 3.7.7, so the older version will be downloaded
14+
python-version: ['3.10']
15+
steps:
16+
- uses: actions/checkout@v2
17+
- uses: actions/setup-python@v2
18+
with:
19+
python-version: '3.11.0-alpha.1'
20+
- run: pip install requests datetime argparse slack_sdk
21+
- 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

Lines changed: 39 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,39 @@
1-
#!/bin/bash
2-
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:miniconda-latest
3-
4-
stages:
5-
- deleteBranch
6-
- IBPSA_Merge
7-
- Update_WhiteList
8-
- Release
9-
- SetSettings
10-
- CheckSettings
11-
- Ref_Check
12-
- Ref_Update
13-
- Dif_Ref
14-
- build
15-
- HTMLCheck
16-
- deploy
17-
- openMR
18-
- post
19-
- ChangedModels
20-
- StyleCheck
21-
- Check
22-
- Simulate
23-
- RegressionTest
24-
25-
26-
variables:
27-
Praefix_Branch: "Correct_HTML_"
28-
TARGET_BRANCH: $CI_COMMIT_REF_NAME
29-
Newbranch: ${Praefix_Branch}${CI_COMMIT_REF_NAME}
30-
Github_Repository : RWTH-EBC/AixLib
31-
32-
include:
33-
- project: 'EBC/EBC_all/gitlab_ci/templates'
34-
file: 'modelica-ci-tests/CheckConfiguration/check_settings.gitlab-ci.yml'
35-
- project: 'EBC/EBC_all/gitlab_ci/templates'
36-
file: 'modelica-ci-tests/deploy/deploy_ref.gitlab-ci.yml'
37-
- project: 'EBC/EBC_all/gitlab_ci/templates'
38-
file: 'modelica-ci-tests/UnitTests/development_check.gitlab-ci.yml'
39-
- project: 'EBC/EBC_all/gitlab_ci/templates'
40-
file: 'modelica-ci-tests/deploy/IBPSA_Merge.gitlab-ci.yml'
41-
- project: 'EBC/EBC_all/gitlab_ci/templates'
42-
file: 'modelica-ci-tests/UnitTests/regression_ref_check.gitlab-ci.yml'
43-
- project: 'EBC/EBC_all/gitlab_ci/templates'
44-
file: 'modelica-ci-tests/SyntaxTests/html_check.gitlab-ci.yml'
45-
- project: 'EBC/EBC_all/gitlab_ci/templates'
46-
file: 'modelica-ci-tests/SyntaxTests/style_check.gitlab-ci.yml'
47-
- project: 'EBC/EBC_all/gitlab_ci/templates'
48-
file: 'modelica-ci-tests/UnitTests/check_model.gitlab-ci.yml'
49-
- project: 'EBC/EBC_all/gitlab_ci/templates'
50-
file: 'modelica-ci-tests/UnitTests/regression_test.gitlab-ci.yml'
51-
- project: 'EBC/EBC_all/gitlab_ci/templates'
52-
file: 'modelica-ci-tests/UnitTests/simulate_model.gitlab-ci.yml'
53-
- project: 'EBC/EBC_all/gitlab_ci/templates'
54-
file: 'modelica-ci-tests/UnitTests/changed_simulate_model.gitlab-ci.yml'
55-
- project: 'EBC/EBC_all/gitlab_ci/templates'
56-
file: 'modelica-ci-tests/UnitTests/changed_check_model.gitlab-ci.yml'
57-
- project: 'EBC/EBC_all/gitlab_ci/templates'
58-
file: 'modelica-ci-tests/UnitTests/changed_regression_test.gitlab-ci.yml'
1+
2+
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-miniconda
3+
4+
stages:
5+
- check_setting
6+
- build_templates
7+
- Ref_Check
8+
- build
9+
- HTML_Check
10+
- IBPSA_Merge
11+
- create_html_whitelist
12+
- Update_WhiteList
13+
- Release
14+
- StyleCheck
15+
- check
16+
- openMR
17+
- post
18+
- create_whitelist
19+
- simulate
20+
- RegressionTest
21+
- Update_Ref
22+
- plot_ref
23+
- prepare
24+
- deploy
25+
26+
variables:
27+
Github_Repository: RWTH-EBC/AixLib
28+
GITLAB_Page: https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/AixLib
29+
30+
include:
31+
- 'bin/templates/03_ci_templates/01_deploy/gitlab_pages.gitlab-ci.yml'
32+
- 'bin/templates/03_ci_templates/01_deploy/IBPSA_Merge.gitlab-ci.yml'
33+
- 'bin/templates/03_ci_templates/02_UnitTests/check_model.gitlab-ci.yml'
34+
- 'bin/templates/03_ci_templates/02_UnitTests/regression_test.gitlab-ci.yml'
35+
- 'bin/templates/03_ci_templates/02_UnitTests/simulate_model.gitlab-ci.yml'
36+
- 'bin/templates/03_ci_templates/03_SyntaxTest/html_check.gitlab-ci.yml'
37+
- 'bin/templates/03_ci_templates/03_SyntaxTest/style_check.gitlab-ci.yml'
38+
- 'bin/templates/03_ci_templates/04_CleanUpScript/ci_setting.gitlab-ci.yml'
39+

.gitmodules

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +0,0 @@
1-
[submodule "netCDF-DataReader"]
2-
path = netCDF-DataReader
3-
url = https://github.com/modelica-3rdparty/netCDF-DataReader
4-
branch = master

0 commit comments

Comments
 (0)