Skip to content

Commit

Permalink
Update 'docs' folder with 1520_newHPModels and delete old branches.
Browse files Browse the repository at this point in the history
  • Loading branch information
@DaJansenGit
DaJansenGit committed Sep 24, 2024
1 parent 9d9f3a0 commit 632cd7c
Show file tree
Hide file tree
Showing 8 changed files with 98 additions and 680 deletions.
2 changes: 1 addition & 1 deletion ...newHPModels/charts/Fluid/AixLib_Fluid_Examples_GeothermalHeatPump_GeothermalHeatPump.html
View file

Large diffs are not rendered by default.

14 changes: 14 additions & 0 deletions ...id/AixLib_Fluid_HeatPumps_ModularReversible_Examples_VCLibAirToWater_OneRoomRadiator.html
View file

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions docs/1520_newHPModels/charts/Fluid/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<body>
<header>
<br><li><a href="AixLib_Fluid_Examples_GeothermalHeatPump_GeothermalHeatPump.html" target="content">AixLib_Fluid_Examples_GeothermalHeatPump_GeothermalHeatPump.html</a></li></br>
<br><li><a href="AixLib_Fluid_HeatPumps_ModularReversible_Examples_VCLibAirToWater_OneRoomRadiator.html" target="content">AixLib_Fluid_HeatPumps_ModularReversible_Examples_VCLibAirToWater_OneRoomRadiator.html</a></li></br>
</header>

</body>
Expand Down
580 changes: 2 additions & 578 deletions docs/1520_newHPModels/index.html
View file

Large diffs are not rendered by default.

