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.

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

62 update ci templates #72

Merged
merged 129 commits into from
Jul 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
fc04509
add new templates
Oct 10, 2023
b9e54c2
use version 2022
Oct 10, 2023
df64f76
fix issue #70
FWuellhorst Dec 7, 2023
5fd782b
update cleanupscript/ci_setting.yml
FWuellhorst Dec 7, 2023
02eb0d1
rm redundant test
FWuellhorst Dec 7, 2023
e1f3c65
rm redundant test
FWuellhorst Dec 7, 2023
8112ee9
use posix paths
FWuellhorst Dec 7, 2023
dc5c8d2
posix
FWuellhorst Dec 7, 2023
9b57ce7
update gitlab-ci
FWuellhorst Dec 7, 2023
a1e75eb
fix path
FWuellhorst Dec 7, 2023
fffed81
Disable html check
FWuellhorst Dec 7, 2023
5f071cd
Disable html check
FWuellhorst Dec 7, 2023
f183e25
Add new scripts
FWuellhorst Dec 7, 2023
0e04c05
Move file to top level
FWuellhorst Dec 7, 2023
92f1aef
fix path
FWuellhorst Dec 7, 2023
a6479d5
fix p
FWuellhorst Dec 7, 2023
6a33de4
install custom dependencies
FWuellhorst Dec 8, 2023
053afe1
fix path
FWuellhorst Dec 8, 2023
64b7308
update ymls
FWuellhorst Dec 8, 2023
d69e7ec
rm utilities.yml
FWuellhorst Dec 8, 2023
cfda724
use python -m
FWuellhorst Dec 8, 2023
036fa03
use private gh
FWuellhorst Dec 8, 2023
b94ce54
use ssh auth
FWuellhorst Dec 8, 2023
95f917c
use correct name
FWuellhorst Dec 8, 2023
e6028c6
new paths
FWuellhorst Dec 8, 2023
4f56332
update utilities.yml
FWuellhorst Dec 11, 2023
364f38f
use https
FWuellhorst Dec 11, 2023
9787e6c
use ssh again for main repo
FWuellhorst Dec 11, 2023
f13bee9
use test branch
FWuellhorst Dec 12, 2023
4a69dea
bb
FWuellhorst Dec 12, 2023
26401dd
Merge branch 'main' into 62-update-ci-templates and delete old files
FWuellhorst Jun 15, 2024
81b32cb
add new ci tests
FWuellhorst Jun 15, 2024
8db3c8f
fix line-endings
FWuellhorst Jun 16, 2024
453bd9c
try fix for after script and HTML PR
FWuellhorst Jun 16, 2024
ff9eb5d
fix exit.sh
FWuellhorst Jun 16, 2024
3b121fc
fix ssh and utils
FWuellhorst Jun 16, 2024
db17e48
fix args
FWuellhorst Jun 16, 2024
b854f8a
CI message from ebc-aixlib-bot. Push new files with corrected html Sy…
FWuellhorst Jun 16, 2024
fec3921
fix args
FWuellhorst Jun 16, 2024
83e2a4d
trigger ci
FWuellhorst Jun 17, 2024
a9dc73b
install depens at correct location
FWuellhorst Jun 17, 2024
0a85961
add toml
FWuellhorst Jun 17, 2024
494859f
trigger ci
FWuellhorst Jun 17, 2024
602b2f8
trigger ci
FWuellhorst Jun 17, 2024
8d2ced7
try fix for tolerance
FWuellhorst Jun 17, 2024
4fbbb75
add Tolerance
FWuellhorst Jun 17, 2024
eaf5314
mv mos scripts
FWuellhorst Jun 17, 2024
b7d283e
try with direct repo
FWuellhorst Jun 17, 2024
d1a91ba
order
FWuellhorst Jun 17, 2024
7515f39
no double cd
FWuellhorst Jun 17, 2024
bfd8ee6
test regression fix
FWuellhorst Jun 17, 2024
eabbfe8
fix example, uninstall buildingspy
FWuellhorst Jun 17, 2024
1967422
force uninstall
FWuellhorst Jun 17, 2024
e72727e
rm custom buildingspy
FWuellhorst Jun 18, 2024
74d3e43
try other setting
FWuellhorst Jun 18, 2024
7617e84
fix display
FWuellhorst Jun 18, 2024
3450e2f
batch mode
FWuellhorst Jun 18, 2024
ad599f9
test createNewReferenceResultsInBatchMode
FWuellhorst Jun 18, 2024
037e377
changes in yml
FWuellhorst Jun 19, 2024
585b940
try syntax fix
FWuellhorst Jun 19, 2024
fbbf397
fix indent
FWuellhorst Jun 19, 2024
f5be43e
fix after scripts
FWuellhorst Jun 19, 2024
74d531b
more verbose
FWuellhorst Jun 19, 2024
62e5479
don't ..
FWuellhorst Jun 19, 2024
23f1e01
cat file
FWuellhorst Jun 19, 2024
086db37
add packages
FWuellhorst Jun 19, 2024
97719f6
switch to branch
FWuellhorst Jun 19, 2024
c7b5d3a
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 19, 2024
0b0ddc0
rm files again to check if it works
FWuellhorst Jun 19, 2024
1003b8b
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 19, 2024
a87beb6
update templates and remove old files
FWuellhorst Jun 19, 2024
c3e72b4
fix switch order
FWuellhorst Jun 19, 2024
24a4231
old order
FWuellhorst Jun 19, 2024
24816e5
try stash pop solution
FWuellhorst Jun 19, 2024
88cdef7
add git head as in examples and status
FWuellhorst Jun 20, 2024
fb5203b
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 20, 2024
9d5b82a
also plot results
FWuellhorst Jun 20, 2024
0be9003
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 20, 2024
c278930
trigger ci
FWuellhorst Jun 20, 2024
dd02afb
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 20, 2024
dcd51ac
use custom pages
FWuellhorst Jun 20, 2024
016d523
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 20, 2024
dfb9cbb
trigger again
FWuellhorst Jun 20, 2024
f346743
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 20, 2024
353e155
use correct folder
FWuellhorst Jun 20, 2024
8d12d82
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 20, 2024
94bc5ba
trigger
FWuellhorst Jun 20, 2024
bc57f3d
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 20, 2024
87e437d
try chart fix
FWuellhorst Jun 20, 2024
33ea53f
trigger
FWuellhorst Jun 20, 2024
83cd23e
list all files
FWuellhorst Jun 20, 2024
3da30cd
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 21, 2024
afa21bd
with pages
FWuellhorst Jun 21, 2024
e97c9f9
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 21, 2024
a780c55
rm files
FWuellhorst Jun 21, 2024
67c5696
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 21, 2024
e07084c
rm files again
FWuellhorst Jun 21, 2024
9c99808
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 21, 2024
30a4ec1
no gh pages
FWuellhorst Jun 21, 2024
5d2d5b1
update script with latest changes
FWuellhorst Jun 25, 2024
91efbad
Adjust OM scripts for startup mos
FWuellhorst Jun 25, 2024
326e3f7
fix pages
FWuellhorst Jun 26, 2024
e723978
update with latest config
FWuellhorst Jun 27, 2024
aaa9167
adjust experiment time to avoid long CI runs
FWuellhorst Jun 27, 2024
6117a3f
fix time
FWuellhorst Jun 27, 2024
e63b6b2
add simulate and plot scripts for all examples
FWuellhorst Jun 27, 2024
7ff6082
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 27, 2024
0707f49
add experiment setup to missing examples
FWuellhorst Jun 28, 2024
d1cf597
fix Tolerance
FWuellhorst Jun 28, 2024
e2df44b
revert existing results
FWuellhorst Jun 28, 2024
db7f907
fix commata
FWuellhorst Jun 28, 2024
a2fada7
Merge branch 'main' into 62-update-ci-templates
FWuellhorst Jun 28, 2024
6513bd9
merge main and fix scripts and initial conditions
FWuellhorst Jun 28, 2024
d9928fc
fix pages
FWuellhorst Jun 28, 2024
2266fc6
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jun 28, 2024
929520c
fix initial conditions in example with ufh
FWuellhorst Jun 28, 2024
117a34c
Merge branch '62-update-ci-templates' of https://github.com/RWTH-EBC/…
FWuellhorst Jun 28, 2024
e1a4046
rm
FWuellhorst Jun 28, 2024
021f2c6
fix initial conditions
FWuellhorst Jul 1, 2024
97d8dc3
fixed initial conditions
FWuellhorst Jul 1, 2024
db3c826
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jul 1, 2024
96f9956
fix initial conditions
FWuellhorst Jul 1, 2024
9eea3b7
Merge branch '62-update-ci-templates' of https://github.com/RWTH-EBC/…
FWuellhorst Jul 1, 2024
26b37df
use parameters in boiler
FWuellhorst Jul 1, 2024
950d030
fix initial conditions
FWuellhorst Jul 1, 2024
229cd48
fix packages in plots
FWuellhorst Jul 2, 2024
4993096
revert wrong change
FWuellhorst Jul 2, 2024
e17e007
update reference results
FWuellhorst Jul 2, 2024
a19d7f1
CI message from ebc-aixlib-bot. Automatic push of CI with new regress…
FWuellhorst Jul 2, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitlab-ci.yml
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
image: registry.git.rwth-aachen.de/ebc/ebc_intern/dymola-docker:Dymola_2022-minicondastages: - check_setting - build_templates - check - create_whitelist - simulate - deploy variables: Github_Repository: RWTH-EBC/BESMod GITLAB_Page: https://ebc.pages.rwth-aachen.de/EBC_all/github_ci/BESMod include: - 'bin/templates/03_ci_templates/02_UnitTests/check_model.gitlab-ci.yml' - 'bin/templates/03_ci_templates/02_UnitTests/simulate_model.gitlab-ci.yml' - 'bin/templates/03_ci_templates/04_CleanUpScript/ci_setting.gitlab-ci.yml'

