merged master

lbl-srg · Oct 25, 2023 · 9ad06bf · 9ad06bf
2 parents e2cc156 + 6263b47
commit 9ad06bf
Show file tree

Hide file tree

Showing 180 changed files with 3,988 additions and 2,465 deletions.
diff --git a/Buildings/.copiedFiles.txt b/Buildings/.copiedFiles.txt
@@ -1064,6 +1064,20 @@ Buildings/Fluid/FixedResistances/Validation/package.mo
 Buildings/Fluid/FixedResistances/Validation/package.order
 Buildings/Fluid/FixedResistances/package.mo
 Buildings/Fluid/FixedResistances/package.order
+Buildings/Fluid/Geothermal/Aquifer/Data/Rock.mo
+Buildings/Fluid/Geothermal/Aquifer/Data/Template.mo
+Buildings/Fluid/Geothermal/Aquifer/Data/package.mo
+Buildings/Fluid/Geothermal/Aquifer/Data/package.order
+Buildings/Fluid/Geothermal/Aquifer/Examples/CoolingOffice.mo
+Buildings/Fluid/Geothermal/Aquifer/Examples/package.mo
+Buildings/Fluid/Geothermal/Aquifer/Examples/package.order
+Buildings/Fluid/Geothermal/Aquifer/MultiWell.mo
+Buildings/Fluid/Geothermal/Aquifer/Validation/NumberWells.mo
+Buildings/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mo
+Buildings/Fluid/Geothermal/Aquifer/Validation/package.mo
+Buildings/Fluid/Geothermal/Aquifer/Validation/package.order
+Buildings/Fluid/Geothermal/Aquifer/package.mo
+Buildings/Fluid/Geothermal/Aquifer/package.order
 Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mo
 Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mo
 Buildings/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mo
@@ -2051,6 +2065,11 @@ Buildings/Resources/Images/Fluid/FixedResistances/Junction.svg
 Buildings/Resources/Images/Fluid/FixedResistances/PressureDrop.png
 Buildings/Resources/Images/Fluid/FixedResistances/Validation/PlugFlowPipes/AITTestBench.png
 Buildings/Resources/Images/Fluid/FixedResistances/Validation/PlugFlowPipes/ULgTestBench.png
+Buildings/Resources/Images/Fluid/Geothermal/Aquifer/Geometry.png
+Buildings/Resources/Images/Fluid/Geothermal/Aquifer/Geometry.svg
+Buildings/Resources/Images/Fluid/Geothermal/Aquifer/PressureCircuit.png
+Buildings/Resources/Images/Fluid/Geothermal/Aquifer/PressureCircuit.svg
+Buildings/Resources/Images/Fluid/Geothermal/Aquifer/results.png
 Buildings/Resources/Images/Fluid/Geothermal/Borefields/BorefieldGeometry_01.png
 Buildings/Resources/Images/Fluid/Geothermal/Borefields/BorefieldGeometry_01.tex
 Buildings/Resources/Images/Fluid/Geothermal/Borefields/BoreholeResistances_01.png
@@ -2484,6 +2503,9 @@ Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDro
 Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsExplicitLinearized.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsParallel.mos
 Buildings/Resources/Scripts/Dymola/Fluid/FixedResistances/Validation/PressureDropsSeries.mos
+Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Aquifer/Examples/CoolingOffice.mos
+Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Aquifer/Validation/NumberWells.mos
+Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Aquifer/Validation/SimulationTest.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXOneUTube.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalHEXTwoUTube.mos
 Buildings/Resources/Scripts/Dymola/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Examples/InternalResistancesOneUTube.mos

diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/Guideline36.mo
@@ -11,14 +11,18 @@ model Guideline36
   Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Controller con(
     eneStd=Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1,
     venStd=Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1,
+
     final VAreBreZon_flow=0.0144,
     final VPopBreZon_flow=0.0075,
     ecoHigLimCon=Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulb,
+
     ashCliZon=Buildings.Controls.OBC.ASHRAE.G36.Types.ASHRAEClimateZone.Zone_6B,
+
     freSta=Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.No_freeze_stat,
     have_winSen=true,
     have_CO2Sen=false,
-    buiPreCon=Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.BarometricRelief,
+    buiPreCon=Buildings.Controls.OBC.ASHRAE.G36.Types.PressureControl.BarometricRelief,
+
     have_locAdj=false,
     ignDemLim=false,
     kCoo=0.1,
@@ -36,11 +40,10 @@ model Guideline36
     have_occSen=false,
     TSup_max=343.15,
     TSup_min=286.15,
-    outDamMinFloMinSpe = 0.2304,
+    outDamMinFloMinSpe=0.2304,
     outDamMinFloMaxSpe=0.02304,
     outDamDesFloMinSpe=0.4,
-    outDamDesFloMaxSpe=0.04)
-    "VAV controller"
+    outDamDesFloMaxSpe=0.04) "VAV controller"
     annotation (Placement(transformation(extent={{-120,-20},{-80,60}})));
 
   Buildings.Controls.OBC.CDL.Reals.Hysteresis hysChiPla(

diff --git a/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUG36.mo b/Buildings/Air/Systems/SingleZone/VAV/Examples/OptimalStart/BaseClasses/ZoneWithAHUG36.mo
@@ -48,14 +48,18 @@ block ZoneWithAHUG36
   Buildings.Controls.OBC.ASHRAE.G36.AHUs.SingleZone.VAV.Controller con(
     eneStd=Buildings.Controls.OBC.ASHRAE.G36.Types.EnergyStandard.ASHRAE90_1,
     venStd=Buildings.Controls.OBC.ASHRAE.G36.Types.VentilationStandard.ASHRAE62_1,
+
     VAreBreZon_flow=0.4989,
     VPopBreZon_flow=0.2075,
     ecoHigLimCon=Buildings.Controls.OBC.ASHRAE.G36.Types.ControlEconomizer.FixedDryBulb,
+
     ashCliZon=Buildings.Controls.OBC.ASHRAE.G36.Types.ASHRAEClimateZone.Zone_6B,
+
     freSta=Buildings.Controls.OBC.ASHRAE.G36.Types.FreezeStat.No_freeze_stat,
     have_winSen=false,
     have_CO2Sen=false,
-    buiPreCon=Buildings.Controls.OBC.ASHRAE.G36.Types.BuildingPressureControlTypes.BarometricRelief,
+    buiPreCon=Buildings.Controls.OBC.ASHRAE.G36.Types.PressureControl.BarometricRelief,
+
     have_locAdj=false,
     TSupDew_max=297.15,
     maxHeaSpe=0.2,
@@ -71,8 +75,7 @@ block ZoneWithAHUG36
     TSup_max=343.15,
     TSup_min=286.15,
     uLow=0,
-    uHigh=0.5)
-    "VAV controller"
+    uHigh=0.5) "VAV controller"
     annotation (Placement(transformation(extent={{-80,-90},{-40,-10}})));
   Buildings.ThermalZones.Detailed.Validation.BaseClasses.SingleZoneFloor sinZonFlo(
     redeclare package Medium = MediumA)