Skip to content

Commit

Permalink
62 update ci templates (#72)
Browse files Browse the repository at this point in the history
  • Loading branch information
FWuellhorst authored Jul 2, 2024
2 parents 00ab622 + a19d7f1 commit e7b3ce2
Show file tree
Hide file tree
Showing 204 changed files with 2,212 additions and 24,430 deletions.
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

0 comments on commit e7b3ce2

Please sign in to comment.