include:
- 'ci-tests/scripts/.gitlab-ci.yml'
2 changes: 1 addition & 1 deletion BESMod/Examples/BAUSimStudy/BESParameters.mo
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ within BESMod.Examples.BAUSimStudy;
record BESParameters
extends Systems.RecordsCollection.SystemParametersBaseDataDefinition(
use_elecHeating=false,
final filNamWea=Modelica.Utilities.Files.loadResource("modelica://BESMod/Resources/TRY2015_522361130393_Jahr_City_Potsdam.mos"),
final filNamWea=Modelica.Utilities.Files.loadResource("modelica://BESMod/Resources/WeatherData/TRY2015_522361130393_Jahr_City_Potsdam.mos"),
final TAmbVen=min(TSetZone_nominal),
final TAmbHyd=min(TSetZone_nominal),
final TDHWWaterCold=283.15,
Expand Down
9 changes: 5 additions & 4 deletions BESMod/Examples/BAUSimStudy/Case1Standard.mo
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ model Case1Standard
systemParameters(QBui_flow_nominal={16308.1}, TOda_nominal=263.15, THydSup_nominal={328.15}));
extends Modelica.Icons.Example;

annotation (experiment(
StopTime=86400,
Interval=600,
__Dymola_Algorithm="Dassl"));
annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/BAUSimStudy/Case1Standard.mos"
"Simulate and plot"));
end Case1Standard;
7 changes: 5 additions & 2 deletions BESMod/Examples/BAUSimStudy/PartialCase.mo
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ partial model PartialCase
redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0),
hBui=sum(building.zoneParam.VAir)^(1/3),
ABui=sum(building.zoneParam.VAir)^(2/3)),
ABui=sum(building.zoneParam.VAir)^(2/3),
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare package Medium_eva = AixLib.Media.Air,
Expand Down Expand Up @@ -80,6 +82,7 @@ partial model PartialCase
parTra,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum)),
redeclare Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
Expand All @@ -96,7 +99,7 @@ partial model PartialCase
parameter Modelica.Units.SI.Temperature TBiv=271.15
"Nominal bivalence temperature. = TOda_nominal for monovalent systems.";
annotation (experiment(
StopTime=31536000,
StopTime=172800,
Interval=600,
__Dymola_Algorithm="Dassl"));
end PartialCase;
25 changes: 15 additions & 10 deletions BESMod/Examples/DesignOptimization/BES.mo
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ model BES
hBui=sum(building.zoneParam.VAir)^(1/3),
ARoo=sum(building.zoneParam.ARoof),
redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0)),
oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0),
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater generation(
redeclare model PerDataRevHP =
AixLib.DataBase.Chiller.PerformanceData.PolynomalApproach (redeclare
function PolyData =
AixLib.DataBase.HeatPump.Functions.Characteristics.ConstantCoP
( powerCompressor=2000, CoP=2)),
redeclare
BESMod.Systems.Hydraulical.Components.Frosting.ZhuIceFacCalculation
frost(density=200, redeclare function frostMapFunc =
BESMod.Systems.Hydraulical.Components.Frosting.Functions.ZhuFrostingMapCico),
redeclare BESMod.Systems.Hydraulical.Components.Frosting.NoFrosting
frost,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare package Medium_eva = AixLib.Media.Air,
redeclare
Expand All @@ -43,11 +43,14 @@ model BES
flowsheet="VIPhaseSeparatorFlowsheet"),
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen),
parTemSen(transferHeat=true)),
redeclare Systems.Hydraulical.Control.MonoenergeticHeatPumpSystem control(
redeclare
BESMod.Systems.Hydraulical.Control.Components.ThermostaticValveController.ThermostaticValvePIControlled
valCtrl,
redeclare model BuildingSupplySetTemperature =
BESMod.Systems.Hydraulical.Control.Components.BuildingSupplyTemperatureSetpoints.IdealHeatingCurve
(dTAddCon=5),
redeclare model DHWHysteresis =
BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.PartParallelBivalent
(
Expand Down Expand Up @@ -96,6 +99,7 @@ model BES
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
parTra)),
redeclare Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
Expand All @@ -110,8 +114,9 @@ model BES

