Skip to content

Commit

Permalink
Merge pull request #1 from RWTH-EBC/master
Browse files Browse the repository at this point in the history
merge head rwth
  • Loading branch information
PRemmen authored Jan 22, 2020
2 parents d062c18 + 4492ed6 commit 29631b6
Show file tree
Hide file tree
Showing 3,598 changed files with 475,960 additions and 26,559 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
15 changes: 0 additions & 15 deletions .github/ISSUE_TEMPLATE.md

This file was deleted.

27 changes: 27 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
---
name: Bug report
about: Create a report to help us improve

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- Simulation environment and version

**Additional context**
Add any other context about the problem here.
30 changes: 30 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
---
name: Feature request
about: Suggest an idea for this project

---

Just stopping by to let us know about some issue you encountered with AixLib? Please feel free to delete all of this text and tell us what you think!

If you want to suggest larger changes and/or adding new models to AixLib, please make sure to briefly answer the following few questions. For more information on how to contribute to AixLib, see our [Wiki](https://github.com/RWTH-EBC/AixLib/wiki). Before submitting the issue, you can delete these first lines. Thanks for contributing!

**What is the problem?**

Is your feature request related to a problem? Please describe.
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

- ...

**How do we want to solve it? Describe the solution you'd like**

A clear and concise description of what you want to happen.

- ...

**Describe alternatives you've considered**

A clear and concise description of any alternative solutions or features you've considered.

**Additional context**

Add any other context or screenshots about the feature request here.
38 changes: 36 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,37 @@
# Ignore Dymola output, log and temporary files (in alphabetical order)
*.bak-mo
*.pyc
*.log
*.mat
*.mof
buildlog.txt
diagnostics.txt
diagnostics_summary.txt
dsfinal.txt
dsin.txt
dslog.txt
dsmodel_fmuconf.h
dsmodel.c
dsmodelext*.c
dsmodelext*.obj
dsres.txt
dymosim
dymosim.exe
dymosim.exp
dymosim.lib
empty.txt
eventlog.txt
failure
fmiModelIdentifier.h
help/
modelDescription.xml
request
stat
status
stop
success
# Ignore files created by BuildingsPy
*.py[cod]
*simulator*.log
*unitTests*.log
*comparison*.log
# Ignore files created by PyCharm
.idea/
275 changes: 275 additions & 0 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
test_overall_coverage:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:conda-integration
stage: test
services:
- docker

before_script:
- printenv
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=utf-8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py --coverage-only

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure

test_dymola_Airflow:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=utf-8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Airflow --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


test_dymola_BoundaryConditions:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.BoundaryConditions --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


test_dymola_Controls:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Controls --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


# test_dymola_Electrical:
# image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
# stage: test
# services:
# - docker

# before_script:
# - Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
# - export PIP_CACHE_DIR="/opt/cache/pip"
# - source activate python27
# - python -V # Print out python version for debugging
# - dir
# - pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
# - export PYTHONIOENCODING=UTF8 # just in case

# script:
# - cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Electrical --tool dymola

# artifacts:
# when: on_failure
# paths:
# - AixLib/simulator-dymola.log

# retry:
# max: 2
# when: runner_system_failure


# test_dymola_FastHVAC:
# image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
# stage: test
# services:
# - docker

# before_script:
# - Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
# - export PIP_CACHE_DIR="/opt/cache/pip"
# - source activate python27
# - python -V # Print out python version for debugging
# - dir
# - pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
# - export PYTHONIOENCODING=UTF8 # just in case

# script:
# - cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.FastHVAC --tool dymola

# artifacts:
# when: on_failure
# paths:
# - AixLib/simulator-dymola.log

# retry:
# max: 2
# when: runner_system_failure


test_dymola_Fluid:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
timeout: 8h 0m
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Fluid --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


test_dymola_Media:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Media --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


test_dymola_Systems:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker

before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.Systems --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure


test_dymola_ThermalZones:
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:aixlibCITesting2020-miniconda-aixlib
stage: test
services:
- docker
before_script:
- Xvfb :77 -extension RANDR -extension GLX & export DISPLAY=:77.0 &&
- export PIP_CACHE_DIR="/opt/cache/pip"
- source activate python27
- python -V # Print out python version for debugging
- dir
- pip install --upgrade git+https://github.com/MichaMans/BuildingsPy@testexamplescoverage
- export PYTHONIOENCODING=UTF8 # just in case

script:
- cd AixLib && python ../bin/runUnitTests.py -n 2 --batch --single-package AixLib.ThermalZones --tool dymola

artifacts:
when: on_failure
paths:
- AixLib/simulator-dymola.log

retry:
max: 2
when: runner_system_failure
4 changes: 4 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[submodule "netCDF-DataReader"]
path = netCDF-DataReader
url = https://github.com/modelica-3rdparty/netCDF-DataReader
branch = master
Loading

0 comments on commit 29631b6

Please sign in to comment.