Update 'docs' folder with 1520_newHPModels and delete old branches.

RWTH-EBC · Sep 24, 2024 · f01a6a8 · f01a6a8
1 parent 632cd7c
commit f01a6a8
Show file tree

Hide file tree

Showing 23 changed files with 2,254 additions and 2,196 deletions.
diff --git a/...id/AixLib_Fluid_HeatPumps_ModularReversible_Examples_VCLibAirToWater_OneRoomRadiator.html b/...id/AixLib_Fluid_HeatPumps_ModularReversible_Examples_VCLibAirToWater_OneRoomRadiator.html
diff --git a/docs/1520_newHPModels/charts/Fluid/index.html b/docs/1520_newHPModels/charts/Fluid/index.html
@@ -7,7 +7,6 @@
       </head>
       <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>
 

diff --git a/docs/1520_newHPModels/index.html b/docs/1520_newHPModels/index.html
diff --git a/docs/1520_newHPModels/naming_violations.txt b/docs/1520_newHPModels/naming_violations.txt
diff --git a/docs/1520_newHPModels/regression/Fluid/comparison-dymola.log b/docs/1520_newHPModels/regression/Fluid/comparison-dymola.log
@@ -30,7 +30,7 @@
     },
     "model": "AixLib.Fluid.FixedResistances.Examples.SimplePipe",
     "simulation": {
-      "elapsed_time": 0.0107,
+      "elapsed_time": 0.0082,
       "final_time": 1000,
       "jacobians": 43,
       "start_time": 0,
@@ -81,7 +81,7 @@
     },
     "model": "AixLib.Fluid.Movers.PumpsPolynomialBased.Examples.PumpHeadControlled",
     "simulation": {
-      "elapsed_time": 0.0107,
+      "elapsed_time": 0.0136,
       "final_time": 600,
       "jacobians": 108,
       "start_time": 0,
@@ -150,7 +150,7 @@
     },
     "model": "AixLib.Fluid.Movers.DpControlledMovers.Examples.DpConst",
     "simulation": {
-      "elapsed_time": 0.0182,
+      "elapsed_time": 0.019,
       "final_time": 3600,
       "jacobians": 120,
       "start_time": 0,
@@ -189,7 +189,7 @@
     },
     "model": "AixLib.Fluid.BoilerCHP.Examples.CHPSystem",
     "simulation": {
-      "elapsed_time": 0.0245,
+      "elapsed_time": 0.058,
       "final_time": 1200,
       "jacobians": 409,
       "start_time": 0,
@@ -234,7 +234,7 @@
     },
     "model": "AixLib.Fluid.DistrictHeatingCooling.Demands.Examples.OpenLoopVarTSupplyDp",
     "simulation": {
-      "elapsed_time": 0.0361,
+      "elapsed_time": 0.0262,
       "final_time": 100000,
       "jacobians": 126,
       "start_time": 0,
@@ -321,7 +321,7 @@
     },
     "model": "AixLib.Fluid.MassExchangers.MembraneBasedEnthalpyExchangers.Examples.Test_EnthalpyExchanger",
     "simulation": {
-      "elapsed_time": 0.29,
+      "elapsed_time": 0.285,
       "final_time": 7200,
       "jacobians": 62,
       "start_time": 0,
@@ -378,7 +378,7 @@
     },
     "model": "AixLib.Fluid.Storage.Examples.StorageSimpleExample",
     "simulation": {
-      "elapsed_time": 8.33,
+      "elapsed_time": 8.97,
       "final_time": 38200,
       "jacobians": 59209,
       "start_time": 0,
@@ -417,7 +417,7 @@
     },
     "model": "AixLib.Fluid.DistrictHeatingCooling.Pipes.Examples.StaticPipe",
     "simulation": {
-      "elapsed_time": 0.00585,
+      "elapsed_time": 0.00634,
       "final_time": 1000,
       "jacobians": 35,
       "start_time": 0,
@@ -486,7 +486,7 @@
     },
     "model": "AixLib.Fluid.Movers.DpControlledMovers.Examples.DpVar",
     "simulation": {
-      "elapsed_time": 0.0197,
+      "elapsed_time": 0.0186,
       "final_time": 3600,
       "jacobians": 122,
       "start_time": 0,
@@ -537,7 +537,7 @@
     },
     "model": "AixLib.Fluid.Storage.Examples.StorageBoiler",
     "simulation": {
-      "elapsed_time": 0.0999,
+      "elapsed_time": 0.141,
       "final_time": 86400,
       "jacobians": 101,
       "start_time": 0,
@@ -576,7 +576,7 @@
     },
     "model": "AixLib.Fluid.FixedResistances.Examples.CompareFixedResistances",
     "simulation": {
-      "elapsed_time": 0.269,
+      "elapsed_time": 0.272,
       "final_time": 3600,
       "jacobians": 41000,
       "start_time": 0,
@@ -633,7 +633,7 @@
     },
     "model": "AixLib.Fluid.HeatPumps.ModularReversible.Examples.TableData3D_OneRoomRadiator",
     "simulation": {
-      "elapsed_time": 0.0651219,
+      "elapsed_time": 0.0690069,
       "final_time": 86400,
       "jacobians": 76,
       "start_time": 0,
@@ -684,7 +684,7 @@
     },
     "model": "AixLib.Fluid.Pools.Examples.IndoorSwimmingPool",
     "simulation": {
-      "elapsed_time": 0.221621,
+      "elapsed_time": 0.223923,
       "final_time": 604800,
       "jacobians": 97,
       "start_time": 0,
@@ -695,17 +695,53 @@
   {
     "comparison": {
       "file_name": "AixLib.Fluid.Examples.GeothermalHeatPump.GeothermalHeatPump.mat",
-      "funnel_dirs": [],
-      "success_rate": 0,
-      "t_err_max": [],
-      "test_passed": [],
-      "var_groups": [],
-      "variables": [],
-      "warnings": []
+      "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": 1.0,
+      "t_err_max": [
+        0.0,
+        0.0,
+        0.0,
+        0.0,
+        0.0
+      ],
+      "test_passed": [
+        1,
+        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": [
+        null,
+        null,
+        null,
+        null,
+        null
+      ]
     },
     "model": "AixLib.Fluid.Examples.GeothermalHeatPump.GeothermalHeatPump",
     "simulation": {
-      "elapsed_time": 4.3,
+      "elapsed_time": 4.67,
       "final_time": 86400,
       "jacobians": 4606,
       "start_time": 0,
@@ -744,7 +780,7 @@
     },
     "model": "AixLib.Fluid.DistrictHeatingCooling.Pipes.Examples.PlugFlowPipeZeta",
     "simulation": {
-      "elapsed_time": 0.00861,
+      "elapsed_time": 0.00836,
       "final_time": 1000,
       "jacobians": 78,
       "start_time": 0,
@@ -795,7 +831,7 @@
     },
     "model": "AixLib.Fluid.Movers.PumpsPolynomialBased.Examples.PumpSpeedControlled",
     "simulation": {
-      "elapsed_time": 0.0112,
+      "elapsed_time": 0.0131,
       "final_time": 600,
       "jacobians": 170,
       "start_time": 0,
@@ -828,7 +864,7 @@
     },
     "model": "AixLib.Fluid.DistrictHeatingCooling.Demands.Examples.OpenLoopVarTSupplyDpFixedTempDifferenceBypass",
     "simulation": {
-      "elapsed_time": 0.0266,
+      "elapsed_time": 0.029,
       "final_time": 100000,
       "jacobians": 162,
       "start_time": 0,
@@ -867,7 +903,7 @@
     },
     "model": "AixLib.Fluid.DistrictHeatingCooling.Pipes.Examples.PlugFlowPipeEmbedded",
     "simulation": {
-      "elapsed_time": 0.0116,
+      "elapsed_time": 0.0118,
       "final_time": 1000,
       "jacobians": 109,
       "start_time": 0,
@@ -930,7 +966,7 @@
     },
     "model": "AixLib.Fluid.MassExchangers.MembraneBasedEnthalpyExchangers.Validation.DynamicValidation",
     "simulation": {
-      "elapsed_time": 21.5,
+      "elapsed_time": 23.1,
       "final_time": 7200,
       "jacobians": 7673,
       "start_time": 0,
@@ -987,7 +1023,7 @@
     },
     "model": "AixLib.Fluid.HeatPumps.ModularReversible.Examples.VCLibAirToWater_OneRoomRadiator",
     "simulation": {
-      "elapsed_time": 0.051826,
+      "elapsed_time": 0.055023,
       "final_time": 86400,
       "jacobians": 60,
       "start_time": 0,
@@ -1050,7 +1086,7 @@
     },
     "model": "AixLib.Fluid.Storage.Examples.StorageSolarCollector",
     "simulation": {
-      "elapsed_time": 0.593,
+      "elapsed_time": 0.695,
       "final_time": 172800,
       "jacobians": 1201,
       "start_time": 0,
@@ -1101,7 +1137,7 @@
     },
     "model": "AixLib.Fluid.Pools.Examples.IndoorSwimmingPoolExternalHeatingSystem",
     "simulation": {
-      "elapsed_time": 0.242575,
+      "elapsed_time": 0.371143,
       "final_time": 604800,
       "jacobians": 97,
       "start_time": 0,
@@ -1146,7 +1182,7 @@
     },
     "model": "AixLib.Fluid.DistrictHeatingCooling.Demands.Examples.OpenLoopHeatPumpCarnot",
     "simulation": {
-      "elapsed_time": 0.0272,
+      "elapsed_time": 0.0297,
       "final_time": 100000,
       "jacobians": 115,
       "start_time": 0,
@@ -1197,7 +1233,7 @@
     },
     "model": "AixLib.Fluid.Movers.PumpsPolynomialBased.Examples.PumpSpeedControlledDpV",
     "simulation": {
-      "elapsed_time": 0.0119,
+      "elapsed_time": 0.013,
       "final_time": 600,
       "jacobians": 134,
       "start_time": 0,
@@ -1272,7 +1308,7 @@
     },
     "model": "AixLib.Fluid.DistrictHeatingCooling.Pipes.Examples.DHCPipe",
     "simulation": {
-      "elapsed_time": 0.463,
+      "elapsed_time": 0.464,
       "final_time": 3600,
       "jacobians": 6494,
       "start_time": 0,
@@ -1323,7 +1359,7 @@
     },
     "model": "AixLib.Fluid.BoilerCHP.Examples.CHPSystemNoControl",
     "simulation": {
-      "elapsed_time": 0.0101,
+      "elapsed_time": 0.0118,
       "final_time": 300,
       "jacobians": 75,
       "start_time": 0,
@@ -1380,7 +1416,7 @@
     },
     "model": "AixLib.Fluid.HeatExchangers.Examples.HeatingRod",
     "simulation": {
-      "elapsed_time": 0.011781,
+      "elapsed_time": 0.0120559,
       "final_time": 172800,
       "jacobians": 40,
       "start_time": 0,
@@ -1443,7 +1479,7 @@
     },
     "model": "AixLib.Fluid.MassExchangers.MembraneBasedEnthalpyExchangers.Validation.StaticValidation",
     "simulation": {
-      "elapsed_time": 7.74,
+      "elapsed_time": 7.99,
       "final_time": 29600,
       "jacobians": 1180,
       "start_time": 0,
@@ -1494,7 +1530,7 @@
     },
     "model": "AixLib.Fluid.Storage.Examples.StorageDetailedExample",
     "simulation": {
-      "elapsed_time": 0.0486,
+      "elapsed_time": 0.0523,
       "final_time": 86400,
       "jacobians": 45,
       "start_time": 0,