extends Modelica.Icons.Example;

annotation (experiment(
StopTime=86400,
Interval=600,
__Dymola_Algorithm="Dassl"));
annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/DesignOptimization/BES.mos"
"Simulate and plot"));
end BES;
20 changes: 11 additions & 9 deletions BESMod/Examples/DesignOptimization/BESNoDHW.mo
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,19 @@ model BESNoDHW "Example to demonstrate usage without DHW"
hBui=sum(building.zoneParam.VAir)^(1/3),
ARoo=sum(building.zoneParam.ARoof),
redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0)),
oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0),
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater generation(
redeclare model PerDataRevHP =
AixLib.DataBase.Chiller.PerformanceData.PolynomalApproach (redeclare
function PolyData =
AixLib.DataBase.HeatPump.Functions.Characteristics.ConstantCoP
( powerCompressor=2000, CoP=2)),
redeclare
BESMod.Systems.Hydraulical.Components.Frosting.ZhuIceFacCalculation
frost(density=200, redeclare function frostMapFunc =
BESMod.Systems.Hydraulical.Components.Frosting.Functions.ZhuFrostingMapCico),
BESMod.Systems.Hydraulical.Components.Frosting.NoFrosting frost,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare package Medium_eva = AixLib.Media.Air,
redeclare
Expand Down Expand Up @@ -85,23 +85,25 @@ model BESNoDHW "Example to demonstrate usage without DHW"
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
parTra)),
redeclare Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
calcmFlow),
redeclare Systems.UserProfiles.TEASERProfiles userProfiles,
redeclare AachenSystem systemParameters(use_ventilation=false, use_dhw=
false),
redeclare ParametersToChange parameterStudy,
redeclare ParametersToChange parameterStudy(VPerQFlow=1),
redeclare final package MediumDHW = AixLib.Media.Water,
redeclare final package MediumZone = AixLib.Media.Air,
redeclare final package MediumHyd = AixLib.Media.Water,
redeclare BESMod.Systems.Ventilation.NoVentilation ventilation);

