Skip to content

Commit

Permalink
Update 'docs' folder with 81_supCtrlInterfaces and delete old branches.
Browse files Browse the repository at this point in the history
  • Loading branch information
FWuellhorst committed Sep 23, 2024
1 parent a4e3503 commit 6676814
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 63 deletions.
34 changes: 17 additions & 17 deletions docs/81_supCtrlInterfaces/regression/Examples/comparison-dymola.log
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
},
"model": "BESMod.Examples.Retrofit.Case1PartialRetrofit",
"simulation": {
"elapsed_time": 1.45,
"elapsed_time": 1.36,
"final_time": 86400,
"jacobians": 1955,
"start_time": 0,
Expand Down Expand Up @@ -123,7 +123,7 @@
},
"model": "BESMod.Examples.ModelicaConferencePaper.BuildingsLibraryRoom",
"simulation": {
"elapsed_time": 25.3,
"elapsed_time": 26.6,
"final_time": 864000,
"jacobians": 21139,
"start_time": 0,
Expand Down Expand Up @@ -180,7 +180,7 @@
},
"model": "BESMod.Examples.HeatPumpAndBoiler.Parallel",
"simulation": {
"elapsed_time": 6.61,
"elapsed_time": 6.52,
"final_time": 172800,
"jacobians": 13147,
"start_time": 0,
Expand Down Expand Up @@ -237,7 +237,7 @@
},
"model": "BESMod.Examples.SolarThermalSystem.SolarThermalAixLib",
"simulation": {
"elapsed_time": 5.78,
"elapsed_time": 5.95,
"final_time": 172800,
"jacobians": 2046,
"start_time": 0,
Expand Down Expand Up @@ -294,7 +294,7 @@
},
"model": "BESMod.Examples.GasBoilerBuildingOnly",
"simulation": {
"elapsed_time": 0.599,
"elapsed_time": 0.613,
"final_time": 172800,
"jacobians": 1725,
"start_time": 0,
Expand Down Expand Up @@ -351,7 +351,7 @@
},
"model": "BESMod.Examples.HeatPumpAndBoiler.AfterBufferWithDHW",
"simulation": {
"elapsed_time": 4.27,
"elapsed_time": 3.96,
"final_time": 172800,
"jacobians": 3976,
"start_time": 0,
Expand Down Expand Up @@ -408,7 +408,7 @@
},
"model": "BESMod.Examples.DesignOptimization.BES",
"simulation": {
"elapsed_time": 1.7,
"elapsed_time": 1.67,
"final_time": 172800,
"jacobians": 3256,
"start_time": 0,
Expand Down Expand Up @@ -471,7 +471,7 @@
},
"model": "BESMod.Examples.HighOrderModel.BES_HOM",
"simulation": {
"elapsed_time": 96.9,
"elapsed_time": 92.5,
"final_time": 172800,
"jacobians": 5603,
"start_time": 0,
Expand Down Expand Up @@ -528,7 +528,7 @@
},
"model": "BESMod.Examples.SolarThermalSystem.SolarThermalBuildings",
"simulation": {
"elapsed_time": 6.67,
"elapsed_time": 6.51,
"final_time": 172800,
"jacobians": 2290,
"start_time": 0,
Expand Down Expand Up @@ -585,7 +585,7 @@
},
"model": "BESMod.Examples.BAUSimStudy.Case1Standard",
"simulation": {
"elapsed_time": 3.32,
"elapsed_time": 3.31,
"final_time": 172800,
"jacobians": 4542,
"start_time": 0,
Expand Down Expand Up @@ -642,7 +642,7 @@
},
"model": "BESMod.Examples.DesignOptimization.BESNoDHW",
"simulation": {
"elapsed_time": 0.98,
"elapsed_time": 0.907,
"final_time": 172800,
"jacobians": 2615,
"start_time": 0,
Expand Down Expand Up @@ -699,7 +699,7 @@
},
"model": "BESMod.Examples.Retrofit.Case1TotalRetrofit",
"simulation": {
"elapsed_time": 1.65,
"elapsed_time": 1.83,
"final_time": 86400,
"jacobians": 2275,
"start_time": 0,
Expand Down Expand Up @@ -756,7 +756,7 @@
},
"model": "BESMod.Examples.HeatPumpAndBoiler.Serial",
"simulation": {
"elapsed_time": 2.61,
"elapsed_time": 2.69,
"final_time": 172800,
"jacobians": 5257,
"start_time": 0,
Expand Down Expand Up @@ -813,7 +813,7 @@
},
"model": "BESMod.Examples.HeatPumpAndBoiler.AfterBufferWithoutDHW",
"simulation": {
"elapsed_time": 2.83,
"elapsed_time": 2.75,
"final_time": 172800,
"jacobians": 3951,
"start_time": 0,
Expand Down Expand Up @@ -888,7 +888,7 @@
},
"model": "BESMod.Examples.ModelicaConferencePaper.TEASERBuilding",
"simulation": {
"elapsed_time": 15.3,
"elapsed_time": 15.2,
"final_time": 864000,
"jacobians": 20625,
"start_time": 0,
Expand Down Expand Up @@ -939,7 +939,7 @@
},
"model": "BESMod.Examples.TEASERHeatLoadCalculation.Example",
"simulation": {
"elapsed_time": 0.203,
"elapsed_time": 0.153,
"final_time": 172800,
"jacobians": 918,
"start_time": 0,
Expand Down Expand Up @@ -996,7 +996,7 @@
},
"model": "BESMod.Examples.Retrofit.Case1NoRetrofit",
"simulation": {
"elapsed_time": 2.17,
"elapsed_time": 2.07,
"final_time": 86400,
"jacobians": 2841,
"start_time": 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -991,9 +991,9 @@ initial equations:
weaDat.pAtmSel.p = building.roo.air.vol.dynBal.p_start;
hydraulic.generation.bou_sinkAir.p = 101325.0;
ventilation.generation.bouExh.p = ventilation.generation.threeWayValve_b.vol.dynBal.p_start;
electrical.distribution.batterySimple.EAva = electrical.distribution.batterySimple.c *electrical.distribution.batterySimple.SOC_start*electrical.distribution.batterySimple.E_nominal;
electrical.distribution.batterySimple.EBou = (1.0-electrical.distribution.batterySimple.c) *electrical.distribution.batterySimple.SOC_start*electrical.distribution.batterySimple.E_nominal;
electrical.distribution.batterySimple.E = electrical.distribution.batterySimple.E_nominal *electrical.distribution.batterySimple.SOC_start;
electrical.distribution.batterySimple.EAva = electrical.distribution.batterySimple.c *electrical.distribution.batterySimple.SOC_start*electrical.distribution.batterySimple.E_nominal;

Sparse solver handling possible: false.
Due to flag Advanced.SparseActivate=false.
Expand Down Expand Up @@ -4017,11 +4017,11 @@ In class Modelica.Units.SI.
Near file: /opt/dymola-2022-x86_64/Modelica/Library/Modelica 4.0.0/Units.mo, line 237
Used in base-class hydraulic.generation.heatPump.eva.preDro.PartialTwoPortInterface.
Near file: /builds/EBC/EBC_all/github_ci/BESMod/installed_dependencies/AixLib/AixLib/Fluid/BaseClasses/PartialResistance.mo, line 3
Warning: The variable hydraulic.generation.heatPump.innerCycle.PerformanceDataHPCooling.sigBus.m_flowEvaMea is part of an expandable connector, and was only used outside of connect. That is not legal since we cannot determine its causality.
Warning: The variable hydraulic.generation.heatPump.innerCycle.PerformanceDataHPCooling.sigBus.m_flowConMea is part of an expandable connector, and was only used outside of connect. That is not legal since we cannot determine its causality.
Warning: The variable hydraulic.generation.heatPump.innerCycle.PerformanceDataHPCooling.sigBus.nSet is part of an expandable connector, and was only used outside of connect. That is not legal since we cannot determine its causality.
Warning: The variable hydraulic.generation.heatPump.innerCycle.PerformanceDataHPCooling.sigBus.TConInMea is part of an expandable connector, and was only used outside of connect. That is not legal since we cannot determine its causality.
Warning: The variable hydraulic.generation.heatPump.innerCycle.PerformanceDataHPCooling.sigBus.TEvaOutMea is part of an expandable connector, and was only used outside of connect. That is not legal since we cannot determine its causality.
Warning: The variable hydraulic.generation.heatPump.innerCycle.PerformanceDataHPCooling.sigBus.m_flowEvaMea is part of an expandable connector, and was only used outside of connect. That is not legal since we cannot determine its causality.
Warning: The variable hydraulic.generation.heatPump.innerCycle.PerformanceDataHPCooling.sigBus.nSet is part of an expandable connector, and was only used outside of connect. That is not legal since we cannot determine its causality.
Warning: The variable hydraulic.generation.heatPump.innerCycle.PerformanceDataHPCooling.sigBus.m_flowConMea is part of an expandable connector, and was only used outside of connect. That is not legal since we cannot determine its causality.
Warning: The bus-input hydraulic.control.buiAndDHWCtr.sigBusDistr.TStoBufBotMea lacks a matching non-input in the connection sets. This means that it lacks a source writing the signal to the bus.
Bus-signal: TStoBufBotMea
Use: connect(hydraulic.control.buiAndDHWCtr.sigBusDistr.TStoBufBotMea, hydraulic.control.buiAndDHWCtr.hysBui.TStoBot);
Expand Down Expand Up @@ -5400,8 +5400,8 @@ The redundancies involve
initial equations:
hydraulic.generation.bou_sinkAir.p = 101325.0;
ventilation.generation.bouExh.p = ventilation.generation.threeWayValve_b.vol.dynBal.p_start;
electrical.distribution.batterySimple.E = electrical.distribution.batterySimple.E_nominal *electrical.distribution.batterySimple.SOC_start;
electrical.distribution.batterySimple.EAva = electrical.distribution.batterySimple.c *electrical.distribution.batterySimple.SOC_start*electrical.distribution.batterySimple.E_nominal;
electrical.distribution.batterySimple.E = electrical.distribution.batterySimple.E_nominal *electrical.distribution.batterySimple.SOC_start;
electrical.distribution.batterySimple.EBou = (1.0-electrical.distribution.batterySimple.c) *electrical.distribution.batterySimple.SOC_start*electrical.distribution.batterySimple.E_nominal;

Warning: The conditions of the following assert statements are always false:
Expand Down
46 changes: 5 additions & 41 deletions docs/81_supCtrlInterfaces/regression/Examples/unitTests-dymola.log
Original file line number Diff line number Diff line change
@@ -1,50 +1,14 @@
Regression tests are only run for the following package:
BESMod.Examples
*** Warning: BESMod.Examples.GasBoilerBuildingOnly: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 41
Old = 43
New = 42
*** Warning: BESMod.Examples.HeatPumpAndBoiler.Serial: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 77
New = 78
*** Warning: BESMod.Examples.HeatPumpAndBoiler.AfterBufferWithoutDHW: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 110
New = 111
*** Warning: BESMod.Examples.HeatPumpAndBoiler.AfterBufferWithDHW: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 144
New = 145
*** Warning: BESMod.Examples.Retrofit.Case1TotalRetrofit: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 104
New = 105
*** Warning: BESMod.Examples.Retrofit.Case1NoRetrofit: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 104
New = 105
*** Warning: BESMod.Examples.Retrofit.Case1PartialRetrofit: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 104
New = 105
*** Warning: BESMod.Examples.DesignOptimization.BES: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 71
New = 72
*** Warning: BESMod.Examples.DesignOptimization.BESNoDHW: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 52
New = 53
*** Warning: BESMod.Examples.TEASERHeatLoadCalculation.Example: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 20
New = 21
*** Warning: BESMod.Examples.SolarThermalSystem.SolarThermalAixLib: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 237
New = 238
*** Warning: BESMod.Examples.SolarThermalSystem.SolarThermalBuildings: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 239
New = 240
*** Warning: BESMod.Examples.BAUSimStudy.Case1Standard: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 104
New = 105
*** Warning: BESMod.Examples.ModelicaConferencePaper.TEASERBuilding: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 84
New = 85
*** Warning: BESMod.Examples.HeatPumpAndBoiler.Parallel: Translation statistics for simulation changed for number of continuous time states, but results are unchanged.
Old = 80
New = 79
Comparison files output by funnel are stored in the directory 'funnel_comp' of size 1.0 MB.
Run 'python -c "import buildingspy.development.regressiontest as t; t.Tester(tool=\"dymola\").report()"'
to access a summary of the comparison results.

Script that runs unit tests had 14 warnings and 0 errors.
Script that runs unit tests had 2 warnings and 0 errors.

0 comments on commit 6676814

Please sign in to comment.