Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue403 dhc cherrypick #1489

Draft
wants to merge 265 commits into
base: development
Choose a base branch
from
Draft

Issue403 dhc cherrypick #1489

wants to merge 265 commits into from

Conversation

DaJansenGit
Copy link
Member

w.i.p

marcusfuchs and others added 30 commits June 28, 2017 11:32
Add demand node with table input
10163db 
For #403
Add temperature controller
a178225
@MichaMans
#403 added a IdealHeatSinkModel with RealInput Interface
bdea273
@TBeckhoelter
add IdealHeatSink model with Q_flow input and temperature based m_flo…
97fa971 
…w calc #403
@TobiasBlacha
#403 added a SubstationHeatingModel with example
a0c6be3
@TBeckhoelter
change dTdesign to real diff of flow and return temperature #403
c88579e
@TBeckhoelter
Merge branch 'issue403_dhcBaseClasses' of https://github.com/RWTH-EBC…
22f8d57 
…/AixLib into issue403_dhcBaseClasses
Merge branch 'development' of https://github.com/RWTH-EBC/AixLib into…
e335b85 
… issue403_dhc
@MichaMans
#403 added a NoReturn supply model with pump and temperature set
4910134
Merge branch 'issue513_ibpsa2aix' of https://github.com/RWTH-EBC/AixLib…
5d3e6bd 
… into issue403_staticPipe
Add static pipe model for comparison to plug flow
eb7387b 
This is only to enable legacy tests, may be removed again in the future
Adding documentation
061eb67
Fix delay calculation
4a3f4f8
@MichaMans
#403 tried to extend from the baseclass. added a temperature input co…
fc81064 
…ntroller
Update pipe wrapper to IBPSA format
eb1f1fe
Add a simple wrapper around plugflow core
037eec5
@MichaMans
added a variable temperature input supply without a pump
0fc5be4
@MichaMans
Merge branch 'issue403_dhc' into issue403_pump_supply
228d480
@MichaMans
Merge branch 'master' into issue403_pump_supply
cc0f51a
Merge branch 'development' of https://github.com/RWTH-EBC/AixLib into…
036eab8 
… issue403_dhc
Merge branch 'issue403_dhc' of https://github.com/RWTH-EBC/AixLib int…
a0927ca 
…o issue403_pump_supply
Fix html
7db99ab
Fix faulty connection
b63d63a
Rename temperature controller
6e6f782
Rename source node with pump
eed7973
Rename source model
e277949
Parameter names and units
01bfd5b
Merge branch 'issue403_pump_supply' of https://github.com/RWTH-EBC/Ai…
508d341 
…xLib into issue403_pump_supply
Update supply models to take T and dp from input
40ac2f2
Add isHeating parameter to heat sink model
35da190
MichaMans and others added 30 commits November 12, 2020 17:22
@MichaMans
Merge remote-tracking branch 'origin/issue403_dhc' into issue403_dhc
69dacc8
@MichaMans
start revising dhc pipe parameters
4ed23dc
@MichaMans
last rebisions erdeis
cab881f
@MichaMans
Merge branch 'issue403_dhc' of https://github.com/RWTH-EBC/AixLib int…
26198d7 
…o issue403_dhc
@MichaMans
Merge branch 'issue403_dhc' of https://github.com/RWTH-EBC/AixLib int…
89bcc6e 
…o issue403_dhc
@MichaMans
#403 finalized short docu of dhc pipe
0e9a1cd
@MichaMans
added working state for general substation layout
0cf98f9
@MichaMans
added first draft of double pipe with example
4cad882
#403 add output for mass flow of storage pump
33e2c85
remove all temporary Demand Models from Jonas Grossmann's Master Thesis
4c5064b
add control logic for reversibe HeatPump from Jonas Grossmann's Maste…
34a9d32 
…r Thesis
add new control logiv for vale. add substaion model from Jonas Grossm…
6ec7a5e 
…ann's Master Thesis. Update Package Orders.
delete old substation model
425021a
add new supply models and valve control for new substation. update pa…
5650440 
…ckage orders.
add first version of examples for substation and heatpump model. not …
c6f592c 
…fully working yet.
#403 correct package order
06d5097
#403 correct Unit for temperature difference
b3ab299
@MichaMans
raised version to 0.10.4
a6adb4d
@MichaMans
feat: added two pe pipe datasheets
6e3bb71
@MichaMans
feat: added more PE Pipe records
470824f
@MichaMans
work on dhc pipe
37b05ad
#403 correct error in initialization of embedded pipe models in Distr…
59d788e 
…ictHeatingCooling package
#403 correct error in parametrization of pipe core in embedded pipe m…
2550aa4 
…odels in DistrictHeatingCooling package
@KaiDroste
update Readme
27e9dca
@JanStock1
Modelling two heat sources with OpenLoop; second supply model for con…
dc68da2 
…trolling return pressure to ensure same mass flow at return as in supply line
@JanStock1
Modelling two heat sources with OpenLoop; control supply pressure at …
cba08f1 
…two heat source to regulate mass flows and set a specific heat ratio
@rahul-karuvingal
Merge branch 'development_before_dhc_changes' into issue403_dhc to ma…
6dd7577 
…ke it compatible with MSL 4.0
@rahul-karuvingal @DaJansenGit
Edited the example files to run with MSL 4.0
71ca622
@rahul-karuvingal @DaJansenGit
Edited the file for running it with MSL 4.0
932591e
@DaJansenGit
Merge branch 'development' into issue403_dhc_cherrypick
e5bb3e2
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@DaJansenGit @MichaMans @TBeckhoelter @TobiasBlacha @KaiDroste @JanStock1 @rahul-karuvingal