extends Modelica.Icons.Example;

annotation (experiment(
StopTime=86400,
Interval=600,
__Dymola_Algorithm="Dassl"));
annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/DesignOptimization/BESNoDHW.mos"
"Simulate and plot"));
end BESNoDHW;
11 changes: 7 additions & 4 deletions BESMod/Examples/GasBoilerBuildingOnly.mo
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ model GasBoilerBuildingOnly
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Ventilation.NoVentilation ventilation,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Hydraulical.Generation.GasBoiler generation(
dTTra_nominal={10},
redeclare
Expand Down Expand Up @@ -38,6 +39,7 @@ model GasBoilerBuildingOnly
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.RadiatorTransferData
parRad)),
redeclare BESMod.Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.PassThrough calcmFlow),
Expand All @@ -54,8 +56,9 @@ model GasBoilerBuildingOnly

extends Modelica.Icons.Example;

annotation (experiment(
StopTime=31536000,
Interval=900.00288,
__Dymola_Algorithm="Dassl"));
annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/GasBoilerBuildingOnly.mos"
"Simulate and plot"));
end GasBoilerBuildingOnly;
9 changes: 5 additions & 4 deletions BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithDHW.mo
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,9 @@ model AfterBufferWithDHW

extends Modelica.Icons.Example;

