Skip to content

Commit

Permalink
Update 'docs' folder with issue1147_GenericBoiler and delete old bran…
Browse files Browse the repository at this point in the history 
…ches.
  • Loading branch information
@DaJansenGit
DaJansenGit committed Jul 30, 2024
1 parent 92dba52 commit 14433fd
Show file tree
Hide file tree
Showing 63 changed files with 2,882 additions and 2,353 deletions.
625 changes: 544 additions & 81 deletions docs/issue1147_GenericBoiler/index.html
View file

Large diffs are not rendered by default.

452 changes: 226 additions & 226 deletions docs/issue1147_GenericBoiler/naming_violations.txt
View file

Large diffs are not rendered by default.

116 changes: 58 additions & 58 deletions docs/issue1147_GenericBoiler/regression/Systems/comparison-dymola.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
},
"model": "AixLib.Systems.ModularAHU.Examples.Heater",
"simulation": {
"elapsed_time": 0.024,
"elapsed_time": 0.0245,
"final_time": 3600,
"jacobians": 31,
"start_time": 0,
Expand Down Expand Up @@ -99,7 +99,7 @@
},
"model": "AixLib.Systems.HydraulicModules.Example.Pump",
"simulation": {
"elapsed_time": 0.0209,
"elapsed_time": 0.0188,
"final_time": 800,
"jacobians": 67,
"start_time": 0,
Expand All @@ -117,20 +117,20 @@
"funnel_comp/AixLib.Systems.ModularEnergySystems.ModularBoiler.Examples.ModularBoilerSimple.mat_boilerControlBus.ThermalPower",
"funnel_comp/AixLib.Systems.ModularEnergySystems.ModularBoiler.Examples.ModularBoilerSimple.mat_boilerControlBus.fuelPower"
],
"success_rate": 0.4,
"success_rate": 1.0,
"t_err_max": [
840.0,
0.0,
0.0,
840.0,
840.0
0.0,
0.0,
0.0
],
"test_passed": [
0,
1,
1,
0,
0
1,
1,
1
],
"var_groups": [
0,
Expand All @@ -147,16 +147,16 @@
"boilerControlBus.fuelPower"
],
"warnings": [
"Absolute error = 2.204e-01 at t = 840.0 for boilerControlBus.TSupMea",
null,
null,
"Absolute error = 4.557e+02 at t = 840.0 for boilerControlBus.ThermalPower",
"Absolute error = 5.088e+02 at t = 840.0 for boilerControlBus.fuelPower"
null,
null,
null
]
},
"model": "AixLib.Systems.ModularEnergySystems.ModularBoiler.Examples.ModularBoilerSimple",
"simulation": {
"elapsed_time": 0.0219,
"elapsed_time": 0.0206,
"final_time": 84000,
"jacobians": 114,
"start_time": 0,
Expand Down Expand Up @@ -219,7 +219,7 @@
},
"model": "AixLib.Systems.HydraulicModules.Example.Injection",
"simulation": {
"elapsed_time": 0.029,
"elapsed_time": 0.0267,
"final_time": 800,
"jacobians": 55,
"start_time": 0,
Expand Down Expand Up @@ -318,7 +318,7 @@
},
"model": "AixLib.Systems.ModularAHU.Validation.AHU2_Cooler",
"simulation": {
"elapsed_time": 2.78,
"elapsed_time": 2.51,
"final_time": 2700,
"jacobians": 11738,
"start_time": 0,
Expand Down Expand Up @@ -375,7 +375,7 @@
},
"model": "AixLib.Systems.ModularAHU.Examples.DemandControlledAHU",
"simulation": {
"elapsed_time": 52.2,
"elapsed_time": 50.8,
"final_time": 6566400.0,
"jacobians": 24401,
"start_time": 5961600.0,
Expand Down Expand Up @@ -438,7 +438,7 @@
},
"model": "AixLib.Systems.HydraulicModules.Example.Throttle",
"simulation": {
"elapsed_time": 0.0113,
"elapsed_time": 0.0134,
"final_time": 1000,
"jacobians": 43,
"start_time": 0,
Expand All @@ -456,20 +456,20 @@
"funnel_comp/AixLib.Systems.ModularEnergySystems.ModularBoiler.Examples.ModularBoilerHeatingCurve.mat_boilerControlBus.ThermalPower",
"funnel_comp/AixLib.Systems.ModularEnergySystems.ModularBoiler.Examples.ModularBoilerHeatingCurve.mat_boilerControlBus.fuelPower"
],
"success_rate": 0.0,
"success_rate": 1.0,
"t_err_max": [
840.0,
840.0,
840.0,
840.0,
840.0
0.0,
0.0,
0.0,
0.0,
0.0
],
"test_passed": [
0,
0,
0,
0,
0
1,
1,
1,
1,
1
],
"var_groups": [
0,
Expand All @@ -486,16 +486,16 @@
"boilerControlBus.fuelPower"
],
"warnings": [
"Absolute error = 9.520e+00 at t = 840.0 for boilerControlBus.TSupMea",
"Absolute error = 1.047e+01 at t = 840.0 for boilerControlBus.TRetMea",
"Absolute error = 7.843e-03 at t = 840.0 for boilerControlBus.Efficiency",
"Absolute error = 1.373e+04 at t = 840.0 for boilerControlBus.ThermalPower",
"Absolute error = 1.371e+04 at t = 840.0 for boilerControlBus.fuelPower"
null,
null,
null,
null,
null
]
},
"model": "AixLib.Systems.ModularEnergySystems.ModularBoiler.Examples.ModularBoilerHeatingCurve",
"simulation": {
"elapsed_time": 0.0536,
"elapsed_time": 0.056,
"final_time": 84000,
"jacobians": 504,
"start_time": 0,
Expand All @@ -513,20 +513,20 @@
"funnel_comp/AixLib.Systems.ModularEnergySystems.ModularBoiler.Examples.ModularBoilerFeedback.mat_boilerControlBus.ThermalPower",
"funnel_comp/AixLib.Systems.ModularEnergySystems.ModularBoiler.Examples.ModularBoilerFeedback.mat_boilerControlBus.fuelPower"
],
"success_rate": 0.0,
"success_rate": 1.0,
"t_err_max": [
11600.0,
11400.0,
11600.0,
12000.0,
12000.0
0.0,
0.0,
0.0,
0.0,
0.0
],
"test_passed": [
0,
0,
0,
0,
0
1,
1,
1,
1,
1
],
"var_groups": [
0,
Expand All @@ -543,16 +543,16 @@
"boilerControlBus.fuelPower"
],
"warnings": [
"Absolute error = 3.413e+00 at t = 11600.0 for boilerControlBus.TSupMea",
"Absolute error = 6.953e+00 at t = 11400.0 for boilerControlBus.TRetMea",
"Absolute error = 1.582e-02 at t = 11600.0 for boilerControlBus.Efficiency",
"Absolute error = 7.962e+03 at t = 12000.0 for boilerControlBus.ThermalPower",
"Absolute error = 8.286e+03 at t = 12000.0 for boilerControlBus.fuelPower"
null,
null,
null,
null,
null
]
},
"model": "AixLib.Systems.ModularEnergySystems.ModularBoiler.Examples.ModularBoilerFeedback",
"simulation": {
"elapsed_time": 6.2,
"elapsed_time": 6.32,
"final_time": 20000,
"jacobians": 69639,
"start_time": 0,
Expand Down Expand Up @@ -615,7 +615,7 @@
},
"model": "AixLib.Systems.HydraulicModules.Example.Injection2WayValve",
"simulation": {
"elapsed_time": 0.0226,
"elapsed_time": 0.0239,
"final_time": 800,
"jacobians": 53,
"start_time": 0,
Expand Down Expand Up @@ -714,7 +714,7 @@
},
"model": "AixLib.Systems.ModularAHU.Validation.AHU2_Heater",
"simulation": {
"elapsed_time": 1.09,
"elapsed_time": 1.11,
"final_time": 4320,
"jacobians": 4262,
"start_time": 0,
Expand Down Expand Up @@ -783,7 +783,7 @@
},
"model": "AixLib.Systems.ModularAHU.Examples.GenericAHU",
"simulation": {
"elapsed_time": 0.133,
"elapsed_time": 0.143,
"final_time": 7200,
"jacobians": 40,
"start_time": 0,
Expand Down Expand Up @@ -846,7 +846,7 @@
},
"model": "AixLib.Systems.HeatPumpSystems.Examples.HeatPumpSystem",
"simulation": {
"elapsed_time": 2.08,
"elapsed_time": 1.87,
"final_time": 86400,
"jacobians": 8350,
"start_time": 0,
Expand Down Expand Up @@ -945,7 +945,7 @@
},
"model": "AixLib.Systems.ModularAHU.Validation.AHU2_Preheater",
"simulation": {
"elapsed_time": 1.65,
"elapsed_time": 1.51,
"final_time": 7200,
"jacobians": 4988,
"start_time": 0,
Expand Down Expand Up @@ -1008,7 +1008,7 @@
},
"model": "AixLib.Systems.HydraulicModules.Example.ThrottlePump",
"simulation": {
"elapsed_time": 0.0157,
"elapsed_time": 0.0173,
"final_time": 600,
"jacobians": 46,
"start_time": 0,
Expand Down Expand Up @@ -1071,7 +1071,7 @@
},
"model": "AixLib.Systems.HydraulicModules.Example.Admix",
"simulation": {
"elapsed_time": 0.0232,
"elapsed_time": 0.0273,
"final_time": 800,
"jacobians": 56,
"start_time": 0,
Expand Down
100 changes: 50 additions & 50 deletions ...s.ModularBoiler.Examples.ModularBoilerFeedback.mat_boilerControlBus.Efficiency/errors.csv
View file
Original file line number Diff line number Diff line change
@@ -1,66 +1,66 @@
x,y
0.000000,0.000000
200.000000,0.000072
400.000000,0.002551
600.000000,0.004516
800.000000,0.006767
1000.000000,0.004567
1200.000000,0.008280
1400.000000,0.009563
1600.000000,0.010535
1800.000000,0.012541
2000.000000,0.009871
2200.000000,0.010986
2400.000000,0.012036
2600.000000,0.010772
2800.000000,0.008658
3000.000000,0.010049
3200.000000,0.008934
3400.000000,0.008248
3600.000000,0.003695
3800.000000,0.004538
4000.000000,0.000523
4200.000000,0.002822
4400.000000,0.001266
4600.000000,0.002145
200.000000,0.000000
400.000000,0.000000
600.000000,0.000000
800.000000,0.000000
1000.000000,0.000000
1200.000000,0.000000
1400.000000,0.000000
1600.000000,0.000000
1800.000000,0.000000
2000.000000,0.000000
2200.000000,0.000000
2400.000000,0.000000
2600.000000,0.000000
2800.000000,0.000000
3000.000000,0.000000
3200.000000,0.000000
3400.000000,0.000000
3600.000000,0.000000
3800.000000,0.000000
4000.000000,0.000000
4200.000000,0.000000
4400.000000,0.000000
4600.000000,0.000000
4800.000000,0.000000
5000.000000,0.000000
5200.000000,0.002726
5200.000000,0.000000
5400.000000,0.000000
5600.000000,0.000571
5800.000000,0.002767
5600.000000,0.000000
5800.000000,0.000000
6000.000000,0.000000
6200.000000,0.001953
6400.000000,0.000673
6200.000000,0.000000
6400.000000,0.000000
6600.000000,0.000000
6800.000000,0.000777
7000.000000,0.000341
7200.000000,0.001548
7400.000000,0.001124
6800.000000,0.000000
7000.000000,0.000000
7200.000000,0.000000
7400.000000,0.000000
7600.000000,0.000000
7800.000000,0.000000
8000.000000,0.000207
8200.000000,0.000740
8000.000000,0.000000
8200.000000,0.000000
8400.000000,0.000000
8600.000000,0.000992
8800.000000,0.001453
9000.000000,0.002117
8600.000000,0.000000
8800.000000,0.000000
9000.000000,0.000000
9200.000000,0.000000
9400.000000,0.000000
9600.000000,0.000289
9800.000000,0.000233
9600.000000,0.000000
9800.000000,0.000000
10000.000000,0.000000
10200.000000,0.002408
10400.000000,0.000064
10600.000000,0.001136
10800.000000,0.001524
11000.000000,0.001872
11200.000000,0.007488
11400.000000,0.015804
11600.000000,0.015823
11800.000000,0.011072
12000.000000,0.003924
12200.000000,0.000154
10200.000000,0.000000
10400.000000,0.000000
10600.000000,0.000000
10800.000000,0.000000
11000.000000,0.000000
11200.000000,0.000000
11400.000000,0.000000
11600.000000,0.000000
11800.000000,0.000000
12000.000000,0.000000
12200.000000,0.000000
12400.000000,0.000000
12600.000000,0.000000
12800.000000,0.000000
Expand Down
Loading

0 comments on commit 14433fd

Please sign in to comment.