108 changes: 36 additions & 72 deletions docs/1520_newHPModels/regression/Fluid/comparison-dymola.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
},
"model": "AixLib.Fluid.FixedResistances.Examples.SimplePipe",
"simulation": {
"elapsed_time": 0.0086,
"elapsed_time": 0.0107,
"final_time": 1000,
"jacobians": 43,
"start_time": 0,
Expand Down Expand Up @@ -81,7 +81,7 @@
},
"model": "AixLib.Fluid.Movers.PumpsPolynomialBased.Examples.PumpHeadControlled",
"simulation": {
"elapsed_time": 0.00944,
"elapsed_time": 0.0107,
"final_time": 600,
"jacobians": 108,
"start_time": 0,
Expand Down Expand Up @@ -150,7 +150,7 @@
},
"model": "AixLib.Fluid.Movers.DpControlledMovers.Examples.DpConst",
"simulation": {
"elapsed_time": 0.0187,
"elapsed_time": 0.0182,
"final_time": 3600,
"jacobians": 120,
"start_time": 0,
Expand Down Expand Up @@ -189,7 +189,7 @@
},
"model": "AixLib.Fluid.BoilerCHP.Examples.CHPSystem",
"simulation": {
"elapsed_time": 0.0415,
"elapsed_time": 0.0245,
"final_time": 1200,
"jacobians": 409,
"start_time": 0,
Expand Down Expand Up @@ -234,7 +234,7 @@
},
"model": "AixLib.Fluid.DistrictHeatingCooling.Demands.Examples.OpenLoopVarTSupplyDp",
"simulation": {
"elapsed_time": 0.0291,
"elapsed_time": 0.0361,
"final_time": 100000,
"jacobians": 126,
"start_time": 0,
Expand Down Expand Up @@ -321,7 +321,7 @@
},
"model": "AixLib.Fluid.MassExchangers.MembraneBasedEnthalpyExchangers.Examples.Test_EnthalpyExchanger",
"simulation": {
"elapsed_time": 0.277,
"elapsed_time": 0.29,
"final_time": 7200,
"jacobians": 62,
"start_time": 0,
Expand Down Expand Up @@ -378,7 +378,7 @@
},
"model": "AixLib.Fluid.Storage.Examples.StorageSimpleExample",
"simulation": {
"elapsed_time": 8.63,
"elapsed_time": 8.33,
"final_time": 38200,
"jacobians": 59209,
"start_time": 0,
Expand Down Expand Up @@ -417,7 +417,7 @@
},
"model": "AixLib.Fluid.DistrictHeatingCooling.Pipes.Examples.StaticPipe",
"simulation": {
"elapsed_time": 0.00602,
"elapsed_time": 0.00585,
"final_time": 1000,
"jacobians": 35,
"start_time": 0,
Expand Down Expand Up @@ -486,7 +486,7 @@
},
"model": "AixLib.Fluid.Movers.DpControlledMovers.Examples.DpVar",
"simulation": {
"elapsed_time": 0.0189,
"elapsed_time": 0.0197,
"final_time": 3600,
"jacobians": 122,
"start_time": 0,
Expand Down Expand Up @@ -537,7 +537,7 @@
},
"model": "AixLib.Fluid.Storage.Examples.StorageBoiler",
"simulation": {
"elapsed_time": 0.101,
"elapsed_time": 0.0999,
"final_time": 86400,
"jacobians": 101,
"start_time": 0,
Expand Down Expand Up @@ -576,7 +576,7 @@
},
"model": "AixLib.Fluid.FixedResistances.Examples.CompareFixedResistances",
"simulation": {
"elapsed_time": 0.279,
"elapsed_time": 0.269,
"final_time": 3600,
"jacobians": 41000,
"start_time": 0,
Expand Down Expand Up @@ -633,7 +633,7 @@
},
"model": "AixLib.Fluid.HeatPumps.ModularReversible.Examples.TableData3D_OneRoomRadiator",
"simulation": {
"elapsed_time": 0.0618,
"elapsed_time": 0.0651219,
"final_time": 86400,
"jacobians": 76,
"start_time": 0,
Expand Down Expand Up @@ -684,7 +684,7 @@
},
"model": "AixLib.Fluid.Pools.Examples.IndoorSwimmingPool",
"simulation": {
"elapsed_time": 0.236195,
"elapsed_time": 0.221621,
"final_time": 604800,
"jacobians": 97,
"start_time": 0,
Expand All @@ -695,53 +695,17 @@
{
"comparison": {
"file_name": "AixLib.Fluid.Examples.GeothermalHeatPump.GeothermalHeatPump.mat",
"funnel_dirs": [
"funnel_comp/AixLib.Fluid.Examples.GeothermalHeatPump.GeothermalHeatPump.mat_heatPumpPower",
"funnel_comp/AixLib.Fluid.Examples.GeothermalHeatPump.GeothermalHeatPump.mat_heatStorage.layer[1].T",
"funnel_comp/AixLib.Fluid.Examples.GeothermalHeatPump.GeothermalHeatPump.mat_heatStorage.layer[5].T",
"funnel_comp/AixLib.Fluid.Examples.GeothermalHeatPump.GeothermalHeatPump.mat_coldStorage.layer[5].T",
"funnel_comp/AixLib.Fluid.Examples.GeothermalHeatPump.GeothermalHeatPump.mat_coldStorage.layer[1].T"
],
"success_rate": 0.8,
"t_err_max": [
52704.0,
0.0,
0.0,
0.0,
0.0
],
"test_passed": [
0,
1,
1,
1,
1
],
"var_groups": [
0,
1,
1,
1,
1
],
"variables": [
"heatPumpPower",
"heatStorage.layer[1].T",
"heatStorage.layer[5].T",
"coldStorage.layer[5].T",
"coldStorage.layer[1].T"
],
"warnings": [
"Absolute error = 2.247e+02 at t = 52704.0 for heatPumpPower",
null,
null,
null,
null
]
"funnel_dirs": [],
"success_rate": 0,
"t_err_max": [],
"test_passed": [],
"var_groups": [],
"variables": [],
"warnings": []
},
"model": "AixLib.Fluid.Examples.GeothermalHeatPump.GeothermalHeatPump",
"simulation": {
"elapsed_time": 4.52,
"elapsed_time": 4.3,
"final_time": 86400,
"jacobians": 4606,
"start_time": 0,
Expand Down Expand Up @@ -780,7 +744,7 @@
},
"model": "AixLib.Fluid.DistrictHeatingCooling.Pipes.Examples.PlugFlowPipeZeta",
"simulation": {
"elapsed_time": 0.00888,
"elapsed_time": 0.00861,
"final_time": 1000,
"jacobians": 78,
"start_time": 0,
Expand Down Expand Up @@ -831,7 +795,7 @@
},
"model": "AixLib.Fluid.Movers.PumpsPolynomialBased.Examples.PumpSpeedControlled",
"simulation": {
"elapsed_time": 0.0166,
"elapsed_time": 0.0112,
"final_time": 600,
"jacobians": 170,
"start_time": 0,
Expand Down Expand Up @@ -864,7 +828,7 @@
},
"model": "AixLib.Fluid.DistrictHeatingCooling.Demands.Examples.OpenLoopVarTSupplyDpFixedTempDifferenceBypass",
"simulation": {
"elapsed_time": 0.0314,
"elapsed_time": 0.0266,
"final_time": 100000,
"jacobians": 162,
"start_time": 0,
Expand Down Expand Up @@ -903,7 +867,7 @@
},
"model": "AixLib.Fluid.DistrictHeatingCooling.Pipes.Examples.PlugFlowPipeEmbedded",
"simulation": {
"elapsed_time": 0.0104,
"elapsed_time": 0.0116,
"final_time": 1000,
"jacobians": 109,
"start_time": 0,
Expand Down Expand Up @@ -966,7 +930,7 @@
},
"model": "AixLib.Fluid.MassExchangers.MembraneBasedEnthalpyExchangers.Validation.DynamicValidation",
"simulation": {
"elapsed_time": 22.5,
"elapsed_time": 21.5,
"final_time": 7200,
"jacobians": 7673,
"start_time": 0,
Expand Down Expand Up @@ -1023,7 +987,7 @@
},
"model": "AixLib.Fluid.HeatPumps.ModularReversible.Examples.VCLibAirToWater_OneRoomRadiator",
"simulation": {
"elapsed_time": 0.0576138,
"elapsed_time": 0.051826,
"final_time": 86400,
"jacobians": 60,
"start_time": 0,
Expand Down Expand Up @@ -1086,7 +1050,7 @@
},
"model": "AixLib.Fluid.Storage.Examples.StorageSolarCollector",
"simulation": {
"elapsed_time": 0.687,
"elapsed_time": 0.593,
"final_time": 172800,
"jacobians": 1201,
"start_time": 0,
Expand Down Expand Up @@ -1137,7 +1101,7 @@
},
"model": "AixLib.Fluid.Pools.Examples.IndoorSwimmingPoolExternalHeatingSystem",
"simulation": {
"elapsed_time": 0.282176,
"elapsed_time": 0.242575,
"final_time": 604800,
"jacobians": 97,
"start_time": 0,
Expand Down Expand Up @@ -1182,7 +1146,7 @@
},
"model": "AixLib.Fluid.DistrictHeatingCooling.Demands.Examples.OpenLoopHeatPumpCarnot",
"simulation": {
"elapsed_time": 0.0357,
"elapsed_time": 0.0272,
"final_time": 100000,
"jacobians": 115,
"start_time": 0,
Expand Down Expand Up @@ -1233,7 +1197,7 @@
},
"model": "AixLib.Fluid.Movers.PumpsPolynomialBased.Examples.PumpSpeedControlledDpV",
"simulation": {
"elapsed_time": 0.0117,
"elapsed_time": 0.0119,
"final_time": 600,
"jacobians": 134,
"start_time": 0,
Expand Down Expand Up @@ -1308,7 +1272,7 @@
},
"model": "AixLib.Fluid.DistrictHeatingCooling.Pipes.Examples.DHCPipe",
"simulation": {
"elapsed_time": 0.455,
"elapsed_time": 0.463,
"final_time": 3600,
"jacobians": 6494,
"start_time": 0,
Expand Down Expand Up @@ -1359,7 +1323,7 @@
},
"model": "AixLib.Fluid.BoilerCHP.Examples.CHPSystemNoControl",
"simulation": {
"elapsed_time": 0.0115,
"elapsed_time": 0.0101,
"final_time": 300,
"jacobians": 75,
"start_time": 0,
Expand Down Expand Up @@ -1416,7 +1380,7 @@
},
"model": "AixLib.Fluid.HeatExchangers.Examples.HeatingRod",
"simulation": {
"elapsed_time": 0.0193861,
"elapsed_time": 0.011781,
"final_time": 172800,
"jacobians": 40,
"start_time": 0,
Expand Down Expand Up @@ -1479,7 +1443,7 @@
},
"model": "AixLib.Fluid.MassExchangers.MembraneBasedEnthalpyExchangers.Validation.StaticValidation",
"simulation": {
"elapsed_time": 8.63,
"elapsed_time": 7.74,
"final_time": 29600,
"jacobians": 1180,
"start_time": 0,
Expand Down Expand Up @@ -1530,7 +1494,7 @@
},
"model": "AixLib.Fluid.Storage.Examples.StorageDetailedExample",
"simulation": {
"elapsed_time": 0.0542,
"elapsed_time": 0.0486,
"final_time": 86400,
"jacobians": 45,
"start_time": 0,
Expand Down
Loading

0 comments on commit 632cd7c

Please sign in to comment.