annotation (experiment(
StopTime=31536000,
Interval=600,
__Dymola_Algorithm="Dassl"));
annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/HeatPumpAndBoiler/AfterBufferWithDHW.mos"
"Simulate and plot"));
end AfterBufferWithDHW;
11 changes: 6 additions & 5 deletions BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithoutDHW.mo
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ model AfterBufferWithoutDHW
distribution(
redeclare
BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor
parTemSen,
parTemSen(initType=Modelica.Blocks.Types.Init.InitialOutput),
redeclare
BESMod.Systems.Hydraulical.Distribution.RecordsCollection.BufferStorage.DefaultDetailedStorage
parStoBuf(VPerQ_flow=parameterStudy.VPerQFlow),
Expand All @@ -43,8 +43,9 @@ model AfterBufferWithoutDHW

extends Modelica.Icons.Example;

annotation (experiment(
StopTime=31536000,
Interval=600,
__Dymola_Algorithm="Dassl"));
annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/HeatPumpAndBoiler/AfterBufferWithoutDHW.mos"
"Simulate and plot"));
end AfterBufferWithoutDHW;
14 changes: 6 additions & 8 deletions BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,24 @@ package BaseClasses "Contains partial example case"
ABui=sum(building.zoneParam.VAir)^(2/3),
hBui=sum(building.zoneParam.VAir)^(1/3),
redeclare BESMod.Systems.Demand.Building.RecordsCollection.RefAachen
oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0)),
oneZoneParam(heaLoadFacGrd=0, heaLoadFacOut=0),
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(redeclare
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, redeclare
Systems.Hydraulical.Control.HybridHeatPumpSystem control(
redeclare
BESMod.Systems.Hydraulical.Control.Components.ThermostaticValveController.ThermostaticValvePIControlled
valCtrl,
dTHysBui=5,
dTHysDHW=5,
meaValPriGen=BESMod.Systems.Hydraulical.Control.Components.BaseClasses.MeasuredValue.GenerationSupplyTemperature,

redeclare model DHWHysteresis =
BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater,

redeclare model BuildingHysteresis =
BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater,

redeclare model DHWSetTemperature =
BESMod.Systems.Hydraulical.Control.Components.DHWSetControl.ConstTSet_DHW,

redeclare
BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI
parPIDHeaPum,
Expand All @@ -49,8 +47,8 @@ package BaseClasses "Contains partial example case"
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
parTra)),
redeclare Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,

redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
calcmFlow),
Expand All @@ -64,7 +62,7 @@ package BaseClasses "Contains partial example case"
redeclare BESMod.Systems.Ventilation.NoVentilation ventilation);

annotation (experiment(
StopTime=31536000,
StopTime=172800,
Interval=600,
__Dymola_Algorithm="Dassl"));
end PartialHybridSystem;
Expand Down
9 changes: 5 additions & 4 deletions BESMod/Examples/HeatPumpAndBoiler/Parallel.mo
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,9 @@ model Parallel

extends Modelica.Icons.Example;

annotation (experiment(
StopTime=31536000,
Interval=600,
__Dymola_Algorithm="Dassl"));
annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/HeatPumpAndBoiler/Parallel.mos"
"Simulate and plot"));
end Parallel;
9 changes: 5 additions & 4 deletions BESMod/Examples/HeatPumpAndBoiler/Serial.mo
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,9 @@ model Serial "Bivalent Heat Pump Systems with serial heat generation"

extends Modelica.Icons.Example;

annotation (experiment(
StopTime=31536000,
Interval=600,
__Dymola_Algorithm="Dassl"));
annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/HeatPumpAndBoiler/Serial.mos"
"Simulate and plot"));
end Serial;
13 changes: 9 additions & 4 deletions BESMod/Examples/HighOrderModel/BES_HOM.mo
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ model BES_HOM
extends BESMod.Systems.BaseClasses.PartialBuildingEnergySystem(
redeclare BESMod.Systems.Electrical.DirectGridConnectionSystem electrical,
redeclare BESMod.Systems.Demand.Building.AixLibHighOrder building(
energyDynamicsWalls=Modelica.Fluid.Types.Dynamics.FixedInitial,
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
useConstVentRate=false,
TimeCorrection=0,
DiffWeatherDataTime=Modelica.Units.Conversions.to_hour(weaDat.timZon),
Expand All @@ -17,6 +19,7 @@ model BES_HOM
HOMBuiEnv),
redeclare BESMod.Systems.Control.NoControl control,
redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Hydraulical.Generation.HeatPumpAndElectricHeater
generation(
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
Expand Down Expand Up @@ -77,6 +80,7 @@ model BES_HOM
BESMod.Systems.Hydraulical.Transfer.RecordsCollection.SteelRadiatorStandardPressureLossData
parTra)),
redeclare BESMod.Systems.Demand.DHW.StandardProfiles DHW(
energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial,
redeclare BESMod.Systems.Demand.DHW.RecordsCollection.ProfileM DHWProfile,
redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum,
redeclare BESMod.Systems.Demand.DHW.TappingProfiles.calcmFlowEquStatic
Expand All @@ -93,8 +97,9 @@ model BES_HOM
redeclare BESMod.Systems.Ventilation.NoVentilation ventilation);

extends Modelica.Icons.Example;
annotation (experiment(
StopTime=172800,
Interval=600,
__Dymola_Algorithm="Dassl"));
annotation (experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/HighOrderModel/BES_HOM.mos"
"Simulate and plot"));
end BES_HOM;
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ model BuildingsLibraryRoom "System using the buildings libraries room model"
systemParameters(QBui_flow_nominal={2504}));
extends Modelica.Icons.Example;

annotation(__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/ModelicaConferencePaper/BuildingsLibraryRoom.mos"
annotation(experiment(StopTime=172800,
Interval=600,
Tolerance=1e-06),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/ModelicaConferencePaper/BuildingsLibraryRoom.mos"
"Simulate and plot"),
__Dymola_Commands(file="modelica://BESMod/Resources/Scripts/Dymola/Examples/ModelicaConferencePaper/BuildingsLibraryRoom.mos"
"Simulate and plot"));
end BuildingsLibraryRoom;
Original file line number Diff line number Diff line change
Expand Up @@ -125,9 +125,4 @@ partial model PartialModelicaConferenceUseCase
parameter Real scalingFactorHP=hydraulic.generation.parHeaPum.QPri_flow_nominal
/13000 "May be overwritten to avoid warnings and thus a fail in the CI";


annotation (experiment(
StopTime=31536000,
Interval=600,
__Dymola_Algorithm="Dassl"));
end PartialModelicaConferenceUseCase;
Loading