diff --git a/BESMod/Examples/BAUSimStudy/PartialCase.mo b/BESMod/Examples/BAUSimStudy/PartialCase.mo index cf853a6c..c864fa3e 100644 --- a/BESMod/Examples/BAUSimStudy/PartialCase.mo +++ b/BESMod/Examples/BAUSimStudy/PartialCase.mo @@ -10,27 +10,23 @@ partial model PartialCase redeclare BESMod.Systems.Control.NoControl control, redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic( energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater generation( + redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater + generation( + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, - redeclare package Medium_eva = AixLib.Media.Air, + genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, + + TBiv=TBiv, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, - TBiv=TBiv, - scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/5000, - dpCon_nominal=0, - dpEva_nominal=0, - use_refIne=false, - refIneFre_constant=0), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea, - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap ( - QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal, - refrigerant="Propane", - flowsheet="VIPhaseSeparatorFlowsheet"), redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen), @@ -42,14 +38,13 @@ partial model PartialCase dTHysDHW=10, redeclare model DHWHysteresis = BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater, + redeclare model BuildingHysteresis = BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater, + redeclare BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI - parPIDHeaPum, - redeclare - BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl - safetyControl), + parPIDHeaPum), redeclare BESMod.Systems.Hydraulical.Distribution.TwoStoDetailedDirectLoading distribution( @@ -69,7 +64,7 @@ partial model PartialCase use_QLos=true, T_m=65 + 273.15), redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHeaAftBuf), redeclare BESMod.Systems.Hydraulical.Transfer.RadiatorPressureBased transfer( diff --git a/BESMod/Examples/DesignOptimization/BES.mo b/BESMod/Examples/DesignOptimization/BES.mo index 5a8ba941..e61a1065 100644 --- a/BESMod/Examples/DesignOptimization/BES.mo +++ b/BESMod/Examples/DesignOptimization/BES.mo @@ -12,35 +12,23 @@ model BES redeclare BESMod.Systems.Control.NoControl control, redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic( energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater generation( - redeclare model PerDataRevHP = - AixLib.DataBase.Chiller.PerformanceData.PolynomalApproach (redeclare - function PolyData = - AixLib.DataBase.HeatPump.Functions.Characteristics.ConstantCoP - ( powerCompressor=2000, CoP=2)), - redeclare BESMod.Systems.Hydraulical.Components.Frosting.NoFrosting - frost, + redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater + generation( redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, - redeclare package Medium_eva = AixLib.Media.Air, + redeclare package MediumEva = AixLib.Media.Air, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), + genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, + TBiv=parameterStudy.TBiv, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, - TBiv=parameterStudy.TBiv, - scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/ - parameterStudy.QHP_flow_biv, - dpCon_nominal=0, - dpEva_nominal=0, - use_refIne=false, - refIneFre_constant=0), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea, - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap ( - QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal, - refrigerant="Propane", - flowsheet="VIPhaseSeparatorFlowsheet"), redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen(transferHeat=true)), @@ -73,10 +61,7 @@ model BES useExtSGSig=false, redeclare BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI - parPIDHeaPum, - redeclare - BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl - safetyControl), + parPIDHeaPum), redeclare Systems.Hydraulical.Distribution.DistributionTwoStorageParallel distribution( redeclare diff --git a/BESMod/Examples/DesignOptimization/BESNoDHW.mo b/BESMod/Examples/DesignOptimization/BESNoDHW.mo index a892e5bf..bea6c198 100644 --- a/BESMod/Examples/DesignOptimization/BESNoDHW.mo +++ b/BESMod/Examples/DesignOptimization/BESNoDHW.mo @@ -12,35 +12,23 @@ model BESNoDHW "Example to demonstrate usage without DHW" redeclare BESMod.Systems.Control.NoControl control, redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic( energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater generation( - redeclare model PerDataRevHP = - AixLib.DataBase.Chiller.PerformanceData.PolynomalApproach (redeclare - function PolyData = - AixLib.DataBase.HeatPump.Functions.Characteristics.ConstantCoP - ( powerCompressor=2000, CoP=2)), - redeclare - BESMod.Systems.Hydraulical.Components.Frosting.NoFrosting frost, + redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater + generation( redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, - redeclare package Medium_eva = AixLib.Media.Air, + redeclare package MediumEva = AixLib.Media.Air, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), + genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, + TBiv=parameterStudy.TBiv, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, - TBiv=parameterStudy.TBiv, - scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/ - parameterStudy.QHP_flow_biv, - dpCon_nominal=0, - dpEva_nominal=0, - use_refIne=false, - refIneFre_constant=0), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea, - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap ( - QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal, - refrigerant="Propane", - flowsheet="VIPhaseSeparatorFlowsheet"), redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen), @@ -70,10 +58,7 @@ model BESNoDHW "Example to demonstrate usage without DHW" useExtSGSig=false, redeclare BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI - parPIDHeaPum, - redeclare - BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl - safetyControl), + parPIDHeaPum), redeclare BESMod.Systems.Hydraulical.Distribution.BuildingOnly distribution(nParallelDem=1), redeclare Systems.Hydraulical.Transfer.IdealValveRadiator transfer( diff --git a/BESMod/Examples/DesignOptimization/ParametersToChange.mo b/BESMod/Examples/DesignOptimization/ParametersToChange.mo index 2c65d3e7..dc7ce13d 100644 --- a/BESMod/Examples/DesignOptimization/ParametersToChange.mo +++ b/BESMod/Examples/DesignOptimization/ParametersToChange.mo @@ -15,6 +15,4 @@ record ParametersToChange annotation(Evaluate=false); parameter Modelica.Units.SI.HeatFlowRate QHP_flow_cutOff=3000 annotation (Evaluate=false); - parameter Modelica.Units.SI.HeatFlowRate QHP_flow_biv=4000 - annotation (Evaluate=false); end ParametersToChange; diff --git a/BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithDHW.mo b/BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithDHW.mo index dea71a9f..d6250b8d 100644 --- a/BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithDHW.mo +++ b/BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithDHW.mo @@ -1,30 +1,23 @@ within BESMod.Examples.HeatPumpAndBoiler; model AfterBufferWithDHW "Bivalent Heat Pump System with boiler integration after buffer tank without DHW support" - extends BaseClasses.PartialHybridSystem( - redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic( - redeclare Systems.Hydraulical.Generation.HeatPump - generation( + extends BaseClasses.PartialHybridSystem(redeclare + BESMod.Systems.Hydraulical.HydraulicSystem hydraulic( + redeclare Systems.Hydraulical.Generation.HeatPump generation( redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, + TBiv=parameterStudy.TBiv, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, - TBiv=parameterStudy.TBiv, - scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/ - parameterStudy.QHP_flow_biv, - dpCon_nominal=0, - dpEva_nominal=0, - use_refIne=false, - refIneFre_constant=0), - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap ( - QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal, - refrigerant="Propane", - flowsheet="VIPhaseSeparatorFlowsheet"), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor - parTemSen), + parTemSen, + genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel), control(boiInGeneration=false), redeclare Systems.Hydraulical.Distribution.TwoStoragesBoilerWithDHW distribution( diff --git a/BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithoutDHW.mo b/BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithoutDHW.mo index 9b5e5c0c..bd0bfab4 100644 --- a/BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithoutDHW.mo +++ b/BESMod/Examples/HeatPumpAndBoiler/AfterBufferWithoutDHW.mo @@ -1,30 +1,23 @@ within BESMod.Examples.HeatPumpAndBoiler; model AfterBufferWithoutDHW "Bivalent Heat Pump System with boiler integration after buffer tank without DHW support" - extends BaseClasses.PartialHybridSystem( - redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic( - redeclare Systems.Hydraulical.Generation.HeatPump - generation( + extends BaseClasses.PartialHybridSystem(redeclare + BESMod.Systems.Hydraulical.HydraulicSystem hydraulic( + redeclare Systems.Hydraulical.Generation.HeatPump generation( redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, + TBiv=parameterStudy.TBiv, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, - TBiv=parameterStudy.TBiv, - scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/ - parameterStudy.QHP_flow_biv, - dpCon_nominal=0, - dpEva_nominal=0, - use_refIne=false, - refIneFre_constant=0), - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap ( - QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal, - refrigerant="Propane", - flowsheet="VIPhaseSeparatorFlowsheet"), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor - parTemSen), + parTemSen, + genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel), control(boiInGeneration=false), redeclare Systems.Hydraulical.Distribution.TwoStoDetailedDirectLoading distribution( diff --git a/BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo b/BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo index 8d05573e..46c6d462 100644 --- a/BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo +++ b/BESMod/Examples/HeatPumpAndBoiler/BaseClasses.mo @@ -32,9 +32,6 @@ package BaseClasses "Contains partial example case" parPIDHeaPum, TBiv=parameterStudy.TBiv, boiInGeneration=true, - redeclare - BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl - safetyControl, TCutOff=parameterStudy.TCutOff, redeclare BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicBoilerPI diff --git a/BESMod/Examples/HeatPumpAndBoiler/Parallel.mo b/BESMod/Examples/HeatPumpAndBoiler/Parallel.mo index 0761e168..84da41fe 100644 --- a/BESMod/Examples/HeatPumpAndBoiler/Parallel.mo +++ b/BESMod/Examples/HeatPumpAndBoiler/Parallel.mo @@ -1,33 +1,25 @@ within BESMod.Examples.HeatPumpAndBoiler; model Parallel "Bivalent Heat Pump Systems with parallel heat generation" - extends BaseClasses.PartialHybridSystem( - redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic( - redeclare Systems.Hydraulical.Generation.HeatPumpAndGasBoilerParallel - generation( + extends BaseClasses.PartialHybridSystem(redeclare + BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(redeclare + Systems.Hydraulical.Generation.HeatPumpAndGasBoilerParallel generation( redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, + TBiv=parameterStudy.TBiv, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, - TBiv=parameterStudy.TBiv, - scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/ - parameterStudy.QHP_flow_biv, - dpCon_nominal=0, - dpEva_nominal=0, - use_refIne=false, - refIneFre_constant=0), - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap ( - QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal, - refrigerant="Propane", - flowsheet="VIPhaseSeparatorFlowsheet"), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen, redeclare BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve - parThrWayVal), - redeclare Systems.Hydraulical.Distribution.DistributionTwoStorageParallel + parThrWayVal), redeclare + Systems.Hydraulical.Distribution.DistributionTwoStorageParallel distribution( redeclare BESMod.Systems.Hydraulical.Distribution.RecordsCollection.SimpleStorage.DefaultStorage diff --git a/BESMod/Examples/HeatPumpAndBoiler/Serial.mo b/BESMod/Examples/HeatPumpAndBoiler/Serial.mo index 844d5a27..cede0848 100644 --- a/BESMod/Examples/HeatPumpAndBoiler/Serial.mo +++ b/BESMod/Examples/HeatPumpAndBoiler/Serial.mo @@ -1,30 +1,22 @@ within BESMod.Examples.HeatPumpAndBoiler; model Serial "Bivalent Heat Pump Systems with serial heat generation" - extends BaseClasses.PartialHybridSystem( - redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic( - redeclare Systems.Hydraulical.Generation.HeatPumpAndGasBoilerSerial - generation( + extends BaseClasses.PartialHybridSystem(redeclare + BESMod.Systems.Hydraulical.HydraulicSystem hydraulic(redeclare + Systems.Hydraulical.Generation.HeatPumpAndGasBoilerSerial generation( redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, + TBiv=parameterStudy.TBiv, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, - TBiv=parameterStudy.TBiv, - scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/ - parameterStudy.QHP_flow_biv, - dpCon_nominal=0, - dpEva_nominal=0, - use_refIne=false, - refIneFre_constant=0), - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap ( - QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal, - refrigerant="Propane", - flowsheet="VIPhaseSeparatorFlowsheet"), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor - parTemSen), - redeclare Systems.Hydraulical.Distribution.DistributionTwoStorageParallel + parTemSen), redeclare + Systems.Hydraulical.Distribution.DistributionTwoStorageParallel distribution( redeclare BESMod.Systems.Hydraulical.Distribution.RecordsCollection.SimpleStorage.DefaultStorage diff --git a/BESMod/Examples/HighOrderModel/BES_HOM.mo b/BESMod/Examples/HighOrderModel/BES_HOM.mo index e29ad71d..e0d14835 100644 --- a/BESMod/Examples/HighOrderModel/BES_HOM.mo +++ b/BESMod/Examples/HighOrderModel/BES_HOM.mo @@ -23,25 +23,18 @@ model BES_HOM redeclare BESMod.Systems.Hydraulical.Generation.HeatPumpAndElectricHeater generation( redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, + TBiv=parameterStudy.TBiv, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, - TBiv=parameterStudy.TBiv, - scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/ - parameterStudy.QHP_flow_biv, - dpCon_nominal=0, - dpEva_nominal=0, - use_refIne=false, - refIneFre_constant=0), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea, - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap ( - QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal, - refrigerant="Propane", - flowsheet="VIPhaseSeparatorFlowsheet"), redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen), @@ -56,10 +49,7 @@ model BES_HOM BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater, redeclare BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI - parPIDHeaPum, - redeclare - BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl - safetyControl), + parPIDHeaPum), redeclare BESMod.Systems.Hydraulical.Distribution.DistributionTwoStorageParallel distribution( diff --git a/BESMod/Examples/ModelicaConferencePaper/PartialModelicaConferenceUseCase.mo b/BESMod/Examples/ModelicaConferencePaper/PartialModelicaConferenceUseCase.mo index 4f5ac664..6d86c3e6 100644 --- a/BESMod/Examples/ModelicaConferencePaper/PartialModelicaConferenceUseCase.mo +++ b/BESMod/Examples/ModelicaConferencePaper/PartialModelicaConferenceUseCase.mo @@ -3,48 +3,44 @@ partial model PartialModelicaConferenceUseCase "Partial model to be extended to replace single subsystems" extends Systems.BaseClasses.PartialBuildingEnergySystem( redeclare BESMod.Systems.Electrical.ElectricalSystem electrical( - redeclare Systems.Electrical.Distribution.BatterySystemSimple distribution( - redeclare + redeclare Systems.Electrical.Distribution.BatterySystemSimple + distribution(redeclare BuildingSystems.Technologies.ElectricalStorages.Data.LithiumIon.LithiumIonTeslaPowerwall1 batteryParameters), redeclare BESMod.Systems.Electrical.Generation.PVSystemMultiSub generation( redeclare model CellTemperature = AixLib.Electrical.PVSystem.BaseClasses.CellTemperatureMountingContactToGround, - redeclare AixLib.DataBase.SolarElectric.SchuecoSPV170SME1 pVParameters, - lat=weaDat.lat, lon=weaDat.lon, alt=weaDat.alt, timZon=weaDat.timZon, ARoo=building.ARoo/2), - redeclare BESMod.Systems.Electrical.Transfer.NoElectricalTransfer transfer, + redeclare BESMod.Systems.Electrical.Transfer.NoElectricalTransfer + transfer, redeclare BESMod.Systems.Electrical.Control.NoControl control), redeclare BESMod.Systems.Control.DHWSuperheating control(TSetDHW= systemParameters.TSetDHW), redeclare BESMod.Systems.Hydraulical.HydraulicSystem hydraulic( energyDynamics=Modelica.Fluid.Types.Dynamics.FixedInitial, - redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater generation( + redeclare Systems.Hydraulical.Generation.HeatPumpAndElectricHeater + generation( dTTra_nominal={10}, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2D + (redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableData2D.EN255.Vitocal350AWI114 + datTab), redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, - redeclare package Medium_eva = AixLib.Media.Air, + redeclare package MediumEva = AixLib.Media.Air, + TBiv=271.15, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, - TBiv=271.15, - scalingFactor=scalingFactorHP, - dpCon_nominal=0, - dpEva_nominal=0, - use_refIne=false, - refIneFre_constant=0), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea, - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.LookUpTable2D (dataTable= - AixLib.DataBase.HeatPump.EN255.Vitocal350AWI114()), redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen), @@ -60,10 +56,7 @@ partial model PartialModelicaConferenceUseCase BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater, redeclare BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI - parPIDHeaPum, - redeclare - BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl - safetyControl), + parPIDHeaPum), redeclare Systems.Hydraulical.Distribution.DistributionTwoStorageParallel distribution( redeclare @@ -122,7 +115,5 @@ partial model PartialModelicaConferenceUseCase redeclare BESMod.Systems.Ventilation.Control.SummerPIDByPass control( use_bypass=false))); - parameter Real scalingFactorHP=hydraulic.generation.parHeaPum.QPri_flow_nominal - /13000 "May be overwritten to avoid warnings and thus a fail in the CI"; end PartialModelicaConferenceUseCase; diff --git a/BESMod/Examples/Retrofit/PartialCase.mo b/BESMod/Examples/Retrofit/PartialCase.mo index cc6e5861..6ea8aac0 100644 --- a/BESMod/Examples/Retrofit/PartialCase.mo +++ b/BESMod/Examples/Retrofit/PartialCase.mo @@ -14,30 +14,22 @@ partial model PartialCase generation( use_old_design={NoRetrofitHydGen}, redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, - redeclare package Medium_eva = AixLib.Media.Air, + TBiv=271.15, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, - TBiv=TBiv, - scalingFactor=hydraulic.generation.parHeaPum.QPri_flow_nominal/5000, - dpCon_nominal=0, - dpEva_nominal=0, - use_refIne=false, - refIneFre_constant=0), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea, - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap ( - QCon_flow_nominal=hydraulic.generation.parHeaPum.QPri_flow_nominal, - refrigerant="Propane", - flowsheet="VIPhaseSeparatorFlowsheet"), redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen), - redeclare Systems.Hydraulical.Control.MonoenergeticHeatPumpSystem - control( + redeclare Systems.Hydraulical.Control.MonoenergeticHeatPumpSystem control( redeclare BESMod.Systems.Hydraulical.Control.Components.ThermostaticValveController.ThermostaticValvePIControlled valCtrl, @@ -49,10 +41,7 @@ partial model PartialCase BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater, redeclare BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI - parPIDHeaPum, - redeclare - BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl - safetyControl), + parPIDHeaPum), redeclare BESMod.Systems.Hydraulical.Distribution.TwoStoDetailedDirectLoading distribution( @@ -61,8 +50,7 @@ partial model PartialCase redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen, - redeclare - BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve + redeclare BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve parThrWayVal, redeclare BESMod.Systems.Hydraulical.Distribution.RecordsCollection.BufferStorage.DefaultDetailedStorage @@ -74,7 +62,7 @@ partial model PartialCase use_QLos=true, T_m=65 + 273.15), redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHeaAftBuf), redeclare BESMod.Systems.Hydraulical.Transfer.RadiatorPressureBased transfer( @@ -101,8 +89,6 @@ partial model PartialCase redeclare final package MediumHyd = AixLib.Media.Water, redeclare BESMod.Systems.Ventilation.NoVentilation ventilation); - parameter Modelica.Units.SI.Temperature TBiv=271.15 - "Nominal bivalence temperature. = TOda_nominal for monovalent systems."; parameter Boolean NoRetrofitHydTra = false "If true, hydraulic transfersystem uses QBuiNoRetrofit."; parameter Boolean NoRetrofitHydDis = false diff --git a/BESMod/Examples/SolarThermalSystem/PartialSolarThermalHPS.mo b/BESMod/Examples/SolarThermalSystem/PartialSolarThermalHPS.mo index f19ae621..ee526135 100644 --- a/BESMod/Examples/SolarThermalSystem/PartialSolarThermalHPS.mo +++ b/BESMod/Examples/SolarThermalSystem/PartialSolarThermalHPS.mo @@ -25,10 +25,7 @@ partial model PartialSolarThermalHPS BESMod.Systems.Hydraulical.Control.Components.BivalentOnOffControllers.TimeBasedElectricHeater, redeclare BESMod.Systems.Hydraulical.Control.RecordsCollection.BasicHeatPumpPI - parPIDHeaPum, - redeclare - BESMod.Systems.Hydraulical.Control.RecordsCollection.DefaultSafetyControl - safetyControl), + parPIDHeaPum), redeclare BESMod.Systems.Hydraulical.Distribution.CombiStorage distribution( redeclare BESMod.Examples.SolarThermalSystem.CombiStorage parameters( V=parameterStudy.V, diff --git a/BESMod/Examples/SolarThermalSystem/SolarCollector.mo b/BESMod/Examples/SolarThermalSystem/SolarCollector.mo index 285ed7ff..db6d847b 100644 --- a/BESMod/Examples/SolarThermalSystem/SolarCollector.mo +++ b/BESMod/Examples/SolarThermalSystem/SolarCollector.mo @@ -1,7 +1,7 @@ within BESMod.Examples.SolarThermalSystem; record SolarCollector "For BA" extends - Systems.Hydraulical.Generation.RecordsCollection.SolarThermalBaseDataDefinition( + Systems.Hydraulical.Generation.RecordsCollection.SolarThermal.Generic( GMax=1000, dTMax=30, spacing(displayUnit="mm") = 0.02, diff --git a/BESMod/Examples/SolarThermalSystem/SolarThermalAixLib.mo b/BESMod/Examples/SolarThermalSystem/SolarThermalAixLib.mo index 5b801698..abc4679c 100644 --- a/BESMod/Examples/SolarThermalSystem/SolarThermalAixLib.mo +++ b/BESMod/Examples/SolarThermalSystem/SolarThermalAixLib.mo @@ -4,17 +4,20 @@ model SolarThermalAixLib "Solar thermal collector from AixLib" model hydGeneration = BESMod.Systems.Hydraulical.Generation.SimpleSolarThermalWithHeatPump ( use_eleHea=false, - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (refrigerant= - "Propane", flowsheet="VIPhaseSeparatorFlowsheet"), + genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum(genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea, redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, - redeclare package Medium_eva = AixLib.Media.Air, + redeclare package MediumEva = AixLib.Media.Air, redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen, diff --git a/BESMod/Examples/SolarThermalSystem/SolarThermalBuildings.mo b/BESMod/Examples/SolarThermalSystem/SolarThermalBuildings.mo index 19248618..0138c1c1 100644 --- a/BESMod/Examples/SolarThermalSystem/SolarThermalBuildings.mo +++ b/BESMod/Examples/SolarThermalSystem/SolarThermalBuildings.mo @@ -6,17 +6,20 @@ model SolarThermalBuildings BESMod.Systems.Hydraulical.Generation.DetailedSolarThermalWithHeatPump ( use_eleHea=false, - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap (refrigerant= - "Propane", flowsheet="VIPhaseSeparatorFlowsheet"), + genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP - parHeaPum(genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent), + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP + parHeaPum, + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData3D + (y_nominal=0.8, redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableDataSDF.TableData3D.VCLibPy.VCLibVaporInjectionPhaseSeparatorPropane + datTab), redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea, redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, - redeclare package Medium_eva = AixLib.Media.Air, + redeclare package MediumEva = AixLib.Media.Air, redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen, diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt index ac27c4da..4318ebd2 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_BAUSimStudy_Case1Standard.txt @@ -1,20 +1,19 @@ -last-generated=2024-07-16 +last-generated=2024-09-02 statistics-initialization= { - "linear": "0", - "nonlinear": "5, 7, 1, 2, 1", + "nonlinear": "5, 7, 1, 3, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1", - "number of continuous time states": "105", + "number of continuous time states": "101", "numerical Jacobians": "0" } time=[0e+00, 1.728e+05] weaDat.weaBus.TDryBul=[2.713500061035156e+02, 2.714423522949219e+02, 2.713688049316406e+02, 2.711300048828125e+02, 2.708900146484375e+02, 2.706499938964844e+02, 2.704100036621094e+02, 2.701031188964844e+02, 2.696802062988281e+02, 2.693132629394531e+02, 2.689815979003906e+02, 2.687498474121094e+02, 2.687302856445312e+02, 2.684281311035156e+02, 2.677860412597656e+02, 2.674700012207031e+02, 2.672780151367188e+02, 2.670859985351562e+02, 2.668940124511719e+02, 2.667543640136719e+02, 2.674586791992188e+02, 2.682342834472656e+02, 2.686448669433594e+02, 2.692129211425781e+02, 2.700237121582031e+02, 2.708500061035156e+02, 2.716349792480469e+02, 2.723893127441406e+02, 2.729895324707031e+02, 2.733184814453125e+02, 2.734673461914062e+02, 2.735424194335938e+02, 2.735648498535156e+02, 2.73562255859375e+02, 2.734952392578125e+02, 2.733829650878906e+02, 2.733241271972656e+02, 2.733239440917969e+02, 2.734044799804688e+02, 2.735684204101562e+02, 2.736940002441406e+02, 2.737637023925781e+02, 2.737111511230469e+02, 2.734936828613281e+02, 2.733190002441406e+02, 2.73205322265625e+02, 2.731450805664062e+02, 2.731335754394531e+02, 2.7315283203125e+02, 2.732023315429688e+02, 2.7325e+02, 2.732466735839844e+02, 2.732464294433594e+02, 2.733169860839844e+02, 2.734288940429688e+02, 2.735700073242188e+02, 2.737182312011719e+02, 2.738376770019531e+02, 2.739303588867188e+02, 2.739819946289062e+02, 2.740299987792969e+02, 2.740780029296875e+02, 2.741260070800781e+02, 2.741852416992188e+02, 2.742919921875e+02, 2.743815307617188e+02, 2.744320983886719e+02, 2.744386291503906e+02, 2.742976684570312e+02, 2.742652587890625e+02, 2.743667907714844e+02, 2.744607849121094e+02, 2.74489013671875e+02, 2.745615539550781e+02, 2.748076477050781e+02, 2.751499938964844e+02, 2.755416259765625e+02, 2.759237670898438e+02, 2.761777038574219e+02, 2.763310241699219e+02, 2.764301147460938e+02, 2.764605407714844e+02, 2.7639404296875e+02, 2.762903747558594e+02, 2.7616455078125e+02, 2.760198059082031e+02, 2.758236999511719e+02, 2.755619812011719e+02, 2.753553771972656e+02, 2.751993103027344e+02, 2.751300048828125e+02, 2.750820007324219e+02, 2.750339965820312e+02, 2.749859924316406e+02, 2.749522399902344e+02, 2.751499938964844e+02, 2.753774108886719e+02, 2.755320129394531e+02, 2.756587219238281e+02, 2.756750183105469e+02, 2.755499877929688e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.368198547363281e+02, 3.120782165527344e+02, 3.2021337890625e+02, 3.160978393554688e+02, 3.158927307128906e+02, 3.157301635742188e+02, 3.168073120117188e+02, 3.162746276855469e+02, 3.164396362304688e+02, 3.168296508789062e+02, 3.167882995605469e+02, 3.171757507324219e+02, 3.166976318359375e+02, 3.174046020507812e+02, 3.18225830078125e+02, 3.178263244628906e+02, 3.189713439941406e+02, 3.247501525878906e+02, 3.191550903320312e+02, 3.244266052246094e+02, 3.185859985351562e+02, 3.179185791015625e+02, 3.175262451171875e+02, 3.173318481445312e+02, 3.173134460449219e+02, 3.174115905761719e+02, 3.33109130859375e+02, 3.153789978027344e+02, 3.165580749511719e+02, 3.171094665527344e+02, 3.175784301757812e+02, 3.179546508789062e+02, 3.180767517089844e+02, 3.181165771484375e+02, 3.181830749511719e+02, 3.182416381835938e+02, 3.182583618164062e+02, 3.182063598632812e+02, 3.180657043457031e+02, 3.179210510253906e+02, 3.178298950195312e+02, 3.178382568359375e+02, 3.179985046386719e+02, 3.181934204101562e+02, 3.183377075195312e+02, 3.184226379394531e+02, 3.184514465332031e+02, 3.217134094238281e+02, 3.159909973144531e+02, 3.168193054199219e+02, 3.173307189941406e+02, 3.177182312011719e+02, 3.180352478027344e+02, 3.181962585449219e+02, 3.181121215820312e+02, 3.17945556640625e+02, 3.177911071777344e+02, 3.176768188476562e+02, 3.176119384765625e+02, 3.175664367675781e+02, 3.175240478515625e+02, 3.174800720214844e+02, 3.174302062988281e+02, 3.173486022949219e+02, 3.172582092285156e+02, 3.171902160644531e+02, 3.171647644042969e+02, 3.172600708007812e+02, 3.173360900878906e+02, 3.172859497070312e+02, 3.171864929199219e+02, 3.171319274902344e+02, 3.170655822753906e+02, 3.168660583496094e+02, 3.165505981445312e+02, 3.161662292480469e+02, 3.346020202636719e+02, 3.153389892578125e+02, 3.154884643554688e+02, 3.153600158691406e+02, 3.152462768554688e+02, 3.152532653808594e+02, 3.15337646484375e+02, 3.15460205078125e+02, 3.156028747558594e+02, 3.15782958984375e+02, 3.160243225097656e+02, 3.1624169921875e+02, 3.164049377441406e+02, 3.164912414550781e+02, 3.165426940917969e+02, 3.165853576660156e+02, 3.166273498535156e+02, 3.166634521484375e+02, 3.16530517578125e+02, 3.156502075195312e+02, 3.162016296386719e+02, 3.161859130859375e+02, 3.160594177246094e+02, 3.160762939453125e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.85699951171875e+02, 2.871388549804688e+02, 2.888817443847656e+02, 2.8933935546875e+02, 2.891906127929688e+02, 2.891016845703125e+02, 2.893425598144531e+02, 2.891734924316406e+02, 2.893533935546875e+02, 2.893330383300781e+02, 2.894776000976562e+02, 2.894840087890625e+02, 2.8961669921875e+02, 2.899127197265625e+02, 2.9051904296875e+02, 2.904528198242188e+02, 2.91005126953125e+02, 2.908058471679688e+02, 2.9138134765625e+02, 2.912884216308594e+02, 2.916156616210938e+02, 2.916356201171875e+02, 2.915824279785156e+02, 2.914650268554688e+02, 2.914811401367188e+02, 2.914835205078125e+02, 2.914468078613281e+02, 2.911633605957031e+02, 2.914664916992188e+02, 2.916843872070312e+02, 2.919057922363281e+02, 2.920524597167969e+02, 2.921463928222656e+02, 2.92162109375e+02, 2.92151123046875e+02, 2.921365661621094e+02, 2.921099243164062e+02, 2.920588989257812e+02, 2.919600524902344e+02, 2.918822631835938e+02, 2.918922119140625e+02, 2.91901123046875e+02, 2.919019165039062e+02, 2.91920654296875e+02, 2.919149475097656e+02, 2.919095458984375e+02, 2.919501953125e+02, 2.919846801757812e+02, 2.915474853515625e+02, 2.916464538574219e+02, 2.917356567382812e+02, 2.918422546386719e+02, 2.91942138671875e+02, 2.920328063964844e+02, 2.920862426757812e+02, 2.921061706542969e+02, 2.921126708984375e+02, 2.921193237304688e+02, 2.921306457519531e+02, 2.921488037109375e+02, 2.921697998046875e+02, 2.921911010742188e+02, 2.922845458984375e+02, 2.924981384277344e+02, 2.926727294921875e+02, 2.927568359375e+02, 2.928313903808594e+02, 2.928813781738281e+02, 2.930115051269531e+02, 2.931454467773438e+02, 2.932413330078125e+02, 2.933151550292969e+02, 2.933202209472656e+02, 2.932891235351562e+02, 2.932689208984375e+02, 2.93221435546875e+02, 2.931389465332031e+02, 2.929524536132812e+02, 2.930748901367188e+02, 2.931455383300781e+02, 2.931735534667969e+02, 2.931827087402344e+02, 2.932016296386719e+02, 2.932341613769531e+02, 2.932760314941406e+02, 2.933088684082031e+02, 2.933328552246094e+02, 2.933223571777344e+02, 2.932382507324219e+02, 2.931833190917969e+02, 2.932084045410156e+02, 2.932227478027344e+02, 2.932151489257812e+02, 2.932077331542969e+02, 2.932041015625e+02, 2.928963928222656e+02, 2.930596618652344e+02, 2.931542663574219e+02, 2.931456604003906e+02, 2.93119140625e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.009140319824219e+02, 3.16260986328125e+02, 3.161566162109375e+02, 3.170010375976562e+02, 3.173376159667969e+02, 3.175872802734375e+02, 3.177565002441406e+02, 3.178508605957031e+02, 3.1789892578125e+02, 3.179121704101562e+02, 3.179057922363281e+02, 3.179104309082031e+02, 3.179000854492188e+02, 3.240648803710938e+02, 3.193486633300781e+02, 3.190718383789062e+02, 3.249246826171875e+02, 3.200587158203125e+02, 3.196944580078125e+02, 3.19550048828125e+02, 3.195683898925781e+02, 3.196685485839844e+02, 3.19811767578125e+02, 3.199805603027344e+02, 3.202012329101562e+02, 3.200487670898438e+02, 3.193597717285156e+02, 3.186784973144531e+02, 3.372159118652344e+02, 3.177638854980469e+02, 3.181494445800781e+02, 3.181518249511719e+02, 3.18084228515625e+02, 3.180854187011719e+02, 3.1816845703125e+02, 3.182399291992188e+02, 3.182572937011719e+02, 3.181968383789062e+02, 3.180455932617188e+02, 3.179024963378906e+02, 3.178204956054688e+02, 3.178440551757812e+02, 3.180260925292969e+02, 3.182225646972656e+02, 3.183562927246094e+02, 3.169385681152344e+02, 3.1794775390625e+02, 3.185041809082031e+02, 3.185145874023438e+02, 3.184026184082031e+02, 3.183428039550781e+02, 3.183260192871094e+02, 3.182716064453125e+02, 3.181723022460938e+02, 3.180374450683594e+02, 3.178875732421875e+02, 3.177618103027344e+02, 3.176647338867188e+02, 3.176085815429688e+02, 3.17564453125e+02, 3.175207214355469e+02, 3.174754333496094e+02, 3.174234313964844e+02, 3.173351745605469e+02, 3.172437438964844e+02, 3.171808776855469e+02, 3.171620788574219e+02, 3.172723693847656e+02, 3.17341796875e+02, 3.172743530273438e+02, 3.171737060546875e+02, 3.171252746582031e+02, 3.170604248046875e+02, 3.168506774902344e+02, 3.16524169921875e+02, 3.161410522460938e+02, 3.369860229492188e+02, 3.154273681640625e+02, 3.154447631835938e+02, 3.153102722167969e+02, 3.152216186523438e+02, 3.152493591308594e+02, 3.153431091308594e+02, 3.154684143066406e+02, 3.156117248535156e+02, 3.157953796386719e+02, 3.160435791015625e+02, 3.162588195800781e+02, 3.164168395996094e+02, 3.164967651367188e+02, 3.165450744628906e+02, 3.165876770019531e+02, 3.166305541992188e+02, 3.166663513183594e+02, 3.165169982910156e+02, 3.158820190429688e+02, 3.162284240722656e+02, 3.161161804199219e+02, 3.160050048828125e+02, 3.160611572265625e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.863721313476562e+02, 2.879945373535156e+02, 2.894874267578125e+02, 2.894030456542969e+02, 2.894102783203125e+02, 2.894178161621094e+02, 2.894053344726562e+02, 2.894096374511719e+02, 2.894234313964844e+02, 2.894357299804688e+02, 2.894525756835938e+02, 2.894956665039062e+02, 2.896098327636719e+02, 2.898636474609375e+02, 2.904363403320312e+02, 2.905436096191406e+02, 2.906849365234375e+02, 2.911435852050781e+02, 2.912456359863281e+02, 2.913872375488281e+02, 2.916410217285156e+02, 2.918732299804688e+02, 2.919716491699219e+02, 2.919644165039062e+02, 2.920584716796875e+02, 2.921044006347656e+02, 2.920389099121094e+02, 2.920394287109375e+02, 2.920212707519531e+02, 2.919393920898438e+02, 2.921554565429688e+02, 2.922674865722656e+02, 2.92300048828125e+02, 2.922837524414062e+02, 2.922637939453125e+02, 2.922485961914062e+02, 2.922210083007812e+02, 2.921674194335938e+02, 2.920648803710938e+02, 2.919838562011719e+02, 2.919924011230469e+02, 2.920013122558594e+02, 2.920037841796875e+02, 2.920240783691406e+02, 2.9201611328125e+02, 2.917086486816406e+02, 2.918290100097656e+02, 2.919998168945312e+02, 2.9208154296875e+02, 2.920927734375e+02, 2.921023254394531e+02, 2.92121337890625e+02, 2.921471862792969e+02, 2.92168701171875e+02, 2.921841735839844e+02, 2.921940002441406e+02, 2.922010803222656e+02, 2.922102355957031e+02, 2.92222900390625e+02, 2.922409057617188e+02, 2.922606506347656e+02, 2.922802734375e+02, 2.923720397949219e+02, 2.925838928222656e+02, 2.9275634765625e+02, 2.928393859863281e+02, 2.929136657714844e+02, 2.929644165039062e+02, 2.930953674316406e+02, 2.932256469726562e+02, 2.933173522949219e+02, 2.933891296386719e+02, 2.933928527832031e+02, 2.933591003417969e+02, 2.933345031738281e+02, 2.932832946777344e+02, 2.931935119628906e+02, 2.930874938964844e+02, 2.93151611328125e+02, 2.932003173828125e+02, 2.932253723144531e+02, 2.93236083984375e+02, 2.93255615234375e+02, 2.932864990234375e+02, 2.933248901367188e+02, 2.933528442382812e+02, 2.933713989257812e+02, 2.933538513183594e+02, 2.932642517089844e+02, 2.932059326171875e+02, 2.932254638671875e+02, 2.932339172363281e+02, 2.932213439941406e+02, 2.932095336914062e+02, 2.93201171875e+02, 2.930211791992188e+02, 2.93111328125e+02, 2.931586608886719e+02, 2.931361083984375e+02, 2.931122741699219e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[4.087993408203125e+03, 5.86535595703125e+03, 2.2602833984375e+04, 2.213530078125e+04, 4.87001171875e+03, 4.8476083984375e+03, 4.82758447265625e+03, 4.8728173828125e+03, 4.82280615234375e+03, 4.81459521484375e+03, 4.81871240234375e+03, 4.8054248046875e+03, 4.82494482421875e+03, 4.788521484375e+03, 4.78948291015625e+03, 4.81958154296875e+03, 4.78698046875e+03, 4.8338720703125e+03, 2.134491015625e+04, 4.82354833984375e+03, 2.0830494140625e+04, 4.8776943359375e+03, 4.8619970703125e+03, 4.86920263671875e+03, 4.89865283203125e+03, 4.93746484375e+03, 4.97997705078125e+03, 5.8039951171875e+03, 4.92130810546875e+03, 5.0041474609375e+03, 5.04405322265625e+03, 5.07625244140625e+03, 5.1007294921875e+03, 4.84858349609375e+03, 4.744615234375e+03, 4.80238671875e+03, 4.832732421875e+03, 4.8006259765625e+03, 4.68852099609375e+03, 4.51861181640625e+03, 4.436388671875e+03, 4.42294970703125e+03, 4.52935986328125e+03, 4.81166455078125e+03, 5.002509765625e+03, 5.0646767578125e+03, 5.05453173828125e+03, 4.9906123046875e+03, 5.30027392578125e+03, 4.9655126953125e+03, 5.01678173828125e+03, 5.0474833984375e+03, 5.0712666015625e+03, 5.09426806640625e+03, 4.927146484375e+03, 4.578838378906247e+03, 4.359428222656249e+03, 4.268150878906251e+03, 4.2337587890625e+03, 4.2365107421875e+03, 4.2264267578125e+03, 4.20185205078125e+03, 4.17073876953125e+03, 4.12337158203125e+03, 4.00486083984375e+03, 3.90516015625e+03, 3.866417236328125e+03, 3.869660888671875e+03, 4.001114257812501e+03, 3.996393066406251e+03, 3.836985107421876e+03, 3.724373291015625e+03, 3.698987060546875e+03, 3.65507666015625e+03, 3.492743896484375e+03, 3.292119140625e+03, 3.1184296875e+03, 6.116083984375e+03, 4.00653271484375e+03, 3.367248046875e+03, 3.05224853515625e+03, 2.977468994140625e+03, 3.029114013671875e+03, 3.098284912109375e+03, 3.158406005859375e+03, 3.2122265625e+03, 3.29163720703125e+03, 3.41555078125e+03, 3.4863349609375e+03, 3.53159521484375e+03, 3.527385498046875e+03, 3.5138408203125e+03, 3.516185546875e+03, 3.530753662109375e+03, 3.539488525390625e+03, 3.37754833984375e+03, 4.810306640625e+03, 4.062450439453125e+03, 3.427209716796875e+03, 3.23474755859375e+03, 3.303385986328125e+03] +electricalGrid.PElecLoa=[4.60110400390625e+03, 4.61448876953125e+03, 2.273285546875e+04, 5.29536181640625e+03, 5.36977294921875e+03, 5.3997353515625e+03, 5.4206142578125e+03, 5.431748046875e+03, 5.43280078125e+03, 5.4302001953125e+03, 5.4247412109375e+03, 5.41936328125e+03, 5.4194443359375e+03, 5.41218408203125e+03, 2.1202525390625e+04, 5.53617578125e+03, 5.5042294921875e+03, 2.112237890625e+04, 5.5949482421875e+03, 5.5547470703125e+03, 5.556974609375e+03, 5.5773251953125e+03, 5.5967392578125e+03, 5.624134765625e+03, 5.659591796875e+03, 5.701044921875e+03, 5.06017041015625e+03, 4.28889013671875e+03, 3.978102783203125e+03, 7.70870849609375e+03, 5.500091796875e+03, 4.8182060546875e+03, 4.33816015625e+03, 4.16718359375e+03, 4.201218750000001e+03, 4.30726123046875e+03, 4.3371171875e+03, 4.30432958984375e+03, 4.2127568359375e+03, 4.086643798828125e+03, 4.048562255859375e+03, 4.0533642578125e+03, 4.1514755859375e+03, 4.36866162109375e+03, 4.47672607421875e+03, 4.4941279296875e+03, 5.40720166015625e+03, 5.5141142578125e+03, 5.08012890625e+03, 4.5137294921875e+03, 4.2893828125e+03, 4.27467626953125e+03, 4.29318115234375e+03, 4.23538916015625e+03, 4.14452587890625e+03, 4.050989257812499e+03, 3.98084423828125e+03, 3.94473486328125e+03, 3.92654345703125e+03, 3.93007275390625e+03, 3.920875244140625e+03, 3.902103515625e+03, 3.88013525390625e+03, 3.844657958984375e+03, 3.749757080078125e+03, 3.675681884765625e+03, 3.65279638671875e+03, 3.661744384765625e+03, 3.77478466796875e+03, 3.751013183593751e+03, 3.606855224609376e+03, 3.5124580078125e+03, 3.49756640625e+03, 3.454836669921875e+03, 3.30184619140625e+03, 3.13969189453125e+03, 2.99166845703125e+03, 7.76582861328125e+03, 3.649015380859375e+03, 3.15123681640625e+03, 2.937426025390625e+03, 2.90116748046875e+03, 2.96097119140625e+03, 3.023766357421875e+03, 3.0736748046875e+03, 3.116853271484375e+03, 3.18228076171875e+03, 3.276864013671875e+03, 3.318883056640625e+03, 3.347828857421875e+03, 3.333760009765625e+03, 3.3161669921875e+03, 3.31503173828125e+03, 3.324297607421875e+03, 3.32670751953125e+03, 3.18142333984375e+03, 4.39614599609375e+03, 3.58851220703125e+03, 3.148874755859375e+03, 3.07705810546875e+03, 3.179161376953125e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt index 4945390b..ddcfa36a 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BES.txt @@ -1,20 +1,19 @@ -last-generated=2024-07-16 +last-generated=2024-09-02 statistics-initialization= { - "linear": "0", "nonlinear": "5, 7, 2, 0, 0, 1, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0", "nonlinear": "2, 6, 1, 0, 1, 0, 1, 0, 1, 1, 1", - "number of continuous time states": "72", + "number of continuous time states": "68", "numerical Jacobians": "0" } time=[0e+00, 1.728e+05] weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.089097900390625e+02, 3.169534301757812e+02, 3.219212951660156e+02, 3.249086608886719e+02, 3.266421508789062e+02, 3.276005859375e+02, 3.278534851074219e+02, 3.278287658691406e+02, 3.278040466308594e+02, 3.277965087890625e+02, 3.277693786621094e+02, 3.276161499023438e+02, 3.274412841796875e+02, 3.272928771972656e+02, 3.271624450683594e+02, 3.271659545898438e+02, 3.271467895507812e+02, 3.268902282714844e+02, 3.266611938476562e+02, 3.267593688964844e+02, 3.268376159667969e+02, 3.266109619140625e+02, 3.226101379394531e+02, 3.001298217773438e+02, 2.948038330078125e+02, 2.935419006347656e+02, 2.932428588867188e+02, 3.135110168457032e+02, 3.206701354980469e+02, 3.24949951171875e+02, 3.219051208496094e+02, 3.247024536132812e+02, 3.246370239257812e+02, 3.2452001953125e+02, 3.24520751953125e+02, 3.0669970703125e+02, 2.963600463867188e+02, 2.939105834960938e+02, 2.933302307128906e+02, 3.085238952636719e+02, 3.175549621582031e+02, 3.2316845703125e+02, 3.257992553710938e+02, 3.258955078125e+02, 3.258182373046875e+02, 3.2580810546875e+02, 3.25813720703125e+02, 3.25802734375e+02, 3.257575988769531e+02, 3.257024536132812e+02, 3.256784362792969e+02, 3.256885986328125e+02, 3.217817687988281e+02, 3.255741882324219e+02, 3.262804870605469e+02, 3.263461608886719e+02, 3.264707641601562e+02, 3.266513366699219e+02, 3.268197631835938e+02, 3.2686767578125e+02, 3.268406677246094e+02, 3.267802734375e+02, 3.267438659667969e+02, 3.267572631835938e+02, 3.267331848144531e+02, 3.265610961914062e+02, 3.264395751953125e+02, 3.265023193359375e+02, 3.265351867675781e+02, 3.264601135253906e+02, 3.263723754882812e+02, 3.208203430175781e+02, 2.997056884765625e+02, 2.947032165527344e+02, 2.935180053710938e+02, 2.932371826171875e+02, 3.30403076171875e+02, 3.180208129882812e+02, 3.239972839355469e+02, 3.263303833007812e+02, 3.261866149902344e+02, 3.2593017578125e+02, 3.25742919921875e+02, 3.259348449707031e+02, 3.065680847167969e+02, 2.963289794921875e+02, 2.939031372070312e+02, 2.933284301757812e+02, 3.097825317382812e+02, 3.1764306640625e+02, 3.225293273925781e+02, 3.254850769042969e+02, 3.27192138671875e+02, 3.283797607421875e+02, 3.292589721679688e+02, 3.29969482421875e+02, 3.307695922851562e+02, 3.260815734863281e+02, 3.290172729492188e+02, 3.312119750976562e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.882499389648438e+02, 2.888918762207031e+02, 2.893286437988281e+02, 2.895913696289062e+02, 2.897240905761719e+02, 2.897719116210938e+02, 2.897857666015625e+02, 2.898103332519531e+02, 2.898447875976562e+02, 2.898819885253906e+02, 2.89925048828125e+02, 2.899801330566406e+02, 2.901293029785156e+02, 2.904572143554688e+02, 2.907664794921875e+02, 2.90984375e+02, 2.912081909179688e+02, 2.914019165039062e+02, 2.915742797851562e+02, 2.916720886230469e+02, 2.91794921875e+02, 2.919207153320312e+02, 2.920203552246094e+02, 2.91075439453125e+02, 2.902745056152344e+02, 2.89705078125e+02, 2.892782592773438e+02, 2.901368103027344e+02, 2.9105419921875e+02, 2.917869262695312e+02, 2.917467041015625e+02, 2.921689758300781e+02, 2.923044128417969e+02, 2.923079528808594e+02, 2.922884826660156e+02, 2.918913269042969e+02, 2.909031066894531e+02, 2.901885070800781e+02, 2.895935974121094e+02, 2.895799560546875e+02, 2.905008544921875e+02, 2.911636352539062e+02, 2.915776672363281e+02, 2.916761169433594e+02, 2.916389770507812e+02, 2.916038513183594e+02, 2.916407470703125e+02, 2.916812744140625e+02, 2.917009582519531e+02, 2.917160339355469e+02, 2.917489318847656e+02, 2.917860107421875e+02, 2.914604797363281e+02, 2.916599426269531e+02, 2.918857727050781e+02, 2.919391174316406e+02, 2.919759826660156e+02, 2.920182189941406e+02, 2.920645141601562e+02, 2.921114501953125e+02, 2.921534118652344e+02, 2.921926574707031e+02, 2.923121032714844e+02, 2.925841064453125e+02, 2.928319702148438e+02, 2.929771423339844e+02, 2.930983276367188e+02, 2.931753845214844e+02, 2.932628784179688e+02, 2.933385009765625e+02, 2.93560302734375e+02, 2.937323303222656e+02, 2.931672973632812e+02, 2.925294189453125e+02, 2.920641784667969e+02, 2.916651916503906e+02, 2.921266479492188e+02, 2.926399230957031e+02, 2.933287353515625e+02, 2.937143859863281e+02, 2.937379760742188e+02, 2.936593322753906e+02, 2.935625610351562e+02, 2.934726257324219e+02, 2.933295593261719e+02, 2.926609191894531e+02, 2.91988037109375e+02, 2.914336547851562e+02, 2.913682861328125e+02, 2.920566711425781e+02, 2.926135559082031e+02, 2.92973876953125e+02, 2.931654357910156e+02, 2.932585144042969e+02, 2.933275756835938e+02, 2.933602294921875e+02, 2.934032287597656e+02, 2.928917846679688e+02, 2.931365661621094e+02, 2.933180541992188e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.066344909667969e+02, 3.138789367675781e+02, 3.191392822265625e+02, 3.228367004394531e+02, 3.253791809082031e+02, 3.270803527832031e+02, 3.278757019042969e+02, 3.278726501464844e+02, 3.278177490234375e+02, 3.2779833984375e+02, 3.277654113769531e+02, 3.276003112792969e+02, 3.274255676269531e+02, 3.2728076171875e+02, 3.271526794433594e+02, 3.271645202636719e+02, 3.271443176269531e+02, 3.26875e+02, 3.266470947265625e+02, 3.26762939453125e+02, 3.268410949707031e+02, 3.265995178222656e+02, 3.225980834960938e+02, 3.001268615722656e+02, 2.948031311035156e+02, 2.93541748046875e+02, 2.932427978515625e+02, 3.111723632812501e+02, 3.178486022949219e+02, 3.227694702148438e+02, 3.198778381347656e+02, 3.242760620117188e+02, 3.247027282714844e+02, 3.245637817382812e+02, 3.245316467285156e+02, 3.067020263671875e+02, 2.963606262207031e+02, 2.939107055664062e+02, 2.933302612304688e+02, 3.069534606933594e+02, 3.146813049316406e+02, 3.203549499511719e+02, 3.243870239257812e+02, 3.259377746582031e+02, 3.259013366699219e+02, 3.258340759277344e+02, 3.258180541992188e+02, 3.258021850585938e+02, 3.257553100585938e+02, 3.256997985839844e+02, 3.256770935058594e+02, 3.256888732910156e+02, 3.257378234863281e+02, 3.249369201660156e+02, 3.239741516113282e+02, 3.263746948242188e+02, 3.266300354003906e+02, 3.267124938964844e+02, 3.268377380371094e+02, 3.268707580566406e+02, 3.268383483886719e+02, 3.267765197753906e+02, 3.267416381835938e+02, 3.267569885253906e+02, 3.267312927246094e+02, 3.265529174804688e+02, 3.264332885742188e+02, 3.265022583007812e+02, 3.265313110351562e+02, 3.264508666992188e+02, 3.263577270507812e+02, 3.2081005859375e+02, 2.997032470703125e+02, 2.9470263671875e+02, 2.935178833007812e+02, 2.932371215820312e+02, 3.278116455078125e+02, 3.151759033203125e+02, 3.21338134765625e+02, 3.2575927734375e+02, 3.262739868164062e+02, 3.259781799316406e+02, 3.257511596679688e+02, 3.259380798339844e+02, 3.065709228515625e+02, 2.963296813964844e+02, 2.939033203125e+02, 2.933284606933594e+02, 3.086109008789062e+02, 3.1585009765625e+02, 3.211110534667969e+02, 3.248273315429688e+02, 3.273760681152344e+02, 3.293307800292969e+02, 3.304734497070312e+02, 3.30584228515625e+02, 3.308160705566406e+02, 3.310575256347656e+02, 3.356224670410156e+02, 3.303475036621094e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.881278991699219e+02, 2.886315612792969e+02, 2.890379943847656e+02, 2.893353881835938e+02, 2.895294799804688e+02, 2.896451110839844e+02, 2.897237854003906e+02, 2.897663269042969e+02, 2.898011779785156e+02, 2.89837890625e+02, 2.898812255859375e+02, 2.899359741210938e+02, 2.900850830078125e+02, 2.904135437011719e+02, 2.907232360839844e+02, 2.909419555664062e+02, 2.911664123535156e+02, 2.913594360351562e+02, 2.915312805175781e+02, 2.916307678222656e+02, 2.917550048828125e+02, 2.91880126953125e+02, 2.919793701171875e+02, 2.910335693359375e+02, 2.902330627441406e+02, 2.896641235351562e+02, 2.892378845214844e+02, 2.899570617675781e+02, 2.907461547851562e+02, 2.914580993652344e+02, 2.914338073730469e+02, 2.919480895996094e+02, 2.922079772949219e+02, 2.922288818359375e+02, 2.922096557617188e+02, 2.918114929199219e+02, 2.908226013183594e+02, 2.901079711914062e+02, 2.895131530761719e+02, 2.894680480957031e+02, 2.901889038085938e+02, 2.90787109375e+02, 2.912411804199219e+02, 2.915298767089844e+02, 2.915375671386719e+02, 2.915036315917969e+02, 2.915398559570312e+02, 2.91581298828125e+02, 2.916023864746094e+02, 2.916188354492188e+02, 2.916531677246094e+02, 2.916917724609375e+02, 2.917312622070312e+02, 2.917016296386719e+02, 2.914300842285156e+02, 2.91771484375e+02, 2.9189111328125e+02, 2.919336547851562e+02, 2.919761962890625e+02, 2.920224304199219e+02, 2.9206494140625e+02, 2.921050720214844e+02, 2.922256774902344e+02, 2.924987487792969e+02, 2.927475280761719e+02, 2.928930969238281e+02, 2.930148620605469e+02, 2.93095703125e+02, 2.931948547363281e+02, 2.932791137695312e+02, 2.935122680664062e+02, 2.9370068359375e+02, 2.930924072265625e+02, 2.924525146484375e+02, 2.919847717285156e+02, 2.915867614746094e+02, 2.919654541015625e+02, 2.923253173828125e+02, 2.929714660644531e+02, 2.934967956542969e+02, 2.937051391601562e+02, 2.936669006347656e+02, 2.935871276855469e+02, 2.935106506347656e+02, 2.933441772460938e+02, 2.925765991210938e+02, 2.919098510742188e+02, 2.913536071777344e+02, 2.912693176269531e+02, 2.918258666992188e+02, 2.923690795898438e+02, 2.927822875976562e+02, 2.930580444335938e+02, 2.9324267578125e+02, 2.933736877441406e+02, 2.933739318847656e+02, 2.933657836914062e+02, 2.933568725585938e+02, 2.931278991699219e+02, 2.930975952148438e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[4.1990263671875e+03, 4.4661513671875e+03, 4.83908935546875e+03, 5.1114140625e+03, 5.26255419921875e+03, 5.33047998046875e+03, 5.3626513671875e+03, 5.0658623046875e+03, 4.96509375e+03, 4.95468603515625e+03, 4.95510498046875e+03, 4.90981396484375e+03, 4.74987548828125e+03, 4.647162109375e+03, 4.5365068359375e+03, 4.4383134765625e+03, 4.4623017578125e+03, 4.380088378906249e+03, 4.14424658203125e+03, 4.06846923828125e+03, 4.21857080078125e+03, 4.17570361328125e+03, 3.965174560546875e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.678604003906253e+03, 5.1255849609375e+03, 4.9003828125e+03, 5.23663525390625e+03, 3.94870654296875e+03, 3.34027197265625e+03, 3.31564111328125e+03, 3.34426708984375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 4.54120654296875e+03, 4.94085400390625e+03, 5.25575830078125e+03, 4.47552392578125e+03, 3.83979248046875e+03, 3.79402001953125e+03, 3.815390380859375e+03, 3.8166298828125e+03, 3.8002919921875e+03, 3.7690517578125e+03, 3.74785400390625e+03, 3.74692138671875e+03, 3.75599267578125e+03, 5.17210693359375e+03, 5.32449609375e+03, 4.100172851562497e+03, 3.970489990234375e+03, 4.0353681640625e+03, 4.11577392578125e+03, 4.161306640625e+03, 4.12274658203125e+03, 4.078576904296875e+03, 4.0404072265625e+03, 4.029935791015625e+03, 4.012813720703125e+03, 3.9435810546875e+03, 3.815118408203125e+03, 3.7907861328125e+03, 3.84846533203125e+03, 3.793303222656251e+03, 3.682558105468751e+03, 3.51096630859375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.6576298828125e+03, 4.9604462890625e+03, 5.2800595703125e+03, 3.88319677734375e+03, 3.191609130859375e+03, 2.970382080078125e+03, 2.849037109375e+03, 2.89073974609375e+03, 0e+00, 0e+00, 0e+00, 0e+00, 4.385943359375e+03, 4.78662158203125e+03, 5.0287275390625e+03, 5.15814453125e+03, 5.20746533203125e+03, 5.50781103515625e+03, 5.55483056640625e+03, 5.7396044921875e+03, 5.995466796875e+03, 6.4288076171875e+03, 6.8977978515625e+03, 7.317103515625e+03] +electricalGrid.PElecLoa=[3.821148681640625e+03, 3.821964599609375e+03, 4.173287109375e+03, 4.619556640625e+03, 4.938318359375e+03, 5.15621337890625e+03, 5.30302685546875e+03, 4.967426757812499e+03, 4.67138623046875e+03, 4.63679150390625e+03, 4.6411689453125e+03, 4.60694970703125e+03, 4.4895390625e+03, 4.42276416015625e+03, 4.3315537109375e+03, 4.2484072265625e+03, 4.275076171875e+03, 4.188871582031249e+03, 3.963826171875e+03, 3.91375341796875e+03, 4.06991162109375e+03, 4.008000244140625e+03, 3.808577880859375e+03, -6.156915161245411e-30, -1.512667790157913e-30, -2.074894125572026e-28, -2.849440797222623e-28, -3.173906367739983e-29, 3.964237792968753e+03, 4.5358740234375e+03, 4.975564453125e+03, 4.72922021484375e+03, 4.7941845703125e+03, 3.409495849609375e+03, 3.253909423828125e+03, 3.280646240234375e+03, -8.483637747443815e-29, -2.59413705619691e-29, -6.307172604387858e-29, -2.857006331526662e-29, 3.853132080078125e+03, 4.26381640625e+03, 4.75286474609375e+03, 5.10787353515625e+03, 4.1089140625e+03, 3.73073095703125e+03, 3.7184462890625e+03, 3.724496826171875e+03, 3.711727294921875e+03, 3.682854248046875e+03, 3.66494287109375e+03, 3.666043701171875e+03, 3.674966796875e+03, 3.696028564453125e+03, 5.205091796875e+03, 5.063306152343753e+03, 4.566971679687491e+03, 3.973522216796877e+03, 3.9564501953125e+03, 3.997429931640625e+03, 3.9580556640625e+03, 3.9174091796875e+03, 3.886277587890625e+03, 3.879431396484375e+03, 3.862055419921875e+03, 3.792414306640625e+03, 3.671537353515625e+03, 3.658654052734375e+03, 3.71983447265625e+03, 3.671869873046876e+03, 3.575309082031251e+03, 3.420573486328125e+03, -1.34991956661312e-28, -1.931823410387682e-28, -2.601902766844544e-30, -8.195290525435696e-29, -3.286145412112429e-28, 5.478634765625e+03, 4.3043525390625e+03, 4.83312841796875e+03, 5.05561962890625e+03, 3.3207587890625e+03, 2.94680029296875e+03, 2.807982177734375e+03, 2.866053955078125e+03, -3.024448606821633e-28, -1.480046227011859e-28, -3.109772118182848e-28, -2.973757709388185e-29, 3.7902431640625e+03, 4.31093994140625e+03, 4.752376953125e+03, 5.06726904296875e+03, 5.28222265625e+03, 5.70654541015625e+03, 5.29410986328125e+03, 4.9815556640625e+03, 5.18744189453125e+03, 5.3466982421875e+03, 7.67716943359375e+03, 7.48734033203125e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt index ce75483a..737a9c3e 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_DesignOptimization_BESNoDHW.txt @@ -1,20 +1,19 @@ -last-generated=2024-07-16 +last-generated=2024-09-09 statistics-initialization= { - "linear": "0", "nonlinear": "5, 7, 1, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0", "nonlinear": "6, 1, 0, 1, 0, 1, 0, 1, 1, 1", - "number of continuous time states": "53", + "number of continuous time states": "49", "numerical Jacobians": "0" } time=[0e+00, 1.728e+05] weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.215209350585938e+02, 3.219566650390625e+02, 3.221395263671875e+02, 3.223133850097656e+02, 3.225346374511719e+02, 3.227501525878906e+02, 3.227833251953125e+02, 3.227899780273438e+02, 3.22792724609375e+02, 3.227936401367188e+02, 3.227616577148438e+02, 3.225936584472656e+02, 3.224303588867188e+02, 3.222870788574219e+02, 3.221586303710938e+02, 3.221750183105469e+02, 3.221384887695312e+02, 3.218601989746094e+02, 3.216575012207031e+02, 3.217870788574219e+02, 3.218323974609375e+02, 3.215806274414062e+02, 3.126960144042969e+02, 2.964165954589844e+02, 2.916865844726562e+02, 2.899447326660156e+02, 2.891441955566406e+02, 3.2014599609375e+02, 3.204700317382812e+02, 3.201241760253906e+02, 3.195367126464844e+02, 3.194236755371094e+02, 3.19423095703125e+02, 3.194651794433594e+02, 3.195135803222656e+02, 3.014866638183594e+02, 2.933465270996094e+02, 2.90645263671875e+02, 2.894618225097656e+02, 3.135982360839844e+02, 3.202246704101562e+02, 3.2050146484375e+02, 3.20630615234375e+02, 3.207018432617188e+02, 3.207602844238281e+02, 3.207975463867188e+02, 3.208114318847656e+02, 3.207996826171875e+02, 3.207524719238281e+02, 3.206996459960938e+02, 3.206794738769531e+02, 3.206910400390625e+02, 3.207395629882812e+02, 3.208587341308594e+02, 3.210523681640625e+02, 3.212527160644531e+02, 3.214536437988281e+02, 3.216529846191406e+02, 3.218188781738281e+02, 3.218563842773438e+02, 3.218304748535156e+02, 3.217745666503906e+02, 3.21745849609375e+02, 3.217612915039062e+02, 3.217268371582031e+02, 3.215444641113281e+02, 3.214408264160156e+02, 3.215132751464844e+02, 3.215235595703125e+02, 3.214359130859375e+02, 3.213305053710938e+02, 3.123688049316406e+02, 2.97146240234375e+02, 2.928778686523438e+02, 2.913197021484375e+02, 2.906116943359375e+02, 3.199238891601562e+02, 3.204761962890625e+02, 3.209530029296875e+02, 3.209825134277344e+02, 3.209297485351562e+02, 3.208149108886719e+02, 3.206853637695312e+02, 3.209090576171875e+02, 3.021622619628906e+02, 2.94336181640625e+02, 2.9171484375e+02, 2.905901794433594e+02, 3.139735412597656e+02, 3.238264770507812e+02, 3.243094482421875e+02, 3.246211547851562e+02, 3.2499951171875e+02, 3.253717346191406e+02, 3.253740539550781e+02, 3.254739990234375e+02, 3.257739562988281e+02, 3.260267333984375e+02, 3.262257690429688e+02, 3.264138488769531e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.897055053710938e+02, 2.897633972167969e+02, 2.896979370117188e+02, 2.896317138671875e+02, 2.895609436035156e+02, 2.894921569824219e+02, 2.8943701171875e+02, 2.894346923828125e+02, 2.894500122070312e+02, 2.894677734375e+02, 2.894903259277344e+02, 2.895219421386719e+02, 2.896506042480469e+02, 2.899574279785156e+02, 2.902443237304688e+02, 2.904428100585938e+02, 2.906423950195312e+02, 2.908057250976562e+02, 2.909563293457031e+02, 2.910434875488281e+02, 2.911448974609375e+02, 2.912422790527344e+02, 2.912432556152344e+02, 2.892245788574219e+02, 2.885972900390625e+02, 2.883037414550781e+02, 2.88098876953125e+02, 2.905556335449219e+02, 2.909679260253906e+02, 2.911485290527344e+02, 2.912911071777344e+02, 2.913664245605469e+02, 2.914066772460938e+02, 2.914081115722656e+02, 2.913854370117188e+02, 2.900912170410156e+02, 2.889665832519531e+02, 2.884950256347656e+02, 2.881252136230469e+02, 2.890096740722656e+02, 2.905210876464844e+02, 2.906034545898438e+02, 2.906284484863281e+02, 2.906328430175781e+02, 2.905916748046875e+02, 2.905536499023438e+02, 2.905789489746094e+02, 2.906066284179688e+02, 2.906131896972656e+02, 2.906160888671875e+02, 2.906380615234375e+02, 2.90664306640625e+02, 2.906916198730469e+02, 2.907203674316406e+02, 2.907520446777344e+02, 2.907853088378906e+02, 2.908191223144531e+02, 2.90853271484375e+02, 2.908884582519531e+02, 2.909210205078125e+02, 2.909503784179688e+02, 2.909783020019531e+02, 2.910866088867188e+02, 2.913456726074219e+02, 2.915777893066406e+02, 2.917041320800781e+02, 2.918127746582031e+02, 2.918827514648438e+02, 2.919696044921875e+02, 2.92056884765625e+02, 2.923251342773438e+02, 2.924360656738281e+02, 2.906888427734375e+02, 2.902080688476562e+02, 2.900124206542969e+02, 2.898318176269531e+02, 2.92163818359375e+02, 2.923395080566406e+02, 2.92412109375e+02, 2.924827270507812e+02, 2.925461730957031e+02, 2.925863952636719e+02, 2.926084899902344e+02, 2.92643310546875e+02, 2.912875366210938e+02, 2.901991577148438e+02, 2.897686767578125e+02, 2.894569702148438e+02, 2.903276062011719e+02, 2.919489135742188e+02, 2.920865478515625e+02, 2.921373901367188e+02, 2.921537780761719e+02, 2.921687316894531e+02, 2.921665954589844e+02, 2.921570129394531e+02, 2.921851501464844e+02, 2.922122192382812e+02, 2.92212646484375e+02, 2.9220849609375e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.200366821289062e+02, 3.219562377929688e+02, 3.221435852050781e+02, 3.223178405761719e+02, 3.225402526855469e+02, 3.227579040527344e+02, 3.227863159179688e+02, 3.227908020019531e+02, 3.2279296875e+02, 3.227937316894531e+02, 3.227602233886719e+02, 3.225888977050781e+02, 3.22425537109375e+02, 3.222844848632812e+02, 3.221566162109375e+02, 3.221760864257812e+02, 3.221395263671875e+02, 3.218511047363281e+02, 3.216488647460938e+02, 3.217897644042969e+02, 3.218345336914062e+02, 3.215761413574219e+02, 3.130110168457031e+02, 2.971640625e+02, 2.921204223632812e+02, 2.901934204101562e+02, 2.892937622070312e+02, 3.185182495117188e+02, 3.204631042480469e+02, 3.20119873046875e+02, 3.195249938964844e+02, 3.194187622070312e+02, 3.19422119140625e+02, 3.194655456542969e+02, 3.195142517089844e+02, 3.023238525390625e+02, 2.938880920410156e+02, 2.909531555175781e+02, 2.896419677734375e+02, 3.087638244628906e+02, 3.20157958984375e+02, 3.205048828125e+02, 3.206345825195312e+02, 3.207043151855469e+02, 3.207619018554688e+02, 3.207985534667969e+02, 3.208121643066406e+02, 3.207999572753906e+02, 3.207518615722656e+02, 3.206984558105469e+02, 3.206788330078125e+02, 3.206911926269531e+02, 3.207405090332031e+02, 3.20861083984375e+02, 3.210567321777344e+02, 3.212578430175781e+02, 3.214592895507812e+02, 3.216608581542969e+02, 3.218262329101562e+02, 3.218592834472656e+02, 3.218302917480469e+02, 3.217726745605469e+02, 3.217445068359375e+02, 3.217616882324219e+02, 3.217279663085938e+02, 3.215424194335938e+02, 3.214383544921875e+02, 3.215144348144531e+02, 3.215253601074219e+02, 3.214355163574219e+02, 3.2133056640625e+02, 3.127992858886719e+02, 2.978450927734375e+02, 2.932796020507812e+02, 2.915469055175781e+02, 2.907450561523438e+02, 3.194768981933594e+02, 3.204842834472656e+02, 3.209664001464844e+02, 3.209877319335938e+02, 3.209304809570312e+02, 3.208122863769531e+02, 3.206813354492188e+02, 3.209126281738281e+02, 3.030055847167969e+02, 2.948710632324219e+02, 2.920169067382812e+02, 2.907645568847656e+02, 3.100587768554688e+02, 3.234122009277344e+02, 3.243257446289062e+02, 3.246394958496094e+02, 3.250230407714844e+02, 3.2538720703125e+02, 3.253775024414062e+02, 3.254770202636719e+02, 3.257792663574219e+02, 3.260314636230469e+02, 3.262256469726562e+02, 3.26416015625e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.8939013671875e+02, 2.897420349121094e+02, 2.896820678710938e+02, 2.89617431640625e+02, 2.895476379394531e+02, 2.894796142578125e+02, 2.894246215820312e+02, 2.894223022460938e+02, 2.89437744140625e+02, 2.894557189941406e+02, 2.894783935546875e+02, 2.895098266601562e+02, 2.896384887695312e+02, 2.899455871582031e+02, 2.902326965332031e+02, 2.904314575195312e+02, 2.906313171386719e+02, 2.907938232421875e+02, 2.909442138671875e+02, 2.910323791503906e+02, 2.911343688964844e+02, 2.912311401367188e+02, 2.912559814453125e+02, 2.892855529785156e+02, 2.886291198730469e+02, 2.88319091796875e+02, 2.881063232421875e+02, 2.901567077636719e+02, 2.90939208984375e+02, 2.911263732910156e+02, 2.912695922851562e+02, 2.913462524414062e+02, 2.913876647949219e+02, 2.913898010253906e+02, 2.913676147460938e+02, 2.901460876464844e+02, 2.890013427734375e+02, 2.885083923339844e+02, 2.881280517578125e+02, 2.887198486328125e+02, 2.904408874511719e+02, 2.905738830566406e+02, 2.906017150878906e+02, 2.906073913574219e+02, 2.905671081542969e+02, 2.90529541015625e+02, 2.905554809570312e+02, 2.905835266113281e+02, 2.905903930664062e+02, 2.905935668945312e+02, 2.906158752441406e+02, 2.906425170898438e+02, 2.906702575683594e+02, 2.906994323730469e+02, 2.907316589355469e+02, 2.90765380859375e+02, 2.907995300292969e+02, 2.90834228515625e+02, 2.908697814941406e+02, 2.909022827148438e+02, 2.909315490722656e+02, 2.909595031738281e+02, 2.910680541992188e+02, 2.913274841308594e+02, 2.915599670410156e+02, 2.916862182617188e+02, 2.917948913574219e+02, 2.918653259277344e+02, 2.919526062011719e+02, 2.920399169921875e+02, 2.923084106445312e+02, 2.924528503417969e+02, 2.907412414550781e+02, 2.902321166992188e+02, 2.900205688476562e+02, 2.898319396972656e+02, 2.919082641601562e+02, 2.923119201660156e+02, 2.923891296386719e+02, 2.924606018066406e+02, 2.925242919921875e+02, 2.925647583007812e+02, 2.925869750976562e+02, 2.926227111816406e+02, 2.913436279296875e+02, 2.902323303222656e+02, 2.897798156738281e+02, 2.894571838378906e+02, 2.900673522949219e+02, 2.917276000976562e+02, 2.920494689941406e+02, 2.92105224609375e+02, 2.921240539550781e+02, 2.921401672363281e+02, 2.921373901367188e+02, 2.921281127929688e+02, 2.921570434570312e+02, 2.921846008300781e+02, 2.921851196289062e+02, 2.921814270019531e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[3.88858251953125e+03, 3.32026708984375e+03, 3.19924951171875e+03, 3.258170654296875e+03, 3.320991943359375e+03, 3.406996826171875e+03, 3.479865234375e+03, 3.49e+03, 3.49641259765625e+03, 3.498287841796875e+03, 3.499328857421875e+03, 3.479903564453125e+03, 3.415646484375e+03, 3.35867236328125e+03, 3.28016455078125e+03, 3.212979248046875e+03, 3.205820556640625e+03, 3.159728515625e+03, 3.04853759765625e+03, 2.991105712890625e+03, 3.0356552734375e+03, 3.01614697265625e+03, 2.927962158203125e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 2.968524414062495e+03, 2.720214599609375e+03, 2.588484375e+03, 2.45844970703125e+03, 2.44877001953125e+03, 2.447992919921875e+03, 2.45555859375e+03, 2.465292724609375e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 4.206453125e+03, 2.74003076171875e+03, 2.77516943359375e+03, 2.794080078125e+03, 2.80778076171875e+03, 2.823409912109375e+03, 2.833945556640625e+03, 2.833657470703125e+03, 2.8265361328125e+03, 2.812155029296875e+03, 2.799932373046875e+03, 2.795133056640625e+03, 2.797111572265625e+03, 2.808486328125e+03, 2.83907470703125e+03, 2.884921875e+03, 2.93019970703125e+03, 2.976426025390625e+03, 3.028568115234375e+03, 3.065638671875e+03, 3.064348876953125e+03, 3.05004150390625e+03, 3.02964892578125e+03, 3.01544091796875e+03, 2.992069580078125e+03, 2.951171875e+03, 2.888396484375e+03, 2.862335693359375e+03, 2.878541748046875e+03, 2.86265478515625e+03, 2.828265869140625e+03, 2.771653564453125e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 2.595181396484375e+03, 2.607219482421875e+03, 2.693128173828125e+03, 2.673552734375e+03, 2.65219189453125e+03, 2.61532568359375e+03, 2.5885791015625e+03, 2.6651435546875e+03, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, -4.200777038931847e-04, 4.062532470703125e+03, 3.685321533203125e+03, 3.73023779296875e+03, 3.836264404296875e+03, 3.995215576171875e+03, 4.21324169921875e+03, 4.18617578125e+03, 4.30858349609375e+03, 4.5809375e+03, 4.822169921875e+03, 5.03256787109375e+03, 5.2502861328125e+03] +electricalGrid.PElecLoa=[2.912937663495541e-03, 4.081726806640625e+03, 3.2122431640625e+03, 3.26831494140625e+03, 3.33228857421875e+03, 3.420758056640625e+03, 3.488802001953125e+03, 3.49516748046875e+03, 3.501582763671875e+03, 3.503376953125e+03, 3.50439453125e+03, 3.484766357421875e+03, 3.421693359375e+03, 3.365866455078125e+03, 3.280197998046875e+03, 3.2060615234375e+03, 3.1959580078125e+03, 3.13996142578125e+03, 3.037894775390625e+03, 2.9922646484375e+03, 3.03438232421875e+03, 3.006670654296875e+03, 2.918305908203125e+03, -4.725874168798327e-04, -4.725874168798327e-04, -4.725874168798327e-04, -4.725874168798327e-04, -4.725874168798327e-04, 3.982455566406255e+03, 2.73718212890625e+03, 2.5819921875e+03, 2.45972021484375e+03, 2.455337890625e+03, 2.4546435546875e+03, 2.462412841796875e+03, 2.472644775390625e+03, -4.725874168798327e-04, -4.725874168798327e-04, -4.725874168798327e-04, -4.725874168798327e-04, 3.568650634765625e+03, 2.836181640625e+03, 2.806190673828125e+03, 2.820387939453125e+03, 2.83259619140625e+03, 2.848106201171875e+03, 2.858620849609375e+03, 2.857146728515625e+03, 2.848605712890625e+03, 2.833121337890625e+03, 2.821234130859375e+03, 2.8167763671875e+03, 2.818739501953125e+03, 2.83025390625e+03, 2.86170556640625e+03, 2.906782470703125e+03, 2.95004296875e+03, 2.993470458984375e+03, 3.037048828125e+03, 3.06474658203125e+03, 3.059567626953125e+03, 3.0454228515625e+03, 3.027043212890625e+03, 3.014343994140625e+03, 2.9882890625e+03, 2.940595947265625e+03, 2.872642822265625e+03, 2.848172607421875e+03, 2.8645048828125e+03, 2.842133056640625e+03, 2.8037431640625e+03, 2.73862939453125e+03, -4.725874168798327e-04, -4.725874168798327e-04, -4.725874168798327e-04, -4.725874168798327e-04, -4.725874168798327e-04, 3.051296142578125e+03, 2.5925576171875e+03, 2.667431396484375e+03, 2.636531982421875e+03, 2.611798828125e+03, 2.5769580078125e+03, 2.55570263671875e+03, 2.63494189453125e+03, -4.725874168798327e-04, -4.725874168798327e-04, -4.725874168798327e-04, -4.725874168798327e-04, 3.5103564453125e+03, 4.10230029296875e+03, 3.62647607421875e+03, 3.705095458984375e+03, 3.826337646484375e+03, 4.015794921875e+03, 3.98794921875e+03, 4.1072294921875e+03, 4.3681240234375e+03, 4.593357421875e+03, 4.8027919921875e+03, 5.01711572265625e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt index 95d24309..71aa020e 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithDHW.txt @@ -1,20 +1,19 @@ -last-generated=2024-07-16 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0", - "nonlinear": "0, 0, 5, 7, 2, 2, 1, 1", + "nonlinear": "0, 0, 5, 7, 3, 3, 1, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1, 6, 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1", - "number of continuous time states": "145", + "number of continuous time states": "141", "numerical Jacobians": "0" } time=[0e+00, 1.728e+05] weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.245396423339844e+02, 3.350958251953125e+02, 3.118341369628906e+02, 3.169881591796875e+02, 3.199224853515625e+02, 3.220684814453125e+02, 3.229777221679688e+02, 3.229879760742188e+02, 3.228802490234375e+02, 3.228186950683594e+02, 3.227675170898438e+02, 3.226062316894531e+02, 3.224334716796875e+02, 3.222836303710938e+02, 3.221546325683594e+02, 3.2215966796875e+02, 3.221351623535156e+02, 3.218751831054688e+02, 3.320304260253906e+02, 3.218243408203125e+02, 3.220244140625e+02, 3.216924438476562e+02, 3.213760375976562e+02, 3.212333679199219e+02, 3.211253967285156e+02, 3.209453430175781e+02, 3.207351684570312e+02, 3.206016540527344e+02, 3.205195617675781e+02, 3.201491394042969e+02, 3.195509033203125e+02, 3.193973693847656e+02, 3.194029235839844e+02, 3.194559631347656e+02, 3.195106811523438e+02, 3.195487670898438e+02, 3.195699768066406e+02, 3.197168273925781e+02, 3.199164733886719e+02, 3.201213989257812e+02, 3.203252868652344e+02, 3.207997131347656e+02, 3.208019409179688e+02, 3.208400268554688e+02, 3.208157043457031e+02, 3.208130493164062e+02, 3.20814453125e+02, 3.2080126953125e+02, 3.207559204101562e+02, 3.207014465332031e+02, 3.206768188476562e+02, 3.20686279296875e+02, 3.202043762207031e+02, 3.210559997558594e+02, 3.211629943847656e+02, 3.212885131835938e+02, 3.214601440429688e+02, 3.216543579101562e+02, 3.218229370117188e+02, 3.218688659667969e+02, 3.218415832519531e+02, 3.217809143066406e+02, 3.217432250976562e+02, 3.217525024414062e+02, 3.217260131835938e+02, 3.215578918457031e+02, 3.214408874511719e+02, 3.214976806640625e+02, 3.209177856445312e+02, 3.216476745605469e+02, 3.214596252441406e+02, 3.212379150390625e+02, 3.210330505371094e+02, 3.206847839355469e+02, 3.202970886230469e+02, 3.201175842285156e+02, 3.20141845703125e+02, 3.204891967773438e+02, 3.209512634277344e+02, 3.210143737792969e+02, 3.209552917480469e+02, 3.20836669921875e+02, 3.207014465332031e+02, 3.208981323242188e+02, 3.215462646484375e+02, 3.22287109375e+02, 3.230628662109375e+02, 3.235974426269531e+02, 3.238978881835938e+02, 3.241305541992188e+02, 3.240023803710938e+02, 3.24747802734375e+02, 3.251264038085938e+02, 3.253804321289062e+02, 3.254085388183594e+02, 3.248779907226562e+02, 3.257368774414062e+02, 3.260408630371094e+02, 3.261988830566406e+02, 3.263524780273438e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.873885803222656e+02, 2.870670166015625e+02, 2.88569091796875e+02, 2.886474914550781e+02, 2.888670959472656e+02, 2.890127258300781e+02, 2.891177673339844e+02, 2.891562805175781e+02, 2.891734619140625e+02, 2.891894226074219e+02, 2.892141723632812e+02, 2.892537231445312e+02, 2.893860168457031e+02, 2.896936340332031e+02, 2.899820251464844e+02, 2.901773071289062e+02, 2.903799133300781e+02, 2.905541076660156e+02, 2.905719604492188e+02, 2.906973266601562e+02, 2.908897399902344e+02, 2.910016174316406e+02, 2.910820007324219e+02, 2.910802917480469e+02, 2.910847778320312e+02, 2.910686340332031e+02, 2.910349426269531e+02, 2.911376953125e+02, 2.912685852050781e+02, 2.914258728027344e+02, 2.9156298828125e+02, 2.91610595703125e+02, 2.916376342773438e+02, 2.916324462890625e+02, 2.916044921875e+02, 2.915682983398438e+02, 2.915162353515625e+02, 2.914383850097656e+02, 2.913218078613281e+02, 2.91238525390625e+02, 2.912574157714844e+02, 2.907794799804688e+02, 2.912309875488281e+02, 2.912590637207031e+02, 2.911967468261719e+02, 2.911400146484375e+02, 2.911538696289062e+02, 2.911724243164062e+02, 2.911712951660156e+02, 2.911658630371094e+02, 2.9117822265625e+02, 2.911950073242188e+02, 2.909229431152344e+02, 2.912142639160156e+02, 2.912515563964844e+02, 2.912699584960938e+02, 2.912918090820312e+02, 2.913172302246094e+02, 2.913460083007812e+02, 2.913760375976562e+02, 2.9140087890625e+02, 2.914228515625e+02, 2.915238037109375e+02, 2.917756652832031e+02, 2.920042419433594e+02, 2.921318359375e+02, 2.922337036132812e+02, 2.922916259765625e+02, 2.920584716796875e+02, 2.924414978027344e+02, 2.92725830078125e+02, 2.929898071289062e+02, 2.931579284667969e+02, 2.932375793457031e+02, 2.932597045898438e+02, 2.93216796875e+02, 2.931697692871094e+02, 2.931478576660156e+02, 2.931741333007812e+02, 2.932254028320312e+02, 2.932596130371094e+02, 2.932688598632812e+02, 2.932613525390625e+02, 2.932532958984375e+02, 2.932703552246094e+02, 2.932916259765625e+02, 2.933006286621094e+02, 2.932594299316406e+02, 2.931375732421875e+02, 2.930562744140625e+02, 2.930196533203125e+02, 2.930742492675781e+02, 2.93080078125e+02, 2.930720825195312e+02, 2.930639343261719e+02, 2.92965576171875e+02, 2.930472106933594e+02, 2.930875854492188e+02, 2.930808410644531e+02, 2.930681457519531e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.331510620117188e+02, 3.0853466796875e+02, 3.146473388671875e+02, 3.175578918457031e+02, 3.199058227539062e+02, 3.217738647460938e+02, 3.228920288085938e+02, 3.229826049804688e+02, 3.228909912109375e+02, 3.228237915039062e+02, 3.227674255371094e+02, 3.225997009277344e+02, 3.224251403808594e+02, 3.222757263183594e+02, 3.221478881835938e+02, 3.221583862304688e+02, 3.221338195800781e+02, 3.218729858398438e+02, 3.319536743164062e+02, 3.217456665039062e+02, 3.22019287109375e+02, 3.217010192871094e+02, 3.213742370605469e+02, 3.212290954589844e+02, 3.211210632324219e+02, 3.209393615722656e+02, 3.207279052734375e+02, 3.205959777832031e+02, 3.205169067382812e+02, 3.201502990722656e+02, 3.195457458496094e+02, 3.193879089355469e+02, 3.193970642089844e+02, 3.194542541503906e+02, 3.195109558105469e+02, 3.195497741699219e+02, 3.195701293945312e+02, 3.197159729003906e+02, 3.199167785644531e+02, 3.201231994628906e+02, 3.203307800292969e+02, 3.205294799804688e+02, 3.200495300292969e+02, 3.208774108886719e+02, 3.2086962890625e+02, 3.208370666503906e+02, 3.20821044921875e+02, 3.208017272949219e+02, 3.207542724609375e+02, 3.206993408203125e+02, 3.206754455566406e+02, 3.206860961914062e+02, 3.233367309570312e+02, 3.205814514160156e+02, 3.212389221191406e+02, 3.213660583496094e+02, 3.214967651367188e+02, 3.216680297851562e+02, 3.218291625976562e+02, 3.2187255859375e+02, 3.218432312011719e+02, 3.2178076171875e+02, 3.217421569824219e+02, 3.217523803710938e+02, 3.217254943847656e+02, 3.215536193847656e+02, 3.214366149902344e+02, 3.214978332519531e+02, 3.332620239257809e+02, 3.215209045410156e+02, 3.215213928222656e+02, 3.212807312011719e+02, 3.210462341308594e+02, 3.206800842285156e+02, 3.202876892089844e+02, 3.201111755371094e+02, 3.201406555175781e+02, 3.204899597167969e+02, 3.209624938964844e+02, 3.210255737304688e+02, 3.209642333984375e+02, 3.20841796875e+02, 3.207010498046875e+02, 3.208944091796875e+02, 3.215527954101562e+02, 3.223085632324219e+02, 3.230887451171875e+02, 3.236229248046875e+02, 3.239151000976562e+02, 3.241432189941406e+02, 3.243841857910156e+02, 3.246472778320312e+02, 3.246991577148438e+02, 3.251536254882812e+02, 3.255575866699219e+02, 3.255771179199219e+02, 3.257283935546875e+02, 3.259412536621094e+02, 3.261429138183594e+02, 3.263380737304688e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.873885803222656e+02, 2.88314697265625e+02, 2.886181640625e+02, 2.888155517578125e+02, 2.889564208984375e+02, 2.890586242675781e+02, 2.891552124023438e+02, 2.892072143554688e+02, 2.8922705078125e+02, 2.892422485351562e+02, 2.892656860351562e+02, 2.893038940429688e+02, 2.8943505859375e+02, 2.897421875e+02, 2.900301818847656e+02, 2.902254028320312e+02, 2.904280090332031e+02, 2.90601806640625e+02, 2.905891418457031e+02, 2.907194519042969e+02, 2.909299011230469e+02, 2.910458679199219e+02, 2.91125732421875e+02, 2.911226806640625e+02, 2.91126220703125e+02, 2.911091918945312e+02, 2.910744934082031e+02, 2.911767883300781e+02, 2.913075866699219e+02, 2.914649047851562e+02, 2.91601806640625e+02, 2.916482238769531e+02, 2.916746215820312e+02, 2.91669189453125e+02, 2.916407775878906e+02, 2.916039733886719e+02, 2.915512084960938e+02, 2.914726257324219e+02, 2.913554992675781e+02, 2.912718505859375e+02, 2.912905578613281e+02, 2.913075256347656e+02, 2.910591125488281e+02, 2.912739562988281e+02, 2.91231201171875e+02, 2.911730651855469e+02, 2.911844177246094e+02, 2.912015991210938e+02, 2.9119970703125e+02, 2.911937255859375e+02, 2.912056884765625e+02, 2.9122216796875e+02, 2.912392578125e+02, 2.9109765625e+02, 2.912648010253906e+02, 2.913008422851562e+02, 2.913207092285156e+02, 2.913430480957031e+02, 2.913702392578125e+02, 2.913995971679688e+02, 2.914238891601562e+02, 2.914453735351562e+02, 2.915458374023438e+02, 2.917975158691406e+02, 2.9202587890625e+02, 2.921530151367188e+02, 2.922543334960938e+02, 2.923122863769531e+02, 2.921796264648438e+02, 2.923882141113281e+02, 2.927417297363281e+02, 2.930124816894531e+02, 2.931769714355469e+02, 2.932521667480469e+02, 2.932715454101562e+02, 2.932266845703125e+02, 2.931785888671875e+02, 2.931556396484375e+02, 2.931809692382812e+02, 2.932311706542969e+02, 2.93263916015625e+02, 2.93271484375e+02, 2.932623901367188e+02, 2.932527770996094e+02, 2.932684631347656e+02, 2.932897338867188e+02, 2.932980651855469e+02, 2.93256103515625e+02, 2.931337280273438e+02, 2.930523681640625e+02, 2.930644226074219e+02, 2.930715026855469e+02, 2.930216674804688e+02, 2.929947509765625e+02, 2.930682678222656e+02, 2.9306201171875e+02, 2.930636596679688e+02, 2.930736694335938e+02, 2.930670776367188e+02, 2.930592346191406e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[4.20201708984375e+03, 5.1771630859375e+03, 5.254724609375e+03, 4.46233740234375e+03, 4.73855859375e+03, 4.89533154296875e+03, 5.01335498046875e+03, 4.342137695312499e+03, 3.79538232421875e+03, 3.642381591796875e+03, 3.62143896484375e+03, 3.601811767578125e+03, 3.50182958984375e+03, 3.43377490234375e+03, 3.363595458984375e+03, 3.3010302734375e+03, 3.331977783203125e+03, 3.29140380859375e+03, 3.128551025390625e+03, 5.577486328125e+03, 3.993323486328125e+03, 3.34058349609375e+03, 3.027501953125e+03, 2.922829833984375e+03, 2.930748046875e+03, 2.91257421875e+03, 2.84608935546875e+03, 2.7880390625e+03, 2.7765615234375e+03, 2.759449951171875e+03, 2.596834228515625e+03, 2.427859619140625e+03, 2.49199560546875e+03, 2.532523681640625e+03, 2.55476611328125e+03, 2.567917236328125e+03, 2.571553466796875e+03, 2.578949462890625e+03, 2.646091552734375e+03, 2.71114599609375e+03, 2.7653359375e+03, 2.81708837890625e+03, 2.7534287109375e+03, 3.23116650390625e+03, 2.92676611328125e+03, 2.863969970703125e+03, 2.864597412109375e+03, 2.865695556640625e+03, 2.85603662109375e+03, 2.833055908203125e+03, 2.816315673828125e+03, 2.818735595703125e+03, 2.83176708984375e+03, 4.3912783203125e+03, 3.191271240234375e+03, 3.02096240234375e+03, 3.029984619140625e+03, 3.08208349609375e+03, 3.13783203125e+03, 3.168663330078125e+03, 3.135177734375e+03, 3.094888427734375e+03, 3.0611806640625e+03, 3.053166259765625e+03, 3.050859375e+03, 3.008496337890625e+03, 2.904114013671875e+03, 2.877201904296875e+03, 2.9367431640625e+03, 4.524549316406238e+03, 3.172451171875005e+03, 2.84385302734375e+03, 2.72526220703125e+03, 2.662166748046875e+03, 2.58107666015625e+03, 2.531797119140625e+03, 2.551657470703125e+03, 2.590986572265625e+03, 2.73110107421875e+03, 2.844921142578125e+03, 2.736863037109375e+03, 2.66420166015625e+03, 2.58588623046875e+03, 2.524927734375e+03, 2.63246142578125e+03, 2.89107861328125e+03, 3.106572021484375e+03, 3.294541748046875e+03, 3.31795556640625e+03, 3.322872802734375e+03, 3.401698974609375e+03, 4.71401025390625e+03, 4.14060791015625e+03, 3.957178466796875e+03, 3.9434033203125e+03, 3.82752587890625e+03, 5.01880419921875e+03, 4.806169921875e+03, 4.50419775390625e+03, 4.4353974609375e+03, 4.49127587890625e+03] +electricalGrid.PElecLoa=[3.82371875e+03, 5.74616015625e+03, 3.82386865234375e+03, 4.1123193359375e+03, 4.35443701171875e+03, 4.55095556640625e+03, 4.706806640625e+03, 4.395867187499999e+03, 3.765446044921875e+03, 3.55120263671875e+03, 3.51812109375e+03, 3.497634765625e+03, 3.404502685546875e+03, 3.34691748046875e+03, 3.284353759765625e+03, 3.22782275390625e+03, 3.26311328125e+03, 3.218653076171875e+03, 3.033281005859375e+03, 5.70618408203125e+03, 4.04033740234375e+03, 3.32688916015625e+03, 2.93829052734375e+03, 2.829715576171875e+03, 2.8442529296875e+03, 2.830642578125e+03, 2.7683701171875e+03, 2.71651708984375e+03, 2.71210302734375e+03, 2.69535205078125e+03, 2.500167236328125e+03, 2.312318115234375e+03, 2.396698486328125e+03, 2.45266162109375e+03, 2.4802998046875e+03, 2.4947060546875e+03, 2.497332275390625e+03, 2.5057890625e+03, 2.5863994140625e+03, 2.66282080078125e+03, 2.724134765625e+03, 2.771957275390625e+03, 2.8094736328125e+03, 4.3130634765625e+03, 3.06107568359375e+03, 2.83724609375e+03, 2.79842919921875e+03, 2.79449951171875e+03, 2.786566650390625e+03, 2.765619873046875e+03, 2.7512080078125e+03, 2.75565478515625e+03, 2.769605224609375e+03, 4.76123779296875e+03, 4.129859375e+03, 3.203580322265622e+03, 3.0122607421875e+03, 3.00882568359375e+03, 3.05939892578125e+03, 3.09015576171875e+03, 3.047043701171875e+03, 2.997980224609375e+03, 2.959075439453125e+03, 2.95250634765625e+03, 2.950598388671875e+03, 2.90694091796875e+03, 2.80371044921875e+03, 2.78262255859375e+03, 2.8447470703125e+03, 5.818832031249965e+03, 3.535763183593764e+03, 2.86285400390625e+03, 2.636364501953125e+03, 2.543683837890625e+03, 2.4628193359375e+03, 2.419832763671875e+03, 2.449736083984375e+03, 2.494028076171875e+03, 2.6571416015625e+03, 2.765826171875e+03, 2.62880908203125e+03, 2.52772265625e+03, 2.427514892578125e+03, 2.3644072265625e+03, 2.495322021484375e+03, 2.786416015625e+03, 2.982310791015625e+03, 3.15902734375e+03, 3.1406484375e+03, 3.12006396484375e+03, 3.1898525390625e+03, 3.26468017578125e+03, 3.362184814453125e+03, 4.04096728515625e+03, 4.92037890625e+03, 4.04941796875e+03, 3.7179931640625e+03, 3.7748896484375e+03, 3.87232373046875e+03, 3.952455810546875e+03, 4.035489990234375e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt index a6a89a51..80746d4c 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_AfterBufferWithoutDHW.txt @@ -1,20 +1,19 @@ -last-generated=2024-07-16 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0", - "nonlinear": "0, 0, 5, 7, 2, 1, 1", + "nonlinear": "0, 0, 5, 7, 3, 1, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1", - "number of continuous time states": "111", + "number of continuous time states": "107", "numerical Jacobians": "0" } time=[0e+00, 1.728e+05] weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.017720642089844e+02, 3.12014404296875e+02, 3.182207946777344e+02, 3.221053466796875e+02, 3.227923889160156e+02, 3.228872985839844e+02, 3.228380737304688e+02, 3.228057861328125e+02, 3.227963562011719e+02, 3.227945861816406e+02, 3.227640686035156e+02, 3.226025390625e+02, 3.224313354492188e+02, 3.222848510742188e+02, 3.250894470214844e+02, 3.2213623046875e+02, 3.222904968261719e+02, 3.219401245117188e+02, 3.216712951660156e+02, 3.217716979980469e+02, 3.218311767578125e+02, 3.215950622558594e+02, 3.213443298339844e+02, 3.21230712890625e+02, 3.211276550292969e+02, 3.209444274902344e+02, 3.207335205078125e+02, 3.206027526855469e+02, 3.20521240234375e+02, 3.199538879394531e+02, 3.196772766113281e+02, 3.19478271484375e+02, 3.194317321777344e+02, 3.194632568359375e+02, 3.1951171875e+02, 3.195483703613281e+02, 3.19570068359375e+02, 3.197206420898438e+02, 3.199208068847656e+02, 3.20124267578125e+02, 3.20329833984375e+02, 3.205250244140625e+02, 3.284526672363281e+02, 3.207955322265625e+02, 3.208837585449219e+02, 3.208471374511719e+02, 3.208246154785156e+02, 3.20802734375e+02, 3.207544555664062e+02, 3.206997985839844e+02, 3.206769409179688e+02, 3.235270385742188e+02, 3.207839965820312e+02, 3.209853210449219e+02, 3.211030578613281e+02, 3.212650756835938e+02, 3.214554443359375e+02, 3.216550903320312e+02, 3.218236389160156e+02, 3.218648986816406e+02, 3.218361511230469e+02, 3.217766723632812e+02, 3.217424926757812e+02, 3.217555236816406e+02, 3.229038696289062e+02, 3.215617065429688e+02, 3.215856628417969e+02, 3.21568359375e+02, 3.215415954589844e+02, 3.214437561035156e+02, 3.213306274414062e+02, 3.211925048828125e+02, 3.210301208496094e+02, 3.207040100097656e+02, 3.203198852539062e+02, 3.2012939453125e+02, 3.201419067382812e+02, 3.204901123046875e+02, 3.209617614746094e+02, 3.210990600585938e+02, 3.210847778320312e+02, 3.208688659667969e+02, 3.206968688964844e+02, 3.208982543945312e+02, 3.215747375488281e+02, 3.22318115234375e+02, 3.23082763671875e+02, 3.235929565429688e+02, 3.23873046875e+02, 3.241156005859375e+02, 3.2436865234375e+02, 3.246315307617188e+02, 3.269546203613281e+02, 3.251767883300781e+02, 3.255762329101562e+02, 3.255116882324219e+02, 3.256755676269531e+02, 3.259100646972656e+02, 3.261207580566406e+02, 3.263185424804688e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.875501098632812e+02, 2.884264221191406e+02, 2.889635620117188e+02, 2.893037719726562e+02, 2.893929443359375e+02, 2.89334716796875e+02, 2.892799987792969e+02, 2.892776184082031e+02, 2.892944641113281e+02, 2.893145446777344e+02, 2.893401184082031e+02, 2.893764953613281e+02, 2.895068359375e+02, 2.898141174316406e+02, 2.90101806640625e+02, 2.902612609863281e+02, 2.905107421875e+02, 2.906779174804688e+02, 2.908220825195312e+02, 2.909010314941406e+02, 2.910060119628906e+02, 2.911110229492188e+02, 2.9119580078125e+02, 2.911981201171875e+02, 2.912023010253906e+02, 2.911827697753906e+02, 2.911460571289062e+02, 2.912488098144531e+02, 2.913800048828125e+02, 2.914767456054688e+02, 2.91666259765625e+02, 2.917245788574219e+02, 2.917489318847656e+02, 2.917399291992188e+02, 2.917090148925781e+02, 2.916704711914062e+02, 2.916161193847656e+02, 2.915388488769531e+02, 2.914220886230469e+02, 2.913376770019531e+02, 2.913556518554688e+02, 2.913717041015625e+02, 2.913625183105469e+02, 2.913374633789062e+02, 2.913028259277344e+02, 2.912439270019531e+02, 2.912534790039062e+02, 2.912691650390625e+02, 2.912657775878906e+02, 2.912587585449219e+02, 2.912704162597656e+02, 2.9128662109375e+02, 2.912802734375e+02, 2.913335876464844e+02, 2.913509826660156e+02, 2.913702697753906e+02, 2.913934631347656e+02, 2.914187622070312e+02, 2.914462585449219e+02, 2.91472900390625e+02, 2.914950256347656e+02, 2.915152282714844e+02, 2.916156311035156e+02, 2.918678283691406e+02, 2.9209521484375e+02, 2.921813354492188e+02, 2.923310241699219e+02, 2.923883666992188e+02, 2.924651184082031e+02, 2.92545166015625e+02, 2.928060607910156e+02, 2.930753173828125e+02, 2.932381286621094e+02, 2.933079528808594e+02, 2.933206176757812e+02, 2.932708435058594e+02, 2.932174377441406e+02, 2.931914978027344e+02, 2.932119750976562e+02, 2.932337341308594e+02, 2.932894592285156e+02, 2.932826538085938e+02, 2.932635498046875e+02, 2.93252685546875e+02, 2.932696228027344e+02, 2.932852478027344e+02, 2.932864685058594e+02, 2.932361755371094e+02, 2.931108093261719e+02, 2.9303271484375e+02, 2.930483703613281e+02, 2.930573425292969e+02, 2.930464782714844e+02, 2.929812927246094e+02, 2.930664672851562e+02, 2.930467529296875e+02, 2.930502319335938e+02, 2.93063720703125e+02, 2.930588989257812e+02, 2.93052001953125e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.072737426757812e+02, 3.13672607421875e+02, 3.183539123535156e+02, 3.217197570800781e+02, 3.227677917480469e+02, 3.229010620117188e+02, 3.228440856933594e+02, 3.228067321777344e+02, 3.227960815429688e+02, 3.227943115234375e+02, 3.227625427246094e+02, 3.22595703125e+02, 3.224231567382812e+02, 3.222771606445312e+02, 3.221490173339844e+02, 3.221632080078125e+02, 3.221374816894531e+02, 3.21582275390625e+02, 3.218050231933594e+02, 3.218656616210938e+02, 3.218650207519531e+02, 3.215976257324219e+02, 3.213367614746094e+02, 3.212250061035156e+02, 3.211233520507812e+02, 3.209384155273438e+02, 3.207262573242188e+02, 3.20597900390625e+02, 3.205194091796875e+02, 3.201452331542969e+02, 3.19535888671875e+02, 3.193941650390625e+02, 3.194053344726562e+02, 3.194579467773438e+02, 3.194356689453125e+02, 3.196795349121094e+02, 3.196366271972656e+02, 3.197394409179688e+02, 3.199252319335938e+02, 3.201265869140625e+02, 3.203331298828125e+02, 3.20530517578125e+02, 3.20645263671875e+02, 3.207096862792969e+02, 3.213422241210938e+02, 3.206361999511719e+02, 3.210556945800781e+02, 3.209192199707031e+02, 3.207862243652344e+02, 3.207032165527344e+02, 3.206755676269531e+02, 3.206871643066406e+02, 3.207367553710938e+02, 3.208561096191406e+02, 3.2105224609375e+02, 3.212572021484375e+02, 3.214606018066406e+02, 3.216616821289062e+02, 3.218298645019531e+02, 3.21868896484375e+02, 3.218369445800781e+02, 3.217751770019531e+02, 3.217410278320312e+02, 3.217555847167969e+02, 3.233015747070312e+02, 3.215259399414062e+02, 3.215896911621094e+02, 3.215733947753906e+02, 3.21543212890625e+02, 3.214417114257812e+02, 3.213277587890625e+02, 3.211920166015625e+02, 3.210316467285156e+02, 3.207037048339844e+02, 3.203145141601562e+02, 3.201231994628906e+02, 3.201385498046875e+02, 3.204899597167969e+02, 3.209703369140625e+02, 3.210207214355469e+02, 3.208698425292969e+02, 3.210050659179688e+02, 3.207533264160156e+02, 3.209100036621094e+02, 3.215828247070312e+02, 3.223386535644531e+02, 3.231112670898438e+02, 3.236161804199219e+02, 3.238865966796875e+02, 3.241246337890625e+02, 3.243784484863281e+02, 3.246447143554688e+02, 3.250122985839844e+02, 3.253329772949219e+02, 3.281241149902344e+02, 3.245494689941406e+02, 3.257834167480469e+02, 3.259449157714844e+02, 3.261376647949219e+02, 3.263316955566406e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.8826318359375e+02, 2.887152404785156e+02, 2.890639038085938e+02, 2.893218688964844e+02, 2.894258117675781e+02, 2.893727111816406e+02, 2.893170776367188e+02, 2.89313232421875e+02, 2.893291931152344e+02, 2.893486633300781e+02, 2.893736572265625e+02, 2.894091186523438e+02, 2.895386962890625e+02, 2.898456420898438e+02, 2.901331481933594e+02, 2.903299560546875e+02, 2.905319213867188e+02, 2.906257019042969e+02, 2.908535766601562e+02, 2.909417114257812e+02, 2.910406494140625e+02, 2.911417541503906e+02, 2.912243347167969e+02, 2.912257995605469e+02, 2.912296142578125e+02, 2.912094421386719e+02, 2.911720275878906e+02, 2.912745361328125e+02, 2.914058227539062e+02, 2.915581970214844e+02, 2.91689208984375e+02, 2.917410278320312e+02, 2.917701721191406e+02, 2.917638549804688e+02, 2.916992797851562e+02, 2.917028198242188e+02, 2.916477966308594e+02, 2.915646057128906e+02, 2.914451904296875e+02, 2.9135986328125e+02, 2.913775939941406e+02, 2.913934326171875e+02, 2.913887329101562e+02, 2.913725891113281e+02, 2.913099670410156e+02, 2.911443786621094e+02, 2.912805786132812e+02, 2.912973327636719e+02, 2.912845764160156e+02, 2.912731018066406e+02, 2.912834777832031e+02, 2.912994995117188e+02, 2.913169250488281e+02, 2.913353271484375e+02, 2.913569641113281e+02, 2.913815002441406e+02, 2.914067077636719e+02, 2.914323425292969e+02, 2.914596862792969e+02, 2.91486083984375e+02, 2.915077819824219e+02, 2.915274963378906e+02, 2.916275634765625e+02, 2.918797607421875e+02, 2.921070556640625e+02, 2.921870422363281e+02, 2.923414916992188e+02, 2.923998718261719e+02, 2.924763488769531e+02, 2.925558471679688e+02, 2.928166198730469e+02, 2.930855102539062e+02, 2.932470397949219e+02, 2.933157653808594e+02, 2.93326904296875e+02, 2.932758483886719e+02, 2.932217102050781e+02, 2.931951293945312e+02, 2.932152404785156e+02, 2.932521667480469e+02, 2.93240234375e+02, 2.932916564941406e+02, 2.932713317871094e+02, 2.932539672851562e+02, 2.932686462402344e+02, 2.932840881347656e+02, 2.93285400390625e+02, 2.932345275878906e+02, 2.931085815429688e+02, 2.930304260253906e+02, 2.930462646484375e+02, 2.930556640625e+02, 2.930479736328125e+02, 2.930462036132812e+02, 2.929804077148438e+02, 2.9287548828125e+02, 2.930813903808594e+02, 2.930585632324219e+02, 2.930507202148438e+02, 2.930436096191406e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[4.20201708984375e+03, 4.4694345703125e+03, 4.46779638671875e+03, 4.81503125e+03, 4.967310546875e+03, 3.862115234375e+03, 3.659177734375e+03, 3.587940673828125e+03, 3.581271484375e+03, 3.583042236328125e+03, 3.583909423828125e+03, 3.558455322265625e+03, 3.466023681640625e+03, 3.404416259765625e+03, 3.3296982421875e+03, 5.11537060546875e+03, 3.984302001953125e+03, 3.380861083984374e+03, 3.104944580078125e+03, 3.045707763671875e+03, 3.145967529296875e+03, 3.126640625e+03, 2.991400146484375e+03, 2.9219326171875e+03, 2.918905517578125e+03, 2.89154296875e+03, 2.828270263671875e+03, 2.774626220703125e+03, 2.7612998046875e+03, 2.73985791015625e+03, 3.289634765625e+03, 2.59350390625e+03, 2.50121533203125e+03, 2.50826171875e+03, 2.527436279296875e+03, 2.54219873046875e+03, 2.547336181640625e+03, 2.55493359375e+03, 2.613518798828125e+03, 2.668923095703125e+03, 2.71817724609375e+03, 2.757935791015625e+03, 2.796595703125e+03, 5.454734375e+03, 3.209210205078125e+03, 2.89451171875e+03, 2.833541259765625e+03, 2.825762939453125e+03, 2.818156005859375e+03, 2.799839111328125e+03, 2.787105712890625e+03, 2.78866015625e+03, 5.18526025390625e+03, 3.305567626953125e+03, 2.956231689453125e+03, 2.928466064453125e+03, 2.97104345703125e+03, 3.0225537109375e+03, 3.07273974609375e+03, 3.1010283203125e+03, 3.078045654296875e+03, 3.051075927734375e+03, 3.026365478515625e+03, 3.019509521484375e+03, 3.0084423828125e+03, 5.109798828125e+03, 3.474027587890625e+03, 2.971056884765625e+03, 2.90801513671875e+03, 2.876769287109375e+03, 2.828589599609375e+03, 2.771228515625e+03, 2.7084794921875e+03, 2.6307578125e+03, 2.49965869140625e+03, 2.401218017578125e+03, 2.39933447265625e+03, 2.443375244140625e+03, 2.58553466796875e+03, 2.6683154296875e+03, 3.000389892578125e+03, 2.55655126953125e+03, 2.456710205078125e+03, 2.4274736328125e+03, 2.538659912109375e+03, 2.728322509765625e+03, 2.862655029296875e+03, 3.00810595703125e+03, 3.042653076171875e+03, 3.113896240234375e+03, 3.22604345703125e+03, 3.31004736328125e+03, 3.41998876953125e+03, 5.14369921875e+03, 4.80174609375e+03, 3.827942626953125e+03, 3.745421875e+03, 3.911445556640625e+03, 4.052102294921875e+03, 4.1639150390625e+03, 4.27866064453125e+03] +electricalGrid.PElecLoa=[3.82371875e+03, 3.824535400390625e+03, 4.0361708984375e+03, 4.42666162109375e+03, 4.71058837890625e+03, 3.852833984375e+03, 3.571379150390625e+03, 3.484852783203125e+03, 3.478135986328125e+03, 3.48126171875e+03, 3.482843994140625e+03, 3.45787109375e+03, 3.371836181640625e+03, 3.320169189453125e+03, 3.25174560546875e+03, 3.19197314453125e+03, 3.21548193359375e+03, 3.16010400390625e+03, 4.04888671875e+03, 3.21740380859375e+03, 3.100248291015625e+03, 3.030912353515625e+03, 2.886381591796875e+03, 2.82980712890625e+03, 2.83493212890625e+03, 2.810876708984375e+03, 2.751548583984375e+03, 2.70423291015625e+03, 2.69507666015625e+03, 2.671533935546875e+03, 2.48727197265625e+03, 2.325543701171875e+03, 2.393294677734375e+03, 2.42810791015625e+03, 2.4493271484375e+03, 3.075075439453128e+03, 2.60324072265625e+03, 2.4858134765625e+03, 2.53972314453125e+03, 2.60624072265625e+03, 2.663464599609375e+03, 2.70659423828125e+03, 2.742302001953125e+03, 2.74403271484375e+03, 2.74711865234375e+03, 4.704017578125e+03, 4.01991455078125e+03, 3.00662646484375e+03, 2.767672119140625e+03, 2.72214111328125e+03, 2.716674560546875e+03, 2.72426025390625e+03, 2.7357783203125e+03, 2.7554931640625e+03, 2.79872119140625e+03, 2.85586376953125e+03, 2.9001650390625e+03, 2.94113232421875e+03, 2.98815625e+03, 3.011244384765625e+03, 2.977767822265625e+03, 2.946986083984375e+03, 2.92398974609375e+03, 2.9194033203125e+03, 2.907992431640625e+03, 4.860453125e+03, 3.4644931640625e+03, 2.890383056640625e+03, 2.81470556640625e+03, 2.77882958984375e+03, 2.7312783203125e+03, 2.67408984375e+03, 2.59960205078125e+03, 2.5035146484375e+03, 2.35399609375e+03, 2.258921630859375e+03, 2.264279296875e+03, 2.31314697265625e+03, 2.47152587890625e+03, 2.556960693359375e+03, 2.431458740234375e+03, 3.12716015625e+03, 2.38858837890625e+03, 2.2658046875e+03, 2.383697265625e+03, 2.60255908203125e+03, 2.726606689453125e+03, 2.84022607421875e+03, 2.843529541015625e+03, 2.90270458984375e+03, 3.01098681640625e+03, 3.086465087890625e+03, 3.187989501953125e+03, 3.353350341796875e+03, 3.43840087890625e+03, 5.20420556640625e+03, 4.904494140625e+03, 3.544724365234375e+03, 3.66496630859375e+03, 3.7608076171875e+03, 3.862425537109375e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt index 5dad5195..0efeb744 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Parallel.txt @@ -1,20 +1,19 @@ -last-generated=2024-09-23 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0", "nonlinear": "0, 0, 5, 7, 4, 1, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "3, 6, 1, 0, 1, 0, 1, 0, 1, 1, 1", - "number of continuous time states": "79", + "number of continuous time states": "75", "numerical Jacobians": "0" } time=[0e+00, 1.728e+05] weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.090269470214844e+02, 3.168741455078125e+02, 3.217583923339844e+02, 3.226177062988281e+02, 3.226524963378906e+02, 3.227782287597656e+02, 3.227994995117188e+02, 3.227950744628906e+02, 3.227938537597656e+02, 3.227938537597656e+02, 3.22764892578125e+02, 3.226029663085938e+02, 3.224291076660156e+02, 3.222832641601562e+02, 3.221522521972656e+02, 3.221632690429688e+02, 3.221394348144531e+02, 3.218694763183594e+02, 3.271341857910156e+02, 3.219284362792969e+02, 3.220270690917969e+02, 3.216502685546875e+02, 3.213487243652344e+02, 3.212286682128906e+02, 3.211282348632812e+02, 3.209454650878906e+02, 3.207318725585938e+02, 3.206005249023438e+02, 3.205215454101562e+02, 3.201493835449219e+02, 3.195390930175781e+02, 3.193984069824219e+02, 3.194100341796875e+02, 3.194603576660156e+02, 3.195122680664062e+02, 3.195492553710938e+02, 3.19569580078125e+02, 3.197196350097656e+02, 3.199217224121094e+02, 3.200033874511719e+02, 3.205206298828125e+02, 3.205908508300781e+02, 3.206534729003906e+02, 3.207067260742188e+02, 3.203204345703125e+02, 3.207854309082031e+02, 3.210530090332031e+02, 3.208777465820312e+02, 3.207674560546875e+02, 3.206996459960938e+02, 3.206758728027344e+02, 3.206871948242188e+02, 3.207353210449219e+02, 3.208519287109375e+02, 3.210462341308594e+02, 3.212506103515625e+02, 3.214533996582031e+02, 3.216552124023438e+02, 3.218248596191406e+02, 3.218658447265625e+02, 3.218356018066406e+02, 3.217757568359375e+02, 3.217409973144531e+02, 3.217548828125e+02, 3.1937548828125e+02, 3.216398620605469e+02, 3.2161767578125e+02, 3.215545654296875e+02, 3.215345458984375e+02, 3.21441650390625e+02, 3.21328857421875e+02, 3.211919860839844e+02, 3.210220031738281e+02, 3.206989135742188e+02, 3.203132629394531e+02, 3.201253356933594e+02, 3.201403198242188e+02, 3.204861145019531e+02, 3.209623718261719e+02, 3.210075378417969e+02, 3.20942138671875e+02, 3.208234252929688e+02, 3.205458984375e+02, 3.2109619140625e+02, 3.216353149414062e+02, 3.2232275390625e+02, 3.230798950195312e+02, 3.235969848632812e+02, 3.23881103515625e+02, 3.241188354492188e+02, 3.243662719726562e+02, 3.246323547363281e+02, 3.249967956542969e+02, 3.2532080078125e+02, 3.279819641113281e+02, 3.234057922363281e+02, 3.251307678222656e+02, 3.258261413574219e+02, 3.261359252929688e+02, 3.264699096679688e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.882925720214844e+02, 2.889140625e+02, 2.893377380371094e+02, 2.894808044433594e+02, 2.894178771972656e+02, 2.893406372070312e+02, 2.892867736816406e+02, 2.892840270996094e+02, 2.892986145019531e+02, 2.893158569335938e+02, 2.893384704589844e+02, 2.8937255859375e+02, 2.895002746582031e+02, 2.898052368164062e+02, 2.900909423828125e+02, 2.902852478027344e+02, 2.904846801757812e+02, 2.906521301269531e+02, 2.907607116699219e+02, 2.908177795410156e+02, 2.909945678710938e+02, 2.910893859863281e+02, 2.911650390625e+02, 2.911640014648438e+02, 2.911664428710938e+02, 2.911454772949219e+02, 2.911070861816406e+02, 2.912079467773438e+02, 2.913372802734375e+02, 2.914877014160156e+02, 2.916161499023438e+02, 2.916690063476562e+02, 2.91697509765625e+02, 2.91689697265625e+02, 2.916580505371094e+02, 2.916180725097656e+02, 2.915624389648438e+02, 2.91483154296875e+02, 2.913641357421875e+02, 2.911656188964844e+02, 2.9130126953125e+02, 2.913143920898438e+02, 2.913010559082031e+02, 2.912815551757812e+02, 2.91219970703125e+02, 2.910363159179688e+02, 2.911883544921875e+02, 2.911993408203125e+02, 2.911863403320312e+02, 2.911755981445312e+02, 2.911855163574219e+02, 2.912003784179688e+02, 2.912164611816406e+02, 2.912332153320312e+02, 2.912528686523438e+02, 2.912756958007812e+02, 2.912992248535156e+02, 2.913233337402344e+02, 2.913491821289062e+02, 2.913746948242188e+02, 2.913956909179688e+02, 2.914147644042969e+02, 2.915138854980469e+02, 2.917645263671875e+02, 2.919907836914062e+02, 2.920345764160156e+02, 2.922256469726562e+02, 2.922777099609375e+02, 2.923522644042969e+02, 2.924324340820312e+02, 2.926934509277344e+02, 2.929622192382812e+02, 2.931340942382812e+02, 2.932172546386719e+02, 2.932418823242188e+02, 2.932037048339844e+02, 2.931593322753906e+02, 2.931402893066406e+02, 2.931679992675781e+02, 2.932147827148438e+02, 2.932492065429688e+02, 2.932603454589844e+02, 2.931556396484375e+02, 2.932702026367188e+02, 2.932925720214844e+02, 2.93310546875e+02, 2.933189697265625e+02, 2.932745361328125e+02, 2.931462707519531e+02, 2.930601196289062e+02, 2.930699462890625e+02, 2.930755004882812e+02, 2.930638427734375e+02, 2.930580444335938e+02, 2.930455932617188e+02, 2.928291015625e+02, 2.929667358398438e+02, 2.930530395507812e+02, 2.930663146972656e+02, 2.930515747070312e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.067190856933594e+02, 3.138328247070312e+02, 3.190207214355469e+02, 3.223509826660156e+02, 3.2278076171875e+02, 3.2284033203125e+02, 3.228128662109375e+02, 3.227958679199219e+02, 3.227933959960938e+02, 3.22793701171875e+02, 3.227633361816406e+02, 3.225955505371094e+02, 3.2242041015625e+02, 3.222750854492188e+02, 3.2214697265625e+02, 3.221618957519531e+02, 3.221405334472656e+02, 3.218644104003906e+02, 3.198363037109375e+02, 3.219906921386719e+02, 3.219906005859375e+02, 3.216273803710938e+02, 3.213356018066406e+02, 3.212225646972656e+02, 3.211240539550781e+02, 3.209391174316406e+02, 3.207253112792969e+02, 3.205956420898438e+02, 3.205197143554688e+02, 3.201500549316406e+02, 3.195299987792969e+02, 3.193894653320312e+02, 3.194065551757812e+02, 3.194601135253906e+02, 3.195130004882812e+02, 3.195503540039062e+02, 3.195697326660156e+02, 3.197195739746094e+02, 3.211796264648438e+02, 3.202313537597656e+02, 3.204887390136719e+02, 3.20573974609375e+02, 3.206517944335938e+02, 3.207088012695312e+02, 3.207634887695312e+02, 3.205811462402344e+02, 3.210638122558594e+02, 3.208883666992188e+02, 3.207680053710938e+02, 3.206976318359375e+02, 3.206745300292969e+02, 3.206872253417969e+02, 3.2073681640625e+02, 3.208558349609375e+02, 3.21052978515625e+02, 3.212583618164062e+02, 3.214613342285156e+02, 3.216631469726562e+02, 3.218318176269531e+02, 3.218687438964844e+02, 3.218353576660156e+02, 3.217738342285156e+02, 3.217394409179688e+02, 3.217548522949219e+02, 3.217282104492188e+02, 3.270895690917969e+02, 3.21640869140625e+02, 3.216405639648438e+02, 3.215598754882812e+02, 3.214425354003906e+02, 3.213256225585938e+02, 3.2119091796875e+02, 3.210208740234375e+02, 3.206952209472656e+02, 3.203052062988281e+02, 3.201177978515625e+02, 3.201365661621094e+02, 3.204851989746094e+02, 3.209706115722656e+02, 3.210163269042969e+02, 3.209450988769531e+02, 3.208228454589844e+02, 3.206832580566406e+02, 3.208902893066406e+02, 3.21043701171875e+02, 3.225704040527344e+02, 3.232087707519531e+02, 3.236398620605469e+02, 3.238975219726562e+02, 3.241315307617188e+02, 3.24380126953125e+02, 3.246476440429688e+02, 3.250171813964844e+02, 3.253398742675781e+02, 3.237444458007812e+02, 3.235268249511719e+02, 3.250863342285156e+02, 3.258583374023438e+02, 3.261601257324219e+02, 3.263542175292969e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.881623229980469e+02, 2.886522827148438e+02, 2.890498962402344e+02, 2.893401184082031e+02, 2.893844604492188e+02, 2.893146667480469e+02, 2.89257568359375e+02, 2.892537536621094e+02, 2.892686157226562e+02, 2.89286376953125e+02, 2.893094482421875e+02, 2.893435363769531e+02, 2.8947119140625e+02, 2.897763671875e+02, 2.900623474121094e+02, 2.902571716308594e+02, 2.904570617675781e+02, 2.906245422363281e+02, 2.905650329589844e+02, 2.908228759765625e+02, 2.909657897949219e+02, 2.910596313476562e+02, 2.911365051269531e+02, 2.911366577148438e+02, 2.911399536132812e+02, 2.911193542480469e+02, 2.910812683105469e+02, 2.911824035644531e+02, 2.913121643066406e+02, 2.914630737304688e+02, 2.915912475585938e+02, 2.916437377929688e+02, 2.916729431152344e+02, 2.916658935546875e+02, 2.916348876953125e+02, 2.915953979492188e+02, 2.915401611328125e+02, 2.914611511230469e+02, 2.91342041015625e+02, 2.911991577148438e+02, 2.912831420898438e+02, 2.912908325195312e+02, 2.912793273925781e+02, 2.912608337402344e+02, 2.911997375488281e+02, 2.909762573242188e+02, 2.911622009277344e+02, 2.911791076660156e+02, 2.91165771484375e+02, 2.911548767089844e+02, 2.911650390625e+02, 2.911802673339844e+02, 2.911967468261719e+02, 2.912139587402344e+02, 2.912341613769531e+02, 2.912574157714844e+02, 2.912812805175781e+02, 2.913056640625e+02, 2.913317565917969e+02, 2.913572387695312e+02, 2.913780822753906e+02, 2.913971557617188e+02, 2.91496337890625e+02, 2.917472839355469e+02, 2.919737548828125e+02, 2.919759521484375e+02, 2.921672973632812e+02, 2.922669982910156e+02, 2.923392028808594e+02, 2.924161376953125e+02, 2.926760559082031e+02, 2.92945068359375e+02, 2.931174011230469e+02, 2.932029113769531e+02, 2.932286376953125e+02, 2.931916809082031e+02, 2.931488647460938e+02, 2.931312561035156e+02, 2.931608276367188e+02, 2.932094116210938e+02, 2.932447509765625e+02, 2.932568054199219e+02, 2.932522277832031e+02, 2.932520751953125e+02, 2.931456298828125e+02, 2.933207092285156e+02, 2.933397216796875e+02, 2.93287109375e+02, 2.931547546386719e+02, 2.930667419433594e+02, 2.930760498046875e+02, 2.930812377929688e+02, 2.930694885253906e+02, 2.930634460449219e+02, 2.93052490234375e+02, 2.928908996582031e+02, 2.929614562988281e+02, 2.930530395507812e+02, 2.930677795410156e+02, 2.930516662597656e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[4.20362353515625e+03, 4.471041015625e+03, 4.8656279296875e+03, 5.1317470703125e+03, 3.66726953125e+03, 3.554647216796875e+03, 3.63292529296875e+03, 3.612768798828125e+03, 3.613466796875e+03, 3.615587158203125e+03, 3.6168447265625e+03, 3.589029052734375e+03, 3.492984619140625e+03, 3.4368955078125e+03, 3.364574951171875e+03, 3.305790771484375e+03, 3.32875341796875e+03, 3.274327880859375e+03, 3.123950439453125e+03, 5.43733740234375e+03, 3.805542724609375e+03, 3.1820458984375e+03, 2.9939990234375e+03, 2.945677978515625e+03, 2.953679931640625e+03, 2.9236904296875e+03, 2.855977783203125e+03, 2.805833251953125e+03, 2.79747314453125e+03, 2.774238037109375e+03, 2.604395751953125e+03, 2.461748046875e+03, 2.525973876953125e+03, 2.5478330078125e+03, 2.56235595703125e+03, 2.57387255859375e+03, 2.577216064453125e+03, 2.5860615234375e+03, 2.649521240234375e+03, 2.703458740234375e+03, 3.60453125e+03, 2.860260986328125e+03, 2.814742919921875e+03, 2.826160888671875e+03, 2.840588623046875e+03, 5.04941796875e+03, 3.841994873046875e+03, 2.932055908203125e+03, 2.832521484375e+03, 2.824131591796875e+03, 2.82071923828125e+03, 2.825587158203125e+03, 2.8360830078125e+03, 2.856966796875e+03, 2.90475537109375e+03, 2.968353515625e+03, 3.019098388671875e+03, 3.068036376953125e+03, 3.117348876953125e+03, 3.14335546875e+03, 3.11711376953125e+03, 3.09155078125e+03, 3.068454833984375e+03, 3.06474609375e+03, 3.054982421875e+03, 5.0281259765625e+03, 3.545681884765625e+03, 2.93297216796875e+03, 2.9323623046875e+03, 2.915700439453125e+03, 2.867859619140625e+03, 2.81252001953125e+03, 2.748688232421875e+03, 2.68734326171875e+03, 2.561978271484375e+03, 2.4746474609375e+03, 2.481087890625e+03, 2.52918896484375e+03, 2.684466064453125e+03, 2.7670146484375e+03, 2.67824658203125e+03, 2.63465771484375e+03, 2.581458251953125e+03, 3.455398681640625e+03, 2.73942041015625e+03, 2.86749462890625e+03, 3.035372314453125e+03, 3.197258056640625e+03, 3.218165771484375e+03, 3.267986328125e+03, 3.372123046875e+03, 3.46858349609375e+03, 3.578837158203125e+03, 3.75639208984375e+03, 3.85304833984375e+03, 4.97951513671875e+03, 3.890537353515625e+03, 4.39893115234375e+03, 4.41379638671875e+03, 4.4021328125e+03, 4.1694306640625e+03] +electricalGrid.PElecLoa=[3.82532568359375e+03, 3.826142578125e+03, 4.20966552734375e+03, 4.65235888671875e+03, 4.44359326171875e+03, 3.539393798828125e+03, 3.493361328125e+03, 3.46986376953125e+03, 3.478361572265625e+03, 3.483087158203125e+03, 3.484661376953125e+03, 3.45650927734375e+03, 3.366485107421875e+03, 3.3214560546875e+03, 3.255689208984375e+03, 3.19767578125e+03, 3.226459228515625e+03, 3.159180908203125e+03, 2.995813720703125e+03, 4.73555517578125e+03, 3.501813720703125e+03, 3.0353037109375e+03, 2.87532958984375e+03, 2.8400029296875e+03, 2.854640380859375e+03, 2.82674072265625e+03, 2.7628896484375e+03, 2.716878173828125e+03, 2.7138330078125e+03, 2.688160400390625e+03, 2.48293115234375e+03, 2.338884765625e+03, 2.41895361328125e+03, 2.448953125e+03, 2.465373046875e+03, 2.477423828125e+03, 2.47965966796875e+03, 2.48984033203125e+03, 2.566110107421875e+03, 4.93324462890625e+03, 3.2083720703125e+03, 2.744084716796875e+03, 2.740891357421875e+03, 2.75140234375e+03, 2.761694580078125e+03, 2.776799560546875e+03, 4.08918896484375e+03, 2.8866083984375e+03, 2.7452177734375e+03, 2.7375625e+03, 2.738056640625e+03, 2.74577783203125e+03, 2.75683837890625e+03, 2.777073974609375e+03, 2.822790771484375e+03, 2.88044287109375e+03, 2.92306298828125e+03, 2.9636865234375e+03, 3.004637939453125e+03, 3.021913330078125e+03, 2.9909521484375e+03, 2.965403076171875e+03, 2.944468017578125e+03, 2.943299072265625e+03, 2.93300634765625e+03, 2.87982470703125e+03, 1.160069580078125e+03, 3.1411171875e+03, 2.83345166015625e+03, 2.78646484375e+03, 2.745659912109375e+03, 2.69314501953125e+03, 2.617955322265625e+03, 2.54575048828125e+03, 2.410182373046875e+03, 2.330153564453125e+03, 2.346685302734375e+03, 2.400966796875e+03, 2.581308837890625e+03, 2.66760302734375e+03, 2.545672607421875e+03, 2.4906845703125e+03, 2.4348798828125e+03, 2.40866748046875e+03, 2.550229736328125e+03, 4.36833154296875e+03, 3.08859130859375e+03, 3.020593505859375e+03, 3.019509033203125e+03, 3.0655087890625e+03, 3.1611064453125e+03, 3.246380615234375e+03, 3.3433623046875e+03, 3.501310302734375e+03, 3.570709228515625e+03, 4.61462060546875e+03, 3.206380615234375e+03, 4.134015625e+03, 4.032341552734375e+03, 3.969811279296875e+03, 4.00540478515625e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt index eb0d6fb5..a583e52e 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HeatPumpAndBoiler_Serial.txt @@ -1,20 +1,19 @@ -last-generated=2024-07-16 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0", "nonlinear": "0, 0, 5, 7, 2, 0, 0, 1, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "2, 6, 1, 0, 1, 0, 1, 0, 1, 1, 1", - "number of continuous time states": "78", + "number of continuous time states": "74", "numerical Jacobians": "0" } time=[0e+00, 1.728e+05] weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.090508728027344e+02, 3.168974304199219e+02, 3.218009338378906e+02, 3.226180114746094e+02, 3.226542663574219e+02, 3.227795715332031e+02, 3.227996520996094e+02, 3.227951354980469e+02, 3.227938537597656e+02, 3.227938232421875e+02, 3.227648620605469e+02, 3.226026611328125e+02, 3.224290466308594e+02, 3.22282958984375e+02, 3.221512451171875e+02, 3.221631469726562e+02, 3.221392822265625e+02, 3.218690185546875e+02, 3.205345153808594e+02, 3.220065002441406e+02, 3.219710083007812e+02, 3.216293640136719e+02, 3.213449401855469e+02, 3.212284851074219e+02, 3.211282348632812e+02, 3.209452819824219e+02, 3.207310791015625e+02, 3.206003112792969e+02, 3.205214233398438e+02, 3.201488952636719e+02, 3.195387878417969e+02, 3.193987121582031e+02, 3.19409912109375e+02, 3.194602355957031e+02, 3.1951220703125e+02, 3.195492553710938e+02, 3.195695495605469e+02, 3.197198181152344e+02, 3.193108215332031e+02, 3.203279724121094e+02, 3.2042041015625e+02, 3.205465698242188e+02, 3.20644287109375e+02, 3.207062377929688e+02, 3.178678588867188e+02, 3.207847595214844e+02, 3.210452270507812e+02, 3.208774719238281e+02, 3.20767578125e+02, 3.206996154785156e+02, 3.206760559082031e+02, 3.206878051757812e+02, 3.207355346679688e+02, 3.208520202636719e+02, 3.210463256835938e+02, 3.212506408691406e+02, 3.214534606933594e+02, 3.216553039550781e+02, 3.21824951171875e+02, 3.218657836914062e+02, 3.218356323242188e+02, 3.217757568359375e+02, 3.217410278320312e+02, 3.217547912597656e+02, 3.193630981445312e+02, 3.216272277832031e+02, 3.216119689941406e+02, 3.215552673339844e+02, 3.215349731445312e+02, 3.21441650390625e+02, 3.213280029296875e+02, 3.211915283203125e+02, 3.210218505859375e+02, 3.206973876953125e+02, 3.203120727539062e+02, 3.201247863769531e+02, 3.201398620605469e+02, 3.204859008789062e+02, 3.209616088867188e+02, 3.210061950683594e+02, 3.209412841796875e+02, 3.208226623535156e+02, 3.205408325195312e+02, 3.2108740234375e+02, 3.216339721679688e+02, 3.223217468261719e+02, 3.230791625976562e+02, 3.235968933105469e+02, 3.238829956054688e+02, 3.241204528808594e+02, 3.243670959472656e+02, 3.246331176757812e+02, 3.249978942871094e+02, 3.253218078613281e+02, 3.302505798339844e+02, 3.254320373535156e+02, 3.2572900390625e+02, 3.259380798339844e+02, 3.261297912597656e+02, 3.263216552734375e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.882765197753906e+02, 2.888967895507812e+02, 2.893229370117188e+02, 2.894674682617188e+02, 2.8940576171875e+02, 2.893282775878906e+02, 2.892740478515625e+02, 2.892709655761719e+02, 2.8928515625e+02, 2.89302001953125e+02, 2.893242797851562e+02, 2.893581848144531e+02, 2.894856567382812e+02, 2.897902526855469e+02, 2.900755310058594e+02, 2.902693786621094e+02, 2.904683837890625e+02, 2.906358032226562e+02, 2.905771179199219e+02, 2.908416442871094e+02, 2.90974365234375e+02, 2.910688781738281e+02, 2.911464233398438e+02, 2.911459655761719e+02, 2.911483154296875e+02, 2.911272583007812e+02, 2.910887756347656e+02, 2.911893310546875e+02, 2.913182983398438e+02, 2.9146875e+02, 2.915975646972656e+02, 2.9164990234375e+02, 2.916778869628906e+02, 2.916697387695312e+02, 2.916380004882812e+02, 2.91597900390625e+02, 2.915421752929688e+02, 2.914626159667969e+02, 2.912135620117188e+02, 2.912495422363281e+02, 2.912802429199219e+02, 2.912862854003906e+02, 2.912767639160156e+02, 2.912586364746094e+02, 2.91197265625e+02, 2.910092163085938e+02, 2.911621704101562e+02, 2.911753234863281e+02, 2.911625671386719e+02, 2.911516418457031e+02, 2.911613464355469e+02, 2.91176025390625e+02, 2.911918640136719e+02, 2.912083129882812e+02, 2.912275695800781e+02, 2.912500915527344e+02, 2.912733764648438e+02, 2.912972106933594e+02, 2.913227844238281e+02, 2.913482360839844e+02, 2.913691711425781e+02, 2.913881530761719e+02, 2.91487060546875e+02, 2.917374267578125e+02, 2.919635009765625e+02, 2.920018005371094e+02, 2.921956481933594e+02, 2.922493286132812e+02, 2.923238525390625e+02, 2.924040222167969e+02, 2.926649169921875e+02, 2.929338684082031e+02, 2.931059265136719e+02, 2.931929626464844e+02, 2.932201843261719e+02, 2.931842041015625e+02, 2.931413879394531e+02, 2.931234436035156e+02, 2.931525268554688e+02, 2.932017517089844e+02, 2.932388305664062e+02, 2.932525329589844e+02, 2.931435241699219e+02, 2.932637329101562e+02, 2.932911682128906e+02, 2.933125305175781e+02, 2.933241577148438e+02, 2.932826843261719e+02, 2.931548461914062e+02, 2.930671691894531e+02, 2.93075927734375e+02, 2.930807800292969e+02, 2.930682678222656e+02, 2.930616455078125e+02, 2.930476989746094e+02, 2.930121459960938e+02, 2.9304931640625e+02, 2.930618286132812e+02, 2.93052490234375e+02, 2.930416564941406e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.068103637695312e+02, 3.138709106445312e+02, 3.190361022949219e+02, 3.223576354980469e+02, 3.227802429199219e+02, 3.228422546386719e+02, 3.228136596679688e+02, 3.227960815429688e+02, 3.227933959960938e+02, 3.227936706542969e+02, 3.227633056640625e+02, 3.225953979492188e+02, 3.224205017089844e+02, 3.222749938964844e+02, 3.221467590332031e+02, 3.221619873046875e+02, 3.221404113769531e+02, 3.218638305664062e+02, 3.209732666015625e+02, 3.21997314453125e+02, 3.21954833984375e+02, 3.216163940429688e+02, 3.213341674804688e+02, 3.212227172851562e+02, 3.211240539550781e+02, 3.209390258789062e+02, 3.207253112792969e+02, 3.205956726074219e+02, 3.205196228027344e+02, 3.201495666503906e+02, 3.195297241210938e+02, 3.193900451660156e+02, 3.194064636230469e+02, 3.194599609375e+02, 3.19512939453125e+02, 3.195503540039062e+02, 3.195697021484375e+02, 3.197197265625e+02, 3.188635864257812e+02, 3.203229675292969e+02, 3.204380798339844e+02, 3.205548095703125e+02, 3.206483459472656e+02, 3.207087097167969e+02, 3.207167663574219e+02, 3.205763549804688e+02, 3.210545349121094e+02, 3.208888244628906e+02, 3.2076904296875e+02, 3.206979370117188e+02, 3.206745300292969e+02, 3.206871948242188e+02, 3.207367858886719e+02, 3.208558349609375e+02, 3.21052978515625e+02, 3.212583312988281e+02, 3.214613342285156e+02, 3.216631469726562e+02, 3.218318176269531e+02, 3.218686828613281e+02, 3.218353881835938e+02, 3.217738342285156e+02, 3.217394714355469e+02, 3.217548217773438e+02, 3.217281494140625e+02, 3.199852905273438e+02, 3.216405029296875e+02, 3.216261291503906e+02, 3.2155615234375e+02, 3.21442138671875e+02, 3.213256530761719e+02, 3.211908874511719e+02, 3.210209350585938e+02, 3.206936340332031e+02, 3.20303955078125e+02, 3.201171875e+02, 3.201360473632812e+02, 3.204847412109375e+02, 3.209695129394531e+02, 3.210146179199219e+02, 3.20944091796875e+02, 3.208223266601562e+02, 3.206826782226562e+02, 3.208893432617188e+02, 3.213405456542969e+02, 3.225439453125e+02, 3.231879272460938e+02, 3.236351623535156e+02, 3.238990173339844e+02, 3.241329040527344e+02, 3.243807373046875e+02, 3.246482543945312e+02, 3.250181884765625e+02, 3.253407897949219e+02, 3.28666259765625e+02, 3.25479248046875e+02, 3.25759765625e+02, 3.259594421386719e+02, 3.261473999023438e+02, 3.263395690917969e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.881550598144531e+02, 2.88640380859375e+02, 2.890352478027344e+02, 2.8932470703125e+02, 2.893709411621094e+02, 2.893020935058594e+02, 2.892448120117188e+02, 2.892405700683594e+02, 2.892550048828125e+02, 2.892723388671875e+02, 2.892950439453125e+02, 2.893289489746094e+02, 2.894563598632812e+02, 2.897611083984375e+02, 2.900467529296875e+02, 2.902410278320312e+02, 2.904404602050781e+02, 2.906078491210938e+02, 2.90537841796875e+02, 2.908217468261719e+02, 2.909447937011719e+02, 2.910397644042969e+02, 2.911178894042969e+02, 2.911180419921875e+02, 2.911211547851562e+02, 2.911005249023438e+02, 2.910624389648438e+02, 2.911632080078125e+02, 2.912925109863281e+02, 2.914434509277344e+02, 2.915719909667969e+02, 2.916239929199219e+02, 2.91652587890625e+02, 2.916452331542969e+02, 2.916140747070312e+02, 2.915744934082031e+02, 2.915191955566406e+02, 2.914398498535156e+02, 2.91171630859375e+02, 2.91218994140625e+02, 2.912582397460938e+02, 2.912647399902344e+02, 2.912550048828125e+02, 2.912369079589844e+02, 2.911759033203125e+02, 2.909466857910156e+02, 2.911340637207031e+02, 2.9115380859375e+02, 2.91140869140625e+02, 2.911297607421875e+02, 2.911396484375e+02, 2.911546630859375e+02, 2.911708679199219e+02, 2.911877746582031e+02, 2.912075805664062e+02, 2.912305297851562e+02, 2.912540893554688e+02, 2.912781982421875e+02, 2.913040466308594e+02, 2.913294372558594e+02, 2.913502502441406e+02, 2.913692016601562e+02, 2.914682006835938e+02, 2.917188415527344e+02, 2.919451293945312e+02, 2.918921508789062e+02, 2.921430053710938e+02, 2.922355651855469e+02, 2.9230859375e+02, 2.923861389160156e+02, 2.926461791992188e+02, 2.929154052734375e+02, 2.930876770019531e+02, 2.931768493652344e+02, 2.932052001953125e+02, 2.931704711914062e+02, 2.931292114257812e+02, 2.931127014160156e+02, 2.931436157226562e+02, 2.931947326660156e+02, 2.932328491210938e+02, 2.932476196289062e+02, 2.932454528808594e+02, 2.93247314453125e+02, 2.931567993164062e+02, 2.933235778808594e+02, 2.933419189453125e+02, 2.932942504882812e+02, 2.931632385253906e+02, 2.930738830566406e+02, 2.930821838378906e+02, 2.930867614746094e+02, 2.930742492675781e+02, 2.930674133300781e+02, 2.9305517578125e+02, 2.930155029296875e+02, 2.930549011230469e+02, 2.930659790039062e+02, 2.930558776855469e+02, 2.930433654785156e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[4.20362744140625e+03, 4.471044921875e+03, 4.847501953125e+03, 5.1149931640625e+03, 3.635391845703125e+03, 3.51963818359375e+03, 3.5938310546875e+03, 3.57422607421875e+03, 3.5748837890625e+03, 3.5770205078125e+03, 3.57833642578125e+03, 3.55071142578125e+03, 3.456280517578125e+03, 3.4007021484375e+03, 3.329689208984375e+03, 3.27506103515625e+03, 3.297648681640625e+03, 3.24374560546875e+03, 3.09551611328125e+03, 5.07856494140625e+03, 3.4672451171875e+03, 3.12650048828125e+03, 2.9718974609375e+03, 2.9219130859375e+03, 2.9275986328125e+03, 2.8975439453125e+03, 2.830757080078125e+03, 2.783749755859375e+03, 2.775597412109375e+03, 2.75258984375e+03, 2.584221923828125e+03, 2.443223388671875e+03, 2.505903564453125e+03, 2.528210693359375e+03, 2.542896240234375e+03, 2.554392578125e+03, 2.557683349609375e+03, 2.566595458984375e+03, 2.62937109375e+03, 4.09356982421875e+03, 2.8847431640625e+03, 2.76443310546875e+03, 2.798231201171875e+03, 2.8086337890625e+03, 2.8180322265625e+03, 4.94146728515625e+03, 3.783546630859375e+03, 2.914451416015625e+03, 2.8114609375e+03, 2.802537841796875e+03, 2.7992919921875e+03, 2.80368310546875e+03, 2.812370361328125e+03, 2.83279736328125e+03, 2.880218017578125e+03, 2.943169921875e+03, 2.99352978515625e+03, 3.042e+03, 3.090807373046875e+03, 3.11639501953125e+03, 3.090547607421875e+03, 3.065083251953125e+03, 3.042174072265625e+03, 3.0384892578125e+03, 3.028966552734375e+03, 5.082373046875e+03, 3.5092119140625e+03, 2.91586279296875e+03, 2.9093857421875e+03, 2.8914873046875e+03, 2.84425e+03, 2.79168603515625e+03, 2.728918212890625e+03, 2.66798828125e+03, 2.54740625e+03, 2.463005126953125e+03, 2.47034521484375e+03, 2.51910205078125e+03, 2.674340576171875e+03, 2.757969482421875e+03, 2.67311083984375e+03, 2.631214599609375e+03, 2.579774169921875e+03, 3.428507568359375e+03, 2.74894189453125e+03, 2.87448779296875e+03, 3.043897705078125e+03, 3.208783935546875e+03, 3.23142431640625e+03, 3.275771240234375e+03, 3.375390869140625e+03, 3.470294921875e+03, 3.5785654296875e+03, 3.7526376953125e+03, 3.846533935546875e+03, 5.098025390625e+03, 4.193751953125e+03, 4.09529638671875e+03, 4.17628271484375e+03, 4.27993359375e+03, 4.393884765625e+03] +electricalGrid.PElecLoa=[3.82532958984375e+03, 3.826146240234375e+03, 4.18593212890625e+03, 4.6229580078125e+03, 4.39715478515625e+03, 3.51555224609375e+03, 3.463154296875e+03, 3.438323974609375e+03, 3.446498779296875e+03, 3.451360595703125e+03, 3.45307373046875e+03, 3.425033447265625e+03, 3.336207763671875e+03, 3.291246826171875e+03, 3.226241455078125e+03, 3.1693759765625e+03, 3.197504150390625e+03, 3.1309091796875e+03, 2.97119482421875e+03, 4.71289453125e+03, 3.31661328125e+03, 3.001606689453125e+03, 2.856328369140625e+03, 2.818398681640625e+03, 2.83118212890625e+03, 2.80345556640625e+03, 2.740403564453125e+03, 2.69470849609375e+03, 2.691571044921875e+03, 2.666220947265625e+03, 2.463087646484375e+03, 2.321734619140625e+03, 2.398639892578125e+03, 2.429097900390625e+03, 2.44580322265625e+03, 2.457864013671875e+03, 2.46005859375e+03, 2.470333984375e+03, 2.54564013671875e+03, 4.66569970703125e+03, 2.880201171875e+03, 2.695623291015625e+03, 2.724186279296875e+03, 2.73274072265625e+03, 2.74080615234375e+03, 3.846961669921875e+03, 4.02558203125e+03, 2.874393310546875e+03, 2.727193603515625e+03, 2.716241943359375e+03, 2.7164716796875e+03, 2.724263427734375e+03, 2.735376708984375e+03, 2.75557568359375e+03, 2.801004150390625e+03, 2.858177734375e+03, 2.900655517578125e+03, 2.9410244140625e+03, 2.98167236328125e+03, 2.998714111328125e+03, 2.968236572265625e+03, 2.942735595703125e+03, 2.92191943359375e+03, 2.9207109375e+03, 2.910650146484375e+03, 2.858029541015625e+03, 4.7373017578125e+03, 3.05476904296875e+03, 2.81187841796875e+03, 2.76784228515625e+03, 2.726026611328125e+03, 2.67344384765625e+03, 2.599026611328125e+03, 2.52729443359375e+03, 2.397328857421875e+03, 2.320510498046875e+03, 2.33784765625e+03, 2.392708251953125e+03, 2.57394091796875e+03, 2.6620283203125e+03, 2.545906494140625e+03, 2.49323486328125e+03, 2.436701171875e+03, 2.41201904296875e+03, 2.55723193359375e+03, 3.935120361328125e+03, 3.04878857421875e+03, 3.040007080078125e+03, 3.041278076171875e+03, 3.0795380859375e+03, 3.17269384765625e+03, 3.2565830078125e+03, 3.35141064453125e+03, 3.50522119140625e+03, 3.57186279296875e+03, 4.95726953125e+03, 3.915113037109375e+03, 3.7488251953125e+03, 3.796665771484375e+03, 3.873137939453125e+03, 3.959239990234375e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HighOrderModel_BES_HOM.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HighOrderModel_BES_HOM.txt index e3e1d11c..c199d1ae 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HighOrderModel_BES_HOM.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_HighOrderModel_BES_HOM.txt @@ -1,21 +1,20 @@ -last-generated=2024-06-28 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "5, 5, 5, 5, 5, 5, 5, 2, 5, 5, 2, 0, 0, 8, 7, 8, 7, 8, 9, 8, 9, 8, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 28, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "2, 8, 7, 8, 7, 8, 9, 8, 9, 8, 9, 10, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1", - "number of continuous time states": "377", + "number of continuous time states": "373", "numerical Jacobians": "0" } time=[0e+00, 1.728e+05] weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.093565368652344e+02, 3.229222106933594e+02, 3.234674377441406e+02, 3.236371459960938e+02, 3.238032531738281e+02, 3.239726867675781e+02, 3.240011291503906e+02, 3.239976501464844e+02, 3.239949645996094e+02, 3.239938354492188e+02, 3.239693298339844e+02, 3.238400573730469e+02, 3.237039184570312e+02, 3.235838012695312e+02, 3.235336608886719e+02, 3.235342102050781e+02, 3.234913940429688e+02, 3.22888671875e+02, 3.230000305175781e+02, 3.226450500488281e+02, 3.227793579101562e+02, 3.230761413574219e+02, 3.228890686035156e+02, 3.227847595214844e+02, 3.226984558105469e+02, 3.225520629882812e+02, 3.2303466796875e+02, 3.217946472167969e+02, 3.225873107910156e+02, 3.220470275878906e+02, 3.214743041992188e+02, 3.213490600585938e+02, 3.213561401367188e+02, 3.213902282714844e+02, 3.214331970214844e+02, 3.214884948730469e+02, 3.215110168457031e+02, 3.216861267089844e+02, 3.218431091308594e+02, 3.218229370117188e+02, 3.212530517578125e+02, 3.218063354492188e+02, 3.223728637695312e+02, 3.224020385742188e+02, 3.22428466796875e+02, 3.189721374511719e+02, 3.229010620117188e+02, 3.2266015625e+02, 3.224547729492188e+02, 3.223721313476562e+02, 3.223501586914062e+02, 3.223600769042969e+02, 3.223989868164062e+02, 3.224917297363281e+02, 3.226437683105469e+02, 3.228016052246094e+02, 3.229577331542969e+02, 3.231136779785156e+02, 3.232434692382812e+02, 3.232711791992188e+02, 3.232455444335938e+02, 3.231978759765625e+02, 3.231702575683594e+02, 3.231766662597656e+02, 3.232014770507812e+02, 3.231207275390625e+02, 3.226885681152344e+02, 3.227188415527344e+02, 3.22807861328125e+02, 3.221397399902344e+02, 3.224505615234375e+02, 3.228079833984375e+02, 3.227198181152344e+02, 3.224737854003906e+02, 3.261825561523438e+02, 3.223711853027344e+02, 3.221650390625e+02, 3.222274169921875e+02, 3.225570678710938e+02, 3.226227416992188e+02, 3.225663146972656e+02, 3.224550170898438e+02, 3.22339111328125e+02, 3.2243994140625e+02, 3.230191040039062e+02, 3.237958679199219e+02, 3.242962951660156e+02, 3.245877685546875e+02, 3.250166625976562e+02, 3.248580322265625e+02, 3.2469775390625e+02, 3.251273193359375e+02, 3.258812866210938e+02, 3.260281066894531e+02, 3.109534301757812e+02, 3.322037963867188e+02, 3.264500732421875e+02, 3.268112487792969e+02, 3.267018127441406e+02, 3.267722473144531e+02] -hydraulic.control.buiMeaBus.TZoneMea[1]=[2.951099853515625e+02, 2.894295349121094e+02, 2.91299560546875e+02, 2.9169189453125e+02, 2.918677673339844e+02, 2.919853820800781e+02, 2.920858459472656e+02, 2.921773071289062e+02, 2.922559509277344e+02, 2.923292236328125e+02, 2.923995056152344e+02, 2.924682922363281e+02, 2.925339660644531e+02, 2.925916748046875e+02, 2.926476135253906e+02, 2.927037963867188e+02, 2.927688598632812e+02, 2.928282165527344e+02, 2.816566467285156e+02, 2.889656066894531e+02, 2.922814331054688e+02, 2.926274108886719e+02, 2.928617248535156e+02, 2.93006591796875e+02, 2.930958557128906e+02, 2.931829223632812e+02, 2.93270263671875e+02, 2.932245788574219e+02, 2.92930419921875e+02, 2.933915710449219e+02, 2.934743347167969e+02, 2.934909362792969e+02, 2.9348779296875e+02, 2.934959106445312e+02, 2.935018920898438e+02, 2.935227661132812e+02, 2.947620849609375e+02, 2.949692687988281e+02, 2.950735473632812e+02, 2.828692321777344e+02, 2.934571533203125e+02, 2.952957153320312e+02, 2.955338439941406e+02, 2.956411437988281e+02, 2.954769592285156e+02, 2.954198913574219e+02, 2.940205383300781e+02, 2.939609069824219e+02, 2.941138610839844e+02, 2.941329956054688e+02, 2.94158203125e+02, 2.94190673828125e+02, 2.942267456054688e+02, 2.942644653320312e+02, 2.943032531738281e+02, 2.943448791503906e+02, 2.943892211914062e+02, 2.944338989257812e+02, 2.94478515625e+02, 2.945238037109375e+02, 2.945674133300781e+02, 2.946056213378906e+02, 2.946406860351562e+02, 2.946737060546875e+02, 2.947073669433594e+02, 2.947452087402344e+02, 2.947943420410156e+02, 2.948065795898438e+02, 2.825572814941406e+02, 2.90169952392578e+02, 2.941666564941406e+02, 2.945005798339844e+02, 2.96156005859375e+02, 2.969669494628906e+02, 2.966786804199219e+02, 2.959287719726562e+02, 2.951492919921875e+02, 2.949174194335938e+02, 2.94799560546875e+02, 2.947761840820312e+02, 2.948533020019531e+02, 2.950330505371094e+02, 2.9499072265625e+02, 2.949921264648438e+02, 2.9499072265625e+02, 2.950100708007812e+02, 2.959410400390625e+02, 2.956083984375e+02, 2.953937683105469e+02, 2.807231140136719e+02, 2.942712097167969e+02, 2.959104614257812e+02, 2.956317749023438e+02, 2.953841552734375e+02, 2.951177978515625e+02, 2.951738891601562e+02, 2.940583190917969e+02, 2.945369262695312e+02, 2.948499755859375e+02, 2.949556579589844e+02, 2.950263977050781e+02] -hydraulic.control.buiMeaBus.TZoneMea[10]=[2.951099853515625e+02, 2.901929321289062e+02, 2.917223815917969e+02, 2.921303405761719e+02, 2.924017639160156e+02, 2.926197204589844e+02, 2.928101806640625e+02, 2.929778442382812e+02, 2.931246643066406e+02, 2.932589721679688e+02, 2.933843994140625e+02, 2.935031433105469e+02, 2.936132507324219e+02, 2.937136535644531e+02, 2.938099060058594e+02, 2.934764709472656e+02, 2.93481689453125e+02, 2.93035400390625e+02, 2.922273864746094e+02, 2.934007568359375e+02, 2.837171325683594e+02, 2.895255126953125e+02, 2.928280029296875e+02, 2.931189880371094e+02, 2.933041381835938e+02, 2.93455810546875e+02, 2.935873107910156e+02, 2.936100769042969e+02, 2.934463500976562e+02, 2.938261108398438e+02, 2.946622619628906e+02, 2.947973022460938e+02, 2.9489794921875e+02, 2.949923400878906e+02, 2.943563232421875e+02, 2.943365173339844e+02, 2.959716186523438e+02, 2.961124572753906e+02, 2.93896484375e+02, 2.937648315429688e+02, 2.943712463378906e+02, 2.843280639648438e+02, 2.93404296875e+02, 2.9510791015625e+02, 2.948638916015625e+02, 2.948939208984375e+02, 2.946150512695312e+02, 2.950228576660156e+02, 2.951737365722656e+02, 2.952431640625e+02, 2.953035888671875e+02, 2.953559265136719e+02, 2.953987731933594e+02, 2.95431396484375e+02, 2.954537658691406e+02, 2.954668884277344e+02, 2.954695739746094e+02, 2.954605407714844e+02, 2.954407958984375e+02, 2.954129333496094e+02, 2.953787841796875e+02, 2.953407287597656e+02, 2.953038940429688e+02, 2.952711181640625e+02, 2.952446594238281e+02, 2.94865478515625e+02, 2.949346313476562e+02, 2.945710144042969e+02, 2.938165893554688e+02, 2.948780517578125e+02, 2.849646301269532e+02, 2.913163452148438e+02, 2.948489379882812e+02, 2.954320068359375e+02, 2.957348022460938e+02, 2.957948913574219e+02, 2.9569482421875e+02, 2.956255798339844e+02, 2.954634094238281e+02, 2.9533837890625e+02, 2.957020874023438e+02, 2.954520568847656e+02, 2.952848205566406e+02, 2.951925659179688e+02, 2.947276611328125e+02, 2.948990478515625e+02, 2.96201416015625e+02, 2.958549499511719e+02, 2.940491943359375e+02, 2.943603210449219e+02, 2.950325012207031e+02, 2.833538513183594e+02, 2.944213562011719e+02, 2.959861450195312e+02, 2.955201110839844e+02, 2.954767761230469e+02, 2.95369384765625e+02, 2.953279724121094e+02, 2.953599853515625e+02, 2.952939453125e+02, 2.952437133789062e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.072667541503906e+02, 3.250808715820312e+02, 3.234896850585938e+02, 3.236583251953125e+02, 3.238187561035156e+02, 3.239851989746094e+02, 3.240063781738281e+02, 3.23999267578125e+02, 3.2399560546875e+02, 3.239943542480469e+02, 3.239688110351562e+02, 3.238338928222656e+02, 3.23697265625e+02, 3.235791015625e+02, 3.235406799316406e+02, 3.235510559082031e+02, 3.235548400878906e+02, 3.230711364746094e+02, 3.226087951660156e+02, 3.224288635253906e+02, 3.227853393554688e+02, 3.230320739746094e+02, 3.228750610351562e+02, 3.22779296875e+02, 3.226970825195312e+02, 3.225521545410156e+02, 3.215383911132812e+02, 3.217508239746094e+02, 3.226466369628906e+02, 3.220876770019531e+02, 3.214934692382812e+02, 3.213725280761719e+02, 3.213829956054688e+02, 3.213564453125e+02, 3.214334411621094e+02, 3.216191711425781e+02, 3.215643005371094e+02, 3.221393432617188e+02, 3.2385986328125e+02, 3.249107055664062e+02, 3.256734619140625e+02, 3.136669921875e+02, 2.980110168457031e+02, 2.943018188476562e+02, 3.210562438964844e+02, 3.233512878417969e+02, 3.228172912597656e+02, 3.225499572753906e+02, 3.224156188964844e+02, 3.223587341308594e+02, 3.223418884277344e+02, 3.223540344238281e+02, 3.223954162597656e+02, 3.224916687011719e+02, 3.226490783691406e+02, 3.228504333496094e+02, 3.231283569335938e+02, 3.234848022460938e+02, 3.239256286621094e+02, 3.244651794433594e+02, 3.251148986816406e+02, 3.25882080078125e+02, 3.26771728515625e+02, 3.277869873046875e+02, 3.092381896972656e+02, 2.969613037109375e+02, 2.940529174804688e+02, 2.933639221191406e+02, 3.126178894042982e+02, 3.226390991210938e+02, 3.22850341796875e+02, 3.243639831542969e+02, 3.270285339355469e+02, 3.216866149902344e+02, 3.144607849121094e+02, 2.981985168457031e+02, 2.94345703125e+02, 2.934331665039062e+02, 2.93217041015625e+02, 2.931658935546875e+02, 2.931537780761719e+02, 2.9315087890625e+02, 2.931502075195312e+02, 2.931500549316406e+02, 2.931500244140625e+02, 3.210118713378906e+02, 3.260092468261719e+02, 3.238698120117188e+02, 3.004283752441406e+02, 2.948744201660156e+02, 2.935585632324219e+02, 2.932467956542969e+02, 2.931729431152344e+02, 2.931554260253906e+02, 3.119881896972656e+02, 3.329334716796875e+02, 3.032715454101562e+02, 2.955476989746094e+02, 2.937186584472656e+02, 2.932847595214844e+02] +hydraulic.control.buiMeaBus.TZoneMea[1]=[2.951099853515625e+02, 2.903302917480469e+02, 2.922905883789062e+02, 2.928279724121094e+02, 2.930532531738281e+02, 2.932103271484375e+02, 2.933480529785156e+02, 2.934649047851562e+02, 2.935654602050781e+02, 2.936601257324219e+02, 2.937515563964844e+02, 2.938400573730469e+02, 2.939177856445312e+02, 2.939863891601562e+02, 2.940541381835938e+02, 2.941240234375e+02, 2.942129821777344e+02, 2.943246154785156e+02, 2.921602478027344e+02, 2.922165832519531e+02, 2.942352600097656e+02, 2.944694213867188e+02, 2.946715698242188e+02, 2.948181457519531e+02, 2.949305114746094e+02, 2.950517272949219e+02, 2.951729431152344e+02, 2.951676635742188e+02, 2.948993530273438e+02, 2.95362548828125e+02, 2.954232788085938e+02, 2.953941345214844e+02, 2.953672485351562e+02, 2.953536682128906e+02, 2.953300476074219e+02, 2.953279113769531e+02, 2.963434753417969e+02, 2.960800170898438e+02, 2.957434387207031e+02, 2.944620666503906e+02, 2.956099548339844e+02, 2.957685546875e+02, 2.956017761230469e+02, 2.955575561523438e+02, 2.953965759277344e+02, 2.953301086425781e+02, 2.942118835449219e+02, 2.94780517578125e+02, 2.949506530761719e+02, 2.950457153320312e+02, 2.951056518554688e+02, 2.951434631347656e+02, 2.951670837402344e+02, 2.95181640625e+02, 2.951907348632812e+02, 2.951970520019531e+02, 2.952006225585938e+02, 2.952030944824219e+02, 2.952049255371094e+02, 2.952061462402344e+02, 2.952069396972656e+02, 2.952073974609375e+02, 2.952073669433594e+02, 2.952066650390625e+02, 2.95205322265625e+02, 2.951981811523438e+02, 2.951762084960938e+02, 2.951617126464844e+02, 2.940921936035156e+02, 2.941086730957031e+02, 2.954165649414062e+02, 2.954120178222656e+02, 2.9676171875e+02, 2.977006225585938e+02, 2.982588500976562e+02, 2.9823291015625e+02, 2.977148132324219e+02, 2.971511535644531e+02, 2.966327514648438e+02, 2.962567138671875e+02, 2.960273132324219e+02, 2.960371704101562e+02, 2.959212951660156e+02, 2.957863464355469e+02, 2.956756896972656e+02, 2.955920715332031e+02, 2.967999572753906e+02, 2.969561767578125e+02, 2.96960205078125e+02, 2.996436462402344e+02, 2.983675537109375e+02, 2.981767578125e+02, 2.982048645019531e+02, 2.9823681640625e+02, 2.981086120605469e+02, 2.980566101074219e+02, 2.969028930664062e+02, 2.9591796875e+02, 2.957627258300781e+02, 2.956781616210938e+02, 2.9562109375e+02] +hydraulic.control.buiMeaBus.TZoneMea[10]=[2.951099853515625e+02, 2.906040344238281e+02, 2.921771240234375e+02, 2.926957397460938e+02, 2.930120239257812e+02, 2.932673645019531e+02, 2.934922180175781e+02, 2.936870727539062e+02, 2.938582763671875e+02, 2.940159912109375e+02, 2.941641540527344e+02, 2.943046569824219e+02, 2.944325866699219e+02, 2.945502014160156e+02, 2.946641845703125e+02, 2.943493041992188e+02, 2.943784484863281e+02, 2.939578552246094e+02, 2.931757507324219e+02, 2.943236083984375e+02, 2.928805236816406e+02, 2.938876342773438e+02, 2.945947265625e+02, 2.947730407714844e+02, 2.94916015625e+02, 2.950536804199219e+02, 2.951828918457031e+02, 2.952168884277344e+02, 2.950637512207031e+02, 2.954273986816406e+02, 2.961410217285156e+02, 2.960992126464844e+02, 2.959711303710938e+02, 2.9578076171875e+02, 2.950840454101562e+02, 2.951023254394531e+02, 2.963798522949219e+02, 2.960513000488281e+02, 2.942509155273438e+02, 2.944673461914062e+02, 2.952041931152344e+02, 2.946491394042969e+02, 2.963575439453125e+02, 2.958172607421875e+02, 2.950289611816406e+02, 2.950619506835938e+02, 2.951310119628906e+02, 2.951766967773438e+02, 2.951746826171875e+02, 2.951693725585938e+02, 2.951672668457031e+02, 2.951663513183594e+02, 2.951659545898438e+02, 2.95165771484375e+02, 2.951657104492188e+02, 2.951658325195312e+02, 2.951658325195312e+02, 2.951658630371094e+02, 2.951659240722656e+02, 2.951659240722656e+02, 2.951658935546875e+02, 2.951658020019531e+02, 2.951656188964844e+02, 2.951653137207031e+02, 2.951648864746094e+02, 2.9485546875e+02, 2.950902099609375e+02, 2.949534606933594e+02, 2.946824340820312e+02, 2.953346557617188e+02, 2.947645874023438e+02, 2.954710083007812e+02, 2.957483520507812e+02, 2.957795104980469e+02, 2.959188232421875e+02, 2.959876403808594e+02, 2.959673461914062e+02, 2.959123229980469e+02, 2.958317565917969e+02, 2.957495727539062e+02, 2.964679870605469e+02, 2.965451354980469e+02, 2.965718383789062e+02, 2.965796813964844e+02, 2.958253173828125e+02, 2.957105712890625e+02, 2.97388916015625e+02, 2.97643310546875e+02, 2.960745849609375e+02, 2.958738098144531e+02, 2.957774963378906e+02, 2.987097778320312e+02, 2.975543823242188e+02, 2.974098205566406e+02, 2.968586120605469e+02, 2.966092834472656e+02, 2.965555419921875e+02, 2.965215759277344e+02, 2.965003967285156e+02, 2.964871520996094e+02, 2.964798278808594e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[2.467245361328125e+03, 2.62419775390625e+03, 2.044160766601562e+03, 1.862458618164062e+03, 1.838702026367188e+03, 1.851822265625e+03, 1.857337524414062e+03, 1.827200561523438e+03, 1.811484375e+03, 1.79972216796875e+03, 1.788910278320312e+03, 1.76815771484375e+03, 1.724471801757812e+03, 1.6979638671875e+03, 1.674513061523438e+03, 1.600779663085938e+03, 1.556399047851562e+03, 1.553100341796874e+03, 1.8540380859375e+03, 1.791607421875e+03, 1.559284912109375e+03, 1.853821899414062e+03, 1.66378125e+03, 1.582773193359375e+03, 1.5684794921875e+03, 1.547366577148438e+03, 1.514246459960938e+03, 3.083111083984375e+03, 2.785989746093739e+03, 1.5353740234375e+03, 1.3808515625e+03, 1.3337275390625e+03, 1.361357543945312e+03, 1.36822705078125e+03, 1.377797485351562e+03, 1.382031616210938e+03, 1.354317260742188e+03, 1.319017211914062e+03, 1.260711303710938e+03, 1.190723388671875e+03, 1.352115234375e+03, 1.30036181640625e+03, 1.728627197265625e+03, 1.42957568359375e+03, 1.374728393554688e+03, 1.361256958007812e+03, 2.9427109375e+03, 1.684033203125e+03, 1.419209350585938e+03, 1.399697875976562e+03, 1.392105102539062e+03, 1.382605224609375e+03, 1.372162841796875e+03, 1.363757568359375e+03, 1.3632041015625e+03, 1.366957885742188e+03, 1.367306762695312e+03, 1.368727294921875e+03, 1.371145263671875e+03, 1.366975952148438e+03, 1.349217651367188e+03, 1.333970703125e+03, 1.320712158203125e+03, 1.314989990234375e+03, 1.312349731445312e+03, 1.249144409179688e+03, 1.082930908203125e+03, 1.369064331054688e+03, 1.534464721679686e+03, 1.632247802734385e+03, 1.445951782226565e+03, 1.596026123046875e+03, 1.439200073242188e+03, 1.263317138671875e+03, 1.083363647460938e+03, 3.19609375e+03, 1.35132763671875e+03, 1.086228271484375e+03, 1.167404296875e+03, 1.22111474609375e+03, 1.138234985351562e+03, 1.106782592773438e+03, 1.084621215820312e+03, 1.083810668945312e+03, 1.21923193359375e+03, 1.300404296875e+03, 1.128001953125e+03, 1.106176635742188e+03, 1.199318481445312e+03, 1.02395751953125e+03, 1.416553833007812e+03, 1.524494262695312e+03, 1.681920288085938e+03, 1.325583618164062e+03, 1.264395263671875e+03, 2.559898681640625e+03, 3.16513623046875e+03, 2.1511494140625e+03, 1.448778198242188e+03, 1.4152744140625e+03, 1.431885009765625e+03] +electricalGrid.PElecLoa=[2.245217041015625e+03, 2.2456962890625e+03, 7.619947265625e+03, 1.691911987304688e+03, 1.640660888671875e+03, 1.64111962890625e+03, 1.635555908203125e+03, 1.5991767578125e+03, 1.58173779296875e+03, 1.568848510742188e+03, 1.556815673828125e+03, 1.534330688476562e+03, 1.49633447265625e+03, 1.475788208007812e+03, 1.455032470703125e+03, 1.369390747070312e+03, 1.30169384765625e+03, 1.192774658203125e+03, 1.274764526367188e+03, 1.456540649414062e+03, 1.225335083007812e+03, 1.4970029296875e+03, 1.401552978515625e+03, 1.321620239257812e+03, 1.309185913085938e+03, 1.286206909179688e+03, 1.2486279296875e+03, 2.871235595703125e+03, 2.588829345703114e+03, 1.264315673828125e+03, 1.065561401367188e+03, 9.94560302734375e+02, 9.959935913085938e+02, 9.722250366210938e+02, 1.032254150390625e+03, 1.026283081054688e+03, 8.544615478515625e+02, 7.851672973632812e+02, 7.239596557617188e+02, 7.51154052734375e+02, 7.668527221679688e+02, 7.787542114257812e+02, -6.078913192938405e-29, -3.125205016124399e-29, -1.777850246529405e-28, 1.99788037109375e+03, 7.59616748046875e+03, 8.051822509765625e+02, 7.378531494140625e+02, 7.432927856445312e+02, 7.413441772460938e+02, 7.391306762695312e+02, 7.354448852539062e+02, 7.318272705078125e+02, 7.328154907226562e+02, 7.3298876953125e+02, 7.347274780273438e+02, 7.389536743164062e+02, 7.443593139648438e+02, 7.510421142578125e+02, 7.592598266601562e+02, 7.691781005859375e+02, 7.8124609375e+02, 7.952421875e+02, 8.111819458007812e+02, -2.935998348195705e-29, -3.607786485995723e-29, -1.926516299777336e-29, -9.032677643017809e-29, 2.377418701171859e+03, 9.080133666992147e+02, 8.050654296875e+02, 7.586790161132812e+02, -6.55751280264971e-29, 2.86939404296875e+03, -5.279601785588301e-30, -8.773925193407627e-30, -7.534096506962576e-29, -7.283910984949382e-29, -1.48756647186955e-29, -2.860293352273934e-29, -1.555456254725584e-29, -1.693868551625303e-31, -1.841313610427475e-29, -5.125302447438348e-30, -2.123887375944807e-28, 2.81944580078125e+03, 7.831871337890625e+02, -2.216568722102622e-29, -1.274995997958375e-30, -1.71407569448204e-29, -1.24330068674495e-28, -3.714753989276483e-31, -1.641022764279002e-29, -4.097803851011706e-29, 2.28784619140625e+03, 3.405392578125e+03, -4.929995170715893e-29, -2.544522994343618e-29, -1.876358614104585e-29, -2.898837341839657e-30] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_BuildingsLibraryRoom.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_BuildingsLibraryRoom.txt index 35990d2f..6b76b396 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_BuildingsLibraryRoom.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_BuildingsLibraryRoom.txt @@ -1,23 +1,23 @@ -last-generated=2024-06-21 +last-generated=2024-09-02 statistics-initialization= { - "linear": "19, 0", + "linear": "19", "nonlinear": "5, 14, 2, 0, 0, 1, 1, 1, 0, 1, 1, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "2, 1, 1, 1, 1, 0, 0, 1, 1, 1", - "number of continuous time states": "131", + "number of continuous time states": "127", "numerical Jacobians": "0" } time=[0e+00, 8.64e+05] -electrical.distribution.batterySimple.PLoad=[6.044802856445312e+02, 8.892757568359375e+02, 8.9664599609375e+02, 8.604776000976562e+02, 8.548848266601562e+02, 1.029414794921875e+03, 6.085785522460938e+02, 6.916784057617189e+02, 7.640795288085938e+02, 7.903673706054688e+02, 7.882152709960938e+02, 8.889323120117188e+02, 8.504589233398438e+02, 8.460120239257812e+02, 8.09960327148437e+02, 3.00488338470459e+01, 3.00488338470459e+01, 8.015423583984375e+02, 1.001890991210938e+03, 1.094816528320312e+03, 1.282255615234375e+03, 1.17831005859375e+03, 1.2337724609375e+03, 1.03974951171875e+03, 1.217335327148438e+03, 4.68498779296875e+02, 3.00488338470459e+01, 9.836677246093715e+02, 1.0020478515625e+03, 8.608239746093776e+02, 1.11985693359375e+03, 1.0072744140625e+03, 9.556023559570312e+02, 1.084446044921875e+03, 9.596390991210938e+02, 7.33722412109375e+02, 6.536064453125e+02, 6.611700439453125e+02, 6.535509643554688e+02, 8.901640625e+02, 6.624489135742188e+02, 6.026398315429688e+02, 5.917799072265625e+02, 1.131334228515625e+03, 6.211959228515625e+02, 5.191118774414062e+02, 4.865762329101562e+02, 5.1730078125e+02, 5.531453247070312e+02, 8.979608154296875e+02, 5.827833862304688e+02, 5.160011596679688e+02, 4.954766540527344e+02, 1.140913940429688e+03, 4.457770080566403e+02, 3.868813171386715e+02, 3.582957763671875e+02, 3.925029602050779e+02, 4.160882568359376e+02, 9.24319580078125e+02, 4.039059143066406e+02, 3.732694702148438e+02, 3.902551574707031e+02, 1.16145703125e+03, 3.994608764648438e+02, 3.00488338470459e+01, 3.537293701171875e+02, 3.00488338470459e+01, 4.760809936523438e+02, 9.0335107421875e+02, 5.801935424804688e+02, 5.310357666015625e+02, 5.418681030273438e+02, 1.134277954101562e+03, 4.972531127929688e+02, 3.00488338470459e+01, 3.00488338470459e+01, 3.613734436035156e+02, 4.750429382324219e+02, 9.1172216796875e+02, 4.833560791015625e+02, 4.169056091308594e+02, 4.212202758789062e+02, 1.15972802734375e+03, 4.257053527832031e+02, 3.637772521972656e+02, 3.824314880371094e+02, 3.824936218261719e+02, 4.865457458496094e+02, 9.016998901367188e+02, 5.747334594726562e+02, 5.00464599609375e+02, 5.290575561523438e+02, 1.137313232421875e+03, 5.63051025390625e+02, 3.00488338470459e+01, 3.00488338470459e+01, 3.00488338470459e+01, 4.090643310546875e+02, 9.27930908203125e+02, 3.530197143554688e+02] +electrical.distribution.batterySimple.PLoad=[5.64611572265625e+02, 9.051380615234375e+02, 8.947080688476562e+02, 8.592804565429688e+02, 8.548998413085938e+02, 1.191422485351562e+03, 6.1983740234375e+02, 6.900806884765626e+02, 7.640772705078125e+02, 7.90469482421875e+02, 7.881476440429688e+02, 8.97326171875e+02, 8.51317138671875e+02, 8.455700073242188e+02, 8.102639160156245e+02, 3.00488338470459e+01, 3.00488338470459e+01, 8.390835571289062e+02, 1.002010986328125e+03, 1.09510888671875e+03, 1.180521240234375e+03, 1.207814086914062e+03, 1.260190673828125e+03, 9.3737158203125e+02, 1.196182861328125e+03, 4.706997680664062e+02, 3.00488338470459e+01, 1.069831787109371e+03, 1.002576293945313e+03, 7.73711730957064e+02, 1.145247802734375e+03, 1.010176147460938e+03, 9.546581420898438e+02, 9.727411499023438e+02, 9.683004150390625e+02, 7.344737548828125e+02, 6.527064208984375e+02, 6.608650512695312e+02, 6.531498413085938e+02, 7.943912963867188e+02, 6.675233764648438e+02, 6.030302734375e+02, 5.912767333984375e+02, 1.012199157714844e+03, 6.3085546875e+02, 5.1801611328125e+02, 4.857794494628906e+02, 5.172542114257812e+02, 5.53327392578125e+02, 7.991727905273438e+02, 5.8810888671875e+02, 5.160587768554688e+02, 4.948496398925781e+02, 1.018784790039062e+03, 4.542284545898432e+02, 3.858862915039059e+02, 3.50272003173828e+02, 3.922401123046873e+02, 4.159178771972657e+02, 8.202769775390625e+02, 4.114501037597656e+02, 3.726052551269531e+02, 3.897491455078125e+02, 1.023127746582031e+03, 4.02276611328125e+02, 3.3999267578125e+02, 7.968369750976562e+02, 3.357184753417969e+02, 4.736581420898438e+02, 8.035480346679688e+02, 5.883548583984375e+02, 5.302009887695312e+02, 5.408724365234375e+02, 1.012131958007812e+03, 5.102560424804688e+02, 3.00488338470459e+01, 3.00488338470459e+01, 3.596290283203125e+02, 4.755883178710938e+02, 8.101533203125e+02, 4.898810729980469e+02, 4.164240112304688e+02, 4.206164245605469e+02, 1.019543518066406e+03, 4.293371887207031e+02, 3.225684204101562e+02, 3.363426208496094e+02, 4.028641967773438e+02, 4.838838500976562e+02, 8.02249267578125e+02, 5.796614990234375e+02, 5.002283020019531e+02, 5.290010986328125e+02, 1.013906127929688e+03, 5.7679052734375e+02, 3.00488338470459e+01, 3.00488338470459e+01, 3.00488338470459e+01, 4.084521179199219e+02, 8.23151123046875e+02, 3.600413208007812e+02] electrical.distribution.batterySimple.PCharge=[0e+00, 0e+00, 0e+00, 0e+00, 6.106711196899414e+01, 1.966503143310547e+02, 1.606682739257812e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.385809631347672e+02, 6.023507690429688e+02, 1.929048767089844e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 8.724502563476562e+01, 5.237630615234375e+02, 3.925466918945312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.034864044189453e+01, 1.458991088867188e+02, 1.536140747070312e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.488282012939453e+01, 1.819532165527344e+02, 1.381690826416016e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 5.560786437988357e+01, 1.03811111450196e+02, 1.586644439697252e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.00876350402832e+02, 2.906117553710938e+02, 1.937550354003906e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.009622650146484e+02, 5.782365112304688e+02, 1.11823616027832e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 6.448879241943359e+01, 2.345380401611328e+02, 2.187659454345703e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.192265472412109e+02, 6.185657958984375e+02, 3.130384521484375e+02, 0e+00, 0e+00, 0e+00, 0e+00] -hydraulic.distribution.sigBusDistr.TStoDHWTopMea=[3.231499938964844e+02, 3.321806030273438e+02, 3.310122680664062e+02, 3.279363708496094e+02, 3.242606506347656e+02, 3.332041625976562e+02, 3.317101745605469e+02, 3.302680358886719e+02, 3.286690063476562e+02, 3.201045227050781e+02, 3.182661437988281e+02, 3.325194396972656e+02, 3.313196411132812e+02, 3.274573364257812e+02, 3.235414123535156e+02, 3.326138305664062e+02, 3.311002807617188e+02, 3.295917358398438e+02, 3.278446044921875e+02, 3.185500183105469e+02, 3.275909423828125e+02, 3.265343322753906e+02, 3.255190734863281e+02, 3.209482116699219e+02, 3.315225830078125e+02, 3.298449401855469e+02, 3.281622619628906e+02, 3.263241271972656e+02, 3.24021728515625e+02, 3.102319335937507e+02, 3.275569763183594e+02, 3.264894714355469e+02, 3.25464111328125e+02, 3.201933898925781e+02, 3.316396484375e+02, 3.300067138671875e+02, 3.283538208007812e+02, 3.265401611328125e+02, 3.242584838867188e+02, 3.106763916015625e+02, 3.276027526855469e+02, 3.265543212890625e+02, 3.255464477539062e+02, 3.21307373046875e+02, 3.315316772460938e+02, 3.298998107910156e+02, 3.282470703125e+02, 3.264328918457031e+02, 3.241502685546875e+02, 3.105906982421875e+02, 3.276061401367188e+02, 3.265634765625e+02, 3.255608520507812e+02, 3.216166687011719e+02, 3.314943542480469e+02, 3.298493957519531e+02, 3.2818701171875e+02, 3.263640747070312e+02, 3.240731201171875e+02, 3.105991516113281e+02, 3.275090026855469e+02, 3.264685974121094e+02, 3.254681396484375e+02, 3.213499450683594e+02, 3.314685974121094e+02, 3.298152770996094e+02, 3.281468811035156e+02, 3.263180236816406e+02, 3.240207824707031e+02, 3.104618530273438e+02, 3.27525390625e+02, 3.264879150390625e+02, 3.254901733398438e+02, 3.216549987792969e+02, 3.315177307128906e+02, 3.298816223144531e+02, 3.282261657714844e+02, 3.264090576171875e+02, 3.241232604980469e+02, 3.1060400390625e+02, 3.275174865722656e+02, 3.264783935546875e+02, 3.254791259765625e+02, 3.21464599609375e+02, 3.314717102050781e+02, 3.298195495605469e+02, 3.281517333984375e+02, 3.263237915039062e+02, 3.24027587890625e+02, 3.104657592773438e+02, 3.275258178710938e+02, 3.264881286621094e+02, 3.254901733398438e+02, 3.216316223144531e+02, 3.315135192871094e+02, 3.298761596679688e+02, 3.282197265625e+02, 3.264019470214844e+02, 3.241152038574219e+02, 3.106575927734375e+02, 3.275050964355469e+02] -hydraulic.distribution.sigBusDistr.TStoBufTopMea=[2.931499938964844e+02, 3.224053649902344e+02, 3.226419067382812e+02, 3.219933776855469e+02, 3.215923156738281e+02, 3.098993530273438e+02, 3.201977233886719e+02, 3.19386962890625e+02, 3.199786987304688e+02, 3.206245727539062e+02, 3.205617980957031e+02, 3.207919006347656e+02, 3.217290649414062e+02, 3.215717468261719e+02, 3.213417358398438e+02, 3.253443908691406e+02, 3.241617736816406e+02, 3.216560668945312e+02, 3.23933349609375e+02, 3.251889953613281e+02, 3.259115905761719e+02, 3.263574829101562e+02, 3.275064392089844e+02, 3.27634765625e+02, 3.26609619140625e+02, 3.228073425292969e+02, 3.259606628417969e+02, 3.221144714355469e+02, 3.240404663085938e+02, 3.245735778808594e+02, 3.242560424804688e+02, 3.238517456054688e+02, 3.232145690917969e+02, 3.231056823730469e+02, 3.220279235839844e+02, 3.206701965332031e+02, 3.196347351074219e+02, 3.187434387207031e+02, 3.18132080078125e+02, 3.172727355957031e+02, 3.172992248535156e+02, 3.173073120117188e+02, 3.170620727539062e+02, 3.169536743164062e+02, 3.171629943847656e+02, 3.168170776367188e+02, 3.163078918457031e+02, 3.160673217773438e+02, 3.160986938476562e+02, 3.159187316894531e+02, 3.159908752441406e+02, 3.15603759765625e+02, 3.151129760742188e+02, 3.146816101074219e+02, 3.138922424316406e+02, 3.133150939941406e+02, 3.134046020507812e+02, 3.133323974609375e+02, 3.132657775878906e+02, 3.126215209960938e+02, 3.127228088378906e+02, 3.123328857421875e+02, 3.126031799316406e+02, 3.129562072753906e+02, 3.133258972167969e+02, 3.170809326171875e+02, 3.122093200683594e+02, 3.12619873046875e+02, 3.142437438964844e+02, 3.150671691894531e+02, 3.162240295410156e+02, 3.159438781738281e+02, 3.162582397460938e+02, 3.161415405273438e+02, 3.160589294433594e+02, 3.1952587890625e+02, 3.185284118652344e+02, 3.140101318359375e+02, 3.142713623046875e+02, 3.139544067382812e+02, 3.140323181152344e+02, 3.135901184082031e+02, 3.134112548828125e+02, 3.130463256835938e+02, 3.133781433105469e+02, 3.139706420898438e+02, 3.169993286132812e+02, 3.170580444335938e+02, 3.148161010742188e+02, 3.153633728027344e+02, 3.156551513671875e+02, 3.152135925292969e+02, 3.155143127441406e+02, 3.1553515625e+02, 3.164063110351562e+02, 3.205731201171875e+02, 3.195676574707031e+02, 3.156025390625e+02, 3.13596435546875e+02, 3.123902282714844e+02, 3.117051696777344e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.225759582519531e+02, 3.227876586914062e+02, 3.2213134765625e+02, 3.217643737792969e+02, 3.107992858886719e+02, 3.201800231933594e+02, 3.194795227050781e+02, 3.201288757324219e+02, 3.207632751464844e+02, 3.206962585449219e+02, 3.211070861816406e+02, 3.218797912597656e+02, 3.217146301269531e+02, 3.214692077636719e+02, 3.260723571777344e+02, 3.260723571777344e+02, 3.218011474609375e+02, 3.241205749511719e+02, 3.253845520019531e+02, 3.263778381347656e+02, 3.2658544921875e+02, 3.277009887695312e+02, 3.132234497070312e+02, 3.268699035644531e+02, 3.227413024902344e+02, 3.270084533691406e+02, 3.224407348632812e+02, 3.242205810546875e+02, 3.028873291015626e+02, 3.246400146484375e+02, 3.240556640625e+02, 3.233908386230469e+02, 3.136994018554688e+02, 3.223617248535156e+02, 3.207471618652344e+02, 3.196768188476562e+02, 3.1882373046875e+02, 3.182318420410156e+02, 3.041296997070312e+02, 3.174976501464844e+02, 3.173958129882812e+02, 3.171487426757812e+02, 3.1445947265625e+02, 3.172882690429688e+02, 3.168561096191406e+02, 3.163453369140625e+02, 3.161316528320312e+02, 3.161883239746094e+02, 3.043193359375e+02, 3.161391906738281e+02, 3.156653442382812e+02, 3.151726379394531e+02, 3.145960083007812e+02, 3.139449462890625e+02, 3.133541564941406e+02, 3.134439697265625e+02, 3.133565979003906e+02, 3.133114929199219e+02, 3.049167785644531e+02, 3.127775573730469e+02, 3.12376708984375e+02, 3.126622619628906e+02, 3.150436096191406e+02, 3.133445434570312e+02, 3.173323974609375e+02, 3.12376708984375e+02, 3.168272705078125e+02, 3.143568725585938e+02, 3.044533996582031e+02, 3.163526306152344e+02, 3.160158081054688e+02, 3.163199157714844e+02, 3.144807739257812e+02, 3.161004943847656e+02, 3.205648193359375e+02, 3.205648193359375e+02, 3.13970458984375e+02, 3.143634338378906e+02, 3.046355895996094e+02, 3.141381530761719e+02, 3.136188049316406e+02, 3.134650268554688e+02, 3.149864501953125e+02, 3.134428405761719e+02, 3.140589599609375e+02, 3.170427856445312e+02, 3.170086975097656e+02, 3.148763122558594e+02, 3.044146423339844e+02, 3.158131713867188e+02, 3.152802734375e+02, 3.156107177734375e+02, 3.145460815429688e+02, 3.165470886230469e+02, 3.216121826171875e+02, 3.216121826171875e+02, 3.216121826171875e+02, 3.136240539550781e+02, 3.049919128417969e+02, 3.117299194335938e+02] -ventilation.generation.TSup.T=[2.931499938964844e+02, 2.886919860839844e+02, 2.885331420898438e+02, 2.886723022460938e+02, 2.887674865722656e+02, 2.879842224121094e+02, 2.892481689453125e+02, 2.890648498535156e+02, 2.89038330078125e+02, 2.889390869140625e+02, 2.88949462890625e+02, 2.890860900878906e+02, 2.888308410644531e+02, 2.8875390625e+02, 2.889328918457031e+02, 2.924093017578125e+02, 2.889698181152344e+02, 2.885530700683594e+02, 2.881749877929688e+02, 2.880255432128906e+02, 2.880359802246094e+02, 2.879170532226562e+02, 2.875986022949219e+02, 2.875167541503906e+02, 2.880133361816406e+02, 2.892759399414062e+02, 2.888121643066406e+02, 2.882782592773438e+02, 2.881368103027344e+02, 2.880617370605469e+02, 2.8832080078125e+02, 2.884261779785156e+02, 2.88447265625e+02, 2.884278259277344e+02, 2.888371887207031e+02, 2.891725769042969e+02, 2.892035217285156e+02, 2.892351379394531e+02, 2.894059753417969e+02, 2.895741882324219e+02, 2.898015441894531e+02, 2.897077331542969e+02, 2.896551513671875e+02, 2.896522216796875e+02, 2.898323364257812e+02, 2.898901977539062e+02, 2.898068542480469e+02, 2.897574768066406e+02, 2.897823791503906e+02, 2.8981640625e+02, 2.900751953125e+02, 2.900307006835938e+02, 2.900402221679688e+02, 2.901175842285156e+02, 2.904423217773438e+02, 2.904798583984375e+02, 2.904467468261719e+02, 2.902757568359375e+02, 2.903625183105469e+02, 2.904992065429688e+02, 2.906785888671875e+02, 2.906213073730469e+02, 2.905133361816406e+02, 2.904319458007812e+02, 2.905270690917969e+02, 2.908671875e+02, 2.906716613769531e+02, 2.905988464355469e+02, 2.900947875976562e+02, 2.89955810546875e+02, 2.90022705078125e+02, 2.899271240234375e+02, 2.898029174804688e+02, 2.898164978027344e+02, 2.903479309082031e+02, 2.913412780761719e+02, 2.899939270019531e+02, 2.90188720703125e+02, 2.901069946289062e+02, 2.902117614746094e+02, 2.904351501464844e+02, 2.904187316894531e+02, 2.903683776855469e+02, 2.904247131347656e+02, 2.904893188476562e+02, 2.906635131835938e+02, 2.902710571289062e+02, 2.902173461914062e+02, 2.899382019042969e+02, 2.899350280761719e+02, 2.901222229003906e+02, 2.900977783203125e+02, 2.899378967285156e+02, 2.899287719726562e+02, 2.901876525878906e+02, 2.918366088867188e+02, 2.915637512207031e+02, 2.902304382324219e+02, 2.902295837402344e+02, 2.905532836914062e+02, 2.908665161132812e+02] +hydraulic.distribution.sigBusDistr.TStoDHWTopMea=[3.231499938964844e+02, 3.322236328125e+02, 3.310592346191406e+02, 3.281361694335938e+02, 3.244893188476562e+02, 3.200893249511719e+02, 3.319848937988281e+02, 3.3049853515625e+02, 3.288680114746094e+02, 3.203034973144531e+02, 3.184598999023438e+02, 3.325224914550781e+02, 3.313184204101562e+02, 3.273343200683594e+02, 3.2339404296875e+02, 3.325299987792969e+02, 3.310790100097656e+02, 3.296315307617188e+02, 3.279501037597656e+02, 3.187951965332031e+02, 3.27594482421875e+02, 3.26535400390625e+02, 3.255179138183594e+02, 3.212348327636719e+02, 3.314579467773438e+02, 3.297529602050781e+02, 3.280518798828125e+02, 3.2619873046875e+02, 3.238836669921875e+02, 3.105086975097665e+02, 3.275496520996094e+02, 3.264808349609375e+02, 3.254541931152344e+02, 3.202698669433594e+02, 3.315425109863281e+02, 3.298688659667969e+02, 3.281889953613281e+02, 3.263535461425781e+02, 3.240538940429688e+02, 3.106332702636719e+02, 3.276033020019531e+02, 3.265484619140625e+02, 3.255347290039062e+02, 3.209774169921875e+02, 3.316572265625e+02, 3.300663452148438e+02, 3.284441223144531e+02, 3.266575622558594e+02, 3.244017028808594e+02, 3.110194396972656e+02, 3.276198425292969e+02, 3.265699462890625e+02, 3.255607299804688e+02, 3.212217102050781e+02, 3.316144714355469e+02, 3.300087890625e+02, 3.283756103515625e+02, 3.265792541503906e+02, 3.243140258789062e+02, 3.108678894042969e+02, 3.275469970703125e+02, 3.265119934082031e+02, 3.255165405273438e+02, 3.218252868652344e+02, 3.315861206054688e+02, 3.299718017578125e+02, 3.283328552246094e+02, 3.265306701660156e+02, 3.242599182128906e+02, 3.108282775878906e+02, 3.2763134765625e+02, 3.265853576660156e+02, 3.255797424316406e+02, 3.216084289550781e+02, 3.316401062011719e+02, 3.300438232421875e+02, 3.284180908203125e+02, 3.266279907226562e+02, 3.243683471679688e+02, 3.109413757324219e+02, 3.276353759765625e+02, 3.265963745117188e+02, 3.2559716796875e+02, 3.219624938964844e+02, 3.315888977050781e+02, 3.299753723144531e+02, 3.283365173339844e+02, 3.265351257324219e+02, 3.2426513671875e+02, 3.108428039550781e+02, 3.276304626464844e+02, 3.265840454101562e+02, 3.255780334472656e+02, 3.215425109863281e+02, 3.316359558105469e+02, 3.300383911132812e+02, 3.284116516113281e+02, 3.266209106445312e+02, 3.243603515625e+02, 3.109227600097656e+02, 3.275428161621094e+02] +hydraulic.distribution.sigBusDistr.TStoBufTopMea=[2.931499938964844e+02, 3.223988342285156e+02, 3.226414794921875e+02, 3.219916687011719e+02, 3.2158447265625e+02, 3.146368408203125e+02, 3.202377319335938e+02, 3.193822326660156e+02, 3.199740295410156e+02, 3.206214599609375e+02, 3.205594787597656e+02, 3.207657165527344e+02, 3.217293090820312e+02, 3.215697021484375e+02, 3.213438110351562e+02, 3.253324584960938e+02, 3.241525268554688e+02, 3.215776672363281e+02, 3.239268493652344e+02, 3.251875915527344e+02, 3.242140197753906e+02, 3.2522216796875e+02, 3.272927856445312e+02, 3.276277465820312e+02, 3.248119506835938e+02, 3.228843078613281e+02, 3.26080810546875e+02, 3.212815246582032e+02, 3.240328369140625e+02, 3.245485839843751e+02, 3.241558227539062e+02, 3.238471984863281e+02, 3.23214111328125e+02, 3.230943298339844e+02, 3.220020751953125e+02, 3.206750793457031e+02, 3.196368713378906e+02, 3.187395935058594e+02, 3.181303100585938e+02, 3.172518615722656e+02, 3.172909240722656e+02, 3.173086547851562e+02, 3.170613708496094e+02, 3.169309387207031e+02, 3.17154541015625e+02, 3.168247985839844e+02, 3.163066711425781e+02, 3.160617980957031e+02, 3.160956726074219e+02, 3.159324035644531e+02, 3.159863891601562e+02, 3.156061401367188e+02, 3.151130981445312e+02, 3.146709899902344e+02, 3.139019165039062e+02, 3.133178405761719e+02, 3.133381958007812e+02, 3.133331909179688e+02, 3.13265625e+02, 3.126294250488281e+02, 3.127286071777344e+02, 3.123338317871094e+02, 3.126013793945312e+02, 3.12969482421875e+02, 3.133528747558594e+02, 3.1512353515625e+02, 3.090084533691406e+02, 3.144759216308594e+02, 3.141764526367188e+02, 3.150729675292969e+02, 3.162179870605469e+02, 3.159434814453125e+02, 3.162601318359375e+02, 3.161377258300781e+02, 3.160651245117188e+02, 3.194962463378906e+02, 3.1850439453125e+02, 3.140481262207031e+02, 3.142670593261719e+02, 3.139648742675781e+02, 3.140312194824219e+02, 3.135945129394531e+02, 3.13410888671875e+02, 3.130590209960938e+02, 3.133985290527344e+02, 3.1269873046875e+02, 3.139988403320312e+02, 3.136274108886719e+02, 3.148338928222656e+02, 3.153882446289062e+02, 3.156522521972656e+02, 3.152142639160156e+02, 3.155107116699219e+02, 3.155295104980469e+02, 3.16398681640625e+02, 3.205130004882812e+02, 3.195100708007812e+02, 3.156448974609375e+02, 3.135987243652344e+02, 3.123997192382812e+02, 3.117211303710938e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.225943298339844e+02, 3.227886047363281e+02, 3.221308288574219e+02, 3.217590942382812e+02, 3.23326171875e+02, 3.202253723144531e+02, 3.194754333496094e+02, 3.201262817382812e+02, 3.207627258300781e+02, 3.206965637207031e+02, 3.211068725585938e+02, 3.218846435546875e+02, 3.217153930664062e+02, 3.214743041992188e+02, 3.070718383789062e+02, 2.931603698730469e+02, 3.217691040039062e+02, 3.241171569824219e+02, 3.253873901367188e+02, 3.247019653320312e+02, 3.256164245605469e+02, 3.275516662597656e+02, 3.132138061523438e+02, 3.252647094726562e+02, 3.228209533691406e+02, 2.947863159179688e+02, 3.216756591796875e+02, 3.242168579101562e+02, 3.025866699218774e+02, 3.24609375e+02, 3.240625610351562e+02, 3.233933715820312e+02, 3.133882446289062e+02, 3.223649291992188e+02, 3.20755126953125e+02, 3.196798706054688e+02, 3.188214111328125e+02, 3.182318115234375e+02, 3.035992431640625e+02, 3.175057373046875e+02, 3.174001770019531e+02, 3.171492919921875e+02, 3.140521850585938e+02, 3.173027038574219e+02, 3.168643798828125e+02, 3.163444519042969e+02, 3.161271362304688e+02, 3.1618701171875e+02, 3.0367822265625e+02, 3.161495056152344e+02, 3.15669921875e+02, 3.151735229492188e+02, 3.140706176757812e+02, 3.139672241210938e+02, 3.133574829101562e+02, 3.133639526367188e+02, 3.133575439453125e+02, 3.13312255859375e+02, 3.041577758789062e+02, 3.127947692871094e+02, 3.12378173828125e+02, 3.126608581542969e+02, 3.136949768066406e+02, 3.13372802734375e+02, 3.152979431152344e+02, 3.100653991699219e+02, 3.145290832519531e+02, 3.142934875488281e+02, 3.037886657714844e+02, 3.16364990234375e+02, 3.16016357421875e+02, 3.163220825195312e+02, 3.139375e+02, 3.161224365234375e+02, 2.945727233886719e+02, 2.931510620117188e+02, 3.139927673339844e+02, 3.143607177734375e+02, 3.039284362792969e+02, 3.141515502929688e+02, 3.136244506835938e+02, 3.134652099609375e+02, 3.135137023925781e+02, 3.134659729003906e+02, 3.127276306152344e+02, 3.139742736816406e+02, 3.13676025390625e+02, 3.148934020996094e+02, 3.037590942382812e+02, 3.158235473632812e+02, 3.152823181152344e+02, 3.156085510253906e+02, 3.139433898925781e+02, 3.165576477050781e+02, 2.946872863769531e+02, 2.931511535644531e+02, 2.931499938964844e+02, 3.136268310546875e+02, 3.042171020507812e+02, 3.1175390625e+02] +ventilation.generation.TSup.T=[2.931499938964844e+02, 2.887435913085938e+02, 2.885465087890625e+02, 2.886705017089844e+02, 2.887660522460938e+02, 2.887609558105469e+02, 2.89318115234375e+02, 2.8907177734375e+02, 2.890366821289062e+02, 2.889385681152344e+02, 2.88949462890625e+02, 2.890801696777344e+02, 2.888416442871094e+02, 2.887545471191406e+02, 2.889325866699219e+02, 2.924046325683594e+02, 2.889668579101562e+02, 2.88552490234375e+02, 2.881790466308594e+02, 2.880256652832031e+02, 2.878441772460938e+02, 2.879706115722656e+02, 2.876912841796875e+02, 2.875230712890625e+02, 2.87794189453125e+02, 2.893836975097656e+02, 2.888117980957031e+02, 2.881856994628906e+02, 2.88145751953125e+02, 2.880620422363281e+02, 2.882757263183594e+02, 2.884441223144531e+02, 2.88451416015625e+02, 2.884278564453125e+02, 2.88822509765625e+02, 2.891849060058594e+02, 2.892044067382812e+02, 2.892343444824219e+02, 2.894060363769531e+02, 2.895741577148438e+02, 2.898014831542969e+02, 2.897177429199219e+02, 2.896558837890625e+02, 2.896515197753906e+02, 2.898561401367188e+02, 2.899072875976562e+02, 2.89805419921875e+02, 2.897565307617188e+02, 2.897822265625e+02, 2.898164978027344e+02, 2.900794372558594e+02, 2.900414733886719e+02, 2.900406799316406e+02, 2.901169738769531e+02, 2.904771728515625e+02, 2.904974365234375e+02, 2.904434204101562e+02, 2.902782897949219e+02, 2.903628845214844e+02, 2.904990539550781e+02, 2.907026977539062e+02, 2.906376037597656e+02, 2.905126342773438e+02, 2.904308776855469e+02, 2.905585021972656e+02, 2.90853759765625e+02, 2.904030456542969e+02, 2.906891479492188e+02, 2.900109558105469e+02, 2.899466857910156e+02, 2.900386047363281e+02, 2.899423217773438e+02, 2.898030090332031e+02, 2.898154907226562e+02, 2.903810729980469e+02, 2.913617248535156e+02, 2.899939575195312e+02, 2.901937255859375e+02, 2.901073913574219e+02, 2.902118225097656e+02, 2.904509887695312e+02, 2.904336547851562e+02, 2.903681640625e+02, 2.904236450195312e+02, 2.905212707519531e+02, 2.906283264160156e+02, 2.902504272460938e+02, 2.901882019042969e+02, 2.9001171875e+02, 2.899355773925781e+02, 2.901271057128906e+02, 2.901067810058594e+02, 2.89937744140625e+02, 2.899281616210938e+02, 2.902207641601562e+02, 2.918564453125e+02, 2.915759582519531e+02, 2.902311096191406e+02, 2.902319946289062e+02, 2.905535888671875e+02, 2.908958435058594e+02] ventilation.generation.weaBus.TDryBul=[2.711499938964844e+02, 2.706598205566406e+02, 2.704500122070312e+02, 2.710835876464844e+02, 2.713986511230469e+02, 2.720499877929688e+02, 2.730393371582031e+02, 2.735700073242188e+02, 2.729700012207031e+02, 2.723796081542969e+02, 2.724500122070312e+02, 2.720899963378906e+02, 2.713411865234375e+02, 2.714856872558594e+02, 2.71758056640625e+02, 2.728500061035156e+02, 2.721732788085938e+02, 2.715361633300781e+02, 2.691483459472656e+02, 2.680009765625e+02, 2.670499877929688e+02, 2.668262023925781e+02, 2.657754821777344e+02, 2.654322509765625e+02, 2.667328796386719e+02, 2.708500061035156e+02, 2.715960083007812e+02, 2.706900024414062e+02, 2.6904345703125e+02, 2.681499938964844e+02, 2.6875e+02, 2.692776794433594e+02, 2.698986511230469e+02, 2.698555908203125e+02, 2.7092041015625e+02, 2.724500122070312e+02, 2.734451904296875e+02, 2.742142639160156e+02, 2.747942810058594e+02, 2.753908081054688e+02, 2.755499877929688e+02, 2.75614013671875e+02, 2.758299865722656e+02, 2.758448791503906e+02, 2.757672424316406e+02, 2.761499938964844e+02, 2.765899963378906e+02, 2.767610473632812e+02, 2.767300109863281e+02, 2.766708068847656e+02, 2.768500061035156e+02, 2.772636108398438e+02, 2.7771533203125e+02, 2.781019897460938e+02, 2.789319152832031e+02, 2.794500122070312e+02, 2.794466247558594e+02, 2.794279174804688e+02, 2.794849243164062e+02, 2.799500122070312e+02, 2.800499877929688e+02, 2.803680114746094e+02, 2.800899963378906e+02, 2.797099914550781e+02, 2.795200500488281e+02, 2.806499938964844e+02, 2.810128784179688e+02, 2.810320129394531e+02, 2.784481201171875e+02, 2.775330505371094e+02, 2.766499938964844e+02, 2.768958740234375e+02, 2.766292114257812e+02, 2.766669616699219e+02, 2.769802551269531e+02, 2.786499938964844e+02, 2.78731689453125e+02, 2.791405029296875e+02, 2.784546508789062e+02, 2.786761779785156e+02, 2.7875e+02, 2.792179870605469e+02, 2.793362731933594e+02, 2.796307983398438e+02, 2.793832702636719e+02, 2.800499877929688e+02, 2.789285583496094e+02, 2.790899963378906e+02, 2.779700012207031e+02, 2.77250732421875e+02, 2.771499938964844e+02, 2.77614013671875e+02, 2.772754516601562e+02, 2.772228088378906e+02, 2.764660034179688e+02, 2.784500122070312e+02, 2.800023193359375e+02, 2.797099914550781e+02, 2.791930847167969e+02, 2.803331909179688e+02, 2.810499877929688e+02] -building.buiMeaBus.TZoneMea[1]=[2.931499938964844e+02, 2.9326025390625e+02, 2.931221313476562e+02, 2.931365966796875e+02, 2.931763610839844e+02, 2.92018798828125e+02, 2.93359375e+02, 2.929951171875e+02, 2.931140747070312e+02, 2.931375732421875e+02, 2.931324157714844e+02, 2.9339599609375e+02, 2.932664794921875e+02, 2.931342163085938e+02, 2.932913818359375e+02, 2.973800354003906e+02, 2.932247924804688e+02, 2.928753051757812e+02, 2.930089416503906e+02, 2.93114013671875e+02, 2.933707885742188e+02, 2.932774047851562e+02, 2.931463928222656e+02, 2.931317443847656e+02, 2.934248962402344e+02, 2.939557800292969e+02, 2.93184814453125e+02, 2.927506713867188e+02, 2.929893798828125e+02, 2.931224975585938e+02, 2.932958374023438e+02, 2.9329248046875e+02, 2.931615295410156e+02, 2.931460266113281e+02, 2.933856506347656e+02, 2.93412841796875e+02, 2.931969604492188e+02, 2.930396423339844e+02, 2.931055908203125e+02, 2.931637573242188e+02, 2.934087219238281e+02, 2.932742004394531e+02, 2.931538391113281e+02, 2.931466979980469e+02, 2.933932495117188e+02, 2.933682861328125e+02, 2.931515197753906e+02, 2.930454711914062e+02, 2.930845031738281e+02, 2.931414184570312e+02, 2.934197692871094e+02, 2.932585754394531e+02, 2.931553039550781e+02, 2.931534423828125e+02, 2.933494567871094e+02, 2.932645874023438e+02, 2.932228698730469e+02, 2.930140380859375e+02, 2.931083679199219e+02, 2.931609802246094e+02, 2.933597106933594e+02, 2.932075500488281e+02, 2.931427612304688e+02, 2.931375427246094e+02, 2.933058166503906e+02, 2.934443054199219e+02, 2.931099853515625e+02, 2.930100708007812e+02, 2.930355834960938e+02, 2.930953063964844e+02, 2.934045104980469e+02, 2.932223815917969e+02, 2.931347045898438e+02, 2.931433715820312e+02, 2.937330627441406e+02, 2.94553466796875e+02, 2.928429870605469e+02, 2.929825134277344e+02, 2.930527648925781e+02, 2.931273803710938e+02, 2.933883056640625e+02, 2.932481079101562e+02, 2.931537170410156e+02, 2.931495056152344e+02, 2.932940673828125e+02, 2.9334423828125e+02, 2.931384582519531e+02, 2.930275573730469e+02, 2.929635620117188e+02, 2.931426696777344e+02, 2.934022216796875e+02, 2.932527465820312e+02, 2.93138671875e+02, 2.931412353515625e+02, 2.936605224609375e+02, 2.952243041992188e+02, 2.944835510253906e+02, 2.928892517089844e+02, 2.93019775390625e+02, 2.931343078613281e+02, 2.933429260253906e+02] +building.buiMeaBus.TZoneMea[1]=[2.931499938964844e+02, 2.933250122070312e+02, 2.931388244628906e+02, 2.931343383789062e+02, 2.931745910644531e+02, 2.929957275390625e+02, 2.934469909667969e+02, 2.930037536621094e+02, 2.931120300292969e+02, 2.931369018554688e+02, 2.931324157714844e+02, 2.933887023925781e+02, 2.932799987792969e+02, 2.93135009765625e+02, 2.93291015625e+02, 2.973741760253906e+02, 2.932210693359375e+02, 2.928749389648438e+02, 2.930140075683594e+02, 2.931141967773438e+02, 2.931300048828125e+02, 2.933450622558594e+02, 2.932625732421875e+02, 2.931395568847656e+02, 2.931505126953125e+02, 2.9409033203125e+02, 2.931843566894531e+02, 2.926366577148438e+02, 2.930005493164062e+02, 2.931228637695312e+02, 2.9323974609375e+02, 2.9331494140625e+02, 2.931666870117188e+02, 2.931460266113281e+02, 2.93367431640625e+02, 2.934282531738281e+02, 2.931980895996094e+02, 2.930386657714844e+02, 2.931056823730469e+02, 2.931636962890625e+02, 2.934087524414062e+02, 2.932867126464844e+02, 2.9315478515625e+02, 2.931457824707031e+02, 2.934231872558594e+02, 2.933896484375e+02, 2.931497497558594e+02, 2.930442810058594e+02, 2.930843505859375e+02, 2.931415405273438e+02, 2.934251708984375e+02, 2.932720642089844e+02, 2.931558532714844e+02, 2.931526794433594e+02, 2.933932495117188e+02, 2.932865295410156e+02, 2.932186889648438e+02, 2.930172119140625e+02, 2.931088256835938e+02, 2.931607971191406e+02, 2.933900146484375e+02, 2.932279052734375e+02, 2.93141845703125e+02, 2.931361999511719e+02, 2.9334521484375e+02, 2.934275512695312e+02, 2.927716064453125e+02, 2.931243286132812e+02, 2.929307861328125e+02, 2.930839538574219e+02, 2.93424560546875e+02, 2.932413635253906e+02, 2.931348571777344e+02, 2.931421508789062e+02, 2.937748107910156e+02, 2.945790710449219e+02, 2.928428649902344e+02, 2.929888305664062e+02, 2.9305322265625e+02, 2.9312744140625e+02, 2.934082641601562e+02, 2.932667236328125e+02, 2.931534729003906e+02, 2.93148193359375e+02, 2.933341369628906e+02, 2.933000183105469e+02, 2.931126403808594e+02, 2.929912414550781e+02, 2.930553894042969e+02, 2.93143310546875e+02, 2.934084167480469e+02, 2.932640075683594e+02, 2.931384582519531e+02, 2.931404724121094e+02, 2.937022094726562e+02, 2.952491455078125e+02, 2.944988098144531e+02, 2.9289013671875e+02, 2.930227661132812e+02, 2.931346740722656e+02, 2.933797607421875e+02] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt index aab87949..04496c48 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_ModelicaConferencePaper_TEASERBuilding.txt @@ -1,23 +1,22 @@ -last-generated=2024-07-16 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0", "nonlinear": "5, 7, 2, 0, 0, 1, 1, 1, 0, 1, 1, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0", "nonlinear": "2, 1, 1, 6, 0, 0, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1, 1", - "number of continuous time states": "85", + "number of continuous time states": "81", "numerical Jacobians": "0" } time=[0e+00, 8.64e+05] -electrical.distribution.batterySimple.PLoad=[2.135427001953125e+03, 4.48038427734375e+03, 4.4691298828125e+03, 4.3602275390625e+03, 4.20760009765625e+03, 6.3018564453125e+03, 3.564962158203125e+03, 3.499691650390625e+03, 3.7184990234375e+03, 3.83265283203125e+03, 3.7885849609375e+03, 3.940485107421875e+03, 4.075368408203125e+03, 3.94826513671875e+03, 3.699037597656249e+03, 3.7016982421875e+03, 2.619832275390625e+03, 2.929056884765625e+03, 3.61588623046875e+03, 4.1235859375e+03, 4.6146396484375e+03, 4.75779638671875e+03, 4.6501484375e+03, 4.54670947265625e+03, 4.43528271484375e+03, 6.4247412109375e+03, 2.49274755859375e+03, 2.953196777343751e+03, 3.702603515625001e+03, 4.12055126953125e+03, 4.04107470703125e+03, 4.18885888671875e+03, 3.98874951171875e+03, 3.656973388671875e+03, 3.13115087890625e+03, 4.1653515625e+03, 2.47646630859375e+03, 2.36912158203125e+03, 2.48940185546875e+03, 2.571827392578125e+03, 2.650326904296875e+03, 2.679434814453125e+03, 2.642846435546875e+03, 2.465411376953125e+03, 2.0707900390625e+03, 2.526273193359375e+03, 1.786568969726562e+03, 1.786980712890625e+03, 2.046105346679688e+03, 2.24233984375e+03, 5.22706298828125e+03, 2.249717041015625e+03, 2.1964072265625e+03, 1.963016845703125e+03, 1.552773071289061e+03, 1.819095825195278e+03, 1.369634399414062e+03, 1.346271362304688e+03, 1.608577636718748e+03, 1.736755493164062e+03, 1.886291748046875e+03, 1.835259155273438e+03, 1.952498779296875e+03, 4.5144765625e+03, 1.565045776367188e+03, 1.265952514648438e+03, 1.308887817382812e+03, 1.120994186401367e+02, 1.897568359375e+03, 4.12652880859375e+03, 2.508743896484375e+03, 2.533897216796875e+03, 2.633022705078125e+03, 4.61171240234375e+03, 1.961355102539062e+03, 1.305220336914062e+03, 1.320658081054688e+03, 1.293232666015625e+03, 1.870204833984375e+03, 4.16242822265625e+03, 2.14054638671875e+03, 2.076462158203125e+03, 2.1113515625e+03, 4.72304833984375e+03, 1.745663452148438e+03, 1.361332885742188e+03, 1.401757690429688e+03, 1.443909790039062e+03, 1.928893798828125e+03, 4.11730810546875e+03, 2.51965478515625e+03, 2.438783203125e+03, 2.57034033203125e+03, 4.61399169921875e+03, 2.25410888671875e+03, 1.325662475585938e+03, 1.378494262695312e+03, 1.756113525390625e+03, 1.671518310546875e+03, 4.25720849609375e+03, 1.67144775390625e+03] +electrical.distribution.batterySimple.PLoad=[1.994704467773438e+03, 3.914220703125e+03, 3.827599853515625e+03, 3.86755419921875e+03, 3.95355419921875e+03, 4.62059375e+03, 3.604977783203125e+03, 3.5273720703125e+03, 3.74465771484375e+03, 3.85642236328125e+03, 3.809873046875e+03, 3.976682373046875e+03, 4.050473388671875e+03, 3.967931396484375e+03, 3.776913330078124e+03, 5.40102294921875e+03, 2.719772705078125e+03, 2.992892333984375e+03, 3.6544052734375e+03, 4.156025390625e+03, 4.17677490234375e+03, 3.97616357421875e+03, 3.9358779296875e+03, 4.29955224609375e+03, 4.055703125e+03, 5.1428720703125e+03, 2.48594384765625e+03, 2.945562744140626e+03, 3.695403808593751e+03, 4.1145966796875e+03, 4.03293115234375e+03, 4.062941162109375e+03, 4.09473974609375e+03, 3.85814404296875e+03, 3.148309326171875e+03, 5.29944091796875e+03, 2.469076171875e+03, 2.364547607421875e+03, 2.483853271484375e+03, 2.56852587890625e+03, 2.64798046875e+03, 2.688364501953125e+03, 2.648693115234375e+03, 2.471619873046875e+03, 2.07075e+03, 5.65778466796875e+03, 1.78425927734375e+03, 1.78681640625e+03, 2.04547705078125e+03, 2.241895751953125e+03, 2.28143115234375e+03, 2.250423828125e+03, 2.199156982421875e+03, 1.965841674804688e+03, 1.551858398437498e+03, 5.90993603515641e+03, 1.368546630859374e+03, 1.345188598632813e+03, 1.607433959960936e+03, 1.736233154296875e+03, 1.821254516601562e+03, 1.83427490234375e+03, 1.956918823242188e+03, 1.946113403320312e+03, 1.568037231445312e+03, 1.563930419921875e+03, 1.136294311523438e+03, 1.158223266601562e+03, 1.912734741210938e+03, 2.1979892578125e+03, 2.50228857421875e+03, 2.541811279296875e+03, 2.632346435546875e+03, 2.5558193359375e+03, 1.958119384765625e+03, 5.8357353515625e+03, 1.356341552734375e+03, 1.227613647460938e+03, 1.877498779296875e+03, 1.966640258789062e+03, 2.139702880859375e+03, 2.077829833984375e+03, 2.111221435546875e+03, 1.991551025390625e+03, 1.745871215820312e+03, 2.3741865234375e+03, 1.405072021484375e+03, 1.445964111328125e+03, 1.928279663085938e+03, 2.324742431640625e+03, 2.51582763671875e+03, 2.429720703125e+03, 2.571561767578125e+03, 2.476627197265625e+03, 2.257888916015625e+03, 5.83818408203125e+03, 1.18167919921875e+03, 1.189631958007812e+03, 1.663449951171875e+03, 1.6271240234375e+03, 1.671228881835938e+03] electrical.distribution.batterySimple.PCharge=[0e+00, 0e+00, 0e+00, 0e+00, 1.373916625976562e+02, 4.424331359863281e+02, 3.614790344238281e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 3.117859497070343e+02, 1.355197021484375e+03, 4.340064392089844e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.962879486083984e+02, 1.17838671875e+03, 8.831699829101562e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.132767333984375e+02, 3.282506713867188e+02, 3.45608154296875e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 7.848101043701172e+01, 4.093669128417969e+02, 3.108592834472656e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.251091918945329e+02, 2.335591125488297e+02, 3.569707031249969e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 2.269563446044922e+02, 6.538319702148438e+02, 4.359191589355469e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.521343383789062e+02, 1.300943725585938e+03, 2.515860290527344e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 1.450899047851562e+02, 5.276746826171875e+02, 4.921898803710938e+02, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 0e+00, 4.932261657714844e+02, 1.391678466796875e+03, 7.0428857421875e+02, 0e+00, 0e+00, 0e+00, 0e+00] -hydraulic.distribution.sigBusDistr.TStoDHWTopMea=[3.231499938964844e+02, 3.324158935546875e+02, 3.31285888671875e+02, 3.287838745117188e+02, 3.253984680175781e+02, 3.28802490234375e+02, 3.320787658691406e+02, 3.30627685546875e+02, 3.290182800292969e+02, 3.206752014160156e+02, 3.188943481445312e+02, 3.325361938476562e+02, 3.313908996582031e+02, 3.283415832519531e+02, 3.247553405761719e+02, 3.334142761230469e+02, 3.319278259277344e+02, 3.304666748046875e+02, 3.288203430175781e+02, 3.202294921875e+02, 3.184498291015625e+02, 3.325276184082031e+02, 3.313876342773438e+02, 3.285263671875e+02, 3.250038757324219e+02, 3.299694213867188e+02, 3.320758666992188e+02, 3.306386108398438e+02, 3.290481872558594e+02, 3.207654724121098e+02, 3.189847106933594e+02, 3.325269165039062e+02, 3.313855895996094e+02, 3.284731140136719e+02, 3.249318237304688e+02, 3.335232849121094e+02, 3.320349731445312e+02, 3.30585693359375e+02, 3.289765014648438e+02, 3.206253051757812e+02, 3.188450927734375e+02, 3.32527587890625e+02, 3.313793640136719e+02, 3.282323913574219e+02, 3.246142883300781e+02, 3.333856506347656e+02, 3.3186669921875e+02, 3.30364990234375e+02, 3.286611633300781e+02, 3.198681945800781e+02, 3.204453430175781e+02, 3.324552307128906e+02, 3.313083190917969e+02, 3.281464538574219e+02, 3.245272521972656e+02, 3.332818298339844e+02, 3.317373962402344e+02, 3.302044982910156e+02, 3.284585571289062e+02, 3.195389404296875e+02, 3.282237548828125e+02, 3.271847229003906e+02, 3.261846618652344e+02, 3.2250048828125e+02, 3.314703369140625e+02, 3.297867736816406e+02, 3.280749816894531e+02, 3.261929626464844e+02, 3.238330383300781e+02, 3.134141540527344e+02, 3.2761669921875e+02, 3.266058044433594e+02, 3.256325378417969e+02, 3.223293151855469e+02, 3.315402526855469e+02, 3.298855590820312e+02, 3.281965942382812e+02, 3.263352355957031e+02, 3.239974365234375e+02, 3.135264282226562e+02, 3.276127624511719e+02, 3.266003723144531e+02, 3.256256408691406e+02, 3.221805419921875e+02, 3.314796752929688e+02, 3.298002014160156e+02, 3.280909729003906e+02, 3.262099914550781e+02, 3.238520202636719e+02, 3.133995971679688e+02, 3.276183471679688e+02, 3.26607421875e+02, 3.256341552734375e+02, 3.22319091796875e+02, 3.315321044921875e+02, 3.298739318847656e+02, 3.281820678710938e+02, 3.2631884765625e+02, 3.239772644042969e+02, 3.137077331542969e+02, 3.276050720214844e+02] -hydraulic.distribution.sigBusDistr.TStoBufTopMea=[2.931499938964844e+02, 3.212234497070312e+02, 3.212193603515625e+02, 3.214101867675781e+02, 3.209891357421875e+02, 3.159002380371094e+02, 3.195906982421875e+02, 3.188434448242188e+02, 3.193967895507812e+02, 3.200553283691406e+02, 3.200171508789062e+02, 3.203023071289062e+02, 3.211409301757812e+02, 3.21037109375e+02, 3.209784545898438e+02, 3.194729309082031e+02, 3.209754943847656e+02, 3.2138134765625e+02, 3.239437255859375e+02, 3.252111206054688e+02, 3.260747375488281e+02, 3.255227661132812e+02, 3.248444519042969e+02, 3.239731750488281e+02, 3.267419128417969e+02, 3.219249572753906e+02, 3.216010131835938e+02, 3.223951110839844e+02, 3.240316467285156e+02, 3.2503662109375e+02, 3.244129028320312e+02, 3.237018432617188e+02, 3.230633544921875e+02, 3.2343505859375e+02, 3.222499694824219e+02, 3.183155822753906e+02, 3.196492309570312e+02, 3.188025512695312e+02, 3.181062927246094e+02, 3.174403381347656e+02, 3.172010498046875e+02, 3.171197814941406e+02, 3.168739318847656e+02, 3.170083312988281e+02, 3.172294616699219e+02, 3.167265319824219e+02, 3.163241882324219e+02, 3.161109924316406e+02, 3.160726318359375e+02, 3.161090087890625e+02, 3.149963989257812e+02, 3.154915771484375e+02, 3.149909362792969e+02, 3.147215270996094e+02, 3.138977661132812e+02, 3.135117797851563e+02, 3.133310241699219e+02, 3.133809509277344e+02, 3.132255249023438e+02, 3.126772766113281e+02, 3.127281188964844e+02, 3.120845947265625e+02, 3.122626647949219e+02, 3.127344665527344e+02, 3.133281860351562e+02, 3.128693237304688e+02, 3.144672546386719e+02, 3.129520874023438e+02, 3.141867370605469e+02, 3.148353576660156e+02, 3.1597998046875e+02, 3.155779724121094e+02, 3.158110046386719e+02, 3.157856140136719e+02, 3.16021484375e+02, 3.150111083984375e+02, 3.156703491210938e+02, 3.144630432128906e+02, 3.142075500488281e+02, 3.137497863769531e+02, 3.137579650878906e+02, 3.132186279296875e+02, 3.1299609375e+02, 3.126750183105469e+02, 3.133348999023438e+02, 3.1269091796875e+02, 3.140556030273438e+02, 3.136626586914062e+02, 3.147845458984375e+02, 3.150219116210938e+02, 3.153132019042969e+02, 3.147723999023438e+02, 3.1504296875e+02, 3.151457824707031e+02, 3.163329467773438e+02, 3.159071044921875e+02, 3.17515869140625e+02, 3.132628784179688e+02, 3.13530029296875e+02, 3.122041015625e+02, 3.114570922851562e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.220304565429688e+02, 3.220043334960938e+02, 3.221690063476562e+02, 3.217630920410156e+02, 3.366665954589844e+02, 3.201720886230469e+02, 3.195110473632812e+02, 3.201191101074219e+02, 3.207626037597656e+02, 3.207008666992188e+02, 3.2105078125e+02, 3.21869140625e+02, 3.217327880859375e+02, 3.214664001464844e+02, 3.2005322265625e+02, 3.21023193359375e+02, 3.215454711914062e+02, 3.24078369140625e+02, 3.253689880371094e+02, 3.263327026367188e+02, 3.259008178710938e+02, 3.252271423339844e+02, 3.244246215820312e+02, 3.268672180175781e+02, 3.380340270996094e+02, 3.2162646484375e+02, 3.224979248046875e+02, 3.241805419921875e+02, 3.25205322265625e+02, 3.245938415527344e+02, 3.240528259277344e+02, 3.233933715820312e+02, 3.235732116699219e+02, 3.223338317871094e+02, 3.170519714355469e+02, 3.196739501953125e+02, 3.188477172851562e+02, 3.181842041015625e+02, 3.175943908691406e+02, 3.174307250976562e+02, 3.17390380859375e+02, 3.171519165039062e+02, 3.17183837890625e+02, 3.172622375488281e+02, 3.170086059570312e+02, 3.163483276367188e+02, 3.161524047851562e+02, 3.161393127441406e+02, 3.162288208007812e+02, 3.27097412109375e+02, 3.156535949707031e+02, 3.151738586425781e+02, 3.148212280273438e+02, 3.139145812988281e+02, 3.136863403320312e+02, 3.133535766601562e+02, 3.133828430175781e+02, 3.132635803222656e+02, 3.12790283203125e+02, 3.129327697753906e+02, 3.123673095703125e+02, 3.126573791503906e+02, 3.199223937988281e+02, 3.13354248046875e+02, 3.12927978515625e+02, 3.145489501953125e+02, 3.167363586425781e+02, 3.143155822753906e+02, 3.158177490234375e+02, 3.162833251953125e+02, 3.160072937011719e+02, 3.163290405273438e+02, 3.217222290039062e+02, 3.160569763183594e+02, 3.150589294433594e+02, 3.15664306640625e+02, 3.144356689453125e+02, 3.143094787597656e+02, 3.160316467285156e+02, 3.14060791015625e+02, 3.136082458496094e+02, 3.134651794433594e+02, 3.224157409667969e+02, 3.134449157714844e+02, 3.127226867675781e+02, 3.140229797363281e+02, 3.136989440917969e+02, 3.1485009765625e+02, 3.157375183105469e+02, 3.157338256835938e+02, 3.152716979980469e+02, 3.156076354980469e+02, 3.216744079589844e+02, 3.165018920898438e+02, 3.159488525390625e+02, 3.176310729980469e+02, 3.133939208984375e+02, 3.135718994140625e+02, 3.166967468261719e+02, 3.116649475097656e+02] -ventilation.generation.TSup.T=[2.931499938964844e+02, 2.859595031738281e+02, 2.858770141601562e+02, 2.867355346679688e+02, 2.874845275878906e+02, 2.877322387695312e+02, 2.883668212890625e+02, 2.886384582519531e+02, 2.8825341796875e+02, 2.881354370117188e+02, 2.881533508300781e+02, 2.881475219726562e+02, 2.881389770507812e+02, 2.886881408691406e+02, 2.890563659667969e+02, 2.893076477050781e+02, 2.889724426269531e+02, 2.888162231445312e+02, 2.882241821289062e+02, 2.880540771484375e+02, 2.878791809082031e+02, 2.87897705078125e+02, 2.876038513183594e+02, 2.877491149902344e+02, 2.88089599609375e+02, 2.887925720214844e+02, 2.888961791992188e+02, 2.886296691894531e+02, 2.881936950683594e+02, 2.880809631347656e+02, 2.882016296386719e+02, 2.883922424316406e+02, 2.88498291015625e+02, 2.887325134277344e+02, 2.887804565429688e+02, 2.890135498046875e+02, 2.892208862304688e+02, 2.893665161132812e+02, 2.893272094726562e+02, 2.895038146972656e+02, 2.895655822753906e+02, 2.896374816894531e+02, 2.89692138671875e+02, 2.899512329101562e+02, 2.8978125e+02, 2.897862854003906e+02, 2.89838623046875e+02, 2.898702697753906e+02, 2.897180480957031e+02, 2.897673645019531e+02, 2.898138122558594e+02, 2.899473876953125e+02, 2.900496826171875e+02, 2.903762512207031e+02, 2.904008178710938e+02, 2.904493103027344e+02, 2.904215698242188e+02, 2.904002075195312e+02, 2.902448120117188e+02, 2.903748168945312e+02, 2.904266357421875e+02, 2.905031433105469e+02, 2.9047265625e+02, 2.907450256347656e+02, 2.906847229003906e+02, 2.907528686523438e+02, 2.907774658203125e+02, 2.906727294921875e+02, 2.900006103515625e+02, 2.898615417480469e+02, 2.897162170410156e+02, 2.897933959960938e+02, 2.897655029296875e+02, 2.901282348632812e+02, 2.902583618164062e+02, 2.903737182617188e+02, 2.902431640625e+02, 2.903079223632812e+02, 2.900013427734375e+02, 2.900890197753906e+02, 2.901162109375e+02, 2.902472534179688e+02, 2.902622680664062e+02, 2.906775817871094e+02, 2.906780090332031e+02, 2.906265869140625e+02, 2.903656005859375e+02, 2.903049926757812e+02, 2.899101867675781e+02, 2.897971801757812e+02, 2.8979052734375e+02, 2.899085998535156e+02, 2.898280944824219e+02, 2.901986389160156e+02, 2.901640014648438e+02, 2.90354736328125e+02, 2.905780334472656e+02, 2.903877563476562e+02, 2.901584777832031e+02, 2.90424072265625e+02, 2.905685119628906e+02] +hydraulic.distribution.sigBusDistr.TStoDHWTopMea=[3.231499938964844e+02, 3.324349670410156e+02, 3.313045349121094e+02, 3.288152770996094e+02, 3.254302062988281e+02, 3.226961975097656e+02, 3.321448364257812e+02, 3.307628784179688e+02, 3.29243408203125e+02, 3.211684265136719e+02, 3.193803405761719e+02, 3.325098571777344e+02, 3.313721313476562e+02, 3.28601806640625e+02, 3.251057739257812e+02, 3.271350708007812e+02, 3.321031494140625e+02, 3.307193603515625e+02, 3.291973571777344e+02, 3.211158142089844e+02, 3.193304138183594e+02, 3.325015869140625e+02, 3.313680725097656e+02, 3.287418212890625e+02, 3.252929382324219e+02, 3.260426940917969e+02, 3.32114990234375e+02, 3.307446899414062e+02, 3.292392578125e+02, 3.212039489746098e+02, 3.194170532226562e+02, 3.325023498535156e+02, 3.313677368164062e+02, 3.287027893066406e+02, 3.252408752441406e+02, 3.265685424804688e+02, 3.321079406738281e+02, 3.307263488769531e+02, 3.292066955566406e+02, 3.211328430175781e+02, 3.193457946777344e+02, 3.325187377929688e+02, 3.313780212402344e+02, 3.285270690917969e+02, 3.250047912597656e+02, 3.281165161132812e+02, 3.320940246582031e+02, 3.306888427734375e+02, 3.291405639648438e+02, 3.209882507324219e+02, 3.192032775878906e+02, 3.325241088867188e+02, 3.313820190429688e+02, 3.284972534179688e+02, 3.249642944335938e+02, 3.291356811523449e+02, 3.320841369628906e+02, 3.306543884277344e+02, 3.290757446289062e+02, 3.208381652832031e+02, 3.190547485351562e+02, 3.325329895019531e+02, 3.313876342773438e+02, 3.284028015136719e+02, 3.248377685546875e+02, 3.334292602539062e+02, 3.319569091796875e+02, 3.305174560546875e+02, 3.289063110351562e+02, 3.204625549316406e+02, 3.186803894042969e+02, 3.325260620117188e+02, 3.313842468261719e+02, 3.285111999511719e+02, 3.249836730957031e+02, 3.28757080078125e+02, 3.320884399414062e+02, 3.306659851074219e+02, 3.290963745117188e+02, 3.208846435546875e+02, 3.191007385253906e+02, 3.325303955078125e+02, 3.313864135742188e+02, 3.284477844238281e+02, 3.248976745605469e+02, 3.334773254394531e+02, 3.320086059570312e+02, 3.305801696777344e+02, 3.289938659667969e+02, 3.206860046386719e+02, 3.189039611816406e+02, 3.325269775390625e+02, 3.313845825195312e+02, 3.284944763183594e+02, 3.249608764648438e+02, 3.288174743652344e+02, 3.320882873535156e+02, 3.306676940917969e+02, 3.291002197265625e+02, 3.208943176269531e+02, 3.191099548339844e+02] +hydraulic.distribution.sigBusDistr.TStoBufTopMea=[2.931499938964844e+02, 3.193789672851562e+02, 3.181547241210938e+02, 3.183688659667969e+02, 3.19451904296875e+02, 3.173726806640625e+02, 3.195788269042969e+02, 3.188255310058594e+02, 3.193763427734375e+02, 3.200382385253906e+02, 3.200018920898438e+02, 3.202699890136719e+02, 3.208973693847656e+02, 3.210254821777344e+02, 3.208637084960938e+02, 3.191411743164062e+02, 3.209753112792969e+02, 3.213604125976562e+02, 3.239286804199219e+02, 3.252005310058594e+02, 3.245473937988281e+02, 3.224617004394531e+02, 3.220633850097656e+02, 3.260342407226562e+02, 3.234131774902344e+02, 3.220334167480469e+02, 3.216117248535156e+02, 3.22389404296875e+02, 3.240189819335938e+02, 3.25035400390625e+02, 3.244145202636719e+02, 3.226455383300781e+02, 3.226890563964844e+02, 3.233185424804688e+02, 3.222532043457031e+02, 3.198104248046875e+02, 3.196541137695312e+02, 3.188025817871094e+02, 3.181000671386719e+02, 3.17436767578125e+02, 3.171970520019531e+02, 3.171120910644531e+02, 3.168626098632812e+02, 3.170073852539062e+02, 3.172349853515625e+02, 3.163245849609375e+02, 3.163216857910156e+02, 3.161079711914062e+02, 3.160640258789062e+02, 3.161029663085938e+02, 3.15919921875e+02, 3.154957885742188e+02, 3.149855346679688e+02, 3.14724853515625e+02, 3.139002685546875e+02, 3.128224792480468e+02, 3.133290405273438e+02, 3.133833312988281e+02, 3.132196044921875e+02, 3.126715393066406e+02, 3.125125732421875e+02, 3.120751647949219e+02, 3.122428283691406e+02, 3.127699279785156e+02, 3.1333642578125e+02, 3.123745422363281e+02, 3.120796508789062e+02, 3.130515441894531e+02, 3.141439819335938e+02, 3.151582336425781e+02, 3.159845886230469e+02, 3.155453491210938e+02, 3.158058776855469e+02, 3.158906860351562e+02, 3.160337829589844e+02, 3.143430786132812e+02, 3.140088195800781e+02, 3.137688293457031e+02, 3.1420166015625e+02, 3.140049133300781e+02, 3.137537841796875e+02, 3.131973571777344e+02, 3.12988037109375e+02, 3.1278466796875e+02, 3.133370056152344e+02, 3.125875854492188e+02, 3.1406494140625e+02, 3.136606750488281e+02, 3.147785949707031e+02, 3.154280090332031e+02, 3.153128051757812e+02, 3.147816467285156e+02, 3.150306396484375e+02, 3.152523803710938e+02, 3.163313598632812e+02, 3.151583862304688e+02, 3.143450317382812e+02, 3.148567504882812e+02, 3.135052490234375e+02, 3.123756408691406e+02, 3.114551696777344e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.20024169921875e+02, 3.188492431640625e+02, 3.191278991699219e+02, 3.20212890625e+02, 3.2700146484375e+02, 3.201859741210938e+02, 3.195104370117188e+02, 3.20115966796875e+02, 3.207624206542969e+02, 3.20701904296875e+02, 3.210447998046875e+02, 3.216379699707031e+02, 3.217376098632812e+02, 3.214617614746094e+02, 3.337727661132812e+02, 3.210351867675781e+02, 3.215337219238281e+02, 3.240720825195312e+02, 3.253711547851562e+02, 3.247355346679688e+02, 3.228152770996094e+02, 3.224764404296875e+02, 3.261913757324219e+02, 3.236924743652344e+02, 3.321150207519531e+02, 3.216361389160156e+02, 3.224928588867188e+02, 3.241693725585938e+02, 3.252058410644531e+02, 3.24596435546875e+02, 3.230731201171875e+02, 3.231539001464844e+02, 3.235631103515625e+02, 3.2234326171875e+02, 3.329874267578125e+02, 3.196781616210938e+02, 3.188482971191406e+02, 3.181784973144531e+02, 3.175929260253906e+02, 3.174299621582031e+02, 3.173998413085938e+02, 3.171534729003906e+02, 3.171895751953125e+02, 3.17268798828125e+02, 3.353867492675781e+02, 3.163461303710938e+02, 3.161501159667969e+02, 3.161319885253906e+02, 3.162248840332031e+02, 3.16064208984375e+02, 3.156631774902344e+02, 3.151753845214844e+02, 3.148282470703125e+02, 3.139175415039062e+02, 3.370609130859389e+02, 3.133521423339844e+02, 3.133852233886719e+02, 3.132586059570312e+02, 3.127868041992188e+02, 3.127059936523438e+02, 3.12369873046875e+02, 3.126560363769531e+02, 3.130918884277344e+02, 3.133652954101562e+02, 3.124937744140625e+02, 3.121033935546875e+02, 3.130708312988281e+02, 3.142844543457031e+02, 3.153203735351562e+02, 3.162822265625e+02, 3.160182495117188e+02, 3.163331298828125e+02, 3.16306396484375e+02, 3.160704345703125e+02, 3.364861145019531e+02, 3.140488891601562e+02, 3.137120056152344e+02, 3.143064270019531e+02, 3.141334228515625e+02, 3.14057861328125e+02, 3.136152648925781e+02, 3.134656066894531e+02, 3.131684265136719e+02, 3.134486083984375e+02, 3.125103454589844e+02, 3.140356750488281e+02, 3.136973571777344e+02, 3.148454284667969e+02, 3.156384582519531e+02, 3.157274475097656e+02, 3.152816162109375e+02, 3.156053466796875e+02, 3.157010498046875e+02, 3.165029602050781e+02, 3.365253295898438e+02, 3.143909606933594e+02, 3.148287353515625e+02, 3.135502319335938e+02, 3.124374694824219e+02, 3.116657409667969e+02] +ventilation.generation.TSup.T=[2.931499938964844e+02, 2.857986145019531e+02, 2.855503845214844e+02, 2.863363952636719e+02, 2.87177490234375e+02, 2.876444091796875e+02, 2.881999206542969e+02, 2.884849548339844e+02, 2.881131896972656e+02, 2.880063781738281e+02, 2.880343933105469e+02, 2.880259094238281e+02, 2.88006591796875e+02, 2.8858251953125e+02, 2.889989929199219e+02, 2.893935852050781e+02, 2.889963684082031e+02, 2.8882373046875e+02, 2.8822607421875e+02, 2.880555114746094e+02, 2.878168029785156e+02, 2.877533264160156e+02, 2.875089416503906e+02, 2.880613708496094e+02, 2.87973876953125e+02, 2.888535766601562e+02, 2.889087524414062e+02, 2.8863037109375e+02, 2.88193359375e+02, 2.880810241699219e+02, 2.882017822265625e+02, 2.883444519042969e+02, 2.885127563476562e+02, 2.887709045410156e+02, 2.888002014160156e+02, 2.890332336425781e+02, 2.89224853515625e+02, 2.893668518066406e+02, 2.893271179199219e+02, 2.895037536621094e+02, 2.895654296875e+02, 2.8964599609375e+02, 2.896969604492188e+02, 2.899549560546875e+02, 2.897829284667969e+02, 2.897990417480469e+02, 2.898385009765625e+02, 2.898700866699219e+02, 2.897177734375e+02, 2.897672119140625e+02, 2.898242797851562e+02, 2.899536743164062e+02, 2.900523681640625e+02, 2.9037841796875e+02, 2.90401611328125e+02, 2.904466552734375e+02, 2.904206848144531e+02, 2.904001159667969e+02, 2.902446594238281e+02, 2.903745727539062e+02, 2.9040966796875e+02, 2.905077514648438e+02, 2.904747619628906e+02, 2.907481384277344e+02, 2.906862182617188e+02, 2.907510681152344e+02, 2.907463989257812e+02, 2.907149963378906e+02, 2.899924011230469e+02, 2.898616943359375e+02, 2.897092590332031e+02, 2.898046875e+02, 2.897606506347656e+02, 2.901245422363281e+02, 2.902500305175781e+02, 2.903604431152344e+02, 2.902267150878906e+02, 2.903145141601562e+02, 2.900098266601562e+02, 2.90092041015625e+02, 2.901122131347656e+02, 2.902525939941406e+02, 2.902580871582031e+02, 2.906744079589844e+02, 2.90673095703125e+02, 2.906265869140625e+02, 2.903628845214844e+02, 2.9030517578125e+02, 2.899100646972656e+02, 2.897989196777344e+02, 2.897824096679688e+02, 2.899009094238281e+02, 2.89818359375e+02, 2.901915283203125e+02, 2.901550903320312e+02, 2.903416748046875e+02, 2.905594177246094e+02, 2.904163208007812e+02, 2.90140625e+02, 2.90420654296875e+02, 2.905645751953125e+02] ventilation.generation.weaBus.TDryBul=[2.711499938964844e+02, 2.706598205566406e+02, 2.704500122070312e+02, 2.710835876464844e+02, 2.713986511230469e+02, 2.720499877929688e+02, 2.730393371582031e+02, 2.735700073242188e+02, 2.729700012207031e+02, 2.723796081542969e+02, 2.724500122070312e+02, 2.720899963378906e+02, 2.713411865234375e+02, 2.714856872558594e+02, 2.71758056640625e+02, 2.728500061035156e+02, 2.721732788085938e+02, 2.715361633300781e+02, 2.691483459472656e+02, 2.680009765625e+02, 2.670499877929688e+02, 2.668262023925781e+02, 2.657754821777344e+02, 2.654322509765625e+02, 2.667328796386719e+02, 2.708500061035156e+02, 2.715960083007812e+02, 2.706900024414062e+02, 2.6904345703125e+02, 2.681499938964844e+02, 2.6875e+02, 2.692776794433594e+02, 2.698986511230469e+02, 2.698555908203125e+02, 2.7092041015625e+02, 2.724500122070312e+02, 2.734451904296875e+02, 2.742142639160156e+02, 2.747942810058594e+02, 2.753908081054688e+02, 2.755499877929688e+02, 2.75614013671875e+02, 2.758299865722656e+02, 2.758448791503906e+02, 2.757672424316406e+02, 2.761499938964844e+02, 2.765899963378906e+02, 2.767610473632812e+02, 2.767300109863281e+02, 2.766708068847656e+02, 2.768500061035156e+02, 2.772636108398438e+02, 2.7771533203125e+02, 2.781019897460938e+02, 2.789319152832031e+02, 2.794500122070312e+02, 2.794466247558594e+02, 2.794279174804688e+02, 2.794849243164062e+02, 2.799500122070312e+02, 2.800499877929688e+02, 2.803680114746094e+02, 2.800899963378906e+02, 2.797099914550781e+02, 2.795200500488281e+02, 2.806499938964844e+02, 2.810128784179688e+02, 2.810320129394531e+02, 2.784481201171875e+02, 2.775330505371094e+02, 2.766499938964844e+02, 2.768958740234375e+02, 2.766292114257812e+02, 2.766669616699219e+02, 2.769802551269531e+02, 2.786499938964844e+02, 2.78731689453125e+02, 2.791405029296875e+02, 2.784546508789062e+02, 2.786761779785156e+02, 2.7875e+02, 2.792179870605469e+02, 2.793362731933594e+02, 2.796307983398438e+02, 2.793832702636719e+02, 2.800499877929688e+02, 2.789285583496094e+02, 2.790899963378906e+02, 2.779700012207031e+02, 2.77250732421875e+02, 2.771499938964844e+02, 2.77614013671875e+02, 2.772754516601562e+02, 2.772228088378906e+02, 2.764660034179688e+02, 2.784500122070312e+02, 2.800023193359375e+02, 2.797099914550781e+02, 2.791930847167969e+02, 2.803331909179688e+02, 2.810499877929688e+02] -building.buiMeaBus.TZoneMea[1]=[2.931499938964844e+02, 2.89783935546875e+02, 2.897340393066406e+02, 2.906501770019531e+02, 2.915067138671875e+02, 2.916453552246094e+02, 2.922000732421875e+02, 2.924054260253906e+02, 2.920744018554688e+02, 2.920740051269531e+02, 2.920791931152344e+02, 2.921621704101562e+02, 2.923387145996094e+02, 2.929898681640625e+02, 2.933813781738281e+02, 2.934212341308594e+02, 2.931723022460938e+02, 2.931362609863281e+02, 2.929934997558594e+02, 2.930673828125e+02, 2.9308642578125e+02, 2.931654968261719e+02, 2.930608215332031e+02, 2.933286437988281e+02, 2.93428955078125e+02, 2.932780456542969e+02, 2.932211303710938e+02, 2.931146545410156e+02, 2.92981689453125e+02, 2.930636901855469e+02, 2.930644226074219e+02, 2.931708984375e+02, 2.93148193359375e+02, 2.934517211914062e+02, 2.93245361328125e+02, 2.931532592773438e+02, 2.931649780273438e+02, 2.931546630859375e+02, 2.929607849121094e+02, 2.930321350097656e+02, 2.930694580078125e+02, 2.931434326171875e+02, 2.9315771484375e+02, 2.934778442382812e+02, 2.932845153808594e+02, 2.931954956054688e+02, 2.9315087890625e+02, 2.931476440429688e+02, 2.929654541015625e+02, 2.930415954589844e+02, 2.930538024902344e+02, 2.93118408203125e+02, 2.9313330078125e+02, 2.9344482421875e+02, 2.932678833007812e+02, 2.931993408203125e+02, 2.931653747558594e+02, 2.931432800292969e+02, 2.929351501464844e+02, 2.929810180664062e+02, 2.930208435058594e+02, 2.930369567871094e+02, 2.930683898925781e+02, 2.935042114257812e+02, 2.934756469726562e+02, 2.932783813476562e+02, 2.932189331054688e+02, 2.930821228027344e+02, 2.928890686035156e+02, 2.929432373046875e+02, 2.929826049804688e+02, 2.930177917480469e+02, 2.93049560546875e+02, 2.934941101074219e+02, 2.935776977539062e+02, 2.933042907714844e+02, 2.931210632324219e+02, 2.93099853515625e+02, 2.92888427734375e+02, 2.9294189453125e+02, 2.929577331542969e+02, 2.930046691894531e+02, 2.929937744140625e+02, 2.934398193359375e+02, 2.935014038085938e+02, 2.932705688476562e+02, 2.93225341796875e+02, 2.931086120605469e+02, 2.928955688476562e+02, 2.929332580566406e+02, 2.9295068359375e+02, 2.929822387695312e+02, 2.929662780761719e+02, 2.934432067871094e+02, 2.935885925292969e+02, 2.933300476074219e+02, 2.932221069335938e+02, 2.930584106445312e+02, 2.92900390625e+02, 2.929465942382812e+02, 2.929480590820312e+02] +building.buiMeaBus.TZoneMea[1]=[2.931499938964844e+02, 2.89582275390625e+02, 2.893255310058594e+02, 2.901513366699219e+02, 2.911229553222656e+02, 2.915380859375e+02, 2.919914855957031e+02, 2.922135620117188e+02, 2.918991394042969e+02, 2.919127197265625e+02, 2.919305114746094e+02, 2.920101928710938e+02, 2.921732177734375e+02, 2.928578796386719e+02, 2.933097534179688e+02, 2.935277099609375e+02, 2.932021789550781e+02, 2.931456298828125e+02, 2.92995849609375e+02, 2.930691528320312e+02, 2.930082092285156e+02, 2.929845581054688e+02, 2.9294140625e+02, 2.937164001464844e+02, 2.932845764160156e+02, 2.933541259765625e+02, 2.932367858886719e+02, 2.931155090332031e+02, 2.929812927246094e+02, 2.930637817382812e+02, 2.930645751953125e+02, 2.931112670898438e+02, 2.931664123535156e+02, 2.934999694824219e+02, 2.932699890136719e+02, 2.931783752441406e+02, 2.93169921875e+02, 2.931550903320312e+02, 2.929606628417969e+02, 2.930320739746094e+02, 2.930692749023438e+02, 2.93154052734375e+02, 2.931637268066406e+02, 2.934825439453125e+02, 2.932865905761719e+02, 2.932110290527344e+02, 2.931507263183594e+02, 2.931473999023438e+02, 2.929651184082031e+02, 2.930414123535156e+02, 2.930678100585938e+02, 2.931262512207031e+02, 2.931366577148438e+02, 2.934475402832031e+02, 2.932688598632812e+02, 2.931955871582031e+02, 2.931642761230469e+02, 2.931431579589844e+02, 2.929349365234375e+02, 2.92980712890625e+02, 2.9299951171875e+02, 2.930426940917969e+02, 2.930710144042969e+02, 2.935081176757812e+02, 2.934775085449219e+02, 2.932760314941406e+02, 2.931801452636719e+02, 2.931355895996094e+02, 2.9287890625e+02, 2.929436950683594e+02, 2.929739685058594e+02, 2.930318603515625e+02, 2.930434875488281e+02, 2.934895324707031e+02, 2.935673217773438e+02, 2.932876281738281e+02, 2.931006469726562e+02, 2.931079711914062e+02, 2.928989868164062e+02, 2.929458923339844e+02, 2.929527587890625e+02, 2.930113220214844e+02, 2.92988525390625e+02, 2.934358825683594e+02, 2.934952697753906e+02, 2.932710571289062e+02, 2.932219543457031e+02, 2.931087951660156e+02, 2.928954162597656e+02, 2.92935791015625e+02, 2.929405517578125e+02, 2.929725952148438e+02, 2.929541320800781e+02, 2.934343566894531e+02, 2.935774230957031e+02, 2.933136596679688e+02, 2.931988830566406e+02, 2.930927429199219e+02, 2.928781127929688e+02, 2.929424438476562e+02, 2.929431457519531e+02] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt index ae73e950..ae134d65 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1NoRetrofit.txt @@ -1,20 +1,19 @@ -last-generated=2024-07-16 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0", - "nonlinear": "5, 7, 1, 2, 1", + "nonlinear": "5, 7, 1, 3, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1", - "number of continuous time states": "105", + "number of continuous time states": "101", "numerical Jacobians": "0" } time=[0e+00, 8.64e+04] weaDat.weaBus.TDryBul=[2.713500061035156e+02, 2.714065551757812e+02, 2.714423522949219e+02, 2.714366760253906e+02, 2.713688049316406e+02, 2.7125e+02, 2.711300048828125e+02, 2.71010009765625e+02, 2.708900146484375e+02, 2.707699890136719e+02, 2.706499938964844e+02, 2.705299987792969e+02, 2.704100036621094e+02, 2.702814025878906e+02, 2.701031188964844e+02, 2.698934020996094e+02, 2.696802062988281e+02, 2.694894714355469e+02, 2.693132629394531e+02, 2.691443176269531e+02, 2.689815979003906e+02, 2.688259887695312e+02, 2.687498474121094e+02, 2.687407531738281e+02, 2.687302856445312e+02, 2.686499938964844e+02, 2.684281311035156e+02, 2.681062622070312e+02, 2.677860412597656e+02, 2.675690002441406e+02, 2.674700012207031e+02, 2.673739929199219e+02, 2.672780151367188e+02, 2.671820068359375e+02, 2.670859985351562e+02, 2.66989990234375e+02, 2.668940124511719e+02, 2.667980041503906e+02, 2.667543640136719e+02, 2.670124816894531e+02, 2.674586791992188e+02, 2.679197998046875e+02, 2.682342834472656e+02, 2.684475708007812e+02, 2.686448669433594e+02, 2.688818969726562e+02, 2.692129211425781e+02, 2.696084899902344e+02, 2.700237121582031e+02, 2.704428100585938e+02, 2.708500061035156e+02, 2.712447509765625e+02, 2.716349792480469e+02, 2.720175170898438e+02, 2.723893127441406e+02, 2.72725830078125e+02, 2.729895324707031e+02, 2.731852111816406e+02, 2.733184814453125e+02, 2.734028930664062e+02, 2.734673461914062e+02, 2.735138549804688e+02, 2.735424194335938e+02, 2.735553894042969e+02, 2.735648498535156e+02, 2.735686645507812e+02, 2.73562255859375e+02, 2.735403137207031e+02, 2.734952392578125e+02, 2.734378051757812e+02, 2.733829650878906e+02, 2.733453369140625e+02, 2.733241271972656e+02, 2.73316162109375e+02, 2.733239440917969e+02, 2.733500061035156e+02, 2.734044799804688e+02, 2.734835205078125e+02, 2.735684204101562e+02, 2.736405334472656e+02, 2.736940002441406e+02, 2.737383422851562e+02, 2.737637023925781e+02, 2.737596740722656e+02, 2.737111511230469e+02, 2.736122741699219e+02, 2.734936828613281e+02, 2.733878784179688e+02, 2.733190002441406e+02, 2.732585144042969e+02, 2.73205322265625e+02, 2.731657104492188e+02, 2.731450805664062e+02, 2.73135498046875e+02, 2.731335754394531e+02, 2.731393432617188e+02, 2.7315283203125e+02, 2.73175048828125e+02, 2.732023315429688e+02, 2.732291564941406e+02, 2.7325e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.218078918457031e+02, 3.383521728515625e+02, 3.101708679199219e+02, 3.153338317871094e+02, 3.205715942382812e+02, 3.250848693847656e+02, 3.282953796386719e+02, 3.223902587890625e+02, 3.231559448242188e+02, 3.230108337402344e+02, 3.232935180664062e+02, 3.239265441894531e+02, 3.237047119140625e+02, 3.303954772949219e+02, 3.237391967773438e+02, 3.242752990722656e+02, 3.239431457519531e+02, 3.309538879394531e+02, 3.246528625488281e+02, 3.245046997070312e+02, 3.316056823730469e+02, 3.246201782226562e+02, 3.2505859375e+02, 3.245976867675781e+02, 3.244599609375e+02, 3.252648620605469e+02, 3.248459777832031e+02, 3.325746765136719e+02, 3.254520874023438e+02, 3.260676879882812e+02, 3.254676208496094e+02, 3.332218017578125e+02, 3.264121398925781e+02, 3.260995178222656e+02, 3.336256408691406e+02, 3.260443420410156e+02, 3.2675634765625e+02, 3.26125e+02, 3.336301574707031e+02, 3.267723693847656e+02, 3.265009460449219e+02, 3.326959838867188e+02, 3.263403015136719e+02, 3.262664794921875e+02, 3.258694152832031e+02, 3.255455017089844e+02, 3.252900695800781e+02, 3.250927734375e+02, 3.24955322265625e+02, 3.248677368164062e+02, 3.248197021484375e+02, 3.248055419921875e+02, 3.248208618164062e+02, 3.344519653320312e+02, 3.218970947265625e+02, 3.22317626953125e+02, 3.22864013671875e+02, 3.235609436035156e+02, 3.238272399902344e+02, 3.240629272460938e+02, 3.24281494140625e+02, 3.244806518554688e+02, 3.246611022949219e+02, 3.248232116699219e+02, 3.249683837890625e+02, 3.250578308105469e+02, 3.251077575683594e+02, 3.251576232910156e+02, 3.252128601074219e+02, 3.252694091796875e+02, 3.253160705566406e+02, 3.253486328125e+02, 3.253663940429688e+02, 3.253663024902344e+02, 3.253450317382812e+02, 3.252928771972656e+02, 3.252086791992188e+02, 3.251070251464844e+02, 3.250069580078125e+02, 3.249223022460938e+02, 3.248528747558594e+02, 3.24805419921875e+02, 3.247897644042969e+02, 3.248209533691406e+02, 3.249095153808594e+02, 3.250364990234375e+02, 3.251686401367188e+02, 3.2522900390625e+02, 3.252888488769531e+02, 3.253368225097656e+02, 3.371232604980469e+02, 3.223807373046875e+02, 3.227559509277344e+02, 3.231121215820312e+02, 3.234132995605469e+02, 3.236752319335938e+02, 3.239076232910156e+02, 3.241154174804688e+02, 3.243020324707031e+02, 3.244696350097656e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.856601257324219e+02, 2.854604187011719e+02, 2.856351013183594e+02, 2.863979187011719e+02, 2.871377868652344e+02, 2.878543701171875e+02, 2.885304565429688e+02, 2.890649719238281e+02, 2.89106689453125e+02, 2.890479431152344e+02, 2.891405944824219e+02, 2.89201904296875e+02, 2.891220703125e+02, 2.890444641113281e+02, 2.891540222167969e+02, 2.892165222167969e+02, 2.89139892578125e+02, 2.891227111816406e+02, 2.893418273925781e+02, 2.892816772460938e+02, 2.891984252929688e+02, 2.893982238769531e+02, 2.894529418945312e+02, 2.893691101074219e+02, 2.89406494140625e+02, 2.896642456054688e+02, 2.896808471679688e+02, 2.89719970703125e+02, 2.901651306152344e+02, 2.903453674316406e+02, 2.903014526367188e+02, 2.903853759765625e+02, 2.907554626464844e+02, 2.907449035644531e+02, 2.90684326171875e+02, 2.909793090820312e+02, 2.911857299804688e+02, 2.911407775878906e+02, 2.911770629882812e+02, 2.9149365234375e+02, 2.915191955566406e+02, 2.915339660644531e+02, 2.917582092285156e+02, 2.918026733398438e+02, 2.9175732421875e+02, 2.916903076171875e+02, 2.915896911621094e+02, 2.9152001953125e+02, 2.914995422363281e+02, 2.914923706054688e+02, 2.914707946777344e+02, 2.914532165527344e+02, 2.914386596679688e+02, 2.914116821289062e+02, 2.91275390625e+02, 2.911984252929688e+02, 2.912759399414062e+02, 2.913936767578125e+02, 2.914764404296875e+02, 2.915777282714844e+02, 2.916781921386719e+02, 2.917742614746094e+02, 2.918511047363281e+02, 2.919002075195312e+02, 2.919453735351562e+02, 2.91986572265625e+02, 2.920153503417969e+02, 2.92015380859375e+02, 2.92013427734375e+02, 2.92012451171875e+02, 2.920115051269531e+02, 2.9200048828125e+02, 2.919874877929688e+02, 2.9197412109375e+02, 2.919602355957031e+02, 2.919224853515625e+02, 2.918743896484375e+02, 2.918216857910156e+02, 2.917637329101562e+02, 2.917415466308594e+02, 2.917455444335938e+02, 2.917501525878906e+02, 2.917550964355469e+02, 2.917551879882812e+02, 2.917495422363281e+02, 2.917484741210938e+02, 2.917540283203125e+02, 2.917601928710938e+02, 2.917533264160156e+02, 2.917442321777344e+02, 2.91710205078125e+02, 2.914966735839844e+02, 2.913819274902344e+02, 2.9136279296875e+02, 2.913882141113281e+02, 2.914312744140625e+02, 2.914712524414062e+02, 2.915104064941406e+02, 2.915477600097656e+02, 2.915824279785156e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.004697265625e+02, 3.022615661621094e+02, 3.150161743164062e+02, 3.199059143066406e+02, 3.24953857421875e+02, 3.282285461425781e+02, 3.233136291503906e+02, 3.244719543457031e+02, 3.247566223144531e+02, 3.250523681640625e+02, 3.253183898925781e+02, 3.255546569824219e+02, 3.257635498046875e+02, 3.25942138671875e+02, 3.260929565429688e+02, 3.262228698730469e+02, 3.263347473144531e+02, 3.264302978515625e+02, 3.265106201171875e+02, 3.265771789550781e+02, 3.266318054199219e+02, 3.266835021972656e+02, 3.267355041503906e+02, 3.267841491699219e+02, 3.268227233886719e+02, 3.268468933105469e+02, 3.268656921386719e+02, 3.268793334960938e+02, 3.334782104492188e+02, 3.274588928222656e+02, 3.282266540527344e+02, 3.281544799804688e+02, 3.280785522460938e+02, 3.280182800292969e+02, 3.279640502929688e+02, 3.2816748046875e+02, 3.28993408203125e+02, 3.289307250976562e+02, 3.288487243652344e+02, 3.288192443847656e+02, 3.288271179199219e+02, 3.288558654785156e+02, 3.289014587402344e+02, 3.289619445800781e+02, 3.290342102050781e+02, 3.291177673339844e+02, 3.292095031738281e+02, 3.293088684082031e+02, 3.290770568847656e+02, 3.286729125976562e+02, 3.281895751953125e+02, 3.276723022460938e+02, 3.2715283203125e+02, 3.266496887207031e+02, 3.394290771484377e+02, 3.253726806640625e+02, 3.255115051269531e+02, 3.254785766601562e+02, 3.253921508789062e+02, 3.252831115722656e+02, 3.251877136230469e+02, 3.25117919921875e+02, 3.250762939453125e+02, 3.250499572753906e+02, 3.25037353515625e+02, 3.250403747558594e+02, 3.250627746582031e+02, 3.251117248535156e+02, 3.2517919921875e+02, 3.252501831054688e+02, 3.25306884765625e+02, 3.25344482421875e+02, 3.25363525390625e+02, 3.253614807128906e+02, 3.253358764648438e+02, 3.252764282226562e+02, 3.251841430664062e+02, 3.250774230957031e+02, 3.249780883789062e+02, 3.248988037109375e+02, 3.248351440429688e+02, 3.247948608398438e+02, 3.247886962890625e+02, 3.248331298828125e+02, 3.249383544921875e+02, 3.250771484375e+02, 3.252151794433594e+02, 3.253228149414062e+02, 3.25414794921875e+02, 3.259334411621094e+02, 3.266603088378906e+02, 3.241664733886719e+02, 3.249327392578125e+02, 3.255015258789062e+02, 3.256899719238281e+02, 3.257409973144531e+02, 3.257108764648438e+02, 3.256452331542969e+02, 3.255694274902344e+02, 3.25505126953125e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.8571435546875e+02, 2.858942260742188e+02, 2.863065795898438e+02, 2.870804138183594e+02, 2.878184814453125e+02, 2.885274963378906e+02, 2.890829467773438e+02, 2.891695251464844e+02, 2.891963500976562e+02, 2.892261657714844e+02, 2.8925e+02, 2.892690734863281e+02, 2.892831420898438e+02, 2.892873229980469e+02, 2.892994384765625e+02, 2.893211669921875e+02, 2.8934228515625e+02, 2.8936328125e+02, 2.893830261230469e+02, 2.894016418457031e+02, 2.89419189453125e+02, 2.894423828125e+02, 2.894741516113281e+02, 2.895072937011719e+02, 2.895339965820312e+02, 2.896426696777344e+02, 2.897696533203125e+02, 2.898983154296875e+02, 2.900391235351562e+02, 2.90334228515625e+02, 2.905225524902344e+02, 2.905957946777344e+02, 2.9068212890625e+02, 2.907636108398438e+02, 2.908353576660156e+02, 2.910174255371094e+02, 2.912570495605469e+02, 2.913369750976562e+02, 2.914110717773438e+02, 2.915011596679688e+02, 2.916313781738281e+02, 2.917739562988281e+02, 2.919066467285156e+02, 2.920177612304688e+02, 2.920874938964844e+02, 2.921197509765625e+02, 2.921047058105469e+02, 2.92109619140625e+02, 2.921532287597656e+02, 2.921841735839844e+02, 2.921666259765625e+02, 2.921253356933594e+02, 2.920657348632812e+02, 2.919880065917969e+02, 2.919591369628906e+02, 2.918887329101562e+02, 2.918714294433594e+02, 2.91906005859375e+02, 2.919589538574219e+02, 2.920174255371094e+02, 2.920708618164062e+02, 2.921195983886719e+02, 2.921512451171875e+02, 2.921590881347656e+02, 2.921679992675781e+02, 2.921778259277344e+02, 2.921819763183594e+02, 2.921656494140625e+02, 2.921542358398438e+02, 2.921484985351562e+02, 2.921456909179688e+02, 2.921336669921875e+02, 2.921200561523438e+02, 2.921057739257812e+02, 2.920907592773438e+02, 2.920514831542969e+02, 2.92001708984375e+02, 2.91947021484375e+02, 2.918871765136719e+02, 2.918633728027344e+02, 2.918663330078125e+02, 2.918702697753906e+02, 2.918749389648438e+02, 2.918750610351562e+02, 2.918699645996094e+02, 2.918699035644531e+02, 2.918765869140625e+02, 2.918836669921875e+02, 2.918793334960938e+02, 2.918736572265625e+02, 2.918374938964844e+02, 2.917006530761719e+02, 2.916769714355469e+02, 2.917295837402344e+02, 2.918115539550781e+02, 2.918822937011719e+02, 2.919234619140625e+02, 2.919451293945312e+02, 2.919539794921875e+02, 2.919549560546875e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[4.08774462890625e+03, 5.1363642578125e+03, 5.87075830078125e+03, 2.2601708984375e+04, 2.2598794921875e+04, 2.25936640625e+04, 2.2856330078125e+04, 2.2031212890625e+04, 5.13381298828125e+03, 5.166583984375e+03, 5.15257666015625e+03, 5.161544921875e+03, 5.18826416015625e+03, 5.1693271484375e+03, 2.0476044921875e+04, 5.1504169921875e+03, 5.16638720703125e+03, 5.13794873046875e+03, 2.061741796875e+04, 5.15611669921875e+03, 5.138357421875e+03, 2.0780330078125e+04, 5.13158740234375e+03, 5.15075146484375e+03, 5.1284912109375e+03, 5.11703271484375e+03, 5.1400146484375e+03, 5.102775390625e+03, 2.11961484375e+04, 5.09614013671875e+03, 5.11421630859375e+03, 5.0841748046875e+03, 2.105328515625e+04, 5.11049462890625e+03, 5.091517578125e+03, 2.11520234375e+04, 5.07796142578125e+03, 5.0994931640625e+03, 5.0715263671875e+03, 2.0926931640625e+04, 5.14258447265625e+03, 5.15970654296875e+03, 2.0272892578125e+04, 5.18645263671875e+03, 5.19551123046875e+03, 5.1934521484375e+03, 5.2001162109375e+03, 5.2132275390625e+03, 5.22950927734375e+03, 5.246103515625e+03, 5.2637236328125e+03, 5.282470703125e+03, 5.30252880859375e+03, 5.32354638671875e+03, 5.8001865234375e+03, 5.1985166015625e+03, 5.233501953125e+03, 5.27283740234375e+03, 5.31823828125e+03, 5.33762744140625e+03, 5.3544404296875e+03, 5.36945556640625e+03, 5.382509765625e+03, 5.393734375e+03, 5.4037568359375e+03, 5.41253369140625e+03, 5.356919921875e+03, 5.27594970703125e+03, 5.24787255859375e+03, 5.263072265625e+03, 5.2930078125e+03, 5.30823779296875e+03, 5.3036083984375e+03, 5.2838173828125e+03, 5.2458955078125e+03, 5.18759912109375e+03, 5.0985107421875e+03, 4.98798583984375e+03, 4.883953125e+03, 4.8130556640625e+03, 4.78018310546875e+03, 4.762076171875e+03, 4.7684296875e+03, 4.811115234375e+03, 4.90886669921875e+03, 5.07379443359375e+03, 5.26365771484375e+03, 5.41475048828125e+03, 5.41464892578125e+03, 5.41494189453125e+03, 5.41491015625e+03, 5.95443310546875e+03, 5.24428955078125e+03, 5.26423779296875e+03, 5.28369873046875e+03, 5.30068505859375e+03, 5.31602099609375e+03, 5.33030712890625e+03, 5.3435673828125e+03, 5.3556796875e+03, 5.36644970703125e+03] +electricalGrid.PElecLoa=[4.6069794921875e+03, 4.6158173828125e+03, 4.61657568359375e+03, 2.2736376953125e+04, 2.273494140625e+04, 2.313862109375e+04, 2.1991833984375e+04, 5.86896923828125e+03, 5.97951953125e+03, 6.00669189453125e+03, 6.03511572265625e+03, 6.06028564453125e+03, 6.08230126953125e+03, 6.10119482421875e+03, 6.11572509765625e+03, 6.12659130859375e+03, 6.1351572265625e+03, 6.1423271484375e+03, 6.1481005859375e+03, 6.1525166015625e+03, 6.15573095703125e+03, 6.15783935546875e+03, 6.16153369140625e+03, 6.16682275390625e+03, 6.17170458984375e+03, 6.17383642578125e+03, 6.171111328125e+03, 6.1653564453125e+03, 6.1585634765625e+03, 2.090071875e+04, 6.21666796875e+03, 6.28962255859375e+03, 6.27877490234375e+03, 6.26838037109375e+03, 6.25953857421875e+03, 6.2513310546875e+03, 6.27422802734375e+03, 6.35481201171875e+03, 6.34581689453125e+03, 6.344548828125e+03, 6.3537421875e+03, 6.36719384765625e+03, 6.37863623046875e+03, 6.3888828125e+03, 6.40029736328125e+03, 6.413962890625e+03, 6.4312177734375e+03, 6.4509599609375e+03, 6.47208203125e+03, 5.95809521484375e+03, 5.3582744140625e+03, 4.9165537109375e+03, 4.59136376953125e+03, 4.3616435546875e+03, 4.1857978515625e+03, 7.746904785156271e+03, 5.827801757812495e+03, 5.220926757812505e+03, 4.8038876953125e+03, 4.527826171875e+03, 4.38385302734375e+03, 4.31095458984375e+03, 4.2882021484375e+03, 4.29504345703125e+03, 4.30995458984375e+03, 4.3281884765625e+03, 4.35100341796875e+03, 4.3829697265625e+03, 4.432076171875001e+03, 4.48640380859375e+03, 4.529048828125e+03, 4.54658740234375e+03, 4.54325927734375e+03, 4.52747509765625e+03, 4.50015966796875e+03, 4.46114599609375e+03, 4.40353076171875e+03, 4.33467919921875e+03, 4.273751953125e+03, 4.2382197265625e+03, 4.22862548828125e+03, 4.226068359375e+03, 4.23813720703125e+03, 4.273267578125e+03, 4.3434541015625e+03, 4.45176171875e+03, 4.5703212890625e+03, 4.6661142578125e+03, 4.69988671875e+03, 4.71217138671875e+03, 7.09517236328125e+03, 1.759735961914062e+03, 5.997310546875e+03, 6.07871435546875e+03, 5.99449755859375e+03, 5.49626513671875e+03, 5.08635205078125e+03, 4.796490234375e+03, 4.6004462890625e+03, 4.49722802734375e+03, 4.45101171875e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt index d81a87d4..dfd394c9 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1PartialRetrofit.txt @@ -1,20 +1,19 @@ -last-generated=2024-07-16 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0", - "nonlinear": "5, 7, 1, 2, 1", + "nonlinear": "5, 7, 1, 3, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1", - "number of continuous time states": "105", + "number of continuous time states": "101", "numerical Jacobians": "0" } time=[0e+00, 8.64e+04] weaDat.weaBus.TDryBul=[2.713500061035156e+02, 2.714065551757812e+02, 2.714423522949219e+02, 2.714366760253906e+02, 2.713688049316406e+02, 2.7125e+02, 2.711300048828125e+02, 2.71010009765625e+02, 2.708900146484375e+02, 2.707699890136719e+02, 2.706499938964844e+02, 2.705299987792969e+02, 2.704100036621094e+02, 2.702814025878906e+02, 2.701031188964844e+02, 2.698934020996094e+02, 2.696802062988281e+02, 2.694894714355469e+02, 2.693132629394531e+02, 2.691443176269531e+02, 2.689815979003906e+02, 2.688259887695312e+02, 2.687498474121094e+02, 2.687407531738281e+02, 2.687302856445312e+02, 2.686499938964844e+02, 2.684281311035156e+02, 2.681062622070312e+02, 2.677860412597656e+02, 2.675690002441406e+02, 2.674700012207031e+02, 2.673739929199219e+02, 2.672780151367188e+02, 2.671820068359375e+02, 2.670859985351562e+02, 2.66989990234375e+02, 2.668940124511719e+02, 2.667980041503906e+02, 2.667543640136719e+02, 2.670124816894531e+02, 2.674586791992188e+02, 2.679197998046875e+02, 2.682342834472656e+02, 2.684475708007812e+02, 2.686448669433594e+02, 2.688818969726562e+02, 2.692129211425781e+02, 2.696084899902344e+02, 2.700237121582031e+02, 2.704428100585938e+02, 2.708500061035156e+02, 2.712447509765625e+02, 2.716349792480469e+02, 2.720175170898438e+02, 2.723893127441406e+02, 2.72725830078125e+02, 2.729895324707031e+02, 2.731852111816406e+02, 2.733184814453125e+02, 2.734028930664062e+02, 2.734673461914062e+02, 2.735138549804688e+02, 2.735424194335938e+02, 2.735553894042969e+02, 2.735648498535156e+02, 2.735686645507812e+02, 2.73562255859375e+02, 2.735403137207031e+02, 2.734952392578125e+02, 2.734378051757812e+02, 2.733829650878906e+02, 2.733453369140625e+02, 2.733241271972656e+02, 2.73316162109375e+02, 2.733239440917969e+02, 2.733500061035156e+02, 2.734044799804688e+02, 2.734835205078125e+02, 2.735684204101562e+02, 2.736405334472656e+02, 2.736940002441406e+02, 2.737383422851562e+02, 2.737637023925781e+02, 2.737596740722656e+02, 2.737111511230469e+02, 2.736122741699219e+02, 2.734936828613281e+02, 2.733878784179688e+02, 2.733190002441406e+02, 2.732585144042969e+02, 2.73205322265625e+02, 2.731657104492188e+02, 2.731450805664062e+02, 2.73135498046875e+02, 2.731335754394531e+02, 2.731393432617188e+02, 2.7315283203125e+02, 2.73175048828125e+02, 2.732023315429688e+02, 2.732291564941406e+02, 2.7325e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.292882385253906e+02, 3.100580139160156e+02, 3.121235961914062e+02, 3.128670043945312e+02, 3.129295043945312e+02, 3.128672790527344e+02, 3.12814453125e+02, 3.128034362792969e+02, 3.128304138183594e+02, 3.128834228515625e+02, 3.129519653320312e+02, 3.130289306640625e+02, 3.131151733398438e+02, 3.132344055175781e+02, 3.133772888183594e+02, 3.135265808105469e+02, 3.136636352539062e+02, 3.137904663085938e+02, 3.139110717773438e+02, 3.140266418457031e+02, 3.141370849609375e+02, 3.14198974609375e+02, 3.1421435546875e+02, 3.142234497070312e+02, 3.142720031738281e+02, 3.144117431640625e+02, 3.146255798339844e+02, 3.148503112792969e+02, 3.150163879394531e+02, 3.151029968261719e+02, 3.151755065917969e+02, 3.152431335449219e+02, 3.153095397949219e+02, 3.153759155273438e+02, 3.154421997070312e+02, 3.15509033203125e+02, 3.1557666015625e+02, 3.156148071289062e+02, 3.154659423828125e+02, 3.151794128417969e+02, 3.1485986328125e+02, 3.146211853027344e+02, 3.144536743164062e+02, 3.27049560546875e+02, 3.143635864257812e+02, 3.141488952636719e+02, 3.138703002929688e+02, 3.135124206542969e+02, 3.131512756347656e+02, 3.128770141601562e+02, 3.127528686523438e+02, 3.126805114746094e+02, 3.126532592773438e+02, 3.126591186523438e+02, 3.126943054199219e+02, 3.127553405761719e+02, 3.128274841308594e+02, 3.129045104980469e+02, 3.129801330566406e+02, 3.13056884765625e+02, 3.131316528320312e+02, 3.132025451660156e+02, 3.132669982910156e+02, 3.133210754394531e+02, 3.133666381835938e+02, 3.13404296875e+02, 3.134328918457031e+02, 3.134462890625e+02, 3.134480285644531e+02, 3.134424438476562e+02, 3.134336547851562e+02, 3.134223022460938e+02, 3.134092712402344e+02, 3.133973999023438e+02, 3.133886413574219e+02, 3.133831481933594e+02, 3.133791198730469e+02, 3.133768920898438e+02, 3.133731994628906e+02, 3.133695678710938e+02, 3.133758544921875e+02, 3.133835144042969e+02, 3.133884887695312e+02, 3.133852233886719e+02, 3.133671875e+02, 3.13337890625e+02, 3.133027954101562e+02, 3.132684020996094e+02, 3.132299194335938e+02, 3.267185974121094e+02, 3.117964782714844e+02, 3.115359802246094e+02, 3.116806640625e+02, 3.119337768554688e+02, 3.121224975585938e+02, 3.122770690917969e+02, 3.124056396484375e+02, 3.125132141113281e+02, 3.126038208007812e+02, 3.126795959472656e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.890777587890625e+02, 2.889273376464844e+02, 2.894195556640625e+02, 2.899176940917969e+02, 2.901485595703125e+02, 2.902310485839844e+02, 2.90242919921875e+02, 2.9022607421875e+02, 2.901995544433594e+02, 2.901708984375e+02, 2.901427001953125e+02, 2.901153869628906e+02, 2.9008837890625e+02, 2.900563354492188e+02, 2.900397644042969e+02, 2.900413818359375e+02, 2.900479736328125e+02, 2.900582885742188e+02, 2.900702514648438e+02, 2.900836486816406e+02, 2.90098388671875e+02, 2.901208190917969e+02, 2.901517333984375e+02, 2.901819763183594e+02, 2.902044982910156e+02, 2.903195190429688e+02, 2.904656982421875e+02, 2.906232604980469e+02, 2.907998657226562e+02, 2.909551391601562e+02, 2.910844116210938e+02, 2.912130126953125e+02, 2.913432006835938e+02, 2.914639587402344e+02, 2.915712890625e+02, 2.916823425292969e+02, 2.918126525878906e+02, 2.919489135742188e+02, 2.920653686523438e+02, 2.921797485351562e+02, 2.923128356933594e+02, 2.924430847167969e+02, 2.925577087402344e+02, 2.926496276855469e+02, 2.92620849609375e+02, 2.926365966796875e+02, 2.926372375488281e+02, 2.926165466308594e+02, 2.926128234863281e+02, 2.926043090820312e+02, 2.925697937011719e+02, 2.92537109375e+02, 2.925070190429688e+02, 2.924736328125e+02, 2.925052490234375e+02, 2.925741882324219e+02, 2.926430358886719e+02, 2.927095947265625e+02, 2.927791748046875e+02, 2.928550415039062e+02, 2.929288330078125e+02, 2.929994201660156e+02, 2.930511779785156e+02, 2.930713500976562e+02, 2.930886535644531e+02, 2.931038513183594e+02, 2.93110107421875e+02, 2.930885009765625e+02, 2.930667114257812e+02, 2.930464782714844e+02, 2.930263977050781e+02, 2.929955749511719e+02, 2.929635925292969e+02, 2.929328918457031e+02, 2.929042358398438e+02, 2.92853515625e+02, 2.927947387695312e+02, 2.927347412109375e+02, 2.926726379394531e+02, 2.926509704589844e+02, 2.926601867675781e+02, 2.926705017089844e+02, 2.926800537109375e+02, 2.926815795898438e+02, 2.926714172363281e+02, 2.926581420898438e+02, 2.926437683105469e+02, 2.926243286132812e+02, 2.925902404785156e+02, 2.925555725097656e+02, 2.924181213378906e+02, 2.923406066894531e+02, 2.923440856933594e+02, 2.923552551269531e+02, 2.923783264160156e+02, 2.924032592773438e+02, 2.924181823730469e+02, 2.924299621582031e+02, 2.924398803710938e+02, 2.924478454589844e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.105910949707031e+02, 3.120927734375e+02, 3.126124267578125e+02, 3.126861572265625e+02, 3.126729125976562e+02, 3.126638488769531e+02, 3.126835327148438e+02, 3.127292785644531e+02, 3.127927856445312e+02, 3.128668212890625e+02, 3.129464721679688e+02, 3.130289306640625e+02, 3.131177368164062e+02, 3.1323876953125e+02, 3.133831787109375e+02, 3.135335693359375e+02, 3.136709289550781e+02, 3.137976379394531e+02, 3.139180908203125e+02, 3.140334777832031e+02, 3.141438293457031e+02, 3.14204345703125e+02, 3.142174682617188e+02, 3.142250366210938e+02, 3.142738952636719e+02, 3.144165954589844e+02, 3.146344909667969e+02, 3.148615112304688e+02, 3.150273742675781e+02, 3.151110229492188e+02, 3.151815185546875e+02, 3.152479858398438e+02, 3.153138122558594e+02, 3.153799438476562e+02, 3.154461669921875e+02, 3.155130004882812e+02, 3.155806579589844e+02, 3.156183776855469e+02, 3.154629821777344e+02, 3.151679992675781e+02, 3.148436889648438e+02, 3.146055297851562e+02, 3.144408569335938e+02, 3.14296142578125e+02, 3.141306457519531e+02, 3.139044189453125e+02, 3.136297912597656e+02, 3.133374328613281e+02, 3.130414733886719e+02, 3.128424682617188e+02, 3.12699951171875e+02, 3.125932922363281e+02, 3.125170288085938e+02, 3.421004333496094e+02, 3.067283630371093e+02, 3.104048156738281e+02, 3.1076025390625e+02, 3.109156799316406e+02, 3.111482543945312e+02, 3.113798522949219e+02, 3.115840454101562e+02, 3.117668151855469e+02, 3.119290466308594e+02, 3.12068359375e+02, 3.121883239746094e+02, 3.122918090820312e+02, 3.123795776367188e+02, 3.124478149414062e+02, 3.124999084472656e+02, 3.125400390625e+02, 3.125711975097656e+02, 3.125941772460938e+02, 3.126097412109375e+02, 3.126206359863281e+02, 3.126286315917969e+02, 3.126331176757812e+02, 3.126317749023438e+02, 3.126267700195312e+02, 3.126169738769531e+02, 3.126050109863281e+02, 3.126022033691406e+02, 3.126015930175781e+02, 3.126011657714844e+02, 3.125978698730469e+02, 3.125867919921875e+02, 3.125695190429688e+02, 3.125485534667969e+02, 3.125270385742188e+02, 3.1250146484375e+02, 3.245101318359375e+02, 3.231171264648438e+02, 3.041092224121094e+02, 3.103833312988281e+02, 3.108468627929688e+02, 3.110623779296875e+02, 3.111391906738281e+02, 3.113260498046875e+02, 3.114624328613281e+02, 3.115805053710938e+02, 3.116817932128906e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.891801147460938e+02, 2.897022399902344e+02, 2.900948486328125e+02, 2.902535400390625e+02, 2.902985229492188e+02, 2.902974243164062e+02, 2.902768249511719e+02, 2.902496337890625e+02, 2.902212219238281e+02, 2.901931762695312e+02, 2.901658935546875e+02, 2.901392211914062e+02, 2.901124267578125e+02, 2.900804138183594e+02, 2.90063720703125e+02, 2.900652160644531e+02, 2.900716552734375e+02, 2.900818176269531e+02, 2.900935974121094e+02, 2.901067810058594e+02, 2.901213073730469e+02, 2.901435241699219e+02, 2.901742248535156e+02, 2.902041320800781e+02, 2.902263488769531e+02, 2.903412475585938e+02, 2.904874572753906e+02, 2.906452026367188e+02, 2.90822021484375e+02, 2.909773254394531e+02, 2.911064453125e+02, 2.912348937988281e+02, 2.913648681640625e+02, 2.914855041503906e+02, 2.915927734375e+02, 2.917037353515625e+02, 2.918340148925781e+02, 2.919702453613281e+02, 2.920865478515625e+02, 2.922003479003906e+02, 2.923328857421875e+02, 2.924625244140625e+02, 2.925767822265625e+02, 2.926685791015625e+02, 2.927189025878906e+02, 2.927278747558594e+02, 2.926763000488281e+02, 2.926334533691406e+02, 2.926232299804688e+02, 2.926150207519531e+02, 2.925836791992188e+02, 2.925520935058594e+02, 2.925205383300781e+02, 2.924669799804688e+02, 2.924070129394531e+02, 2.922753601074219e+02, 2.923467102050781e+02, 2.924878540039062e+02, 2.925797729492188e+02, 2.926681823730469e+02, 2.927543640136719e+02, 2.928358459472656e+02, 2.9289697265625e+02, 2.929256896972656e+02, 2.929503784179688e+02, 2.929720153808594e+02, 2.929839172363281e+02, 2.92967529296875e+02, 2.929505004882812e+02, 2.929346008300781e+02, 2.929184875488281e+02, 2.928911437988281e+02, 2.928622131347656e+02, 2.928340454101562e+02, 2.928071899414062e+02, 2.927579650878906e+02, 2.926998596191406e+02, 2.926398620605469e+02, 2.925772399902344e+02, 2.925545654296875e+02, 2.925625e+02, 2.925713195800781e+02, 2.925793762207031e+02, 2.925795288085938e+02, 2.925682678222656e+02, 2.925544128417969e+02, 2.925399780273438e+02, 2.925208740234375e+02, 2.924874267578125e+02, 2.924536437988281e+02, 2.92353759765625e+02, 2.922133483886719e+02, 2.920418395996094e+02, 2.921132507324219e+02, 2.922066040039062e+02, 2.922492065429688e+02, 2.922671203613281e+02, 2.92281005859375e+02, 2.922928771972656e+02, 2.923025817871094e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[4.089443359375e+03, 5.0148115234375e+03, 4.4793017578125e+03, 3.191553955078125e+03, 1.969959838867188e+03, 1.604573852539062e+03, 1.47270263671875e+03, 1.422350708007812e+03, 1.4107783203125e+03, 1.415317138671875e+03, 1.425337646484375e+03, 1.436604248046875e+03, 1.44772802734375e+03, 1.459516845703125e+03, 1.476947631835938e+03, 1.496950927734375e+03, 1.515118530273438e+03, 1.529225219726562e+03, 1.5411728515625e+03, 1.552495971679688e+03, 1.56342626953125e+03, 1.573800415039062e+03, 1.574984619140625e+03, 1.569230224609375e+03, 1.565911865234375e+03, 1.572868896484375e+03, 1.595424926757812e+03, 1.629892333984375e+03, 1.660295776367188e+03, 1.670651977539062e+03, 1.662784790039062e+03, 1.658776977539062e+03, 1.658415405273438e+03, 1.659959838867188e+03, 1.662509155273438e+03, 1.6661455078125e+03, 1.670057861328125e+03, 1.67339453125e+03, 1.667407836914062e+03, 1.616405151367188e+03, 1.560165405273438e+03, 1.510168212890625e+03, 1.483540405273438e+03, 1.469709594726562e+03, 4.79357763671875e+03, 1.855734497070312e+03, 1.659578369140625e+03, 1.475222534179688e+03, 1.369492797851562e+03, 1.306884643554688e+03, 1.278709228515625e+03, 1.27751708984375e+03, 1.277439086914062e+03, 1.278318725585938e+03, 1.279882080078125e+03, 1.281982055664062e+03, 1.284439086914062e+03, 1.286846557617188e+03, 1.288915649414062e+03, 1.290931396484375e+03, 1.2929765625e+03, 1.294969360351562e+03, 1.296857055664062e+03, 1.29856982421875e+03, 1.300008911132812e+03, 1.30122265625e+03, 1.30221875e+03, 1.302956787109375e+03, 1.303262084960938e+03, 1.303244750976562e+03, 1.3030341796875e+03, 1.302759033203125e+03, 1.302432495117188e+03, 1.302078369140625e+03, 1.301773803710938e+03, 1.301572631835938e+03, 1.301485107421875e+03, 1.30145849609375e+03, 1.3014794921875e+03, 1.301442260742188e+03, 1.301394653320312e+03, 1.301600219726562e+03, 1.301825317382812e+03, 1.301952270507812e+03, 1.301817749023438e+03, 1.301243530273438e+03, 1.300351806640625e+03, 1.299321411132812e+03, 1.298347290039062e+03, 1.297275146484375e+03, 4.8923955078125e+03, 1.426876831054688e+03, 1.320454833984375e+03, 1.258430297851562e+03, 1.264501220703125e+03, 1.269128173828125e+03, 1.272972900390625e+03, 1.27617626953125e+03, 1.278880126953125e+03, 1.281174560546875e+03, 1.283102905273438e+03] +electricalGrid.PElecLoa=[4.70393603515625e+03, 4.005314697265625e+03, 2.42728466796875e+03, 1.628568237304688e+03, 1.3732255859375e+03, 1.282778076171875e+03, 1.251627319335938e+03, 1.246987426757812e+03, 1.252912963867188e+03, 1.2623125e+03, 1.27246142578125e+03, 1.282472900390625e+03, 1.292192749023438e+03, 1.302972290039062e+03, 1.319731567382812e+03, 1.339084594726562e+03, 1.356424438476562e+03, 1.36952978515625e+03, 1.380618041992188e+03, 1.391220092773438e+03, 1.401555419921875e+03, 1.4112900390625e+03, 1.410838989257812e+03, 1.403710571289062e+03, 1.400075439453125e+03, 1.408003784179688e+03, 1.432786376953125e+03, 1.463794067382812e+03, 1.487363037109375e+03, 1.493049926757812e+03, 1.484769775390625e+03, 1.481070190429688e+03, 1.480635864257812e+03, 1.481845581054688e+03, 1.483865844726562e+03, 1.486755493164062e+03, 1.489850463867188e+03, 1.492454467773438e+03, 1.485918090820312e+03, 1.441343017578125e+03, 1.381727905273438e+03, 1.332520629882812e+03, 1.308934936523438e+03, 1.297066772460938e+03, 1.284482788085938e+03, 1.265433715820312e+03, 1.235860107421875e+03, 1.2031513671875e+03, 1.17272900390625e+03, 1.143436889648438e+03, 1.133033447265625e+03, 1.126986083984375e+03, 1.121931640625e+03, 1.117731811523438e+03, 5.27753662109375e+03, 8.201648712158203e+00, 1.215617309570313e+03, 1.180829956054664e+03, 1.085147583007812e+03, 1.070717163085938e+03, 1.076704345703125e+03, 1.082150512695312e+03, 1.087137573242188e+03, 1.091664184570312e+03, 1.09555517578125e+03, 1.098947998046875e+03, 1.101953002929688e+03, 1.104630249023438e+03, 1.106922119140625e+03, 1.108865112304688e+03, 1.1104462890625e+03, 1.111634521484375e+03, 1.112447265625e+03, 1.112947265625e+03, 1.1131884765625e+03, 1.113201171875e+03, 1.112869262695312e+03, 1.112175537109375e+03, 1.111325927734375e+03, 1.110438354492188e+03, 1.109671997070312e+03, 1.109238891601562e+03, 1.109016235351562e+03, 1.109034423828125e+03, 1.10932177734375e+03, 1.1097919921875e+03, 1.11025146484375e+03, 1.110507934570312e+03, 1.110449340820312e+03, 1.1101962890625e+03, 5.1419609375e+03, 3.243069887161255e+00, 8.201648712158203e+00, 1.254699951171875e+03, 1.204139892578125e+03, 1.108509033203125e+03, 1.072529418945312e+03, 1.07748974609375e+03, 1.081134155273438e+03, 1.084259887695312e+03, 1.086960327148438e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt index d55be8b9..73378573 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_Retrofit_Case1TotalRetrofit.txt @@ -1,20 +1,19 @@ -last-generated=2024-07-16 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0", - "nonlinear": "5, 7, 1, 2, 1", + "nonlinear": "5, 7, 1, 3, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1", - "number of continuous time states": "105", + "number of continuous time states": "101", "numerical Jacobians": "0" } time=[0e+00, 8.64e+04] weaDat.weaBus.TDryBul=[2.713500061035156e+02, 2.714065551757812e+02, 2.714423522949219e+02, 2.714366760253906e+02, 2.713688049316406e+02, 2.7125e+02, 2.711300048828125e+02, 2.71010009765625e+02, 2.708900146484375e+02, 2.707699890136719e+02, 2.706499938964844e+02, 2.705299987792969e+02, 2.704100036621094e+02, 2.702814025878906e+02, 2.701031188964844e+02, 2.698934020996094e+02, 2.696802062988281e+02, 2.694894714355469e+02, 2.693132629394531e+02, 2.691443176269531e+02, 2.689815979003906e+02, 2.688259887695312e+02, 2.687498474121094e+02, 2.687407531738281e+02, 2.687302856445312e+02, 2.686499938964844e+02, 2.684281311035156e+02, 2.681062622070312e+02, 2.677860412597656e+02, 2.675690002441406e+02, 2.674700012207031e+02, 2.673739929199219e+02, 2.672780151367188e+02, 2.671820068359375e+02, 2.670859985351562e+02, 2.66989990234375e+02, 2.668940124511719e+02, 2.667980041503906e+02, 2.667543640136719e+02, 2.670124816894531e+02, 2.674586791992188e+02, 2.679197998046875e+02, 2.682342834472656e+02, 2.684475708007812e+02, 2.686448669433594e+02, 2.688818969726562e+02, 2.692129211425781e+02, 2.696084899902344e+02, 2.700237121582031e+02, 2.704428100585938e+02, 2.708500061035156e+02, 2.712447509765625e+02, 2.716349792480469e+02, 2.720175170898438e+02, 2.723893127441406e+02, 2.72725830078125e+02, 2.729895324707031e+02, 2.731852111816406e+02, 2.733184814453125e+02, 2.734028930664062e+02, 2.734673461914062e+02, 2.735138549804688e+02, 2.735424194335938e+02, 2.735553894042969e+02, 2.735648498535156e+02, 2.735686645507812e+02, 2.73562255859375e+02, 2.735403137207031e+02, 2.734952392578125e+02, 2.734378051757812e+02, 2.733829650878906e+02, 2.733453369140625e+02, 2.733241271972656e+02, 2.73316162109375e+02, 2.733239440917969e+02, 2.733500061035156e+02, 2.734044799804688e+02, 2.734835205078125e+02, 2.735684204101562e+02, 2.736405334472656e+02, 2.736940002441406e+02, 2.737383422851562e+02, 2.737637023925781e+02, 2.737596740722656e+02, 2.737111511230469e+02, 2.736122741699219e+02, 2.734936828613281e+02, 2.733878784179688e+02, 2.733190002441406e+02, 2.732585144042969e+02, 2.73205322265625e+02, 2.731657104492188e+02, 2.731450805664062e+02, 2.73135498046875e+02, 2.731335754394531e+02, 2.731393432617188e+02, 2.7315283203125e+02, 2.73175048828125e+02, 2.732023315429688e+02, 2.732291564941406e+02, 2.7325e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.051783752441406e+02, 3.1141650390625e+02, 3.322492065429688e+02, 3.057630004882812e+02, 3.091819763183594e+02, 3.125884094238281e+02, 3.083719482421875e+02, 3.088800659179688e+02, 3.090914001464844e+02, 3.092567138671875e+02, 3.093793334960938e+02, 3.0946826171875e+02, 3.095280151367188e+02, 3.0955615234375e+02, 3.09557861328125e+02, 3.095443725585938e+02, 3.095195617675781e+02, 3.094862365722656e+02, 3.094458923339844e+02, 3.094002990722656e+02, 3.093509216308594e+02, 3.093099975585938e+02, 3.092815551757812e+02, 3.092587890625e+02, 3.092303161621094e+02, 3.091927185058594e+02, 3.153045349121094e+02, 3.100467224121094e+02, 3.099926147460938e+02, 3.098340759277344e+02, 3.097118225097656e+02, 3.100785522460938e+02, 3.105133972167969e+02, 3.10285400390625e+02, 3.101077575683594e+02, 3.099695434570312e+02, 3.104660949707031e+02, 3.107707824707031e+02, 3.105863647460938e+02, 3.10501953125e+02, 3.104906311035156e+02, 3.105179138183594e+02, 3.105704956054688e+02, 3.106415100097656e+02, 3.107252197265625e+02, 3.108208923339844e+02, 3.109225158691406e+02, 3.110308837890625e+02, 3.206625671386719e+02, 3.26447021484375e+02, 3.125987854003906e+02, 3.074232177734375e+02, 3.091536560058594e+02, 3.097052001953125e+02, 3.102033386230469e+02, 3.106448059082031e+02, 3.110077819824219e+02, 3.110921630859375e+02, 3.1109619140625e+02, 3.110484313964844e+02, 3.109870910644531e+02, 3.109302673339844e+02, 3.108862609863281e+02, 3.108521728515625e+02, 3.108298950195312e+02, 3.108203430175781e+02, 3.108241271972656e+02, 3.108424682617188e+02, 3.108731689453125e+02, 3.10909423828125e+02, 3.109416809082031e+02, 3.109652404785156e+02, 3.109792785644531e+02, 3.109824523925781e+02, 3.109732055664062e+02, 3.109454650878906e+02, 3.108987121582031e+02, 3.108421325683594e+02, 3.107861938476562e+02, 3.107398376464844e+02, 3.107045593261719e+02, 3.106806030273438e+02, 3.10673095703125e+02, 3.106900939941406e+02, 3.107373962402344e+02, 3.10805908203125e+02, 3.10879638671875e+02, 3.109414672851562e+02, 3.1099462890625e+02, 3.103296813964844e+02, 3.191802368164062e+02, 3.334124450683594e+02, 3.339319152832031e+02, 3.067274475097656e+02, 3.084962158203125e+02, 3.091851806640625e+02, 3.097752685546875e+02, 3.102646179199219e+02, 3.106735534667969e+02, 3.109930419921875e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.890777587890625e+02, 2.889215698242188e+02, 2.888302001953125e+02, 2.887602844238281e+02, 2.891433715820312e+02, 2.89571533203125e+02, 2.898331298828125e+02, 2.898074035644531e+02, 2.897869873046875e+02, 2.897696838378906e+02, 2.897503051757812e+02, 2.897277526855469e+02, 2.897015380859375e+02, 2.896665649414062e+02, 2.896420593261719e+02, 2.896307983398438e+02, 2.896212158203125e+02, 2.896137390136719e+02, 2.89607177734375e+02, 2.896015625e+02, 2.89596923828125e+02, 2.896000061035156e+02, 2.896139221191406e+02, 2.896310424804688e+02, 2.89642822265625e+02, 2.897447204589844e+02, 2.898793334960938e+02, 2.901560668945312e+02, 2.902806396484375e+02, 2.903843383789062e+02, 2.904742126464844e+02, 2.906776123046875e+02, 2.908188781738281e+02, 2.908861694335938e+02, 2.90951416015625e+02, 2.910265502929688e+02, 2.912522583007812e+02, 2.913822021484375e+02, 2.914481811523438e+02, 2.9153515625e+02, 2.916626892089844e+02, 2.918027954101562e+02, 2.919335632324219e+02, 2.920425720214844e+02, 2.921098022460938e+02, 2.921373596191406e+02, 2.921105651855469e+02, 2.920975036621094e+02, 2.920775451660156e+02, 2.918528137207031e+02, 2.916018676757812e+02, 2.917192687988281e+02, 2.918398742675781e+02, 2.918492736816406e+02, 2.919285278320312e+02, 2.920403747558594e+02, 2.921466979980469e+02, 2.922429504394531e+02, 2.923272705078125e+02, 2.924048461914062e+02, 2.924718933105469e+02, 2.925311279296875e+02, 2.9256982421875e+02, 2.925782470703125e+02, 2.925847473144531e+02, 2.925906372070312e+02, 2.925891723632812e+02, 2.925634460449219e+02, 2.925397033691406e+02, 2.925198974609375e+02, 2.925019226074219e+02, 2.924740905761719e+02, 2.924451904296875e+02, 2.924171447753906e+02, 2.923901062011719e+02, 2.923392944335938e+02, 2.922782897949219e+02, 2.922141723632812e+02, 2.921465759277344e+02, 2.921187438964844e+02, 2.921219787597656e+02, 2.921264343261719e+02, 2.921306762695312e+02, 2.921280822753906e+02, 2.921160278320312e+02, 2.921040954589844e+02, 2.920943603515625e+02, 2.920819702148438e+02, 2.920565185546875e+02, 2.920305786132812e+02, 2.919456481933594e+02, 2.916667785644531e+02, 2.914321594238281e+02, 2.914626770019531e+02, 2.916319580078125e+02, 2.916949157714844e+02, 2.917546691894531e+02, 2.918092651367188e+02, 2.918573303222656e+02, 2.918984375e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 2.990539855957031e+02, 3.005993041992188e+02, 3.110107727050781e+02, 3.069226379394531e+02, 3.090465393066406e+02, 3.0947021484375e+02, 3.0982958984375e+02, 3.101254577636719e+02, 3.103672790527344e+02, 3.105636901855469e+02, 3.10721435546875e+02, 3.108460998535156e+02, 3.1094189453125e+02, 3.110083618164062e+02, 3.110498046875e+02, 3.110765991210938e+02, 3.110906982421875e+02, 3.110949096679688e+02, 3.110907592773438e+02, 3.110799255371094e+02, 3.110638427734375e+02, 3.1105029296875e+02, 3.110432739257812e+02, 3.110391540527344e+02, 3.11031005859375e+02, 3.110212097167969e+02, 3.110213012695312e+02, 3.110260314941406e+02, 3.110451049804688e+02, 3.110812683105469e+02, 3.111170043945312e+02, 3.111578063964844e+02, 3.112034301757812e+02, 3.112527160644531e+02, 3.113006591796875e+02, 3.113497009277344e+02, 3.114041442871094e+02, 3.114713134765625e+02, 3.115653686523438e+02, 3.116861877441406e+02, 3.118323364257812e+02, 3.119888610839844e+02, 3.121499633789062e+02, 3.123105773925781e+02, 3.124649658203125e+02, 3.126105041503906e+02, 3.127438049316406e+02, 3.128682556152344e+02, 3.129805603027344e+02, 3.128476867675781e+02, 3.126344909667969e+02, 3.12361572265625e+02, 3.120711364746094e+02, 3.201011962890625e+02, 3.283370056152344e+02, 3.365722351074219e+02, 3.079851989746094e+02, 3.093962707519531e+02, 3.101510314941406e+02, 3.1076513671875e+02, 3.109790954589844e+02, 3.110325317382812e+02, 3.110155029296875e+02, 3.109621887207031e+02, 3.10910400390625e+02, 3.108737182617188e+02, 3.108575134277344e+02, 3.108642272949219e+02, 3.108891296386719e+02, 3.109222717285156e+02, 3.109517517089844e+02, 3.109724731445312e+02, 3.109837341308594e+02, 3.109840087890625e+02, 3.109715576171875e+02, 3.109399108886719e+02, 3.1088916015625e+02, 3.108299865722656e+02, 3.107738952636719e+02, 3.107294006347656e+02, 3.106958923339844e+02, 3.106744689941406e+02, 3.106707153320312e+02, 3.106935729980469e+02, 3.107488098144531e+02, 3.108241577148438e+02, 3.108990783691406e+02, 3.109588623046875e+02, 3.110093688964844e+02, 3.110520324707031e+02, 3.209701232910156e+02, 3.289977722167969e+02, 3.15690673828125e+02, 3.076965026855469e+02, 3.090861511230469e+02, 3.098139953613281e+02, 3.104715270996094e+02, 3.109927673339844e+02, 3.111661682128906e+02, 3.112126159667969e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.890836181640625e+02, 2.891642150878906e+02, 2.89421875e+02, 2.898426513671875e+02, 2.899552307128906e+02, 2.899441833496094e+02, 2.899432983398438e+02, 2.89940185546875e+02, 2.8993310546875e+02, 2.899217529296875e+02, 2.899064636230469e+02, 2.898876647949219e+02, 2.898652648925781e+02, 2.89834228515625e+02, 2.898140869140625e+02, 2.898074951171875e+02, 2.898027954101562e+02, 2.898002624511719e+02, 2.897986450195312e+02, 2.897979125976562e+02, 2.897981262207031e+02, 2.898059387207031e+02, 2.898243408203125e+02, 2.898455505371094e+02, 2.898611755371094e+02, 2.8996728515625e+02, 2.900992431640625e+02, 2.902367248535156e+02, 2.903900756835938e+02, 2.905239868164062e+02, 2.906370239257812e+02, 2.907529296875e+02, 2.90872314453125e+02, 2.909833374023438e+02, 2.910814819335938e+02, 2.911835021972656e+02, 2.913049011230469e+02, 2.914330749511719e+02, 2.915453491210938e+02, 2.916668090820312e+02, 2.918214111328125e+02, 2.919827575683594e+02, 2.921311950683594e+02, 2.922547912597656e+02, 2.923345947265625e+02, 2.923725891113281e+02, 2.923536376953125e+02, 2.923470764160156e+02, 2.923754272460938e+02, 2.924051513671875e+02, 2.92398193359375e+02, 2.923759155273438e+02, 2.923422546386719e+02, 2.922829284667969e+02, 2.920934753417969e+02, 2.918844909667969e+02, 2.919248046875e+02, 2.921045837402344e+02, 2.922279357910156e+02, 2.923614807128906e+02, 2.924861755371094e+02, 2.925870971679688e+02, 2.92650390625e+02, 2.926706848144531e+02, 2.926813659667969e+02, 2.926873474121094e+02, 2.926844482421875e+02, 2.9265625e+02, 2.926305236816406e+02, 2.92609130859375e+02, 2.925899963378906e+02, 2.925610961914062e+02, 2.925311279296875e+02, 2.925021362304688e+02, 2.924741516113281e+02, 2.924225463867188e+02, 2.923607788085938e+02, 2.922958679199219e+02, 2.922275390625e+02, 2.921991882324219e+02, 2.922019653320312e+02, 2.922060852050781e+02, 2.922100830078125e+02, 2.922073669433594e+02, 2.921953125e+02, 2.921835632324219e+02, 2.92174072265625e+02, 2.921616821289062e+02, 2.921357421875e+02, 2.921091613769531e+02, 2.920481872558594e+02, 2.917882385253906e+02, 2.915444641113281e+02, 2.916280517578125e+02, 2.917456665039062e+02, 2.918198852539062e+02, 2.918868713378906e+02, 2.919482116699219e+02, 2.920003662109375e+02, 2.920332336425781e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[1.257892211914062e+03, 1.379450317382812e+03, 1.420164184570312e+03, 7.21313916015625e+03, 6.94710791015625e+03, 6.94553076171875e+03, 6.60204736328125e+03, 1.374174438476562e+03, 1.37256591796875e+03, 1.370952026367188e+03, 1.370822265625e+03, 1.371592651367188e+03, 1.37177392578125e+03, 1.37134375e+03, 1.369788330078125e+03, 1.367399169921875e+03, 1.36468896484375e+03, 1.362030883789062e+03, 1.359385864257812e+03, 1.35669921875e+03, 1.353990234375e+03, 1.35129736328125e+03, 1.3497021484375e+03, 1.34912255859375e+03, 1.348619750976562e+03, 1.347177734375e+03, 1.34386767578125e+03, 6.27789599609375e+03, 1.350348022460938e+03, 1.346679443359375e+03, 1.342874389648438e+03, 1.339713623046875e+03, 1.344868041992188e+03, 1.350573608398438e+03, 1.345585083007812e+03, 1.341468627929688e+03, 1.338017822265625e+03, 1.345273803710938e+03, 1.349462768554688e+03, 1.3496787109375e+03, 1.353852294921875e+03, 1.359318725585938e+03, 1.363650146484375e+03, 1.367276611328125e+03, 1.371003784179688e+03, 1.375442016601562e+03, 1.381245849609375e+03, 1.387914794921875e+03, 1.394899658203125e+03, 1.568239990234375e+03, 1.663784301757812e+03, 6.25141357421875e+03, 1.382460693359375e+03, 1.387467163085938e+03, 1.397526733398438e+03, 1.410134887695312e+03, 1.421126342773438e+03, 1.417771484375e+03, 1.306460815429688e+03, 1.217305908203125e+03, 1.155354736328125e+03, 1.1146923828125e+03, 1.09064697265625e+03, 1.078691284179688e+03, 1.074025024414062e+03, 1.07378125e+03, 1.076690551757812e+03, 1.08288330078125e+03, 1.094314086914063e+03, 1.108347534179687e+03, 1.121223388671875e+03, 1.129649780273438e+03, 1.133896362304688e+03, 1.135190795898438e+03, 1.133255126953125e+03, 1.127922973632812e+03, 1.118292724609375e+03, 1.105959838867188e+03, 1.094154052734375e+03, 1.086633666992188e+03, 1.083659423828125e+03, 1.080582275390625e+03, 1.0801689453125e+03, 1.084615112304688e+03, 1.096986938476562e+03, 1.119366333007812e+03, 1.145689575195312e+03, 1.168489379882812e+03, 1.18188232421875e+03, 1.191984130859375e+03, 1.41423828125e+03, 1.588885864257812e+03, 7.26249560546875e+03, 1.810666259765625e+03, 1.401784423828125e+03, 1.401857055664062e+03, 1.402028442382812e+03, 1.406873657226562e+03, 1.416212036132812e+03, 1.42418408203125e+03, 1.41866162109375e+03] +electricalGrid.PElecLoa=[1.446735107421875e+03, 1.450330444335938e+03, 1.450568237304688e+03, 7.018685546875e+03, 1.450079833984375e+03, 1.449290649414062e+03, 1.44849365234375e+03, 1.4549248046875e+03, 1.463718139648438e+03, 1.47079833984375e+03, 1.476437377929688e+03, 1.480851196289062e+03, 1.484219970703125e+03, 1.486634521484375e+03, 1.487901000976562e+03, 1.48824755859375e+03, 1.48811962890625e+03, 1.4876953125e+03, 1.487026123046875e+03, 1.486129760742188e+03, 1.485054321289062e+03, 1.483850708007812e+03, 1.483097045898438e+03, 1.482845825195312e+03, 1.482671020507812e+03, 1.482045776367188e+03, 1.480762084960938e+03, 1.479287353515625e+03, 1.477783447265625e+03, 1.477267456054688e+03, 1.477865844726562e+03, 1.478464965820312e+03, 1.479218017578125e+03, 1.480115112304688e+03, 1.481117553710938e+03, 1.4820732421875e+03, 1.483063842773438e+03, 1.4842236328125e+03, 1.486067260742188e+03, 1.49036083984375e+03, 1.496496826171875e+03, 1.5035107421875e+03, 1.509999755859375e+03, 1.516008178710938e+03, 1.521934326171875e+03, 1.527869873046875e+03, 1.534011474609375e+03, 1.540096313476562e+03, 1.5460498046875e+03, 1.537908935546875e+03, 1.415247192382812e+03, 1.2986220703125e+03, 1.211735107421875e+03, 1.142543823242188e+03, 1.807755981445312e+03, 2.086574462890627e+03, 2.374020751953127e+03, 1.462119506835938e+03, 1.4629130859375e+03, 1.4752412109375e+03, 1.459315063476562e+03, 1.30480517578125e+03, 1.19089697265625e+03, 1.110490234375e+03, 1.06740185546875e+03, 1.045262573242188e+03, 1.03682421875e+03, 1.037755493164062e+03, 1.04654736328125e+03, 1.058562255859375e+03, 1.069392700195312e+03, 1.07603271484375e+03, 1.07908056640625e+03, 1.0797939453125e+03, 1.078007202148438e+03, 1.073640869140625e+03, 1.065936157226562e+03, 1.056486694335938e+03, 1.048029907226562e+03, 1.0436728515625e+03, 1.04312841796875e+03, 1.04194677734375e+03, 1.042765502929688e+03, 1.047503173828125e+03, 1.058650512695312e+03, 1.077345336914062e+03, 1.097676879882812e+03, 1.11627587890625e+03, 1.12570654296875e+03, 1.132615844726562e+03, 1.138308715820312e+03, 1.84147802734375e+03, 2.112888671875e+03, 3.088792114257812e+02, 1.46180078125e+03, 1.461838989257812e+03, 1.463514526367188e+03, 1.484668334960938e+03, 1.4781728515625e+03, 1.351300170898438e+03, 1.248939819335938e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalAixLib.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalAixLib.txt index ad9ccf84..ee4a6ce3 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalAixLib.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalAixLib.txt @@ -1,20 +1,19 @@ -last-generated=2024-06-28 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0, 0, 0, 0, 0, 0", "nonlinear": "5, 2, 7, 1, 1, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1", - "number of continuous time states": "238", + "number of continuous time states": "234", "numerical Jacobians": "0" } time=[0e+00, 1.728e+05] weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 2.976235656738281e+02, 2.98460205078125e+02, 2.989369201660156e+02, 2.992698974609375e+02, 2.995438842773438e+02, 2.998116455078125e+02, 3.001185302734375e+02, 3.004570007324219e+02, 3.008104553222656e+02, 3.011520690917969e+02, 3.014708557128906e+02, 3.017720947265625e+02, 3.020525817871094e+02, 3.023432922363281e+02, 3.0148583984375e+02, 3.024211120605469e+02, 3.027059936523438e+02, 3.029380187988281e+02, 3.031518859863281e+02, 3.03341796875e+02, 3.036251220703125e+02, 3.03735107421875e+02, 3.040588989257812e+02, 3.040740051269531e+02, 3.0435986328125e+02, 3.045631103515625e+02, 3.046571350097656e+02, 3.04857666015625e+02, 3.050440979003906e+02, 3.052525329589844e+02, 3.054298706054688e+02, 3.056427307128906e+02, 3.057525634765625e+02, 3.058958435058594e+02, 3.0596435546875e+02, 3.060804748535156e+02, 3.061780700683594e+02, 3.061997680664062e+02, 3.061729736328125e+02, 3.061642761230469e+02, 3.062226867675781e+02, 3.062634582519531e+02, 3.059176635742188e+02, 3.0614208984375e+02, 3.047901611328125e+02, 3.057672729492188e+02, 3.059272766113281e+02, 3.060142211914062e+02, 3.060795288085938e+02, 3.061302490234375e+02, 3.061634521484375e+02, 3.061827087402344e+02, 3.061916198730469e+02, 3.061894226074219e+02, 3.061753234863281e+02, 3.06156005859375e+02, 3.061331176757812e+02, 3.06106689453125e+02, 3.060803527832031e+02, 3.060663452148438e+02, 3.060614318847656e+02, 3.060617370605469e+02, 3.060658874511719e+02, 3.060984191894531e+02, 3.046855163574219e+02, 3.056379089355469e+02, 3.057669067382812e+02, 3.057775268554688e+02, 3.057783203125e+02, 3.058291625976562e+02, 3.060416259765625e+02, 3.060557250976562e+02, 3.063152465820312e+02, 3.062750244140625e+02, 3.065892333984375e+02, 3.068048400878906e+02, 3.068406677246094e+02, 3.069092407226562e+02, 3.068928527832031e+02, 3.068950500488281e+02, 3.0685498046875e+02, 3.06927734375e+02, 3.069446716308594e+02, 3.06991455078125e+02, 3.069185485839844e+02, 3.068718566894531e+02, 3.067860107421875e+02, 3.066572570800781e+02, 3.065080261230469e+02, 3.063880615234375e+02, 3.063470764160156e+02, 3.062850036621094e+02, 3.058017578125e+02, 3.059133911132812e+02, 3.044535217285156e+02, 3.053607788085938e+02, 3.0540869140625e+02, 3.053730163574219e+02, 3.053112487792969e+02, 3.052338256835938e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.876079711914062e+02, 2.875114440917969e+02, 2.873834228515625e+02, 2.872423706054688e+02, 2.870897521972656e+02, 2.869350280761719e+02, 2.868129577636719e+02, 2.867485046386719e+02, 2.867051696777344e+02, 2.866676940917969e+02, 2.866376647949219e+02, 2.866298828125e+02, 2.867181701660156e+02, 2.869739074707031e+02, 2.872061767578125e+02, 2.873018798828125e+02, 2.874342041015625e+02, 2.875485534667969e+02, 2.876580200195312e+02, 2.876941528320312e+02, 2.877355346679688e+02, 2.878079528808594e+02, 2.878725891113281e+02, 2.878696594238281e+02, 2.878544311523438e+02, 2.878323669433594e+02, 2.877972412109375e+02, 2.878682556152344e+02, 2.87959228515625e+02, 2.880843811035156e+02, 2.882245788574219e+02, 2.882890319824219e+02, 2.88301025390625e+02, 2.882832336425781e+02, 2.882425231933594e+02, 2.881978454589844e+02, 2.881403198242188e+02, 2.880395202636719e+02, 2.878701477050781e+02, 2.877347106933594e+02, 2.877018127441406e+02, 2.876693725585938e+02, 2.876160888671875e+02, 2.875446472167969e+02, 2.874618225097656e+02, 2.873477783203125e+02, 2.873363952636719e+02, 2.873318176269531e+02, 2.873068237304688e+02, 2.872791442871094e+02, 2.87267578125e+02, 2.872562561035156e+02, 2.872417907714844e+02, 2.872217407226562e+02, 2.871947326660156e+02, 2.871655883789062e+02, 2.871354370117188e+02, 2.871046142578125e+02, 2.870751647949219e+02, 2.870549926757812e+02, 2.870412902832031e+02, 2.870315856933594e+02, 2.870987548828125e+02, 2.873068542480469e+02, 2.874874572753906e+02, 2.875330505371094e+02, 2.876119689941406e+02, 2.876309204101562e+02, 2.876658630371094e+02, 2.877298889160156e+02, 2.879807739257812e+02, 2.882511291503906e+02, 2.884246520996094e+02, 2.885433044433594e+02, 2.886123962402344e+02, 2.886204223632812e+02, 2.885912170410156e+02, 2.885403442382812e+02, 2.885006408691406e+02, 2.885050354003906e+02, 2.885196533203125e+02, 2.885340576171875e+02, 2.885394287109375e+02, 2.885439147949219e+02, 2.88527587890625e+02, 2.884933471679688e+02, 2.884364624023438e+02, 2.883256530761719e+02, 2.881178283691406e+02, 2.879477233886719e+02, 2.878845825195312e+02, 2.878209838867188e+02, 2.877237243652344e+02, 2.87607421875e+02, 2.875287170410156e+02, 2.874161376953125e+02, 2.873554992675781e+02, 2.872944946289062e+02, 2.872086791992188e+02, 2.871170654296875e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.043723449707031e+02, 3.065998840332031e+02, 3.080498046875e+02, 3.091797485351562e+02, 3.10187255859375e+02, 3.111793518066406e+02, 3.122145080566406e+02, 3.133346862792969e+02, 3.144778442382812e+02, 3.155899963378906e+02, 3.166366577148438e+02, 3.176206359863281e+02, 3.185331420898438e+02, 3.194159240722656e+02, 3.180355529785156e+02, 3.200839538574219e+02, 3.208963928222656e+02, 3.215906982421875e+02, 3.222431945800781e+02, 3.228403930664062e+02, 3.236356201171875e+02, 3.240206298828125e+02, 3.248743286132812e+02, 3.252286682128906e+02, 3.258573303222656e+02, 3.264390563964844e+02, 3.268001098632812e+02, 3.273670349121094e+02, 3.279018249511719e+02, 3.131569213867188e+02, 2.978901672363281e+02, 2.942730102539062e+02, 3.220765380859375e+02, 3.236800842285156e+02, 3.246744079589844e+02, 3.252416381835938e+02, 3.256806335449219e+02, 3.25981689453125e+02, 3.262501831054688e+02, 3.265980224609375e+02, 3.27113525390625e+02, 3.276373596191406e+02, 3.274071655273438e+02, 3.245744934082031e+02, 3.005950927734375e+02, 2.949138793945312e+02, 3.224346313476562e+02, 3.238567504882812e+02, 3.247650756835938e+02, 3.252147827148438e+02, 3.255664672851562e+02, 3.259201354980469e+02, 3.263044738769531e+02, 3.267495422363281e+02, 3.272423706054688e+02, 3.277566528320312e+02, 3.241694641113285e+02, 3.004991455078125e+02, 2.948910522460938e+02, 2.935623779296875e+02, 3.226896667480469e+02, 3.240505676269531e+02, 3.247415771484375e+02, 3.252221069335938e+02, 3.23095458984375e+02, 3.252456359863281e+02, 3.259082336425781e+02, 3.263977966308594e+02, 3.268768615722656e+02, 3.274186096191406e+02, 3.282154541015625e+02, 3.017747802734375e+02, 2.951931457519531e+02, 2.93634033203125e+02, 2.932646789550781e+02, 3.201828002929688e+02, 3.211679077148438e+02, 3.228489685058594e+02, 3.246224060058594e+02, 3.263254089355469e+02, 3.279322204589844e+02, 3.048674926757812e+02, 2.959261779785156e+02, 2.938075256347656e+02, 2.933057861328125e+02, 2.931868896484375e+02, 2.931587219238281e+02, 3.1777099609375e+02, 3.194826354980469e+02, 3.204036865234375e+02, 3.216527709960938e+02, 3.227428894042969e+02, 3.22885498046875e+02, 3.241151428222656e+02, 3.224128112792969e+02, 3.247796325683594e+02, 3.2559375e+02, 3.261971130371094e+02, 3.267291564941406e+02, 3.271946105957031e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.879235534667969e+02, 2.880890502929688e+02, 2.881209716796875e+02, 2.881037292480469e+02, 2.880614318847656e+02, 2.880135498046875e+02, 2.879995727539062e+02, 2.880502319335938e+02, 2.881303405761719e+02, 2.882206726074219e+02, 2.88320068359375e+02, 2.884411926269531e+02, 2.886607055664062e+02, 2.890525512695312e+02, 2.894145202636719e+02, 2.895997009277344e+02, 2.898759155273438e+02, 2.901294860839844e+02, 2.903782653808594e+02, 2.90546142578125e+02, 2.907155151367188e+02, 2.909188232421875e+02, 2.911089172363281e+02, 2.912175903320312e+02, 2.912975463867188e+02, 2.913797912597656e+02, 2.914422912597656e+02, 2.916451416015625e+02, 2.918824768066406e+02, 2.921429748535156e+02, 2.921989135742188e+02, 2.918982849121094e+02, 2.916575927734375e+02, 2.918984375e+02, 2.92056396484375e+02, 2.921419067382812e+02, 2.921733703613281e+02, 2.921528930664062e+02, 2.920729064941406e+02, 2.920349731445312e+02, 2.921055908203125e+02, 2.921858520507812e+02, 2.922459716796875e+02, 2.922667846679688e+02, 2.921664733886719e+02, 2.91754638671875e+02, 2.914095764160156e+02, 2.916458435058594e+02, 2.918170776367188e+02, 2.919187622070312e+02, 2.920009460449219e+02, 2.920755615234375e+02, 2.921488647460938e+02, 2.922222900390625e+02, 2.922972412109375e+02, 2.923775024414062e+02, 2.924611511230469e+02, 2.924192199707031e+02, 2.920803527832031e+02, 2.917388610839844e+02, 2.91791259765625e+02, 2.920219116210938e+02, 2.922599182128906e+02, 2.925948181152344e+02, 2.9287939453125e+02, 2.929801940917969e+02, 2.931786193847656e+02, 2.93310791015625e+02, 2.934586791992188e+02, 2.93629150390625e+02, 2.939744567871094e+02, 2.941924438476562e+02, 2.940107727050781e+02, 2.936728515625e+02, 2.934267883300781e+02, 2.932539672851562e+02, 2.931986083984375e+02, 2.931801452636719e+02, 2.931855163574219e+02, 2.932010192871094e+02, 2.931987915039062e+02, 2.931854248046875e+02, 2.931680297851562e+02, 2.931531677246094e+02, 2.931407775878906e+02, 2.9312353515625e+02, 2.930978698730469e+02, 2.930150146484375e+02, 2.928770751953125e+02, 2.928312683105469e+02, 2.929080505371094e+02, 2.929959411621094e+02, 2.930415344238281e+02, 2.930444946289062e+02, 2.930817260742188e+02, 2.930439758300781e+02, 2.931100463867188e+02, 2.931624145507812e+02, 2.931807861328125e+02, 2.931892395019531e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[1.627543579101562e+03, 1.7388779296875e+03, 1.738241577148438e+03, 1.73612646484375e+03, 1.7334931640625e+03, 1.729794921875e+03, 1.726401733398438e+03, 1.726202758789062e+03, 1.726202758789062e+03, 1.726202758789062e+03, 1.726202758789062e+03, 1.726895141601562e+03, 1.729876220703125e+03, 1.732551025390625e+03, 1.734991455078125e+03, 1.736978515625e+03, 1.736390502929688e+03, 1.737198608398438e+03, 1.742019287109375e+03, 1.744921020507812e+03, 1.74226904296875e+03, 1.741906127929688e+03, 1.74627587890625e+03, 1.74993359375e+03, 1.75135400390625e+03, 1.753056640625e+03, 1.756109252929688e+03, 1.759350952148438e+03, 1.761141235351562e+03, 1.762440063476562e+03, 1.769081665039062e+03, 1.778270629882812e+03, 1.779417114257812e+03, 1.7792392578125e+03, 1.778498657226562e+03, 1.77771923828125e+03, 1.7772138671875e+03, 1.776833984375e+03, 1.774200317382812e+03, 1.771053466796875e+03, 1.76797998046875e+03, 1.764896606445312e+03, 1.761926147460938e+03, 1.760331176757812e+03, 1.759335571289062e+03, 1.758446411132812e+03, 1.757904296875e+03, 1.757763427734375e+03, 1.757999877929688e+03, 1.758782836914062e+03, 1.759590454101562e+03, 1.75986083984375e+03, 1.759632446289062e+03, 1.758812255859375e+03, 1.756829223632812e+03, 1.75371630859375e+03, 1.750558837890625e+03, 1.747384887695312e+03, 1.744194213867188e+03, 1.741674682617188e+03, 1.7413056640625e+03, 1.741837890625e+03, 1.74277978515625e+03, 1.743220092773438e+03, 1.743036499023438e+03, 1.743719116210938e+03, 1.746732666015625e+03, 1.7481357421875e+03, 1.746740478515625e+03, 1.746750244140625e+03, 1.748244506835938e+03, 1.750090698242188e+03, 1.752299560546875e+03, 1.754952026367188e+03, 1.760347900390625e+03, 1.766050659179688e+03, 1.768378662109375e+03, 1.767817504882812e+03, 1.761780151367188e+03, 1.754901123046875e+03, 1.755078491210938e+03, 1.756058471679688e+03, 1.75799072265625e+03, 1.759905151367188e+03, 1.755733154296875e+03, 1.744568481445312e+03, 1.732839111328125e+03, 1.720439208984375e+03, 1.7125986328125e+03, 1.707770629882812e+03, 1.703461791992188e+03, 1.6992568359375e+03, 1.69458740234375e+03, 1.687942260742188e+03, 1.682941650390625e+03, 1.682867431640625e+03, 1.681353637695312e+03, 1.677035400390625e+03, 1.6729736328125e+03, 1.669524536132812e+03, 1.666205200195312e+03] +electricalGrid.PElecLoa=[4.078162109375e+03, 4.086784423828125e+03, 4.08607275390625e+03, 4.083716064453125e+03, 4.080793701171875e+03, 4.0767099609375e+03, 4.072987548828125e+03, 4.0727705078125e+03, 4.159470703125e+03, 4.25971826171875e+03, 4.3571806640625e+03, 4.44934326171875e+03, 4.53771240234375e+03, 4.62208935546875e+03, 4.70391064453125e+03, 4.5825029296875e+03, 4.7662158203125e+03, 4.84076953125e+03, 4.908103515625e+03, 4.97058544921875e+03, 5.0235185546875e+03, 5.09450048828125e+03, 5.1381064453125e+03, 5.218068359375e+03, 5.23893017578125e+03, 5.31327587890625e+03, 5.37106640625e+03, 5.4087158203125e+03, 5.4638154296875e+03, 5.5155419921875e+03, 7.803009986877441e+00, 7.803009986877441e+00, 7.803009986877441e+00, 4.9825615234375e+03, 5.134514648437501e+03, 5.22680029296875e+03, 5.2796611328125e+03, 5.32079443359375e+03, 5.34692138671875e+03, 5.3693818359375e+03, 5.399142578125e+03, 5.44412890625e+03, 5.49006640625e+03, 5.4722060546875e+03, 7.803009986877441e+00, 7.803009986877441e+00, 7.803009986877441e+00, 4.9963759765625e+03, 5.13180322265625e+03, 5.216787109375e+03, 5.2594541015625e+03, 5.29276025390625e+03, 5.325794921875e+03, 5.36110546875e+03, 5.400837890625e+03, 5.44368310546875e+03, 5.488314453125e+03, 7.803009987423138e+00, 7.803009986877441e+00, 7.803009986877441e+00, 7.803009986877441e+00, 5.0088359375e+03, 5.1345078125e+03, 5.1986591796875e+03, 5.24326806640625e+03, 5.04893701171875e+03, 5.25037255859375e+03, 5.314150390625e+03, 5.358532226562501e+03, 5.404056152343747e+03, 5.457279785156247e+03, 5.5308349609375e+03, 7.62220573425293e+00, 6.51226282119751e+00, 5.380609512329102e+00, 4.740490913391113e+00, 4.8021494140625e+03, 4.88948583984375e+03, 5.038880859375e+03, 5.197896484375e+03, 5.3572890625e+03, 5.50927783203125e+03, 3.41079306602478e+00, 3.355799674987793e+00, 3.388521671295166e+00, 3.493436336517334e+00, 3.724007844924927e+00, 4.154959678649902e+00, 4.54199072265625e+03, 4.68732421875e+03, 4.76818017578125e+03, 4.87596630859375e+03, 4.96896826171875e+03, 4.980919921875e+03, 5.08317333984375e+03, 4.91742578125e+03, 5.1421494140625e+03, 5.210732421875e+03, 5.26065478515625e+03, 5.30472509765625e+03, 5.34281396484375e+03] diff --git a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalBuildings.txt b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalBuildings.txt index a789bfb0..e8f0f64a 100644 --- a/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalBuildings.txt +++ b/BESMod/Resources/ReferenceResults/Dymola/BESMod_Examples_SolarThermalSystem_SolarThermalBuildings.txt @@ -1,20 +1,19 @@ -last-generated=2024-06-28 +last-generated=2024-09-30 statistics-initialization= { - "linear": "0, 0, 0, 0, 0, 0", - "nonlinear": "5, 7, 1, 1, 1, 1", + "nonlinear": "5, 7, 1, 1, 2, 1", "numerical Jacobians": "0" } statistics-simulation= { - "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", + "linear": "0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0", "nonlinear": "1, 1, 6, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 0, 1, 1", - "number of continuous time states": "240", + "number of continuous time states": "236", "numerical Jacobians": "0" } time=[0e+00, 1.728e+05] weaDat.weaBus.TDryBul=[2.711499938964844e+02, 2.711964111328125e+02, 2.711585388183594e+02, 2.710329895019531e+02, 2.708773498535156e+02, 2.706598205566406e+02, 2.704615478515625e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704500122070312e+02, 2.704904479980469e+02, 2.706648559570312e+02, 2.708219909667969e+02, 2.709660034179688e+02, 2.710835876464844e+02, 2.710487060546875e+02, 2.710967712402344e+02, 2.713839721679688e+02, 2.715577392578125e+02, 2.713986511230469e+02, 2.713771667480469e+02, 2.716394348144531e+02, 2.718602600097656e+02, 2.719464111328125e+02, 2.720499877929688e+02, 2.722364196777344e+02, 2.724353637695312e+02, 2.725456237792969e+02, 2.726259155273438e+02, 2.730393371582031e+02, 2.736041564941406e+02, 2.736746826171875e+02, 2.736636657714844e+02, 2.736180114746094e+02, 2.735700073242188e+02, 2.735389404296875e+02, 2.735155944824219e+02, 2.7335400390625e+02, 2.731619873046875e+02, 2.729700012207031e+02, 2.727780151367188e+02, 2.72593994140625e+02, 2.724955749511719e+02, 2.724342651367188e+02, 2.723796081542969e+02, 2.723463134765625e+02, 2.723376770019531e+02, 2.723522033691406e+02, 2.724003295898438e+02, 2.724500122070312e+02, 2.724666442871094e+02, 2.724525451660156e+02, 2.724020690917969e+02, 2.722803344726562e+02, 2.720899963378906e+02, 2.718980102539062e+02, 2.717059936523438e+02, 2.715140075683594e+02, 2.713631591796875e+02, 2.713411865234375e+02, 2.713729858398438e+02, 2.714293518066406e+02, 2.714556884765625e+02, 2.714446716308594e+02, 2.714856872558594e+02, 2.716668701171875e+02, 2.717514038085938e+02, 2.716672058105469e+02, 2.716678771972656e+02, 2.71758056640625e+02, 2.718697814941406e+02, 2.7200390625e+02, 2.721656494140625e+02, 2.724968872070312e+02, 2.728500061035156e+02, 2.729950561523438e+02, 2.729598999023438e+02, 2.725846862792969e+02, 2.721623229980469e+02, 2.721732788085938e+02, 2.722332153320312e+02, 2.723517456054688e+02, 2.724693908691406e+02, 2.722129516601562e+02, 2.715361633300781e+02, 2.708384399414062e+02, 2.701152648925781e+02, 2.6966552734375e+02, 2.693913269042969e+02, 2.691483459472656e+02, 2.68912841796875e+02, 2.686530456542969e+02, 2.682867126464844e+02, 2.680051879882812e+02, 2.680009765625e+02, 2.679133911132812e+02, 2.676651611328125e+02, 2.674332275390625e+02, 2.672374267578125e+02, 2.670499877929688e+02] -hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 2.976658020019531e+02, 2.986680297851562e+02, 2.992571716308594e+02, 2.996145629882812e+02, 2.998484497070312e+02, 3.0003857421875e+02, 3.002480163574219e+02, 3.00486572265625e+02, 3.00755615234375e+02, 3.010447082519531e+02, 3.013450927734375e+02, 3.01657470703125e+02, 3.019657897949219e+02, 3.022986145019531e+02, 3.01447509765625e+02, 3.023903503417969e+02, 3.026644897460938e+02, 3.02913330078125e+02, 3.031400146484375e+02, 3.033462524414062e+02, 3.036559753417969e+02, 3.037683715820312e+02, 3.0410107421875e+02, 3.04111328125e+02, 3.04371826171875e+02, 3.045624694824219e+02, 3.046466674804688e+02, 3.048308410644531e+02, 3.050296020507812e+02, 3.052560729980469e+02, 3.054393615722656e+02, 3.056636047363281e+02, 3.057797546386719e+02, 3.059302062988281e+02, 3.059888000488281e+02, 3.060965576171875e+02, 3.061875e+02, 3.061871032714844e+02, 3.061185913085938e+02, 3.060863952636719e+02, 3.061424255371094e+02, 3.061993713378906e+02, 3.058380737304688e+02, 3.060273742675781e+02, 3.046216430664062e+02, 3.055628051757812e+02, 3.057413940429688e+02, 3.059208984375e+02, 3.060669860839844e+02, 3.061704406738281e+02, 3.062319946289062e+02, 3.062569580078125e+02, 3.062528686523438e+02, 3.062255249023438e+02, 3.061801147460938e+02, 3.061297302246094e+02, 3.0608251953125e+02, 3.060423583984375e+02, 3.060131225585938e+02, 3.06005126953125e+02, 3.060124206542969e+02, 3.060275268554688e+02, 3.060460205078125e+02, 3.060948791503906e+02, 3.046148071289062e+02, 3.05497314453125e+02, 3.055957641601562e+02, 3.056467590332031e+02, 3.056920166015625e+02, 3.058018798828125e+02, 3.062581787109375e+02, 3.049449157714844e+02, 3.047086791992188e+02, 3.048539733886719e+02, 3.057863464355469e+02, 3.065919189453125e+02, 3.069486999511719e+02, 3.070852966308594e+02, 3.067285766601562e+02, 3.064871826171875e+02, 3.062529907226562e+02, 3.061860046386719e+02, 3.061512145996094e+02, 3.062293701171875e+02, 3.062393188476562e+02, 3.063037414550781e+02, 3.063284912109375e+02, 3.062643737792969e+02, 3.061253967285156e+02, 3.060105895996094e+02, 3.059766845703125e+02, 3.0593017578125e+02, 3.054310913085938e+02, 3.054974670410156e+02, 3.04007080078125e+02, 3.048669128417969e+02, 3.049464721679688e+02, 3.05016845703125e+02, 3.050485229492188e+02, 3.050275573730469e+02] -outputs.building.TZone[1]=[2.931499938964844e+02, 2.876071472167969e+02, 2.875175170898438e+02, 2.874015502929688e+02, 2.8726904296875e+02, 2.871190795898438e+02, 2.869621887207031e+02, 2.868347778320312e+02, 2.867630920410156e+02, 2.867120666503906e+02, 2.866679992675781e+02, 2.86633544921875e+02, 2.866239013671875e+02, 2.867125244140625e+02, 2.869701843261719e+02, 2.872058715820312e+02, 2.873030700683594e+02, 2.874338684082031e+02, 2.875478515625e+02, 2.876584777832031e+02, 2.876961975097656e+02, 2.877391357421875e+02, 2.878133544921875e+02, 2.878787841796875e+02, 2.878761901855469e+02, 2.878599853515625e+02, 2.878360900878906e+02, 2.877998962402344e+02, 2.878694458007812e+02, 2.87959716796875e+02, 2.880858154296875e+02, 2.882271728515625e+02, 2.882924499511719e+02, 2.883052368164062e+02, 2.882882995605469e+02, 2.882478942871094e+02, 2.882025451660156e+02, 2.8814453125e+02, 2.88042724609375e+02, 2.878704833984375e+02, 2.877318420410156e+02, 2.876966552734375e+02, 2.876639099121094e+02, 2.876115112304688e+02, 2.875379333496094e+02, 2.874519958496094e+02, 2.873348693847656e+02, 2.873173828125e+02, 2.873149719238281e+02, 2.872969970703125e+02, 2.872760620117188e+02, 2.87269287109375e+02, 2.872607116699219e+02, 2.872470092773438e+02, 2.872260131835938e+02, 2.871968688964844e+02, 2.871649780273438e+02, 2.871320190429688e+02, 2.87098876953125e+02, 2.870679321289062e+02, 2.870472412109375e+02, 2.870338134765625e+02, 2.870250244140625e+02, 2.870933532714844e+02, 2.873027954101562e+02, 2.874847106933594e+02, 2.875263977050781e+02, 2.875961303710938e+02, 2.876125793457031e+02, 2.876499938964844e+02, 2.877185668945312e+02, 2.879772338867188e+02, 2.882306518554688e+02, 2.883175354003906e+02, 2.883886413574219e+02, 2.8847021484375e+02, 2.88527099609375e+02, 2.885458374023438e+02, 2.885226440429688e+02, 2.884881591796875e+02, 2.884660949707031e+02, 2.884560852050781e+02, 2.884488830566406e+02, 2.884388427734375e+02, 2.884351196289062e+02, 2.884188842773438e+02, 2.883898010253906e+02, 2.8834130859375e+02, 2.882380981445312e+02, 2.8803369140625e+02, 2.878644714355469e+02, 2.878010559082031e+02, 2.877376708984375e+02, 2.876405944824219e+02, 2.875213623046875e+02, 2.874387817382812e+02, 2.873233642578125e+02, 2.872565612792969e+02, 2.871980285644531e+02, 2.871200561523438e+02, 2.870358581542969e+02] +hydraulic.generation.sigBusGen.TGenOutMea=[2.931499938964844e+02, 3.045380859375e+02, 3.071354064941406e+02, 3.087449035644531e+02, 3.098776245117188e+02, 3.108309631347656e+02, 3.117410888671875e+02, 3.12694580078125e+02, 3.137122802734375e+02, 3.147567749023438e+02, 3.157989807128906e+02, 3.168150634765625e+02, 3.17807861328125e+02, 3.187375183105469e+02, 3.196473388671875e+02, 3.181557922363281e+02, 3.201779174804688e+02, 3.209835205078125e+02, 3.216786193847656e+02, 3.223236083984375e+02, 3.229121398925781e+02, 3.237456970214844e+02, 3.241331176757812e+02, 3.250083923339844e+02, 3.253616638183594e+02, 3.259470520019531e+02, 3.265097961425781e+02, 3.268562316894531e+02, 3.273924865722656e+02, 3.279500732421875e+02, 3.101976623535156e+02, 2.971890563964844e+02, 2.941068420410156e+02, 3.224810791015625e+02, 3.235592956542969e+02, 3.244914245605469e+02, 3.252366027832031e+02, 3.257795104980469e+02, 3.260538635253906e+02, 3.261982421875e+02, 3.263835144042969e+02, 3.2672705078125e+02, 3.27144287109375e+02, 3.268506774902344e+02, 3.276971130371094e+02, 3.256204833984375e+02, 3.277674560546875e+02, 3.138843078613281e+02, 2.980622253417969e+02, 2.943136596679688e+02, 2.934256896972656e+02, 3.23142578125e+02, 3.243006591796875e+02, 3.250806579589844e+02, 3.256160278320312e+02, 3.25987060546875e+02, 3.262625732421875e+02, 3.265018920898438e+02, 3.267628479003906e+02, 3.270963439941406e+02, 3.275376281738281e+02, 3.280692138671875e+02, 3.055003356933594e+02, 2.960757446289062e+02, 2.93843017578125e+02, 3.198327941894531e+02, 3.222963562011719e+02, 3.235510559082031e+02, 3.243966064453125e+02, 3.250205993652344e+02, 3.2557763671875e+02, 3.257718200683594e+02, 3.233960266113281e+02, 3.237060241699219e+02, 3.243300476074219e+02, 3.273375549316406e+02, 3.0842626953125e+02, 2.96769287109375e+02, 2.940074462890625e+02, 2.933530578613281e+02, 2.931980895996094e+02, 2.931614074707031e+02, 2.931527099609375e+02, 3.148538208007812e+02, 3.172831726074219e+02, 3.201806640625e+02, 3.219269104003906e+02, 3.227062377929688e+02, 3.236464538574219e+02, 3.249691467285156e+02, 3.261045532226562e+02, 3.271912841796875e+02, 3.280670471191406e+02, 3.251210632324219e+02, 3.254851684570312e+02, 3.246785583496094e+02, 3.255302734375e+02, 3.257357788085938e+02, 3.259246215820312e+02, 3.2611181640625e+02, 3.263110656738281e+02] +outputs.building.TZone[1]=[2.931499938964844e+02, 2.879241027832031e+02, 2.881103820800781e+02, 2.881698913574219e+02, 2.881671752929688e+02, 2.881284484863281e+02, 2.880788879394531e+02, 2.880602111816406e+02, 2.881058044433594e+02, 2.881785278320312e+02, 2.882615661621094e+02, 2.883560791015625e+02, 2.884756469726562e+02, 2.886963500976562e+02, 2.890908813476562e+02, 2.894557800292969e+02, 2.896337585449219e+02, 2.899062805175781e+02, 2.901591186523438e+02, 2.904078674316406e+02, 2.905760803222656e+02, 2.907459411621094e+02, 2.909517211914062e+02, 2.911434936523438e+02, 2.912531127929688e+02, 2.913313903808594e+02, 2.91410400390625e+02, 2.914711303710938e+02, 2.9167138671875e+02, 2.919076843261719e+02, 2.9215869140625e+02, 2.922266235351562e+02, 2.920725402832031e+02, 2.917608337402344e+02, 2.919527282714844e+02, 2.920782470703125e+02, 2.921598815917969e+02, 2.922037353515625e+02, 2.921902465820312e+02, 2.921054992675781e+02, 2.9205517578125e+02, 2.92107421875e+02, 2.921697387695312e+02, 2.922171936035156e+02, 2.922293090820312e+02, 2.92232666015625e+02, 2.921638793945312e+02, 2.922563171386719e+02, 2.922179565429688e+02, 2.920494689941406e+02, 2.916536560058594e+02, 2.916990356445312e+02, 2.918854370117188e+02, 2.920235595703125e+02, 2.921264038085938e+02, 2.922024230957031e+02, 2.922631530761719e+02, 2.923153381347656e+02, 2.923650512695312e+02, 2.924201354980469e+02, 2.924933471679688e+02, 2.925840759277344e+02, 2.926388244628906e+02, 2.926217041015625e+02, 2.925912170410156e+02, 2.92438232421875e+02, 2.9265869140625e+02, 2.92932861328125e+02, 2.93110595703125e+02, 2.932820434570312e+02, 2.934580688476562e+02, 2.937826232910156e+02, 2.940070190429688e+02, 2.940515747070312e+02, 2.940453796386719e+02, 2.937942810058594e+02, 2.93466552734375e+02, 2.932813415527344e+02, 2.931969909667969e+02, 2.931579895019531e+02, 2.931466979980469e+02, 2.931373596191406e+02, 2.931183471679688e+02, 2.930905456542969e+02, 2.930215148925781e+02, 2.9305810546875e+02, 2.931428833007812e+02, 2.931744384765625e+02, 2.93141845703125e+02, 2.93101318359375e+02, 2.931181335449219e+02, 2.931649780273438e+02, 2.931794738769531e+02, 2.931294555664062e+02, 2.930690307617188e+02, 2.930571594238281e+02, 2.930444030761719e+02, 2.930644226074219e+02, 2.930773620605469e+02, 2.930705871582031e+02, 2.930625305175781e+02] electricalGrid.PElecGen=[0e+00, 0e+00] -electricalGrid.PElecLoa=[1.627543579101562e+03, 1.7388779296875e+03, 1.738241577148438e+03, 1.73612646484375e+03, 1.7334931640625e+03, 1.729794921875e+03, 1.726401733398438e+03, 1.726202758789062e+03, 1.726202758789062e+03, 1.726202758789062e+03, 1.726202758789062e+03, 1.726895141601562e+03, 1.729876220703125e+03, 1.732551025390625e+03, 1.734991455078125e+03, 1.736978515625e+03, 1.736390502929688e+03, 1.737198608398438e+03, 1.742019287109375e+03, 1.744921020507812e+03, 1.74226904296875e+03, 1.741906005859375e+03, 1.74627587890625e+03, 1.74993359375e+03, 1.75135400390625e+03, 1.753056640625e+03, 1.756109252929688e+03, 1.759350952148438e+03, 1.761141235351562e+03, 1.762440063476562e+03, 1.769081665039062e+03, 1.778270629882812e+03, 1.779417114257812e+03, 1.7792392578125e+03, 1.778498657226562e+03, 1.77771923828125e+03, 1.7772138671875e+03, 1.776834594726562e+03, 1.774200317382812e+03, 1.771053466796875e+03, 1.76797998046875e+03, 1.764896606445312e+03, 1.76192626953125e+03, 1.760331176757812e+03, 1.759335571289062e+03, 1.758446411132812e+03, 1.757904296875e+03, 1.757763427734375e+03, 1.757999755859375e+03, 1.758782836914062e+03, 1.75959033203125e+03, 1.75986083984375e+03, 1.759632446289062e+03, 1.7588125e+03, 1.756829711914062e+03, 1.75371630859375e+03, 1.750558837890625e+03, 1.747384887695312e+03, 1.744194213867188e+03, 1.741674560546875e+03, 1.741305786132812e+03, 1.741837768554688e+03, 1.74277978515625e+03, 1.743220092773438e+03, 1.743036987304688e+03, 1.743719116210938e+03, 1.746732666015625e+03, 1.7481357421875e+03, 1.746740478515625e+03, 1.746750244140625e+03, 1.748244506835938e+03, 1.750090698242188e+03, 1.752299560546875e+03, 1.754952026367188e+03, 1.760347900390625e+03, 1.766050659179688e+03, 1.768378662109375e+03, 1.767817504882812e+03, 1.761779663085938e+03, 1.754901123046875e+03, 1.755078491210938e+03, 1.756058471679688e+03, 1.75799072265625e+03, 1.759905151367188e+03, 1.755733154296875e+03, 1.744568481445312e+03, 1.732839111328125e+03, 1.720439453125e+03, 1.7125986328125e+03, 1.707770629882812e+03, 1.703461791992188e+03, 1.6992568359375e+03, 1.694587280273438e+03, 1.687942260742188e+03, 1.682941528320312e+03, 1.682867431640625e+03, 1.681353637695312e+03, 1.677035400390625e+03, 1.6729736328125e+03, 1.669524536132812e+03, 1.666205200195312e+03] +electricalGrid.PElecLoa=[4.078162109375e+03, 4.086784423828125e+03, 4.08607275390625e+03, 4.083716064453125e+03, 4.080793701171875e+03, 4.0767099609375e+03, 4.072987548828125e+03, 4.10310205078125e+03, 4.19241357421875e+03, 4.2840390625e+03, 4.37544091796875e+03, 4.464986328125e+03, 4.55459521484375e+03, 4.640642578125e+03, 4.7249326171875e+03, 4.59267138671875e+03, 4.7747099609375e+03, 4.84875732421875e+03, 4.9161826171875e+03, 4.97819287109375e+03, 5.030240234375e+03, 5.10481298828125e+03, 5.1486435546875e+03, 5.23062890625e+03, 5.25089599609375e+03, 5.321630859375e+03, 5.3777060546875e+03, 5.4139599609375e+03, 5.46622119140625e+03, 5.52013427734375e+03, 7.803009986877441e+00, 7.803009986877441e+00, 7.803009986877441e+00, 5.01797607421875e+03, 5.122701660156251e+03, 5.2096640625e+03, 5.27946044921875e+03, 5.33023974609375e+03, 5.35366064453125e+03, 5.36434716796875e+03, 5.37866064453125e+03, 5.40748046875e+03, 5.4435615234375e+03, 5.420375e+03, 5.4929404296875e+03, 5.28490380859375e+03, 5.49807080078125e+03, 7.803009986877441e+00, 7.803009986877441e+00, 7.803009986877441e+00, 7.803009986877441e+00, 5.0667958984375e+03, 5.17454931640625e+03, 5.24651123046875e+03, 5.29438232421875e+03, 5.325677734375e+03, 5.34800341796875e+03, 5.36696826171875e+03, 5.387978515625e+03, 5.416509765625e+03, 5.45742822265625e+03, 5.5077138671875e+03, 7.803009986877441e+00, 7.803009986877441e+00, 7.803009986877441e+00, 4.75062841796875e+03, 4.97755908203125e+03, 5.09425244140625e+03, 5.171596679687501e+03, 5.230143554687499e+03, 5.284592773437497e+03, 5.29824169921875e+03, 5.08239013671875e+03, 5.11342431640625e+03, 5.16442578125e+03, 5.4678369140625e+03, 3.441990613937378e+00, 3.289023637771606e+00, 3.313933134078979e+00, 3.422192811965942e+00, 3.487832546234131e+00, 3.604196548461914e+00, 3.880494117736816e+00, 4.3085244140625e+03, 4.52782568359375e+03, 4.7815e+03, 4.92760986328125e+03, 4.98618701171875e+03, 5.06684912109375e+03, 5.1844140625e+03, 5.28452587890625e+03, 5.378388671875e+03, 5.4537490234375e+03, 3.377637939453125e+03, 2.951116943359375e+03, 4.3977890625e+03, 3.342878662109375e+03, 3.31765673828125e+03, 3.463651611328125e+03, 3.633706298828125e+03, 3.784007080078125e+03] diff --git a/BESMod/Systems/Demand/Building/AixLibHighOrder.mo b/BESMod/Systems/Demand/Building/AixLibHighOrder.mo index 898f42aa..f57cb38e 100644 --- a/BESMod/Systems/Demand/Building/AixLibHighOrder.mo +++ b/BESMod/Systems/Demand/Building/AixLibHighOrder.mo @@ -23,10 +23,6 @@ model AixLibHighOrder "High order building model from AixLib library" parameter Modelica.Units.NonSI.Time_hour DiffWeatherDataTime=1 "difference between local time and UTC, e.g. +1 for MET"; parameter Real GroundReflection = 0.2 "ground reflection coefficient"; - Modelica.Thermal.HeatTransfer.Sources.PrescribedTemperature tempOutside - annotation (Placement(transformation(extent={{10,10},{-10,-10}}, - rotation=90, - origin={-50,50}))); Modelica.Thermal.HeatTransfer.Sources.FixedTemperature preTSoi(T=TSoil) "Prescribed soil temperature" annotation (Placement(transformation(extent={{-20,-100},{0,-80}}))); @@ -76,14 +72,6 @@ model AixLibHighOrder "High order building model from AixLib library" Utilities.Electrical.ZeroLoad zeroLoad annotation (Placement(transformation(extent={{24,-108},{44,-88}}))); equation - connect(weaBus.TDryBul, tempOutside.T) annotation (Line( - points={{-47,98},{-47,96},{-50,96},{-50,62}}, - color={255,204,51}, - thickness=0.5), Text( - string="%first", - index=-1, - extent={{-3,-6},{-3,-6}}, - horizontalAlignment=TextAlignment.Right)); connect(convRadToCombPort.portConv, heatPortCon) annotation (Line(points={{-60,-7}, {-72,-7},{-72,-6},{-104,-6},{-104,46},{-86,46},{-86,60},{-100,60}}, color={191,0,0})); @@ -92,8 +80,6 @@ equation connect(HOMBuiEnv.heatingToRooms1, convRadToCombPort.portConvRadComb) annotation (Line(points={{-21.4,-1},{-32,-1},{-32,-12},{-40,-12}}, color={191, 0,0})); - connect(HOMBuiEnv.thermOutside, tempOutside.port) annotation (Line(points={{-22, - 33.3},{-20,33.3},{-20,30},{-50,30},{-50,40}}, color={191,0,0})); connect(HOMBuiEnv.groundTemp, preTSoi.port) annotation (Line(points={{8,-36},{8,-90},{0,-90}}, color={191,0,0})); connect(HOMBuiEnv.portVent_in, portVent_in) annotation (Line(points={{38,-23.4}, @@ -142,8 +128,8 @@ equation Line(points={{40.4,-14.3},{52,-14.3},{52,57.4},{40.8,57.4}}, color={255,128,0})); connect(weaBus.winSpe, HOMBuiEnv.WindSpeedPort) annotation (Line( - points={{-47,98},{-50,98},{-50,76},{-64,76},{-64,22},{-36,22},{-36,20.7},{ - -23.8,20.7}}, + points={{-46.895,98.11},{-50,98.11},{-50,76},{-64,76},{-64,22},{-36,22},{ + -36,20.7},{-23.8,20.7}}, color={255,204,51}, thickness=0.5), Text( string="%first", diff --git a/BESMod/Systems/Demand/Building/Components/AixLibHighOrderOFD.mo b/BESMod/Systems/Demand/Building/Components/AixLibHighOrderOFD.mo index 2d409481..d5c3eb1a 100644 --- a/BESMod/Systems/Demand/Building/Components/AixLibHighOrderOFD.mo +++ b/BESMod/Systems/Demand/Building/Components/AixLibHighOrderOFD.mo @@ -124,9 +124,6 @@ equation 191,0,0})); connect(wholeHouseBuildingEnvelope.WindSpeedPort, WindSpeedPort) annotation ( Line(points={{-48.7,55.2},{-72,55.2},{-72,62},{-106,62}}, color={0,0,127})); - connect(wholeHouseBuildingEnvelope.thermOutside, thermOutside) annotation ( - Line(points={{-44,70.88},{-60,70.88},{-60,100},{-100,100}}, - color={191,0,0})); connect(wholeHouseBuildingEnvelope.West, West) annotation (Line(points={{52.82, -5.28},{76,-5.28},{76,-38},{108,-38}}, color={255,128,0})); diff --git a/BESMod/Systems/Demand/Building/HeatDemand/CalcHeaDemHOM.mo b/BESMod/Systems/Demand/Building/HeatDemand/CalcHeaDemHOM.mo index cb799114..ad7a1ef9 100644 --- a/BESMod/Systems/Demand/Building/HeatDemand/CalcHeaDemHOM.mo +++ b/BESMod/Systems/Demand/Building/HeatDemand/CalcHeaDemHOM.mo @@ -40,7 +40,6 @@ model CalcHeaDemHOM Type_Win, redeclare model CorrSolarGainWin = AixLib.ThermalZones.HighOrder.Components.WindowsDoors.BaseClasses.CorrectionSolarGain.CorGSimple, - use_sunblind=false, UValOutDoors=if TIR == 1 then 1.8 else 2.9, use_infiltEN12831=true, diff --git a/BESMod/Systems/Hydraulical/Components/Frosting/BaseClasses/PartialFrosting.mo b/BESMod/Systems/Hydraulical/Components/Frosting/BaseClasses/PartialFrosting.mo deleted file mode 100644 index 785170eb..00000000 --- a/BESMod/Systems/Hydraulical/Components/Frosting/BaseClasses/PartialFrosting.mo +++ /dev/null @@ -1,35 +0,0 @@ -within BESMod.Systems.Hydraulical.Components.Frosting.BaseClasses; -partial model PartialFrosting - "Partial model for frosting and defrost control" - - Modelica.Blocks.Interfaces.RealInput relHum - "Input relative humidity of outdoor air" annotation (Placement( - transformation(extent={{-140,60},{-100,100}}), iconTransformation( - extent={{-140,56},{-100,96}}))); - AixLib.Controls.Interfaces.VapourCompressionMachineControlBus - genConBus - "Bus with the most relevant information for hp frosting calculation" - annotation (Placement(transformation(extent={{-128,-80},{-88,-40}}), - iconTransformation(extent={{-130,-108},{-90,-68}}))); - Modelica.Blocks.Interfaces.RealOutput iceFacMea "Value of Real output" - annotation (Placement(transformation(extent={{100,50},{120,70}}))); - Modelica.Blocks.Interfaces.BooleanOutput modeHeaPum "Value of Boolean output" - annotation (Placement(transformation(extent={{100,-70},{120,-50}}))); - Modelica.Blocks.Interfaces.RealInput TOda "Outdoor air temperature" annotation - (Placement(transformation(extent={{-140,-40},{-100,0}}), iconTransformation( - extent={{-140,-16},{-100,24}}))); - Modelica.Blocks.Interfaces.RealInput QEva_flow "Evaporator heat flow" - annotation (Placement(transformation(extent={{-140,10},{-100,50}}), - iconTransformation(extent={{-140,-74},{-100,-34}}))); - annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ - Rectangle( - extent={{-100,100},{100,-100}}, - lineColor={0,0,0}, - fillColor={215,215,215}, - fillPattern=FillPattern.Solid, - lineThickness=0.5), Text( - extent={{-76,102},{66,66}}, - lineColor={28,108,200}, - textString="%name%")}), Diagram( - coordinateSystem(preserveAspectRatio=false))); -end PartialFrosting; diff --git a/BESMod/Systems/Hydraulical/Components/Frosting/BaseClasses/package.order b/BESMod/Systems/Hydraulical/Components/Frosting/BaseClasses/package.order deleted file mode 100644 index 2604f6d1..00000000 --- a/BESMod/Systems/Hydraulical/Components/Frosting/BaseClasses/package.order +++ /dev/null @@ -1 +0,0 @@ -PartialFrosting diff --git a/BESMod/Systems/Hydraulical/Components/Frosting/Functions.mo b/BESMod/Systems/Hydraulical/Components/Frosting/Functions.mo deleted file mode 100644 index 51782c14..00000000 --- a/BESMod/Systems/Hydraulical/Components/Frosting/Functions.mo +++ /dev/null @@ -1,86 +0,0 @@ -within BESMod.Systems.Hydraulical.Components.Frosting; -package Functions - - function CICOBasedFunction - "Function to calculate the growth rate according to CICO (Liang et al. 2019) and defrost time according to Zhu, 2015." - extends partialFrostingMap; - - protected - Modelica.Units.SI.TemperatureDifference dT = 1.7e3 * CICO ^ (-0.36); - Modelica.Units.SI.Temperature T_c = T_oda - dT; - algorithm - growth_rate := (-3e-7 * log(CICO) + 5.4e-6); - critDefTim := 0; - // Mapping of CICO into the map by Zhu to determine the time until defrost - if CICO <= 18e6 then - critDefTim := 30 * 60; - elseif CICO <= 39e6 then - critDefTim := 60 * 60; - elseif CICO <= 61e6 then - critDefTim := 165 * 60; - else - critDefTim := Modelica.Constants.inf; - end if; - if T_oda >= 279.15 then - growth_rate := 0; - critDefTim := Modelica.Constants.inf; - end if; - Char :={critDefTim,growth_rate}; - - end CICOBasedFunction; - - function ZhuFrostingMapCico - "Function to calculate the growth rate according to Liang et al. 2020 and defrost time according to Zhu, 2015." - extends partialFrostingMap; - - protected - parameter Real coeff_severe[4] = {8.24762543e-01, -1.90727602e-02, 1.19709272e-03, 2.15230362e-05}; - parameter Real coeff_moderate[4] = {5.81825389e-01, -8.80317871e-03, 6.18167285e-04, -7.75483854e-07}; - parameter Real coeff_mild[4] = {4.42929753e-01, -7.03658239e-03, 7.32505699e-05, -3.37264259e-06}; - Real relHum_severe = poly_fit(coeff_severe, T_oda-273.15); - Real relHum_moderate = poly_fit(coeff_moderate, T_oda-273.15); - Real relHum_mild = poly_fit(coeff_mild, T_oda-273.15); - function poly_fit - input Real coeff[4]; - input Real x; - output Real y; - algorithm - y := 0; - for n in 1:size(coeff, 1) loop - y := y + coeff[n] * x^(n - 1); - end for; - end poly_fit; - algorithm - if relHum >= relHum_severe then - growth_rate := 3.6e-7; - critDefTim := 30 * 60; - elseif relHum >= relHum_moderate then - growth_rate := 2.5e-7; - critDefTim := 60 * 60; - elseif relHum >= relHum_mild then - growth_rate := 0.7e-7; - critDefTim := 165 * 60; - else - growth_rate := 0; - critDefTim := Modelica.Constants.inf; - end if; - if T_oda >= 279.15 then - growth_rate := 0; - critDefTim := Modelica.Constants.inf; - end if; - Char :={critDefTim,growth_rate}; - - end ZhuFrostingMapCico; - - partial function partialFrostingMap "Function for a partial frost map" - input Modelica.Units.SI.Temperature T_oda "Outdoor air temperature"; - input Real relHum "Relative humidity as float (betwenn 0 and 1)"; - input Real CICO(unit="s/m") "CICO value"; - output Real Char[2] "Array with: critDefTim (Time until next defrost cycle) and growth_rate(Growth rate of ice on the surface)"; - protected - Modelica.Units.SI.Velocity growth_rate(min=0) "Growth rate of ice"; - Modelica.Units.SI.Time critDefTim "Time until next defrost cycle (based on time-method)"; - - end partialFrostingMap; - -end Functions; diff --git a/BESMod/Systems/Hydraulical/Components/Frosting/NoFrosting.mo b/BESMod/Systems/Hydraulical/Components/Frosting/NoFrosting.mo deleted file mode 100644 index b4a8a8e8..00000000 --- a/BESMod/Systems/Hydraulical/Components/Frosting/NoFrosting.mo +++ /dev/null @@ -1,23 +0,0 @@ -within BESMod.Systems.Hydraulical.Components.Frosting; -model NoFrosting "Model for no frosting at all times" - extends BaseClasses.PartialFrosting; - Modelica.Blocks.Sources.BooleanConstant booCon(final k=true) "Always heating" - annotation (Placement(transformation( - extent={{-10,-10},{10,10}}, - rotation=0, - origin={10,-60}))); - Modelica.Blocks.Sources.Constant constOne(final k=1) "Always iceFac=1" - annotation (Placement(transformation( - extent={{-10,-10},{10,10}}, - rotation=0, - origin={10,60}))); -equation - connect(constOne.y, iceFacMea) - annotation (Line(points={{21,60},{110,60}}, color={0,0,127})); - connect(booCon.y, modeHeaPum) - annotation (Line(points={{21,-60},{110,-60}}, color={255,0,255})); - annotation (Icon(graphics={Text( - extent={{-68,-50},{80,48}}, - lineColor={0,0,0}, - textString="=1")})); -end NoFrosting; diff --git a/BESMod/Systems/Hydraulical/Components/Frosting/ZhuIceFacCalculation.mo b/BESMod/Systems/Hydraulical/Components/Frosting/ZhuIceFacCalculation.mo deleted file mode 100644 index a5dc479a..00000000 --- a/BESMod/Systems/Hydraulical/Components/Frosting/ZhuIceFacCalculation.mo +++ /dev/null @@ -1,218 +0,0 @@ -within BESMod.Systems.Hydraulical.Components.Frosting; -model ZhuIceFacCalculation "IceFac based on Zhus Frosting Map" - extends BaseClasses.PartialFrosting; - parameter Modelica.Units.SI.SpecificEnthalpy h_water_fusion=333.5e3 "Fusion enthalpy of water (Schmelzenthalpie)"; - - parameter Modelica.Units.SI.Area A=15 - "Area of heat exchanger (All fins from both sides, as the growth rate is specific for the area of the HE"; - parameter Modelica.Units.SI.Density density=918 - "Density of ice"; - parameter Real minIceFac=0.5 - "Minimal allowed icing Factor to trigger the defrost"; - parameter Modelica.Units.SI.Mass m_ice_max=density*A*d/2 - "Maximal possible mass of ice on HE surface. This value is limited by the volume between the fin tube"; - parameter Modelica.Units.SI.Distance d=3e-3 - "Distance between two fins. Used to calculate the maximal mass of ice on the HE"; - parameter Modelica.Units.SI.Volume V_h=19e-6 - "Compressor Displacement Volume per rev"; - parameter Modelica.Units.SI.Frequency N_max=120 - "Maximal compressor rotational speed"; - parameter Modelica.Units.SI.VolumeFlowRate V_flow_air=0.001 - "Volume flow rate over outdoor air coil"; - parameter Real natConvCoeff(unit="m/(s.K)")=1e-7 - "Parameter to be calibrated for natural defrost"; - - Modelica.Blocks.Sources.RealExpression iceFac_internal(y=iceFac) - "iceFac from internal calculations" annotation (Placement(transformation( - extent={{-10,10},{10,-10}}, - rotation=0, - origin={-62,80}))); - Modelica.Blocks.Sources.BooleanExpression mode_internal(y=mode_hp) - "Mode from internal calcuations" annotation (Placement( - transformation( - extent={{-10,10},{10,-10}}, - rotation=0, - origin={70,-90}))); - - Boolean mode_hp(start=false) "Heat pump heating mode"; - Real iceFac(start=1) "Icing Factor"; - Modelica.Units.SI.MassFlowRate m_flow_ice(start=0) "Current mass of ice on evaporator surface"; - Modelica.Units.SI.Mass m_ice(start=0) "Total mass that was on evaporator surface over whole simulation duration"; - Modelica.Units.SI.Velocity growth_rate_natural_conv(min=0, start=0) "Growth rate of ice for natural convection (melting)"; - Modelica.Units.SI.Velocity growth_rate_forced_conv(min=0, start=0) "Growth rate of ice for forced convection"; - Real densityCoeff(start=1) "density coefficient"; - Modelica.Units.SI.Time critDefTim - "Time until next defrost cycle (based on time-method)"; - Real CICO(unit="s/m") "CICO value"; - - replaceable function frostMapFunc = - BESMod.Systems.Hydraulical.Components.Frosting.Functions.ZhuFrostingMapCico - constrainedby BESMod.Systems.Hydraulical.Components.Frosting.Functions.partialFrostingMap annotation(choicesAllMatching=true); - - Modelica.Blocks.Logical.Hysteresis hys(uLow=minIceFac, uHigh=1) - "For the iceFac control. Output signal is used internally" - annotation (Placement(transformation(extent={{-30,70},{-10,90}}))); - Modelica.Blocks.Logical.Timer timer - annotation (Placement(transformation(extent={{30,-40},{50,-20}}))); - Modelica.Blocks.Logical.Greater greater - annotation (Placement(transformation(extent={{60,-60},{80,-40}}))); - Modelica.Blocks.Sources.RealExpression critDefTim_internal(y=critDefTim) - "Mode from internal calcuations" annotation (Placement(transformation( - extent={{-10,10},{10,-10}}, - rotation=0, - origin={30,-70}))); - Modelica.Blocks.Logical.GreaterThreshold greaterThreshold(threshold=Modelica.Constants.eps) - annotation (Placement(transformation(extent={{-30,-20},{-10,0}}))); - Modelica.Blocks.Sources.RealExpression growthRateFor_internal(y= - growth_rate_forced_conv) "growthRate from internal calcuations" - annotation (Placement(transformation( - extent={{-10,10},{10,-10}}, - rotation=0, - origin={-50,30}))); - Modelica.Blocks.Logical.Not not1 - annotation (Placement(transformation(extent={{0,70},{20,90}}))); - Modelica.Blocks.Logical.Or orDefrost "Either hys or crit min time" - annotation (Placement(transformation(extent={{40,0},{60,20}}))); - - Modelica.Blocks.Logical.And and1 - annotation (Placement(transformation(extent={{0,-40},{20,-20}}))); - Modelica.Blocks.Logical.LessEqualThreshold lesEquThr(threshold=1 - Modelica.Constants.eps) - annotation (Placement(transformation(extent={{-40,-60},{-20,-40}}))); - Modelica.Blocks.Routing.BooleanPassThrough boolPassHP_on - annotation (Placement(transformation(extent={{-90,-78},{-70,-58}}))); - - Modelica.Units.SI.Time totalTimeDefrost "Total time where defrost operation was necessary in the year"; - - Modelica.Blocks.Interfaces.BooleanOutput defrost - "Indicate if we are defrosting (true) or not" annotation (Placement( - transformation(extent={{100,-12},{124,12}}), iconTransformation(extent={ - {-140,56},{-100,96}}))); - Modelica.Blocks.Logical.And andDefrost - "Either hys or crit min time" - annotation (Placement(transformation(extent={{72,-10},{92,10}}))); - Modelica.Blocks.Routing.RealPassThrough realPass_n_hp - annotation (Placement(transformation(extent={{-90,-102},{-70,-82}}))); - Modelica.Blocks.Interfaces.RealOutput growth_rate "Growth rate of ice" - annotation (Placement(transformation(extent={{100,20},{124,44}}), - iconTransformation(extent={{-140,56},{-100,96}}))); - Modelica.Blocks.Sources.RealExpression growthRateNat_internal(y= - growth_rate_natural_conv) "growthRate from internal calcuations" - annotation (Placement(transformation( - extent={{-10,10},{10,-10}}, - rotation=0, - origin={-10,30}))); - Modelica.Blocks.Logical.Switch switchGrowthRate - annotation (Placement(transformation(extent={{58,40},{78,60}}))); -protected - Modelica.Blocks.Sources.RealExpression m_ice_internal(y=m_ice); - Real Char[2]; - -initial equation - assert(A * V_flow_air / (V_h * N_max)^2 > 7e6, "The paper found the correlations for CICOS greater than 7e6. Extrapolation will yield wrong results", AssertionLevel.warning); -equation - if m_ice > Modelica.Constants.eps then - growth_rate_natural_conv = min(0, -natConvCoeff * (TOda - 273.15)) "Simply energy balance with constant Area and constant defrost"; - else - growth_rate_natural_conv = 0 "Not possible to melt the ice if no ice is present"; - end if; - - Char = frostMapFunc(TOda, relHum, CICO); - // Only vaild if the hp is turned on - if boolPassHP_on.y then - critDefTim = Char[1]; - // Build a forced convection velocity to ensure the growth rate matches the timing in the map. - growth_rate_forced_conv = Char[2]; - CICO = A * V_flow_air / (V_h * N_max * realPass_n_hp.y)^2; - else - critDefTim = Modelica.Constants.inf; - growth_rate_forced_conv = 0; - CICO = 8e-6 "Only used to avoid log(0) as CICO is not defined for n_hp = 0"; - end if; - - // TODO: Check if necessary - if growth_rate >= 3.6e-7 then - densityCoeff = 1; - elseif growth_rate >= 2.5e-7 then - densityCoeff = 150/190; - elseif growth_rate >= 0.7e-7 then - densityCoeff = 150/310; - else - densityCoeff = 1; - end if; - - der(m_ice) = m_flow_ice; - - // Calculate defrost: - if defrost then - m_flow_ice =-(QEva_flow/h_water_fusion)*densityCoeff; - mode_hp = false; - der(totalTimeDefrost) = 1; - else - m_flow_ice = A * density * growth_rate; - mode_hp = true; - der(totalTimeDefrost) = 0; - end if; - - iceFac = 1 - (m_ice/m_ice_max); - - connect(iceFac_internal.y, hys.u) - annotation (Line(points={{-51,80},{-32,80}}, color={0,0,127})); - connect(critDefTim_internal.y, greater.u2) annotation (Line(points={{41,-70},{ - 53.9,-70},{53.9,-58},{58,-58}}, color={0,0,127})); - connect(timer.y, greater.u1) annotation (Line(points={{51,-30},{51,-30.5},{58, - -30.5},{58,-50}}, color={0,0,127})); - connect(greaterThreshold.u, growthRateFor_internal.y) annotation (Line(points={{-32,-10}, - {-32,30},{-39,30}}, color={0,0,127})); - connect(hys.y, not1.u) - annotation (Line(points={{-9,80},{-2,80}}, color={255,0,255})); - connect(not1.y, orDefrost.u1) annotation (Line(points={{21,80},{34,80},{34,10}, - {38,10}}, color={255,0,255})); - connect(greater.y, orDefrost.u2) annotation (Line(points={{81,-50},{86,-50},{86, - -20},{34,-20},{34,2},{38,2}}, - color={255,0,255})); - connect(greaterThreshold.y,and1. u1) annotation (Line(points={{-9,-10},{-2.65, - -10},{-2.65,-30},{-2,-30}}, color={255,0,255})); - connect(iceFac_internal.y, lesEquThr.u) annotation (Line(points={{-51,80},{-48, - 80},{-48,-50},{-42,-50}}, color={0,0,127})); - connect(lesEquThr.y, and1.u2) annotation (Line(points={{-19,-50},{-19,-50.5},{ - -2,-50.5},{-2,-38}}, color={255,0,255})); - connect(and1.y, timer.u) annotation (Line(points={{21,-30},{21,-30.5},{28,-30.5}, - {28,-30}}, color={255,0,255})); - connect(defrost, andDefrost.y) annotation (Line(points={{112,0},{93,0}}, - color={255,0,255})); - connect(orDefrost.y, andDefrost.u1) annotation (Line(points={{61,10},{69.25,10}, - {69.25,0},{70,0}}, color={255,0,255})); - connect(greaterThreshold.y, andDefrost.u2) annotation (Line(points={{-9,-10},{ - 70,-10},{70,-8}}, color={255,0,255})); - connect(greaterThreshold.y, switchGrowthRate.u2) annotation (Line(points={{-9,-10}, - {8,-10},{8,50},{56,50}}, color={255,0,255})); - connect(growthRateNat_internal.y, switchGrowthRate.u3) annotation (Line( - points={{1,30},{14,30},{14,42},{56,42}}, color={0,0,127})); - connect(growthRateFor_internal.y, switchGrowthRate.u1) annotation (Line( - points={{-39,30},{-26,30},{-26,58},{56,58}}, color={0,0,127})); - connect(switchGrowthRate.y, growth_rate) annotation (Line(points={{79,50},{96,50}, - {96,32},{112,32}}, color={0,0,127})); - connect(boolPassHP_on.u, genConBus.onOffMea) annotation (Line(points={{-92,-68}, - {-102,-68},{-102,-59.9},{-107.9,-59.9}}, - color={255,0,255}), Text( - string="%second", - index=1, - extent={{-6,3},{-6,3}}, - horizontalAlignment=TextAlignment.Right)); - connect(realPass_n_hp.u, genConBus.nSet) annotation (Line(points={{-92,-92},{-102, - -92},{-102,-59.9},{-107.9,-59.9}}, color={0,0,127}), Text( - string="%second", - index=1, - extent={{-6,3},{-6,3}}, - horizontalAlignment=TextAlignment.Right)); - connect(growth_rate, growth_rate) - annotation (Line(points={{112,32},{112,32}}, color={0,0,127})); - connect(mode_internal.y, modeHeaPum) annotation (Line(points={{81,-90},{90,-90}, - {90,-60},{110,-60}}, color={255,0,255})); - connect(iceFac_internal.y, iceFacMea) annotation (Line(points={{-51,80},{-48,80}, - {-48,60},{110,60}}, color={0,0,127})); - annotation (Icon(graphics={Text( - extent={{-64,46},{78,-56}}, - lineColor={0,0,0}, - textString="f(CICO)")}), experiment(StopTime=2592000, Interval=500)); -end ZhuIceFacCalculation; diff --git a/BESMod/Systems/Hydraulical/Components/Frosting/package.mo b/BESMod/Systems/Hydraulical/Components/Frosting/package.mo deleted file mode 100644 index 1224396c..00000000 --- a/BESMod/Systems/Hydraulical/Components/Frosting/package.mo +++ /dev/null @@ -1,4 +0,0 @@ -within BESMod.Systems.Hydraulical.Components; -package Frosting "Package with models to account for possible frosting of a heat pump" - -end Frosting; diff --git a/BESMod/Systems/Hydraulical/Components/Frosting/package.order b/BESMod/Systems/Hydraulical/Components/Frosting/package.order deleted file mode 100644 index 0c918017..00000000 --- a/BESMod/Systems/Hydraulical/Components/Frosting/package.order +++ /dev/null @@ -1,4 +0,0 @@ -Functions -NoFrosting -ZhuIceFacCalculation -BaseClasses diff --git a/BESMod/Systems/Hydraulical/Components/package.order b/BESMod/Systems/Hydraulical/Components/package.order index 03f93f27..f53fb007 100644 --- a/BESMod/Systems/Hydraulical/Components/package.order +++ b/BESMod/Systems/Hydraulical/Components/package.order @@ -1,3 +1,2 @@ ElectricHeaterWithSecurityControl -Frosting UFH diff --git a/BESMod/Systems/Hydraulical/Control/BaseClasses/PartialHeatPumpSystemController.mo b/BESMod/Systems/Hydraulical/Control/BaseClasses/PartialHeatPumpSystemController.mo index 26333094..5523a14d 100644 --- a/BESMod/Systems/Hydraulical/Control/BaseClasses/PartialHeatPumpSystemController.mo +++ b/BESMod/Systems/Hydraulical/Control/BaseClasses/PartialHeatPumpSystemController.mo @@ -96,10 +96,6 @@ partial model PartialHeatPumpSystemController Dialog(group="Heat Pump"), Placement(transformation(extent={{80,40},{100,60}}))); - replaceable BESMod.Systems.Hydraulical.Control.RecordsCollection.HeatPumpSafetyControl - safetyControl "Parameters for safety control of heat pump" - annotation (choicesAllMatching=true,Placement(transformation(extent={{204,84}, - {218,98}})), Dialog(group="Component data")); replaceable BESMod.Systems.Hydraulical.Control.Components.RelativeSpeedController.PID priGenPIDCtrl( @@ -118,36 +114,8 @@ partial model PartialHeatPumpSystemController choicesAllMatching=true, Placement(transformation(extent={{82,82},{98,98}}))); - AixLib.Controls.HeatPump.SafetyControls.SafetyControl safCtr( - final minRunTime=safetyControl.minRunTime, - final minLocTime=safetyControl.minLocTime, - final maxRunPerHou=safetyControl.maxRunPerHou, - final use_opeEnv=safetyControl.use_opeEnv, - final use_opeEnvFroRec=false, - final dataTable=AixLib.DataBase.HeatPump.EN14511.Vitocal200AWO201(tableUppBou= - [-20,50; -10,60; 30,60; 35,55]), - final tableUpp=safetyControl.tableUpp, - final use_minRunTime=safetyControl.use_minRunTime, - final use_minLocTime=safetyControl.use_minLocTime, - final use_runPerHou=safetyControl.use_runPerHou, - final dTHystOperEnv=safetyControl.dT_opeEnv, - final use_deFro=false, - final minIceFac=0, - final use_chiller=false, - final calcPel_deFro=0, - final pre_n_start=safetyControl.pre_n_start_hp, - use_antFre=false) "Safety control" annotation (Placement(transformation( - extent={{-10,-10},{10,10}}, - rotation=0, - origin={210,70}))); - Modelica.Blocks.Sources.BooleanConstant heaPumHea(final k=true) - "Heat pump is always heating" annotation (Placement(transformation( - extent={{-10,-10},{10,10}}, - rotation=0, - origin={170,90}))); - Modelica.Blocks.Math.BooleanToReal booToRea(final realTrue=1, final realFalse=0) - "Turn pump on if any device is on" + "Turn pump on if any device is on" annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, @@ -158,12 +126,6 @@ partial model PartialHeatPumpSystemController extent={{-10,-10},{10,10}}, rotation=270, origin={-150,-10}))); - Components.BaseClasses.HeatPumpBusPassThrough heaPumSigBusPasThr - "Bus connector pass through for OpenModelica" annotation (Placement( - transformation( - extent={{10,-10},{-10,10}}, - rotation=180, - origin={170,64}))); Components.BuildingAndDHWControl buiAndDHWCtr( final use_dhw=use_dhw, final nZones=parTra.nParallelDem, @@ -216,17 +178,6 @@ partial model PartialHeatPumpSystemController equation - connect(safCtr.modeSet, heaPumHea.y) annotation (Line(points={{198.667,68},{ - 186,68},{186,90},{181,90}}, - color={255,0,255})); - connect(safCtr.nOut, sigBusGen.yHeaPumSet) annotation (Line(points={{220.833, - 72},{254,72},{254,-118},{-152,-118},{-152,-99}}, - color={0,0,127}), Text( - string="%second", - index=1, - extent={{6,3},{6,3}}, - horizontalAlignment=TextAlignment.Left)); - connect(priGenPIDCtrl.isOn, sigBusGen.heaPumIsOn) annotation (Line(points={{85.2, 80.4},{85.2,62},{66,62},{66,-99},{-152,-99}}, color={255,0,255}), Text( @@ -242,19 +193,6 @@ equation index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); - connect(heaPumSigBusPasThr.sigBusGen, sigBusGen) annotation (Line( - points={{160,64},{154,64},{154,-56},{0,-56},{0,-70},{-152,-70},{-152,-99}}, - color={255,204,51}, - thickness=0.5), Text( - string="%second", - index=1, - extent={{6,3},{6,3}}, - horizontalAlignment=TextAlignment.Left)); - connect(heaPumSigBusPasThr.vapourCompressionMachineControlBus, safCtr.sigBusHP) - annotation (Line( - points={{180.2,64.2},{190,64.2},{190,63.1},{198.75,63.1}}, - color={255,204,51}, - thickness=0.5)); connect(buiAndDHWCtr.TZoneSet, useProBus.TZoneSet) annotation (Line(points={{-204, 32.3333},{-238,32.3333},{-238,103},{-119,103}}, color={0,0,127}), Text( @@ -348,18 +286,20 @@ equation extent={{-6,3},{-6,3}}, horizontalAlignment=TextAlignment.Right)); - connect(anyGenDevIsOn.u[2], sigBusGen.heaPumIsOn) annotation (Line(points={{-148.25, - 0},{-148,0},{-148,6},{-168,6},{-168,-99},{-152,-99}}, color={255,0,255}), + connect(supCtrNSet.y, sigBusGen.yHeaPumSet) annotation (Line(points={{132,90}, + {252,90},{252,-124},{-152,-124},{-152,-99}}, color={0,0,127}), Text( string="%second", index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); - connect(supCtrNSet.y, safCtr.nSet) annotation (Line(points={{132,90},{132,110}, - {196,110},{196,86},{194,86},{194,72},{198.667,72}}, color={0,0,127})); + connect(supCtrNSet.uLoc, priGenPIDCtrl.ySet) annotation (Line(points={{108,82}, {104,82},{104,90},{98.8,90}}, color={0,0,127})); - annotation (Diagram(graphics={ + connect(buiAndDHWCtr.priGren, anyGenDevIsOn.u[2]) annotation (Line(points={{ + -118,27.3333},{-112,27.3333},{-112,4},{-150,4},{-150,0}}, color={255, + 0,255})); + annotation (Diagram(graphics={ Rectangle( extent={{4,100},{136,36}}, lineColor={28,108,200}, @@ -377,14 +317,5 @@ equation extent={{2,-22},{106,-42}}, lineColor={162,29,33}, lineThickness=1, - textString="Auxilliary Heater Control"), - Rectangle( - extent={{138,100},{240,52}}, - lineColor={28,108,200}, - lineThickness=1), - Text( - extent={{138,122},{242,102}}, - lineColor={28,108,200}, - lineThickness=1, - textString="Heat Pump Safety")})); + textString="Auxilliary Heater Control")})); end PartialHeatPumpSystemController; diff --git a/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/HeatPumpBusPassThrough.mo b/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/HeatPumpBusPassThrough.mo index a4df5391..2379babc 100644 --- a/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/HeatPumpBusPassThrough.mo +++ b/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/HeatPumpBusPassThrough.mo @@ -1,80 +1,81 @@ within BESMod.Systems.Hydraulical.Control.Components.BaseClasses; model HeatPumpBusPassThrough Interfaces.GenerationControlBus sigBusGen - annotation (Placement(transformation(extent={{-110,-10},{-90,10}}))); - AixLib.Controls.Interfaces.VapourCompressionMachineControlBus - vapourCompressionMachineControlBus - annotation (Placement(transformation(extent={{82,-22},{122,18}}))); - Modelica.Blocks.Routing.RealPassThrough realPassThrough[4] - annotation (Placement(transformation(extent={{-10,-10},{10,10}}))); + annotation (Placement(transformation(extent={{90,-10},{110,10}}))); + AixLib.Fluid.HeatPumps.ModularReversible.BaseClasses.RefrigerantMachineControlBus + vapComBus + annotation (Placement(transformation(extent={{-120,-20},{-80,20}}))); + Modelica.Blocks.Routing.RealPassThrough realPassThrough[3] + annotation (Placement(transformation(extent={{-10,0},{10,20}}))); Modelica.Blocks.Routing.BooleanPassThrough booleanPassThrough annotation (Placement(transformation(extent={{-10,-40},{10,-20}}))); equation - connect(booleanPassThrough.u, sigBusGen.heaPumIsOn) annotation (Line(points={{ - -12,-30},{-86,-30},{-86,0},{-100,0}}, color={255,0,255}), Text( + connect(booleanPassThrough.y, sigBusGen.heaPumIsOn) annotation (Line(points={{11,-30}, + {100,-30},{100,0}}, color={255,0,255}), Text( string="%second", index=1, extent={{-6,3},{-6,3}}, horizontalAlignment=TextAlignment.Right)); - connect(booleanPassThrough.y, vapourCompressionMachineControlBus.onOffMea) - annotation (Line(points={{11,-30},{46,-30},{46,-26},{102,-26},{102,-2}}, + connect(booleanPassThrough.u, vapComBus.onOffMea) + annotation (Line(points={{-12,-30},{-84,-30},{-84,0},{-100,0}}, color={255,0,255}), Text( string="%second", index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); - connect(realPassThrough[1].u, sigBusGen.THeaPumIn) annotation (Line(points={{-12, - 0},{-100,0}}, color={0,0,127}), Text( + connect(realPassThrough[1].y, sigBusGen.THeaPumIn) annotation (Line(points={{11,10}, + {56,10},{56,0},{100,0}}, + color={0,0,127}), Text( string="%second", index=1, extent={{-6,3},{-6,3}}, horizontalAlignment=TextAlignment.Right)); - connect(realPassThrough[1].y, vapourCompressionMachineControlBus.TConInMea) - annotation (Line(points={{11,0},{78,0},{78,-2},{102,-2}}, color={0,0,127}), + connect(realPassThrough[1].u, vapComBus.TConInMea) + annotation (Line(points={{-12,10},{-56,10},{-56,0},{-100,0}}, + color={0,0,127}), Text( string="%second", index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); - connect(realPassThrough[2].u, sigBusGen.THeaPumOut) annotation (Line(points={ - {-12,0},{-100,0}}, color={0,0,127}), Text( + connect(realPassThrough[2].y, sigBusGen.THeaPumOut) annotation (Line(points={{11,10}, + {56,10},{56,0},{100,0}}, + color={0,0,127}), Text( string="%second", index=1, extent={{-6,3},{-6,3}}, horizontalAlignment=TextAlignment.Right)); - connect(realPassThrough[2].y, vapourCompressionMachineControlBus.TConOutMea) - annotation (Line(points={{11,0},{78,0},{78,-2},{102,-2}}, color={0,0,127}), + connect(realPassThrough[2].u, vapComBus.TConOutMea) + annotation (Line(points={{-12,10},{-56,10},{-56,0},{-100,0}}, + color={0,0,127}), Text( string="%second", index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); - connect(realPassThrough[3].y, vapourCompressionMachineControlBus.nSet) - annotation (Line(points={{11,0},{78,0},{78,-2},{102,-2}}, color={0,0,127}), - Text( - string="%second", - index=1, - extent={{6,3},{6,3}}, - horizontalAlignment=TextAlignment.Left)); - connect(realPassThrough[3].u, sigBusGen.yHeaPumSet) annotation (Line(points={{ - -12,0},{-100,0}}, color={0,0,127}), Text( - string="%second", - index=1, - extent={{-6,3},{-6,3}}, - horizontalAlignment=TextAlignment.Right)); - connect(realPassThrough[4].u, sigBusGen.THeaPumEvaIn) annotation (Line( - points={{-12,0},{-100,0}}, color={0,0,127}), Text( + connect(realPassThrough[3].y, sigBusGen.THeaPumEvaIn) annotation (Line(points={{11,10}, + {56,10},{56,0},{100,0}}, + color={0,0,127}), Text( string="%second", index=1, extent={{-6,3},{-6,3}}, horizontalAlignment=TextAlignment.Right)); - connect(realPassThrough[4].y, vapourCompressionMachineControlBus.TEvaInMea) - annotation (Line(points={{11,0},{78,0},{78,-2},{102,-2}}, color={0,0,127}), + connect(realPassThrough[3].u, vapComBus.TEvaInMea) + annotation (Line(points={{-12,10},{-56,10},{-56,0},{-100,0}}, + color={0,0,127}), Text( string="%second", index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( + annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ + Text( + extent={{-150,138},{150,98}}, + textString="%name", + textColor={0,0,255}), Rectangle( + extent={{-100,-100},{100,100}}, + lineColor={0,0,127}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid)}), Diagram( coordinateSystem(preserveAspectRatio=false))); end HeatPumpBusPassThrough; diff --git a/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/MeasuredValue.mo b/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/MeasuredValue.mo index 6f5f6fa0..636285f9 100644 --- a/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/MeasuredValue.mo +++ b/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/MeasuredValue.mo @@ -4,4 +4,12 @@ type MeasuredValue = enumeration( "Supply temperature of generation system", DistributionTemperature "Temperature in distribution") - "Select possible measurements for control"; + "Select possible measurements for control" annotation (Icon(graphics={ + Text( + extent={{-150,138},{150,98}}, + textString="%name", + textColor={0,0,255}), Rectangle( + extent={{-100,-100},{100,100}}, + lineColor={0,0,127}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid)})); diff --git a/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/ParallelValveController.mo b/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/ParallelValveController.mo index cb8fd886..38b9b285 100644 --- a/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/ParallelValveController.mo +++ b/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/ParallelValveController.mo @@ -19,7 +19,15 @@ equation else uThrWayVal = 0.5; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( + annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ + Text( + extent={{-150,138},{150,98}}, + textString="%name", + textColor={0,0,255}), Rectangle( + extent={{-100,-100},{100,100}}, + lineColor={0,0,127}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid)}), Diagram( coordinateSystem(preserveAspectRatio=false)), Documentation(info="

diff --git a/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/SetAndMeasuredValueSelector.mo b/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/SetAndMeasuredValueSelector.mo index dc6ad8ec..4e1b5e3f 100644 --- a/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/SetAndMeasuredValueSelector.mo +++ b/BESMod/Systems/Hydraulical/Control/Components/BaseClasses/SetAndMeasuredValueSelector.mo @@ -125,6 +125,14 @@ equation horizontalAlignment=TextAlignment.Right)); end if; end if; - annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram( + annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ + Text( + extent={{-150,138},{150,98}}, + textString="%name", + textColor={0,0,255}), Rectangle( + extent={{-100,-100},{100,100}}, + lineColor={0,0,127}, + fillColor={255,255,255}, + fillPattern=FillPattern.Solid)}), Diagram( coordinateSystem(preserveAspectRatio=false))); end SetAndMeasuredValueSelector; diff --git a/BESMod/Systems/Hydraulical/Control/Components/Defrost/BaseClasses/PartialDefrost.mo b/BESMod/Systems/Hydraulical/Control/Components/Defrost/BaseClasses/PartialDefrost.mo new file mode 100644 index 00000000..ad31ac07 --- /dev/null +++ b/BESMod/Systems/Hydraulical/Control/Components/Defrost/BaseClasses/PartialDefrost.mo @@ -0,0 +1,21 @@ +within BESMod.Systems.Hydraulical.Control.Components.Defrost.BaseClasses; +partial model PartialDefrost "Partial model for defrost control" + + AixLib.Fluid.HeatPumps.ModularReversible.BaseClasses.RefrigerantMachineControlBus + sigBus "Bus with the most relevant information for hp frosting calculation" + annotation (Placement(transformation(extent={{-128,-20},{-88,20}}), + iconTransformation(extent={{-130,-108},{-90,-68}}))); + Modelica.Blocks.Interfaces.BooleanOutput hea "Heating mode for heat pump" + annotation (Placement(transformation(extent={{100,-10},{120,10}}))); + annotation (Icon(coordinateSystem(preserveAspectRatio=false), graphics={ + Rectangle( + extent={{-100,100},{100,-100}}, + lineColor={0,0,0}, + fillColor={215,215,215}, + fillPattern=FillPattern.Solid, + lineThickness=0.5), Text( + extent={{-76,102},{66,66}}, + lineColor={28,108,200}, + textString="%name%")}), Diagram( + coordinateSystem(preserveAspectRatio=false))); +end PartialDefrost; diff --git a/BESMod/Systems/Hydraulical/Components/Frosting/BaseClasses/package.mo b/BESMod/Systems/Hydraulical/Control/Components/Defrost/BaseClasses/package.mo similarity index 55% rename from BESMod/Systems/Hydraulical/Components/Frosting/BaseClasses/package.mo rename to BESMod/Systems/Hydraulical/Control/Components/Defrost/BaseClasses/package.mo index 0756796b..8919e452 100644 --- a/BESMod/Systems/Hydraulical/Components/Frosting/BaseClasses/package.mo +++ b/BESMod/Systems/Hydraulical/Control/Components/Defrost/BaseClasses/package.mo @@ -1,3 +1,3 @@ -within BESMod.Systems.Hydraulical.Components.Frosting; +within BESMod.Systems.Hydraulical.Control.Components.Defrost; package BaseClasses "Partial models for HPFrosting package" end BaseClasses; diff --git a/BESMod/Systems/Hydraulical/Control/Components/Defrost/BaseClasses/package.order b/BESMod/Systems/Hydraulical/Control/Components/Defrost/BaseClasses/package.order new file mode 100644 index 00000000..927a84b1 --- /dev/null +++ b/BESMod/Systems/Hydraulical/Control/Components/Defrost/BaseClasses/package.order @@ -0,0 +1 @@ +PartialDefrost diff --git a/BESMod/Systems/Hydraulical/Control/Components/Defrost/NoDefrost.mo b/BESMod/Systems/Hydraulical/Control/Components/Defrost/NoDefrost.mo new file mode 100644 index 00000000..87fcd676 --- /dev/null +++ b/BESMod/Systems/Hydraulical/Control/Components/Defrost/NoDefrost.mo @@ -0,0 +1,15 @@ +within BESMod.Systems.Hydraulical.Control.Components.Defrost; +model NoDefrost "No defrost, always heating" + extends BaseClasses.PartialDefrost; + Modelica.Blocks.Sources.BooleanConstant booCon(final k=true) "Always heating" + annotation (Placement(transformation( + extent={{-10,-10},{10,10}}, + rotation=0))); +equation + connect(booCon.y, hea) + annotation (Line(points={{11,0},{110,0}}, color={255,0,255})); + annotation (Icon(graphics={Text( + extent={{-68,-50},{80,48}}, + lineColor={0,0,0}, + textString="=1")})); +end NoDefrost; diff --git a/BESMod/Systems/Hydraulical/Control/Components/Defrost/package.mo b/BESMod/Systems/Hydraulical/Control/Components/Defrost/package.mo new file mode 100644 index 00000000..110e9242 --- /dev/null +++ b/BESMod/Systems/Hydraulical/Control/Components/Defrost/package.mo @@ -0,0 +1,4 @@ +within BESMod.Systems.Hydraulical.Control.Components; +package Defrost "Package with models to control heat pump defrost" + +end Defrost; diff --git a/BESMod/Systems/Hydraulical/Control/Components/Defrost/package.order b/BESMod/Systems/Hydraulical/Control/Components/Defrost/package.order new file mode 100644 index 00000000..e5d1fdbf --- /dev/null +++ b/BESMod/Systems/Hydraulical/Control/Components/Defrost/package.order @@ -0,0 +1,2 @@ +NoDefrost +BaseClasses diff --git a/BESMod/Systems/Hydraulical/Control/Components/RelativeSpeedController/BaseClasses/LimPID.mo b/BESMod/Systems/Hydraulical/Control/Components/RelativeSpeedController/BaseClasses/LimPID.mo index 7e92b4e2..44d92717 100644 --- a/BESMod/Systems/Hydraulical/Control/Components/RelativeSpeedController/BaseClasses/LimPID.mo +++ b/BESMod/Systems/Hydraulical/Control/Components/RelativeSpeedController/BaseClasses/LimPID.mo @@ -1,4 +1,4 @@ -within BESMod.Systems.Hydraulical.Control.Components.RelativeSpeedController.BaseClasses; +within BESMod.Systems.Hydraulical.Control.Components.RelativeSpeedController.BaseClasses; block LimPID "P, PI, PD, and PID controller with limited output, anti-windup compensation, setpoint weighting and optional feed-forward" import InitPID = diff --git a/BESMod/Systems/Hydraulical/Control/Components/package.order b/BESMod/Systems/Hydraulical/Control/Components/package.order index 829a82e0..a697f13f 100644 --- a/BESMod/Systems/Hydraulical/Control/Components/package.order +++ b/BESMod/Systems/Hydraulical/Control/Components/package.order @@ -4,6 +4,7 @@ SetTemperatureSGReady BivalentOnOffControllers BuildingSupplyTemperatureSetpoints DHWSetControl +Defrost RelativeSpeedController SummerMode ThermostaticValveController diff --git a/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallel.mo b/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallel.mo index ec01bf6b..77e15103 100644 --- a/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallel.mo +++ b/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallel.mo @@ -142,7 +142,7 @@ partial model PartialTwoStorageParallel "Partial model to later extent" rotation=180, origin={0,-30}))); - AixLib.Fluid.Storage.BufferStorage stoBuf( + AixLib.Fluid.Storage.StorageDetailed stoBuf( redeclare final package Medium = Medium, final energyDynamics=energyDynamics, final p_start=p_start, @@ -155,7 +155,7 @@ partial model PartialTwoStorageParallel "Partial model to later extent" final mHC2_flow_nominal=parStoBuf.mHC2_flow_nominal, final useHeatingCoil2=false, final useHeatingRod=parStoBuf.use_hr, - final TStart=T_start, + TStart=fill(T_start, parStoBuf.nLayer), redeclare final RecordsCollection.BufferStorage.bufferData data( final hTank=parStoBuf.h, hHC1Low=0, @@ -196,7 +196,7 @@ partial model PartialTwoStorageParallel "Partial model to later extent" final allowFlowReversal_HC2=allowFlowReversal) "Buffer storage" annotation (Placement(transformation(extent={{-50,0},{-18,40}}))); - AixLib.Fluid.Storage.BufferStorage stoDHW( + AixLib.Fluid.Storage.StorageDetailed stoDHW( redeclare final package Medium = MediumDHW, final energyDynamics=energyDynamics, final p_start=p_start, @@ -210,7 +210,7 @@ partial model PartialTwoStorageParallel "Partial model to later extent" final useHeatingCoil1=true, final useHeatingCoil2=use_secHeaCoiDHWSto, final useHeatingRod=parStoDHW.use_hr, - final TStart=T_start, + TStart=fill(TDHW_nominal, parStoDHW.nLayer), redeclare final RecordsCollection.BufferStorage.bufferData data( final hTank=parStoDHW.h, hHC1Low=0, diff --git a/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallelWithHeaters.mo b/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallelWithHeaters.mo index f3b8668c..ee4afab5 100644 --- a/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallelWithHeaters.mo +++ b/BESMod/Systems/Hydraulical/Distribution/BaseClasses/PartialTwoStorageParallelWithHeaters.mo @@ -10,10 +10,12 @@ partial model PartialTwoStorageParallelWithHeaters "Type of heater after the buffer storage" annotation(Dialog(group="Component choices")); - replaceable parameter BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + replaceable parameter + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHeaAftBuf if heaAftBufTyp == BESMod.Systems.Hydraulical.Distribution.Types.HeaterType.ElectricHeater "Parameters for electric heater after buffer storage" annotation ( Dialog(group="Component data", enable=heaAftBufTyp == BESMod.Systems.Hydraulical.Distribution.Types.HeaterType.ElectricHeater), + choicesAllMatching=true, Placement(transformation( extent={{-6,-6},{6,6}}, diff --git a/BESMod/Systems/Hydraulical/Distribution/CombiStorage.mo b/BESMod/Systems/Hydraulical/Distribution/CombiStorage.mo index 4cf3504c..a365a9d6 100644 --- a/BESMod/Systems/Hydraulical/Distribution/CombiStorage.mo +++ b/BESMod/Systems/Hydraulical/Distribution/CombiStorage.mo @@ -41,7 +41,7 @@ model CombiStorage annotation (choicesAllMatching=true, Placement(transformation(extent={{82,56}, {96,70}}))); - AixLib.Fluid.Storage.BufferStorage bufSto( + AixLib.Fluid.Storage.StorageDetailed bufSto( redeclare final package Medium = Medium, final energyDynamics=energyDynamics, final p_start=p_start, @@ -55,7 +55,7 @@ model CombiStorage final useHeatingCoil1=true, final useHeatingCoil2=true, final useHeatingRod=parameters.use_hr, - final TStart=T_start, + final TStart=fill(T_start, parameters.nLayer), redeclare BESMod.Systems.Hydraulical.Distribution.RecordsCollection.BufferStorage.bufferData data( diff --git a/BESMod/Systems/Hydraulical/Distribution/DistributionTwoStorageParallel.mo b/BESMod/Systems/Hydraulical/Distribution/DistributionTwoStorageParallel.mo index af4a75e1..02a87861 100644 --- a/BESMod/Systems/Hydraulical/Distribution/DistributionTwoStorageParallel.mo +++ b/BESMod/Systems/Hydraulical/Distribution/DistributionTwoStorageParallel.mo @@ -18,7 +18,7 @@ model DistributionTwoStorageParallel nParallelSup=1, final nParallelDem=1); - AixLib.Fluid.Storage.Storage stoDHW( + AixLib.Fluid.Storage.StorageSimple stoDHW( redeclare final package Medium = MediumDHW, final n=parStoDHW.nLayer, final d=parStoDHW.d, @@ -35,7 +35,7 @@ model DistributionTwoStorageParallel final m_flow_nominal_layer=mDHW_flow_nominal, final m_flow_nominal_HE=mSup_flow_nominal[1], final energyDynamics=energyDynamics, - final T_start=TDHW_nominal, + T_start=fill(TDHW_nominal, parStoDHW.nLayer), final p_start=p_start, final m_flow_small_layer=1E-4*abs(stoDHW.m_flow_nominal_layer), final m_flow_small_layer_HE=1E-4*abs(stoDHW.m_flow_nominal_HE)) @@ -47,7 +47,7 @@ model DistributionTwoStorageParallel extent={{-10,-10},{10,10}}, rotation=0, origin={50,10}))); - AixLib.Fluid.Storage.Storage stoBuf( + AixLib.Fluid.Storage.StorageSimple stoBuf( redeclare package Medium = Medium, final n=parStoBuf.nLayer, final d=parStoBuf.d, @@ -64,7 +64,7 @@ model DistributionTwoStorageParallel final m_flow_nominal_layer=m_flow_nominal[1], final m_flow_nominal_HE=mSup_flow_nominal[1], final energyDynamics=energyDynamics, - final T_start=T_start, + T_start=fill(T_start, parStoBuf.nLayer), final p_start=p_start, final m_flow_small_layer=1E-4*abs(stoBuf.m_flow_nominal_layer), final m_flow_small_layer_HE=1E-4*abs(stoBuf.m_flow_nominal_HE)) diff --git a/BESMod/Systems/Hydraulical/Distribution/RecordsCollection/BufferStorage/bufferData.mo b/BESMod/Systems/Hydraulical/Distribution/RecordsCollection/BufferStorage/bufferData.mo index 34e1f901..c778114d 100644 --- a/BESMod/Systems/Hydraulical/Distribution/RecordsCollection/BufferStorage/bufferData.mo +++ b/BESMod/Systems/Hydraulical/Distribution/RecordsCollection/BufferStorage/bufferData.mo @@ -1,6 +1,6 @@ within BESMod.Systems.Hydraulical.Distribution.RecordsCollection.BufferStorage; record bufferData "Simpler design for this repo" - extends AixLib.DataBase.Storage.BufferStorageBaseDataDefinition( + extends AixLib.DataBase.Storage.StorageDetailedBaseDataDefinition( roughness=2.5e-5, lengthHC1=floor((hHC1Up - hHC1Low)/(dTank*0.8*tan(0.17453292519943)))*cos(0.17453292519943)*dTank*0.8, cWall=cIns, diff --git a/BESMod/Systems/Hydraulical/Distribution/Tests/TestDirectLoading.mo b/BESMod/Systems/Hydraulical/Distribution/Tests/TestDirectLoading.mo index 708290ba..5bb01ed2 100644 --- a/BESMod/Systems/Hydraulical/Distribution/Tests/TestDirectLoading.mo +++ b/BESMod/Systems/Hydraulical/Distribution/Tests/TestDirectLoading.mo @@ -16,7 +16,7 @@ model TestDirectLoading BESMod.Systems.Hydraulical.Distribution.RecordsCollection.BufferStorage.DefaultDetailedStorage parStoDHW(dTLoadingHC1=5), redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHeaAftBuf, QHeaAftBuf_flow_nominal= 0)); diff --git a/BESMod/Systems/Hydraulical/Distribution/Tests/TestIndirectLoading.mo b/BESMod/Systems/Hydraulical/Distribution/Tests/TestIndirectLoading.mo index cbc1357e..919dc2f5 100644 --- a/BESMod/Systems/Hydraulical/Distribution/Tests/TestIndirectLoading.mo +++ b/BESMod/Systems/Hydraulical/Distribution/Tests/TestIndirectLoading.mo @@ -16,7 +16,7 @@ model TestIndirectLoading BESMod.Systems.Hydraulical.Distribution.RecordsCollection.BufferStorage.DefaultDetailedStorage parStoDHW, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHeaAftBuf, dTLoaHCBuf=10, QHeaAftBuf_flow_nominal= diff --git a/BESMod/Systems/Hydraulical/Distribution/TwoStoragesBoilerWithDHW.mo b/BESMod/Systems/Hydraulical/Distribution/TwoStoragesBoilerWithDHW.mo index 00a23469..f848cc94 100644 --- a/BESMod/Systems/Hydraulical/Distribution/TwoStoragesBoilerWithDHW.mo +++ b/BESMod/Systems/Hydraulical/Distribution/TwoStoragesBoilerWithDHW.mo @@ -104,7 +104,7 @@ model TwoStoragesBoilerWithDHW parameters=parThrWayValBoi) "Three way valve to swith the boiler between DHW and building" annotation (Placement(transformation(extent={{20,-40},{40,-20}}))); - AixLib.Fluid.Storage.BufferStorage hydSep( + AixLib.Fluid.Storage.StorageDetailed hydSep( redeclare final package Medium = Medium, final energyDynamics=energyDynamics, final p_start=p_start, @@ -118,7 +118,7 @@ model TwoStoragesBoilerWithDHW final useHeatingCoil1=false, final useHeatingCoil2=false, final useHeatingRod=false, - final TStart=T_start, + final TStart=fill(T_start, parHydSep.nLayer), redeclare final BESMod.Systems.Hydraulical.Distribution.RecordsCollection.BufferStorage.bufferData data( diff --git a/BESMod/Systems/Hydraulical/Generation/BaseClasses/ModularPropagable.mo b/BESMod/Systems/Hydraulical/Generation/BaseClasses/ModularPropagable.mo new file mode 100644 index 00000000..3b4b3efa --- /dev/null +++ b/BESMod/Systems/Hydraulical/Generation/BaseClasses/ModularPropagable.mo @@ -0,0 +1,86 @@ +within BESMod.Systems.Hydraulical.Generation.BaseClasses; +model ModularPropagable "Modular model with propagable modules" + extends + AixLib.Fluid.HeatPumps.ModularReversible.BaseClasses.PartialReversibleRefrigerantMachine( + final use_COP=true, + final use_EER=use_rev, + con(preDro(m_flow(nominal=QHea_flow_nominal/1000/10))), + eva(preDro(m_flow(nominal=QHea_flow_nominal/1000/10))), + final PEle_nominal=refCyc.refCycHeaPumHea.PEle_nominal, + mCon_flow_nominal=QHea_flow_nominal/(dTCon_nominal*cpCon), + mEva_flow_nominal=(QHea_flow_nominal - PEle_nominal)/(dTEva_nominal*cpEva), + use_rev=false, + redeclare AixLib.Fluid.HeatPumps.ModularReversible.BaseClasses.RefrigerantCycle refCyc( + final allowDifferentDeviceIdentifiers=allowDifferentDeviceIdentifiers)); + parameter Modelica.Units.SI.HeatFlowRate QHea_flow_nominal(min=Modelica.Constants.eps) + "Nominal heating capacity" + annotation (Dialog(group="Nominal condition")); + parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal(max=0)=0 + "Nominal cooling capacity" + annotation(Dialog(group="Nominal condition - Cooling", enable=use_rev)); + + parameter Modelica.Units.SI.Temperature TConHea_nominal + "Nominal temperature of the heated fluid" + annotation (Dialog(group="Nominal condition")); + parameter Modelica.Units.SI.Temperature TEvaHea_nominal + "Nominal temperature of the cooled fluid" + annotation (Dialog(group="Nominal condition")); + parameter Modelica.Units.SI.Temperature TConCoo_nominal + "Nominal temperature of the cooled fluid" + annotation(Dialog(enable=use_rev, group="Nominal condition - Cooling")); + parameter Modelica.Units.SI.Temperature TEvaCoo_nominal + "Nominal temperature of the heated fluid" + annotation(Dialog(enable=use_rev, group="Nominal condition - Cooling")); + + Modelica.Blocks.Sources.BooleanConstant conHea(final k=true) + if not use_busConOnl and not use_rev + "Locks the device in heating mode if designated to be not reversible" annotation ( + Placement(transformation( + extent={{-10,-10},{10,10}}, + rotation=0, + origin={-110,-130}))); + Modelica.Blocks.Interfaces.BooleanInput hea if not use_busConOnl and use_rev + "=true for heating, =false for cooling" + annotation (Placement(transformation(extent={{-164,-82},{-140,-58}}), + iconTransformation(extent={{-120,-30},{-102,-12}}))); +equation + connect(conHea.y, sigBus.hea) + annotation (Line(points={{-99,-130},{-76,-130},{-76,-40},{-140,-40},{-140,-41}, + {-141,-41}}, color={255,0,255})); + connect(hea, sigBus.hea) + annotation (Line(points={{-152,-70},{-128,-70},{-128,-40},{-134,-40},{-134,-41}, + {-141,-41}}, color={255,0,255})); + connect(eff.QUse_flow, refCycIneCon.y) annotation (Line(points={{98,37},{48,37}, + {48,66},{8.88178e-16,66},{8.88178e-16,61}}, color={0,0,127})); + connect(eff.hea, sigBus.hea) annotation (Line(points={{98,30},{48,30},{48,0},{ + 26,0},{26,-30},{-20,-30},{-20,-41},{-141,-41}}, color={255,0,255}), + Text( + string="%second", + index=1, + extent={{-6,3},{-6,3}}, + horizontalAlignment=TextAlignment.Right)); + annotation (Icon(coordinateSystem(extent={{-100,-100},{100,100}}), graphics={ + Text( + extent={{-100,-12},{-72,-30}}, + textColor={255,85,255}, + visible=not use_busConOnl and use_rev, + textString="hea")}), + Diagram(coordinateSystem(extent={{-140,-160},{140,160}})), + Documentation(revisions=" + +

+", info=" +

This model is a near exact copy of +AixLib.Fluid.HeatPumps.ModularReversible.Modular, +but enabling the propagation of the refrigerant modules with a constrainedby +clause and final modifiers. See +BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialHeatPump +for an exemplary usage.

+")); +end ModularPropagable; diff --git a/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPump.mo b/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPump.mo index b07cc038..ac75dee9 100644 --- a/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPump.mo +++ b/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPump.mo @@ -12,27 +12,94 @@ model PartialHeatPump "Generation with only the heat pump" dp_nominal={heatPump.dpCon_nominal}, nParallelDem=1); + replaceable model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.PartialHeatPumpCycle + (PEle_nominal=0) + constrainedby + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.BaseClasses.PartialHeatPumpCycle( + final useInHeaPum=true, + final QHea_flow_nominal=heatPump.QHea_flow_nominal, + final TCon_nominal=heatPump.TConHea_nominal, + final TEva_nominal=heatPump.TEvaHea_nominal, + final cpCon=heatPump.cpCon, + final cpEva=heatPump.cpEva) + "Refrigerant cycle module for the heating mode" + annotation (choicesAllMatching=true); + + replaceable parameter RecordsCollection.HeatPumps.Generic parHeaPum + "Heat pump parameters" + annotation (choicesAllMatching=true, + Placement(transformation(extent={{-34,42},{-18,58}}))); + replaceable parameter + AixLib.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 + safCtrPar "Safety control parameters" annotation ( + choicesAllMatching=true, + Placement(transformation(extent={{-58,44},{-42,58}}))); + + replaceable parameter + BESMod.Systems.RecordsCollection.Movers.MoverBaseDataDefinition parPum + "Parameters for pump" annotation ( + choicesAllMatching=true, + Placement(transformation(extent={{42,-56},{56,-44}}))); + replaceable parameter + BESMod.Systems.RecordsCollection.TemperatureSensors.TemperatureSensorBaseDefinition + parTemSen constrainedby + BESMod.Systems.RecordsCollection.TemperatureSensors.TemperatureSensorBaseDefinition( + transferHeat=true) + "Parameters for temperature sensors" + annotation ( + choicesAllMatching=true, + Placement(transformation(extent={{62,104},{76,118}}))); + replaceable model RefrigerantCycleInertia = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.Inertias.NoInertia + "Model approach for internal heat pump intertia" + annotation (choicesAllMatching=true); parameter Boolean use_old_design[nParallelDem]=fill(false, nParallelDem) "If true, design parameters of the building with no retrofit (old state) are used" annotation (Dialog(group="Design - Internal: Parameters are defined by the subsystem")); + // Temperature Levels + parameter Modelica.Units.SI.Temperature TBiv=TOda_nominal + "Bivalence temperature. Equals TOda_nominal for monovalent systems." + annotation (Dialog(enable=genDesTyp <> Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent, + group="Heat Pump System Design")); + parameter Modelica.Units.SI.Temperature THeaTresh=293.15 + "Heating treshhold temperature for bivalent design" + annotation (Dialog(group="Heat Pump System Design")); + parameter + BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign + genDesTyp "Type of generation system design" annotation (Dialog( + group="Heat Pump System Design")); + + parameter Modelica.Units.SI.HeatFlowRate QPriAtTOdaNom_flow_nominal=0 + "Nominal heat flow rate of primary generation device at + nominal outdoor air temperature, required for bivalent parallel design. + Default of 0 equals a part-parallel design with cut-off equal to TOda_nominal" + annotation (Dialog(group="Heat Pump System Design", + enable=genDesTyp == Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentParallel)); + + parameter Modelica.Units.SI.HeatFlowRate QGenBiv_flow_nominal= + Q_flow_design[1]*(TBiv - THeaTresh)/(TOda_nominal - THeaTresh) + "Nominal heat flow rate at bivalence temperature" + annotation (Dialog(tab="Calculated", group="Heat Pump System Design")); + + parameter Modelica.Units.SI.HeatFlowRate QPri_flow_nominal=if genDesTyp == + Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent then + Q_flow_design[1] else QGenBiv_flow_nominal + "Nominal heat flow rate of primary generation component (e.g. heat pump)" + annotation (Dialog(tab="Calculated", group="Heat Pump System Design")); + parameter Modelica.Units.SI.HeatFlowRate QSec_flow_nominal=if genDesTyp == + Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent then 0 + elseif genDesTyp == Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentAlternativ + then Q_flow_design[1] elseif genDesTyp == Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentParallel + then max(0, Q_flow_design[1] - QPriAtTOdaNom_flow_nominal) else Q_flow_design[1] + "Nominal heat flow rate of secondary generation component (e.g. auxilliar heater)" + annotation (Dialog(tab="Calculated", group="Heat Pump System Design")); + - replaceable model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.LookUpTable2D - constrainedby - AixLib.DataBase.HeatPump.PerformanceData.BaseClasses.PartialPerformanceData - "Heat pump model approach" - annotation (Dialog(group="Component data"), choicesAllMatching=true); - replaceable model PerDataRevHP = - AixLib.DataBase.Chiller.PerformanceData.PolynomalApproach (redeclare - function PolyData = - AixLib.DataBase.HeatPump.Functions.Characteristics.ConstantCoP ( powerCompressor=2000, CoP=2)) - constrainedby - AixLib.DataBase.Chiller.PerformanceData.BaseClasses.PartialPerformanceData - annotation (Dialog(group="Frosting"), choicesAllMatching=true); parameter Boolean use_airSource=true - "Turn false to use water as temperature source." + "Turn false to use water as temperature source" annotation(Dialog(group="Component choices")); - replaceable package Medium_eva = IBPSA.Media.Air constrainedby + replaceable package MediumEva = IBPSA.Media.Air constrainedby Modelica.Media.Interfaces.PartialMedium annotation (Dialog(group="Component choices"), choices( choice(redeclare package Medium = IBPSA.Media.Air "Moist air"), @@ -45,90 +112,98 @@ model PartialHeatPump "Generation with only the heat pump" parameter Modelica.Media.Interfaces.Types.Temperature TSoilConst=273.15 + 10 "Constant soil temperature for ground source heat pumps" annotation(Dialog(group="Component choices", enable=use_airSource)); - replaceable Components.Frosting.NoFrosting frost constrainedby - Components.Frosting.BaseClasses.PartialFrosting - "Model to account for frosting and defrost control" annotation (Dialog(group="Frosting"), Placement( - transformation(extent={{-178,2},{-162,18}})), choicesAllMatching=true); - replaceable parameter - BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumpBaseDataDefinition - parHeaPum constrainedby - BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumpBaseDataDefinition( - final QGen_flow_nominal=Q_flow_design[1], final TOda_nominal=TOda_nominal) - "Heat pump parameters" annotation ( - Dialog(group="Component data"), - choicesAllMatching=true, - Placement(transformation(extent={{-98,22},{-82,36}}))); - replaceable parameter - BESMod.Systems.RecordsCollection.Movers.MoverBaseDataDefinition parPum - "Parameters for pump" annotation ( - Dialog(group="Component data"), - choicesAllMatching=true, - Placement(transformation(extent={{42,-56},{56,-44}}))); - replaceable parameter - BESMod.Systems.RecordsCollection.TemperatureSensors.TemperatureSensorBaseDefinition - parTemSen "Parameters for temperature sensors" - annotation ( - Dialog(group="Component data"), - choicesAllMatching=true, - Placement(transformation(extent={{62,104},{76,118}}))); + parameter Boolean use_rev=true + "=true if the heat pump is reversible" + annotation(Dialog(group="Component choices")); + + replaceable BESMod.Systems.Hydraulical.Control.Components.Defrost.NoDefrost defCtrl if use_rev and use_airSource + constrainedby + BESMod.Systems.Hydraulical.Control.Components.Defrost.BaseClasses.PartialDefrost + "Defrost control" + annotation (choicesAllMatching=true, + Dialog(group="Component choices", enable=use_rev and use_airSource), + Placement(transformation(extent={{-98,12},{-82,28}}))); + replaceable model RefrigerantCycleHeatPumpCooling = + AixLib.Fluid.Chillers.ModularReversible.RefrigerantCycle.BaseClasses.NoCooling + constrainedby + AixLib.Fluid.Chillers.ModularReversible.RefrigerantCycle.BaseClasses.PartialChillerCycle( + final useInChi=false, + final cpCon=heatPump.cpCon, + final cpEva=heatPump.cpEva, + final TCon_nominal=heatPump.TEvaCoo_nominal, + final TEva_nominal=heatPump.TConCoo_nominal, + QCoo_flow_nominal=heatPump.QCoo_flow_nominal) + "Refrigerant cycle module for the cooling mode" + annotation (Dialog(group="Component choices", enable=use_rev),choicesAllMatching=true); - AixLib.Fluid.HeatPumps.HeatPump heatPump( - redeclare package Medium_con = Medium, - redeclare package Medium_eva = Medium_eva, - final use_rev=true, - final use_autoCalc=false, - final Q_useNominal=0, - final scalingFactor=parHeaPum.scalingFactor, - final use_refIne=parHeaPum.use_refIne, - final refIneFre_constant=parHeaPum.refIneFre_constant, - final nthOrder=1, - final useBusConnectorOnly=false, - final mFlow_conNominal=m_flow_design[1], - final VCon=parHeaPum.VCon, + parameter Modelica.Units.SI.Temperature TConCoo_nominal=291.15 + "Nominal temperature of the cooled fluid" + annotation(Dialog(group="Component choices", enable=use_rev)); + parameter Modelica.Units.SI.Temperature TEvaCoo_nominal=303.15 + "Nominal temperature of the heated fluid" + annotation(Dialog(group="Component choices", enable=use_rev)); + parameter Modelica.Units.SI.HeatFlowRate QCoo_flow_nominal=0 + "Nominal cooling capacity" + annotation(Dialog(group="Component choices", enable=use_rev)); + BESMod.Systems.Hydraulical.Generation.BaseClasses.ModularPropagable heatPump( + redeclare package MediumCon = Medium, + redeclare package MediumEva = MediumEva, + allowDifferentDeviceIdentifiers=true, + final use_busConOnl=false, + redeclare model RefrigerantCycleInertia = RefrigerantCycleInertia, + final use_rev=use_rev, + final tauCon=parHeaPum.tauCon, + final dTCon_nominal=dTTra_nominal[1], + final mCon_flow_nominal=m_flow_design[1], final dpCon_nominal=parHeaPum.dpCon_nominal, - final use_conCap=false, - final CCon=0, - final GConOut=0, - final GConIns=0, - final mFlow_evaNominal=parHeaPum.mEva_flow_nominal, - final VEva=parHeaPum.VEva, + final use_conCap=parHeaPum.use_conCap, + final CCon=parHeaPum.CCon, + final GConOut=parHeaPum.GConOut, + final GConIns=parHeaPum.GConIns, + final tauEva=parHeaPum.tauEva, + final dTEva_nominal=parHeaPum.dTEva_nominal, final dpEva_nominal=parHeaPum.dpEva_nominal, - final use_evaCap=false, - final CEva=0, - final GEvaOut=0, - final GEvaIns=0, - final tauSenT=parTemSen.tau, - final transferHeat=parTemSen.transferHeat, + final use_evaCap=parHeaPum.use_evaCap, + final CEva=parHeaPum.CEva, + final GEvaOut=parHeaPum.GEvaOut, + final GEvaIns=parHeaPum.GEvaIns, + final safCtrPar=safCtrPar, final allowFlowReversalEva=allowFlowReversal, final allowFlowReversalCon=allowFlowReversal, - final tauHeaTraEva=parTemSen.tauHeaTra, - final TAmbEva_nominal=parTemSen.TAmb, - final tauHeaTraCon=parTemSen.tauHeaTra, - final TAmbCon_nominal=parTemSen.TAmb, final pCon_start=p_start, final TCon_start=T_start, - final pEva_start=Medium_eva.p_default, + final pEva_start=MediumEva.p_default, final TEva_start=TOda_nominal, final energyDynamics=energyDynamics, - final show_TPort=show_T, - redeclare model PerDataMainHP = PerDataMainHP, - redeclare model PerDataRevHP = PerDataRevHP) annotation ( - Placement(transformation( - extent={{22,-27},{-22,27}}, + final show_T=show_T, + final QHea_flow_nominal=QPri_flow_nominal, + QCoo_flow_nominal=QCoo_flow_nominal, + final TConHea_nominal=TSup_nominal[1], + final TEvaHea_nominal=TBiv, + final TConCoo_nominal=TConCoo_nominal, + final TEvaCoo_nominal=TEvaCoo_nominal, + refCyc( + redeclare model RefrigerantCycleHeatPumpHeating = + RefrigerantCycleHeatPumpHeating, + redeclare model RefrigerantCycleHeatPumpCooling = + RefrigerantCycleHeatPumpCooling)) + annotation ( + Placement(transformation( + extent={{17.5,-17.5},{-17.5,17.5}}, rotation=270, - origin={-44,15}))); + origin={-40.5,17.5}))); IBPSA.Fluid.Sources.Boundary_ph bou_sinkAir(final nPorts=1, redeclare package - Medium = Medium_eva) annotation (Placement( + Medium = MediumEva) annotation (Placement( transformation( extent={{10,-10},{-10,10}}, rotation=180, origin={-90,-10}))); IBPSA.Fluid.Sources.MassFlowSource_T bouEva( - final m_flow=parHeaPum.mEva_flow_nominal, + final m_flow=heatPump.mEva_flow_nominal, final use_T_in=true, - redeclare package Medium = Medium_eva, + redeclare package Medium = MediumEva, final use_m_flow_in=false, final nPorts=1) "Evaporator boundary" annotation (Placement(transformation(extent={{-100,40},{-80,60}}))); @@ -171,7 +246,7 @@ model PartialHeatPump "Generation with only the heat pump" rotation=0, origin={-170,50}))); - Utilities.KPIs.EnergyKPICalculator KPIQHP(use_inpCon=false, final y=heatPump.con.QFlow_in) + BESMod.Utilities.KPIs.EnergyKPICalculator KPIQHP(use_inpCon=true) annotation (Placement(transformation(extent={{-140,-80},{-120,-60}}))); IBPSA.Fluid.Sources.Boundary_pT bouPum( @@ -208,33 +283,43 @@ model PartialHeatPump "Generation with only the heat pump" extent={{-6,-6},{6,6}}, rotation=180, origin={130,-82}))); - Modelica.Blocks.Sources.BooleanExpression booExpHeaPumIsOn(y=heatPump.greaterThreshold.y) - annotation (Placement(transformation(extent={{-182,-40},{-162,-20}}))); - Modelica.Blocks.Sources.RealExpression reaExpPEleHeaPum(y=heatPump.innerCycle.Pel) - "Electrical power consumption of heat pump" - annotation (Placement(transformation(extent={{-180,-80},{-160,-60}}))); - Modelica.Blocks.Sources.RealExpression reaExpTHeaPumOut(y=heatPump.senT_b1.T) - annotation (Placement(transformation(extent={{-60,80},{-40,100}}))); - Modelica.Blocks.Sources.RealExpression reaExpTHeaPumIn(y=heatPump.senT_a1.T) - annotation (Placement(transformation(extent={{-60,60},{-40,80}}))); - Modelica.Blocks.Sources.RealExpression reaExpTEvaIn(y=heatPump.senT_a2.T) - annotation (Placement(transformation(extent={{-60,40},{-40,60}}))); - Utilities.KPIs.DeviceKPICalculator KPIHeaPum( + BESMod.Utilities.KPIs.DeviceKPICalculator KPIHeaPum( use_reaInp=false, calc_singleOnTime=true, calc_totalOnTime=true, calc_numSwi=true) "Heat pump KPIs" annotation (Placement(transformation(extent={{-120,-60},{-100,-40}}))); - Modelica.Blocks.Sources.RealExpression reaExpQEva_flow(y=heatPump.innerCycle.QEva) - "Electrical power consumption of heat pump" - annotation (Placement(transformation(extent={{-220,-4},{-200,16}}))); + BESMod.Systems.Hydraulical.Control.Components.BaseClasses.HeatPumpBusPassThrough + heaPumSigBusPasThr + "Bus connector pass through for OpenModelica" annotation (Placement( + transformation( + extent={{10,-10},{-10,10}}, + rotation=180, + origin={-40,90}))); + + Modelica.Blocks.Sources.Constant constTAmb(final k=TAmb) if not use_airSource + "Constant ambient temperature for heat pump" annotation (Placement( + transformation( + extent={{-10,-10},{10,10}}, + rotation=0, + origin={-170,10}))); + AixLib.Fluid.HeatPumps.ModularReversible.BaseClasses.RefrigerantMachineControlBus + sigBus "Bus with model outputs and possibly inputs" + annotation (Placement(transformation(extent={{-92,-60},{-52,-20}}))); + Modelica.Blocks.Routing.RealPassThrough + reaPasThrRelHum + "Get relative humidity" annotation (Placement( + transformation( + extent={{-10,-10},{10,10}}, + rotation=0, + origin={-170,-30}))); equation - connect(bouEva.ports[1], heatPump.port_a2) annotation (Line(points={{-80,50},{-74, - 50},{-74,42},{-57.5,42},{-57.5,37}}, color={0,127,255})); + connect(bouEva.ports[1], heatPump.port_a2) annotation (Line(points={{-80,50},{ + -70,50},{-70,35},{-51,35}}, color={0,127,255})); connect(heatPump.port_b2, bou_sinkAir.ports[1]) annotation (Line( - points={{-57.5,-7},{-56,-7},{-56,-10},{-80,-10}}, + points={{-51,7.10543e-15},{-51,-10},{-80,-10}}, color={0,127,255})); connect(bouEva.T_in, switch.y) annotation (Line(points={{-102,54},{-108,54},{-108, 50},{-119,50}}, color={0,0,127})); @@ -258,14 +343,6 @@ equation thickness=1)); connect(multiSum.y, realToElecCon.PEleLoa) annotation (Line(points={{122.98,-82},{112,-82}}, color={0,0,127})); - connect(multiSum.u[1], reaExpPEleHeaPum.y) annotation (Line(points={{136,-80.95}, - {144,-80.95},{144,-150},{-154,-150},{-154,-70},{-159,-70}}, - color={0,0,127}), - Text( - string="%second", - index=1, - extent={{6,3},{6,3}}, - horizontalAlignment=TextAlignment.Left)); connect(switch.u1, weaBus.TDryBul) annotation (Line(points={{-142,58},{-144,58}, {-144,80.11},{-100.895,80.11}}, @@ -275,44 +352,18 @@ equation extent={{-6,3},{-6,3}}, horizontalAlignment=TextAlignment.Right)); connect(pump.y, sigBusGen.uPump) annotation (Line(points={{10,-58},{24,-58},{24, - -22},{2,-22},{2,98}}, color={0,0,127}), Text( + -10},{2,-10},{2,98}}, color={0,0,127}), Text( string="%second", index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); - connect(reaExpPEleHeaPum.y, KPIWel.u) - annotation (Line(points={{-159,-70},{-148,-70},{-148,-30},{-141.8,-30}}, - color={0,0,127})); - connect(heatPump.nSet, sigBusGen.yHeaPumSet) annotation (Line(points={{-39.5,-10.52}, - {-39.5,-26},{2,-26},{2,98}}, color={0,0,127}), Text( + connect(heatPump.ySet, sigBusGen.yHeaPumSet) annotation (Line(points={{-37.175, + -1.925},{-37.175,-10},{2,-10},{2,98}}, + color={0,0,127}), Text( string="%second", index=1, extent={{-3,-6},{-3,-6}}, horizontalAlignment=TextAlignment.Right)); - connect(booExpHeaPumIsOn.y, sigBusGen.heaPumIsOn) annotation (Line(points={{-161, - -30},{-142,-30},{-142,98},{2,98}}, color={255,0,255}), Text( - string="%second", - index=1, - extent={{6,3},{6,3}}, - horizontalAlignment=TextAlignment.Left)); - connect(reaExpTHeaPumIn.y, sigBusGen.THeaPumIn) annotation (Line(points={{-39, - 70},{2,70},{2,98}}, color={0,0,127}), Text( - string="%second", - index=1, - extent={{6,3},{6,3}}, - horizontalAlignment=TextAlignment.Left)); - connect(reaExpTHeaPumOut.y, sigBusGen.THeaPumOut) annotation (Line(points={{-39, - 90},{-28,90},{-28,74},{2,74},{2,98}}, color={0,0,127}), Text( - string="%second", - index=1, - extent={{6,3},{6,3}}, - horizontalAlignment=TextAlignment.Left)); - connect(reaExpTEvaIn.y, sigBusGen.THeaPumEvaIn) annotation (Line(points={{-39, - 50},{2,50},{2,98}}, color={0,0,127}), Text( - string="%second", - index=1, - extent={{6,3},{6,3}}, - horizontalAlignment=TextAlignment.Left)); connect(senTGenOut.T, sigBusGen.TGenOutMea) annotation (Line(points={{70,91},{ 70,98},{2,98}}, color={0,0,127}), Text( string="%second", @@ -332,40 +383,102 @@ equation index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); - connect(KPIHeaPum.u, booExpHeaPumIsOn.y) annotation (Line(points={{-122.2,-50},{ - -134,-50},{-134,-48},{-154,-48},{-154,-30},{-161,-30}}, color={255,0, - 255})); connect(KPIHeaPum.KPI, outBusGen.heaPum) annotation (Line(points={{-97.8,-50},{ 0,-50},{0,-100}}, color={135,135,135}), Text( string="%second", index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); - connect(frost.modeHeaPum, heatPump.modeSet) annotation (Line(points={{-161.2,5.2}, - {-112,5.2},{-112,-36},{-48.5,-36},{-48.5,-10.52}}, color={255,0,255})); - connect(frost.iceFacMea, heatPump.iceFac_in) annotation (Line(points={{-161.2,14.8}, - {-120,14.8},{-120,-1.72},{-74.6,-1.72}}, color={0,0,127})); - connect(frost.relHum, weaBus.relHum) annotation (Line(points={{-179.6,16.08},{-190, - 16.08},{-190,80.11},{-100.895,80.11}}, color={0,0,127}), Text( + + connect(pump.P, multiSum.u[1]) annotation (Line(points={{-1,-61},{-10,-61},{-10, + -116},{148,-116},{148,-80.95},{136,-80.95}}, color={0,0,127})); + connect(heatPump.P, multiSum.u[2]) annotation (Line(points={{-40.5,36.75},{-40.5, + 40},{152,40},{152,-83.05},{136,-83.05}}, color={0,0,127})); + connect(KPIWel.u, heatPump.P) annotation (Line(points={{-141.8,-30},{-150,-30}, + {-150,36.75},{-40.5,36.75}}, color={0,0,127})); + connect(KPIQHP.u, heatPump.QCon_flow) annotation (Line(points={{-141.8,-70},{-188, + -70},{-188,108},{-8,108},{-8,36},{-24.75,36},{-24.75,36.75}}, color={0, + 0,127})); + connect(heaPumSigBusPasThr.sigBusGen, sigBusGen) annotation (Line( + points={{-30,90},{-24,90},{-24,98},{2,98}}, + color={255,204,51}, + thickness=0.5), Text( string="%second", index=1, extent={{-6,3},{-6,3}}, horizontalAlignment=TextAlignment.Right)); - connect(frost.genConBus, heatPump.sigBus) annotation (Line( - points={{-178.8,2.96},{-190,2.96},{-190,-38},{-52.775,-38},{-52.775,-6.78}}, - color={255,204,51}, - thickness=0.5)); + connect(KPIHeaPum.u, sigBusGen.heaPumIsOn) annotation (Line(points={{-122.2,-50}, + {-148,-50},{-148,98},{2,98}}, color={255,0,255}), Text( + string="%second", + index=1, + extent={{-6,3},{-6,3}}, + horizontalAlignment=TextAlignment.Right)); + if parHeaPum.use_conCap then + if use_airSource then + connect(heatPump.TConAmb, weaBus.TDryBul) annotation (Line(points={{-24.925,-1.925}, + {-24.925,-26},{-100.895,-26},{-100.895,80.11}}, color={0,0,127})); + else + connect(constTAmb.y, heatPump.TConAmb) annotation (Line(points={{-159,10},{-108, + 10},{-108,-26},{-26,-26},{-26,-1.925},{-24.925,-1.925}}, color={0,0,127})); + end if; - connect(frost.TOda, weaBus.TDryBul) annotation (Line(points={{-179.6,10.32},{-200, - 10.32},{-200,80.11},{-100.895,80.11}}, color={0,0,127}), Text( + end if; + if parHeaPum.use_evaCap then + if use_airSource then + connect(heatPump.TEvaAmb, weaBus.TDryBul) annotation (Line(points={{-56.425,-1.925}, + {-56.425,-26},{-100.895,-26},{-100.895,80.11}}, color={0,0,127})); + else + connect(constTAmb.y, heatPump.TEvaAmb) annotation (Line(points={{-159,10},{-108, + 10},{-108,-26},{-56.425,-26},{-56.425,-1.925}}, color={0,0,127})); + end if; + + end if; + connect(defCtrl.hea, heatPump.hea) annotation (Line(points={{-81.2,20},{-60,20}, + {-60,-1.925},{-44.175,-1.925}}, color={255,0,255})); + + connect(sigBus, heatPump.sigBus) annotation (Line( + points={{-72,-40},{-72,0.175},{-47.325,0.175}}, + color={255,204,51}, + thickness=0.5), Text( + string="%first", + index=-1, + extent={{-6,3},{-6,3}}, + horizontalAlignment=TextAlignment.Right)); + connect(heaPumSigBusPasThr.vapComBus, sigBus) annotation (Line( + points={{-50,90},{-66,90},{-66,0},{-72,0},{-72,-40}}, + color={255,204,51}, + thickness=0.5), Text( + string="%second", + index=1, + extent={{-6,3},{-6,3}}, + horizontalAlignment=TextAlignment.Right)); + connect(defCtrl.sigBus, sigBus) annotation (Line( + points={{-98.8,12.96},{-98.8,6},{-66,6},{-66,0},{-72,0},{-72,-40}}, + color={255,204,51}, + thickness=0.5), Text( + string="%second", + index=1, + extent={{-6,3},{-6,3}}, + horizontalAlignment=TextAlignment.Right)); + connect(reaPasThrRelHum.y, sigBus.relHum) annotation (Line(points={{-159,-30}, + {-152,-30},{-152,-40},{-72,-40}}, color={0,0,127}), Text( + string="%second", + index=1, + extent={{-3,-6},{-3,-6}}, + horizontalAlignment=TextAlignment.Right)); + connect(reaPasThrRelHum.u, weaBus.relHum) annotation (Line(points={{-182,-30}, + {-190,-30},{-190,110},{-100.895,110},{-100.895,80.11}}, color={0,0,127}), + Text( + string="%second", + index=1, + extent={{-6,3},{-6,3}}, + horizontalAlignment=TextAlignment.Right)); + connect(heatPump.QEva_flow, sigBus.QEva_flow) annotation (Line(points={{ + -56.25,36.75},{-72,36.75},{-72,-40}}, color={0,0,127}), Text( string="%second", index=1, extent={{-6,3},{-6,3}}, horizontalAlignment=TextAlignment.Right)); - connect(reaExpQEva_flow.y, frost.QEva_flow) annotation (Line(points={{-199,6},{-190, - 6},{-190,5.68},{-179.6,5.68}}, color={0,0,127})); - connect(pump.P, multiSum.u[2]) annotation (Line(points={{-1,-61},{-10,-61},{-10, - -116},{148,-116},{148,-83.05},{136,-83.05}}, color={0,0,127})); annotation (Line( points={{-52.775,-6.78},{-52.775,33.61},{-56,33.61},{-56,74}}, color={255,204,51}, diff --git a/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPumpAndGasBoiler.mo b/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPumpAndGasBoiler.mo index 6850acb4..2b4e8c0c 100644 --- a/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPumpAndGasBoiler.mo +++ b/BESMod/Systems/Hydraulical/Generation/BaseClasses/PartialHeatPumpAndGasBoiler.mo @@ -1,17 +1,17 @@ within BESMod.Systems.Hydraulical.Generation.BaseClasses; model PartialHeatPumpAndGasBoiler "Partial heat pump and boiler" - extends BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialHeatPump( + extends BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialHeatPump(genDesTyp + =BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentPartParallel, dp_nominal={heatPump.dpCon_nominal + boi.dp_nominal}); parameter Real etaTem[:,2]=[293.15,1.09; 303.15,1.08; 313.15,1.05; 323.15,1.; 373.15, - 0.99] "Temperature based efficiency" - annotation(Dialog(group="Component data")); + 0.99] "Temperature based efficiency"; replaceable parameter BESMod.Systems.Hydraulical.Generation.RecordsCollection.AutoparameterBoiler parBoi constrainedby AixLib.DataBase.Boiler.General.BoilerTwoPointBaseDataDefinition( - Q_nom=max(11000, parHeaPum.QSec_flow_nominal)) + Q_nom=max(11000, QSec_flow_nominal)) "Parameters for Boiler" annotation(Placement(transformation(extent={{22,62},{38,78}})), - choicesAllMatching=true, Dialog(group="Component data")); + choicesAllMatching=true); AixLib.Fluid.BoilerCHP.BoilerNoControl boi( redeclare package Medium = Medium, diff --git a/BESMod/Systems/Hydraulical/Generation/BaseClasses/package.order b/BESMod/Systems/Hydraulical/Generation/BaseClasses/package.order index 7673a28b..97c15f42 100644 --- a/BESMod/Systems/Hydraulical/Generation/BaseClasses/package.order +++ b/BESMod/Systems/Hydraulical/Generation/BaseClasses/package.order @@ -1,3 +1,4 @@ PartialGeneration PartialHeatPump PartialHeatPumpAndGasBoiler +ModularPropagable diff --git a/BESMod/Systems/Hydraulical/Generation/DetailedSolarThermalWithHeatPump.mo b/BESMod/Systems/Hydraulical/Generation/DetailedSolarThermalWithHeatPump.mo index de9f2ac4..99e1b9b3 100644 --- a/BESMod/Systems/Hydraulical/Generation/DetailedSolarThermalWithHeatPump.mo +++ b/BESMod/Systems/Hydraulical/Generation/DetailedSolarThermalWithHeatPump.mo @@ -9,11 +9,14 @@ model DetailedSolarThermalWithHeatPump then 10 elseif TDem_nominal[1] > 44.9 then 8 else 5,solarThermalParas.dTMax}, final nParallelDem=2, final dp_nominal={heatPump.dpCon_nominal +dpEleHea_nominal, dpST_nominal}); - replaceable parameter BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermalBaseDataDefinition + replaceable parameter + BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermal.Generic solarThermalParas constrainedby - BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermalBaseDataDefinition( final c_p=cp) - annotation (Dialog(group="Component data"), choicesAllMatching=true, Placement(transformation(extent={{-86,-62}, - {-66,-42}}))); + BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermal.Generic( + final c_p=cp) annotation ( + Dialog(group="Component data"), + choicesAllMatching=true, + Placement(transformation(extent={{-86,-62},{-66,-42}}))); replaceable parameter BESMod.Systems.RecordsCollection.Movers.MoverBaseDataDefinition parPumSolThe "Parameters for solar thermal pump" annotation ( diff --git a/BESMod/Systems/Hydraulical/Generation/ElectricalHeater.mo b/BESMod/Systems/Hydraulical/Generation/ElectricalHeater.mo index 04df8ca2..6acdf32f 100644 --- a/BESMod/Systems/Hydraulical/Generation/ElectricalHeater.mo +++ b/BESMod/Systems/Hydraulical/Generation/ElectricalHeater.mo @@ -35,10 +35,10 @@ model ElectricalHeater "Only heat using an electric heater" annotation (Placement(transformation(extent={{-16,-16},{16,16}}, rotation=90, origin={-32,10}))); - replaceable parameter BESMod.Systems.Hydraulical.Generation.RecordsCollection.EletricHeaterBaseDataDefinition - parEleHea "Electric heater parameters" - annotation (choicesAllMatching=true, Placement(transformation(extent={{-62,-42}, - {-50,-30}}))); + replaceable parameter + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.Generic + parEleHea "Electric heater parameters" annotation (choicesAllMatching=true, + Placement(transformation(extent={{-62,-42},{-50,-30}}))); Modelica.Blocks.Logical.GreaterThreshold isOnHR(threshold=Modelica.Constants.eps) annotation (Placement(transformation( diff --git a/BESMod/Systems/Hydraulical/Generation/HeatPump.mo b/BESMod/Systems/Hydraulical/Generation/HeatPump.mo index 345cffe0..931c9020 100644 --- a/BESMod/Systems/Hydraulical/Generation/HeatPump.mo +++ b/BESMod/Systems/Hydraulical/Generation/HeatPump.mo @@ -1,10 +1,17 @@ within BESMod.Systems.Hydraulical.Generation; model HeatPump "Monovalent heat pump" - extends BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialHeatPump; + extends BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialHeatPump( + final QSec_flow_nominal=0, + final QGenBiv_flow_nominal=Q_flow_design[1]*(TBiv - THeaTresh)/( + TOda_nominal - THeaTresh), + THeaTresh=293.15, + QPriAtTOdaNom_flow_nominal=0, + genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent, + TBiv=TOda_nominal); equation - connect(senTGenOut.port_a, heatPump.port_b1) annotation (Line(points={{60,80},{ - 32,80},{32,44},{-30.5,44},{-30.5,37}}, color={0,127,255})); - connect(heatPump.port_a1, pump.port_b) annotation (Line(points={{-30.5,-7},{ - -30.5,-70},{1.77636e-15,-70}}, color={0,127,255})); + connect(senTGenOut.port_a, heatPump.port_b1) annotation (Line(points={{60,80}, + {32,80},{32,44},{-30,44},{-30,35}}, color={0,127,255})); + connect(heatPump.port_a1, pump.port_b) annotation (Line(points={{-30,0},{-30, + -70},{1.77636e-15,-70}}, color={0,127,255})); end HeatPump; diff --git a/BESMod/Systems/Hydraulical/Generation/HeatPumpAndElectricHeater.mo b/BESMod/Systems/Hydraulical/Generation/HeatPumpAndElectricHeater.mo index 1fbc7246..143b58de 100644 --- a/BESMod/Systems/Hydraulical/Generation/HeatPumpAndElectricHeater.mo +++ b/BESMod/Systems/Hydraulical/Generation/HeatPumpAndElectricHeater.mo @@ -1,9 +1,13 @@ within BESMod.Systems.Hydraulical.Generation; model HeatPumpAndElectricHeater "Heat pump with an electric heater in series" extends BESMod.Systems.Hydraulical.Generation.BaseClasses.PartialHeatPump( + genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentParallel, dp_nominal={heatPump.dpCon_nominal +dpEleHea_nominal}, multiSum(nu=if use_eleHea then 3 else 2)); - + replaceable parameter RecordsCollection.ElectricHeater.Generic parEleHea + "Electric heater parameters" annotation ( + choicesAllMatching=true, + Placement(transformation(extent={{24,64},{36,76}}))); parameter Boolean use_eleHea=true "=false to disable the electric heater" annotation(Dialog(group="Component choices")); @@ -18,7 +22,7 @@ model HeatPumpAndElectricHeater "Heat pump with an electric heater in series" final energyDynamics=energyDynamics, final p_start=p_start, final T_start=T_start, - final Q_flow_nominal=parHeaPum.QSec_flow_nominal, + final Q_flow_nominal=QSec_flow_nominal, final V=parEleHea.V_hr, final eta=parEleHea.eta, use_countNumSwi=false) if use_eleHea "Electric heater" @@ -27,12 +31,7 @@ model HeatPumpAndElectricHeater "Heat pump with an electric heater in series" Medium = Medium, allowFlowReversal=allowFlowReversal) if not use_eleHea "Pass through if electric heater is not used" annotation (Placement(transformation(extent={{20,20},{40,40}}))); - replaceable parameter RecordsCollection.EletricHeaterBaseDataDefinition parEleHea - "Electric heater parameters" - annotation ( - Dialog(group="Component data"), - choicesAllMatching=true, - Placement(transformation(extent={{24,64},{36,76}}))); + Utilities.KPIs.DeviceKPICalculator KPIEleHea( use_reaInp=true, calc_singleOnTime=true, @@ -51,16 +50,16 @@ protected "Possible electric heater nominal pressure drop"; equation - connect(heatPump.port_a1, pump.port_b) annotation (Line(points={{-30.5,-7},{ - -30.5,-70},{1.77636e-15,-70}}, color={0,127,255})); + connect(heatPump.port_a1, pump.port_b) annotation (Line(points={{-30,0},{-30,-70}, + {1.77636e-15,-70}}, color={0,127,255})); connect(pasThrMedEleHea.port_b, senTGenOut.port_a) annotation (Line(points={{40,30}, {54,30},{54,80},{60,80}}, color={0,127,255})); connect(eleHea.port_b, senTGenOut.port_a) annotation (Line(points={{40,50},{54,50}, {54,80},{60,80}}, color={0,127,255})); connect(pasThrMedEleHea.port_a, heatPump.port_b1) annotation (Line(points={{20,30}, - {10,30},{10,50},{-30,50},{-30,38},{-30.5,38},{-30.5,37}}, color={0, + {10,30},{10,50},{-30,50},{-30,38},{-30,38},{-30,35}}, color={0, 127,255})); - connect(heatPump.port_b1, eleHea.port_a) annotation (Line(points={{-30.5,37},{-30.5, + connect(heatPump.port_b1, eleHea.port_a) annotation (Line(points={{-30,35},{-30, 36},{-30,36},{-30,50},{20,50}}, color={0,127,255})); connect(eleHea.u, sigBusGen.uEleHea) annotation (Line(points={{18,56},{2,56},{2, 98}}, color={0,0,127}), Text( diff --git a/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerSerial.mo b/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerSerial.mo index aa5e60a4..eb6810ce 100644 --- a/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerSerial.mo +++ b/BESMod/Systems/Hydraulical/Generation/HeatPumpAndGasBoilerSerial.mo @@ -7,11 +7,11 @@ model HeatPumpAndGasBoilerSerial "serial arrangement of heatpump and boiler" equation connect(boi.port_a, heatPump.port_b1) annotation (Line(points={{20,50},{14,50}, - {14,37},{-30.5,37}}, color={0,127,255})); + {14,35},{-30,35}}, color={0,127,255})); connect(boi.port_b, senTGenOut.port_a) annotation (Line(points={{40,50},{54,50}, {54,80},{60,80}}, color={0,127,255})); - connect(pump.port_b, heatPump.port_a1) annotation (Line(points={{0,-70},{-30.5, - -70},{-30.5,-7}}, color={0,127,255})); + connect(pump.port_b, heatPump.port_a1) annotation (Line(points={{0,-70},{-30,-70}, + {-30,0}}, color={0,127,255})); annotation (Line( points={{-52.775,-6.78},{-52.775,33.61},{-56,33.61},{-56,74}}, color={255,204,51}, diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/BivalentHeatPumpBaseDataDefinition.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/BivalentHeatPumpBaseDataDefinition.mo deleted file mode 100644 index 075a2345..00000000 --- a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/BivalentHeatPumpBaseDataDefinition.mo +++ /dev/null @@ -1,63 +0,0 @@ -within BESMod.Systems.Hydraulical.Generation.RecordsCollection; -partial record BivalentHeatPumpBaseDataDefinition - "Record Collection for bivalent Heat Pump Systems" - extends Modelica.Icons.Record; - - parameter Modelica.Units.SI.HeatFlowRate QGen_flow_nominal - "Nominal heating load at outdoor air temperature" - annotation (Dialog(group="Design")); - - // Temperature Levels - parameter Modelica.Units.SI.Temperature TOda_nominal - "Nominal outdoor air temperature" annotation (Dialog(group="Design")); - parameter Modelica.Units.SI.Temperature THeaTresh "Heating treshhold" - annotation (Dialog(group="Design")); - parameter - BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign - genDesTyp "Type of generation system design" annotation (Dialog( - group="Design")); - parameter Modelica.Units.SI.HeatFlowRate QPri_flow_nominal=if genDesTyp == - Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent then - QGen_flow_nominal else QGenBiv_flow_nominal - "Nominal heat flow rate of primary generation component (e.g. heat pump)" - annotation (Dialog(group="Design")); - parameter Modelica.Units.SI.HeatFlowRate QSec_flow_nominal=if genDesTyp == - Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent then 0 - elseif genDesTyp == Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentAlternativ - then QGen_flow_nominal elseif genDesTyp == Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentParallel - then QGen_flow_nominal - QGenBiv_flow_nominal else QGen_flow_nominal - "Nominal heat flow rate of secondary generation component (e.g. auxilliar heater)" - annotation (Dialog(group="Design")); - parameter Modelica.Units.SI.Temperature TBiv=TOda_nominal - "Nominal bivalence temperature. = TOda_nominal for monovalent systems." - annotation (Dialog(enable=genDesTyp <> Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent, - group="Design")); - - parameter Modelica.Units.SI.HeatFlowRate QGenBiv_flow_nominal= - QGen_flow_nominal*(TBiv - THeaTresh)/(TOda_nominal - THeaTresh) - "Nominal heat flow rate at bivalence temperature" - annotation (Dialog(group="Design")); - - // Generation: Heat Pump - parameter Real scalingFactor=1 "Scaling-factor of vapour compression machine"; - parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal=1 - "Mass flow rate through evaporator"; - parameter Modelica.Units.SI.Volume VEva=0.004 - "Manual input of the evaporator volume (if not automatically calculated)"; - parameter Modelica.Units.SI.Volume VCon=0.001 - "Manual input of the condenser volume"; - parameter Boolean useAirSource=true "Turn false to use water as temperature source."; - parameter Modelica.Units.SI.PressureDifference dpCon_nominal=1000 - "Pressure difference"; - parameter Modelica.Units.SI.PressureDifference dpEva_nominal=1000 - "Pressure difference"; - parameter Boolean use_refIne=false - "Consider the inertia of the refrigerant cycle"; - parameter Modelica.Units.SI.Frequency refIneFre_constant=0 - "Cut off frequency for inertia of refrigerant cycle"; - - replaceable parameter BESMod.Systems.RecordsCollection.TemperatureSensors.TemperatureSensorBaseDefinition TempSensorData "Temperature Sensor Data" annotation(choicesAllMatching=true); - annotation (Icon(graphics, - coordinateSystem(preserveAspectRatio=false)), Diagram(graphics, - coordinateSystem(preserveAspectRatio=false))); -end BivalentHeatPumpBaseDataDefinition; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/DefaultElectricHeater.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/DefaultElectricHeater.mo deleted file mode 100644 index 08c21fb3..00000000 --- a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/DefaultElectricHeater.mo +++ /dev/null @@ -1,9 +0,0 @@ -within BESMod.Systems.Hydraulical.Generation.RecordsCollection; -record DefaultElectricHeater - extends - BESMod.Systems.Hydraulical.Generation.RecordsCollection.EletricHeaterBaseDataDefinition( - discretizationSteps=0, - V_hr=0.001, - eta=0.97, - dp_nominal(displayUnit="Pa") = 1000); -end DefaultElectricHeater; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/DefaultHP.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/DefaultHP.mo deleted file mode 100644 index c6b6d1cd..00000000 --- a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/DefaultHP.mo +++ /dev/null @@ -1,8 +0,0 @@ -within BESMod.Systems.Hydraulical.Generation.RecordsCollection; -record DefaultHP - extends - Systems.Hydraulical.Generation.RecordsCollection.HeatPumpBaseDataDefinition( - genDesTyp=BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentAlternativ, - THeaTresh=293.15); - -end DefaultHP; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/DefaultElectricHeater.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/DefaultElectricHeater.mo new file mode 100644 index 00000000..ec9ca017 --- /dev/null +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/DefaultElectricHeater.mo @@ -0,0 +1,9 @@ +within BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater; +record DefaultElectricHeater "97 % efficiency" + extends + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.Generic( + discretizationSteps=0, + V_hr=0.001, + eta=0.97, + dp_nominal(displayUnit="Pa") = 1000); +end DefaultElectricHeater; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/EletricHeaterBaseDataDefinition.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/Generic.mo similarity index 80% rename from BESMod/Systems/Hydraulical/Generation/RecordsCollection/EletricHeaterBaseDataDefinition.mo rename to BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/Generic.mo index 1717fba9..ab2b9a2e 100644 --- a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/EletricHeaterBaseDataDefinition.mo +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/Generic.mo @@ -1,5 +1,5 @@ -within BESMod.Systems.Hydraulical.Generation.RecordsCollection; -partial record EletricHeaterBaseDataDefinition +within BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater; +partial record Generic extends Modelica.Icons.Record; // Generation: electric heater parameter Real eta "Electric heater efficiency"; @@ -13,4 +13,4 @@ partial record EletricHeaterBaseDataDefinition annotation (Icon(graphics, coordinateSystem(preserveAspectRatio=false)), Diagram(graphics, coordinateSystem(preserveAspectRatio=false))); -end EletricHeaterBaseDataDefinition; +end Generic; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/package.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/package.mo new file mode 100644 index 00000000..9b2004b2 --- /dev/null +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/package.mo @@ -0,0 +1,4 @@ +within BESMod.Systems.Hydraulical.Generation.RecordsCollection; +package ElectricHeater "Package for record of electric heaters" + extends Modelica.Icons.RecordsPackage; +end ElectricHeater; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/package.order b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/package.order new file mode 100644 index 00000000..34b324dc --- /dev/null +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/ElectricHeater/package.order @@ -0,0 +1,2 @@ +Generic +DefaultElectricHeater diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumpBaseDataDefinition.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumpBaseDataDefinition.mo deleted file mode 100644 index 46f8915d..00000000 --- a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumpBaseDataDefinition.mo +++ /dev/null @@ -1,67 +0,0 @@ -within BESMod.Systems.Hydraulical.Generation.RecordsCollection; -partial record HeatPumpBaseDataDefinition - extends Modelica.Icons.Record; - - parameter Modelica.Units.SI.HeatFlowRate QGen_flow_nominal - "Nominal heating load at outdoor air temperature" - annotation (Dialog(group="Design")); - - // Temperature Levels - parameter Modelica.Units.SI.Temperature TOda_nominal - "Nominal outdoor air temperature" annotation (Dialog(group="Design")); - parameter Modelica.Units.SI.Temperature TBiv=TOda_nominal - "Bivalence temperature. Equals TOda_nominal for monovalent systems." - annotation (Dialog(enable=genDesTyp <> Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent, - group="Design")); - parameter Modelica.Units.SI.Temperature THeaTresh "Heating treshhold" - annotation (Dialog(group="Design")); - parameter - BESMod.Systems.Hydraulical.Generation.Types.GenerationDesign - genDesTyp "Type of generation system design" annotation (Dialog( - group="Design")); - - parameter Modelica.Units.SI.HeatFlowRate QPriAtTOdaNom_flow_nominal=0 - "Nominal heat flow rate of primary generation device at - nominal outdoor air temperature, required for bivalent parallel design. - Default of 0 equals a part-parallel design with cut-off equal to TOda_nominal" - annotation (Dialog(group="Design", - enable=genDesTyp == Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentParallel)); - - parameter Modelica.Units.SI.HeatFlowRate QGenBiv_flow_nominal= - QGen_flow_nominal*(TBiv - THeaTresh)/(TOda_nominal - THeaTresh) - "Nominal heat flow rate at bivalence temperature" - annotation (Dialog(group="Design")); - - parameter Modelica.Units.SI.HeatFlowRate QPri_flow_nominal=if genDesTyp == - Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent then - QGen_flow_nominal else QGenBiv_flow_nominal - "Nominal heat flow rate of primary generation component (e.g. heat pump)" - annotation (Dialog(group="Design")); - parameter Modelica.Units.SI.HeatFlowRate QSec_flow_nominal=if genDesTyp == - Systems.Hydraulical.Generation.Types.GenerationDesign.Monovalent then 0 - elseif genDesTyp == Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentAlternativ - then QGen_flow_nominal elseif genDesTyp == Systems.Hydraulical.Generation.Types.GenerationDesign.BivalentParallel - then max(0, QGen_flow_nominal - QPriAtTOdaNom_flow_nominal) else QGen_flow_nominal - "Nominal heat flow rate of secondary generation component (e.g. auxilliar heater)" - annotation (Dialog(group="Design")); - - // Generation: Heat Pump - parameter Real scalingFactor=1 "Scaling-factor of vapour compression machine"; - parameter Modelica.Units.SI.MassFlowRate mEva_flow_nominal=1 - "Mass flow rate through evaporator"; - parameter Modelica.Units.SI.Volume VEva=0.004 - "Manual input of the evaporator volume (if not automatically calculated)"; - parameter Modelica.Units.SI.Volume VCon=0.001 - "Manual input of the condenser volume"; - parameter Modelica.Units.SI.PressureDifference dpCon_nominal=1000 - "Pressure difference"; - parameter Modelica.Units.SI.PressureDifference dpEva_nominal=1000 - "Pressure difference"; - parameter Boolean use_refIne=false - "Consider the inertia of the refrigerant cycle"; - parameter Modelica.Units.SI.Frequency refIneFre_constant=0 - "Cut off frequency for inertia of refrigerant cycle"; - annotation (Icon(graphics, - coordinateSystem(preserveAspectRatio=false)), Diagram(graphics, - coordinateSystem(preserveAspectRatio=false))); -end HeatPumpBaseDataDefinition; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/DefaultHP.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/DefaultHP.mo new file mode 100644 index 00000000..46e247c9 --- /dev/null +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/DefaultHP.mo @@ -0,0 +1,18 @@ +within BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps; +record DefaultHP "No heat loss, standard pressure loss" + extends BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.Generic( + GEvaIns=0, + GEvaOut=0, + CEva=0, + use_evaCap=false, + tauEva=30, + dpEva_nominal=0, + dTEva_nominal=3, + GConIns=0, + GConOut=0, + CCon=0, + use_conCap=false, + tauCon=30, + dpCon_nominal(displayUnit="Pa") = 125); + +end DefaultHP; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/Generic.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/Generic.mo new file mode 100644 index 00000000..fcb75ef4 --- /dev/null +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/Generic.mo @@ -0,0 +1,39 @@ +within BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps; +partial record Generic + extends Modelica.Icons.Record; + parameter Modelica.Units.SI.PressureDifference dpCon_nominal + "Pressure drop at nominal mass flow rate"; + parameter Modelica.Units.SI.Time tauCon=30 + "Condenser heat transfer time constant at nominal flow"; + parameter Boolean use_conCap=false + "=true if using capacitor model for condenser heat loss estimation"; + parameter Modelica.Units.SI.HeatCapacity CCon=0 + "Heat capacity of the condenser" + annotation(Dialog(enable=use_conCap)); + parameter Modelica.Units.SI.ThermalConductance GConOut=0 + "Outer thermal conductance for condenser heat loss calculations" + annotation(Dialog(enable=use_conCap)); + parameter Modelica.Units.SI.ThermalConductance GConIns=0 + "Inner thermal conductance for condenser heat loss calculations" + annotation(Dialog(enable=use_conCap)); + parameter Modelica.Units.SI.TemperatureDifference dTEva_nominal + "Nominal temperature difference in evaporator medium, used to calculate mass flow rate"; + parameter Modelica.Units.SI.PressureDifference dpEva_nominal + "Pressure drop at nominal mass flow rate"; + parameter Modelica.Units.SI.Time tauEva=30 + "Evaporator heat transfer time constant at nominal flow"; + parameter Boolean use_evaCap=false + "=true if using capacitor model for evaporator heat loss estimation"; + parameter Modelica.Units.SI.HeatCapacity CEva=0 + "Heat capacity of the evaporator" + annotation(Dialog(enable=use_evaCap)); + parameter Modelica.Units.SI.ThermalConductance GEvaOut=0 + "Outer thermal conductance for evaporator heat loss calculations" + annotation(Dialog(enable=use_evaCap)); + parameter Modelica.Units.SI.ThermalConductance GEvaIns=0 + "Inner thermal conductance for evaporator heat loss calculations" + annotation(Dialog(enable=use_evaCap)); + annotation (Icon(graphics, + coordinateSystem(preserveAspectRatio=false)), Diagram(graphics, + coordinateSystem(preserveAspectRatio=false))); +end Generic; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/package.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/package.mo new file mode 100644 index 00000000..34dc86e2 --- /dev/null +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/package.mo @@ -0,0 +1,4 @@ +within BESMod.Systems.Hydraulical.Generation.RecordsCollection; +package HeatPumps "Package for record of heat pumps" + extends Modelica.Icons.RecordsPackage; +end HeatPumps; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/package.order b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/package.order new file mode 100644 index 00000000..3c9ecef5 --- /dev/null +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/HeatPumps/package.order @@ -0,0 +1,2 @@ +DefaultHP +Generic diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/DefaultSolarThermal.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/DefaultSolarThermal.mo similarity index 72% rename from BESMod/Systems/Hydraulical/Generation/RecordsCollection/DefaultSolarThermal.mo rename to BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/DefaultSolarThermal.mo index 01e90b5d..205580bf 100644 --- a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/DefaultSolarThermal.mo +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/DefaultSolarThermal.mo @@ -1,7 +1,7 @@ -within BESMod.Systems.Hydraulical.Generation.RecordsCollection; +within BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermal; record DefaultSolarThermal "DummyParameters" extends - BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermalBaseDataDefinition( + BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermal.Generic( GMax=1000, dTMax=35, spacing=0.1, diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermalBaseDataDefinition.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/Generic.mo similarity index 90% rename from BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermalBaseDataDefinition.mo rename to BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/Generic.mo index 7b63240c..a4daf627 100644 --- a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermalBaseDataDefinition.mo +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/Generic.mo @@ -1,5 +1,5 @@ -within BESMod.Systems.Hydraulical.Generation.RecordsCollection; -partial record SolarThermalBaseDataDefinition +within BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermal; +partial record Generic extends Modelica.Icons.Record; parameter Modelica.Units.SI.Efficiency eta_zero=0.75 "Conversion factor/Efficiency at Q = 0"; @@ -28,4 +28,4 @@ partial record SolarThermalBaseDataDefinition annotation (Icon(graphics, coordinateSystem(preserveAspectRatio=false)), Diagram(graphics, coordinateSystem(preserveAspectRatio=false))); -end SolarThermalBaseDataDefinition; +end Generic; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/package.mo b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/package.mo new file mode 100644 index 00000000..e203e05b --- /dev/null +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/package.mo @@ -0,0 +1,4 @@ +within BESMod.Systems.Hydraulical.Generation.RecordsCollection; +package SolarThermal "Package for record of solar thermal" + extends Modelica.Icons.RecordsPackage; +end SolarThermal; diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/package.order b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/package.order new file mode 100644 index 00000000..234d49ea --- /dev/null +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/SolarThermal/package.order @@ -0,0 +1,2 @@ +Generic +DefaultSolarThermal diff --git a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/package.order b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/package.order index f806de53..a4099199 100644 --- a/BESMod/Systems/Hydraulical/Generation/RecordsCollection/package.order +++ b/BESMod/Systems/Hydraulical/Generation/RecordsCollection/package.order @@ -1,8 +1,4 @@ AutoparameterBoiler -BivalentHeatPumpBaseDataDefinition -DefaultElectricHeater -DefaultHP -DefaultSolarThermal -EletricHeaterBaseDataDefinition -HeatPumpBaseDataDefinition -SolarThermalBaseDataDefinition +ElectricHeater +HeatPumps +SolarThermal diff --git a/BESMod/Systems/Hydraulical/Generation/SimpleSolarThermalWithHeatPump.mo b/BESMod/Systems/Hydraulical/Generation/SimpleSolarThermalWithHeatPump.mo index fb717bc9..7fe1546d 100644 --- a/BESMod/Systems/Hydraulical/Generation/SimpleSolarThermalWithHeatPump.mo +++ b/BESMod/Systems/Hydraulical/Generation/SimpleSolarThermalWithHeatPump.mo @@ -9,10 +9,10 @@ model SimpleSolarThermalWithHeatPump final dp_nominal={heatPump.dpCon_nominal +dpEleHea_nominal, dpST_nominal}); replaceable parameter - BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermalBaseDataDefinition + BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermal.Generic parSolThe constrainedby - BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermalBaseDataDefinition( - final c_p=cp) "Parameters for solar thermal system" annotation ( + BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermal.Generic( + final c_p=cp) "Parameters for solar thermal system" annotation ( Dialog(group="Component data"), choicesAllMatching=true, Placement(transformation(extent={{-86,-62},{-66,-42}}))); diff --git a/BESMod/Systems/Hydraulical/Generation/Tests/ElectricalHeater.mo b/BESMod/Systems/Hydraulical/Generation/Tests/ElectricalHeater.mo index e886cbcf..8cfb6497 100644 --- a/BESMod/Systems/Hydraulical/Generation/Tests/ElectricalHeater.mo +++ b/BESMod/Systems/Hydraulical/Generation/Tests/ElectricalHeater.mo @@ -4,7 +4,7 @@ model ElectricalHeater BESMod.Systems.Hydraulical.Generation.ElectricalHeater generation( redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea)); extends Modelica.Icons.Example; diff --git a/BESMod/Systems/Hydraulical/Generation/Tests/HeatPump.mo b/BESMod/Systems/Hydraulical/Generation/Tests/HeatPump.mo index d9decd3b..bb45f7de 100644 --- a/BESMod/Systems/Hydraulical/Generation/Tests/HeatPump.mo +++ b/BESMod/Systems/Hydraulical/Generation/Tests/HeatPump.mo @@ -1,22 +1,29 @@ within BESMod.Systems.Hydraulical.Generation.Tests; model HeatPump "Heat pump test case" - extends PartialTest(redeclare - BESMod.Systems.Hydraulical.Generation.HeatPump + extends PartialTest(redeclare BESMod.Systems.Hydraulical.Generation.HeatPump generation( - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.LookUpTable2D (dataTable= - AixLib.DataBase.HeatPump.EN255.Vitocal350AWI114()), - redeclare BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2D + (redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableData2D.EN14511.Vitocal251A08 + datTab), + redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 + safCtrPar, + redeclare + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP parHeaPum, + redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, redeclare - BESMod.Systems.RecordsCollection.Movers.DefaultMover - parPum, - redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor + BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen)); extends Modelica.Icons.Example; Modelica.Blocks.Sources.Pulse pulse(period=1800) annotation (Placement(transformation(extent={{-40,80},{-20,100}}))); + Modelica.Blocks.Sources.BooleanConstant + booleanConstant + annotation (Placement(transformation(extent={{-40,50},{-20,70}}))); equation connect(pulse.y, genControlBus.yHeaPumSet) annotation (Line(points={{-19,90},{ -14,90},{-14,98},{10,98},{10,74}}, color={0,0,127}), Text( @@ -30,4 +37,10 @@ equation index=1, extent={{6,3},{6,3}}, horizontalAlignment=TextAlignment.Left)); + connect(booleanConstant.y, genControlBus.hea) annotation (Line(points={{-19, + 60},{-14,60},{-14,74},{10,74}}, color={255,0,255}), Text( + string="%second", + index=1, + extent={{6,3},{6,3}}, + horizontalAlignment=TextAlignment.Left)); end HeatPump; diff --git a/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndElectricHeater.mo b/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndElectricHeater.mo index 2a3e982d..eb36b46f 100644 --- a/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndElectricHeater.mo +++ b/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndElectricHeater.mo @@ -1,20 +1,26 @@ within BESMod.Systems.Hydraulical.Generation.Tests; model HeatPumpAndElectricHeater "Test for HeatPumpAndElectricHeater" - extends PartialTest( redeclare + extends PartialTest(redeclare BESMod.Systems.Hydraulical.Generation.HeatPumpAndElectricHeater generation( use_eleHea=true, - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.LookUpTable2D (dataTable= - AixLib.DataBase.HeatPump.EN255.Vitocal350AWI114()), - redeclare BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2D + (redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableData2D.EN14511.Vitocal251A08 + datTab), + redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 + safCtrPar, + redeclare + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP parHeaPum, + redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, redeclare - BESMod.Systems.RecordsCollection.Movers.DefaultMover - parPum, - redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor + BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen, - redeclare BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + redeclare + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea)); extends Modelica.Icons.Example; diff --git a/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndGasBoilerParallel.mo b/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndGasBoilerParallel.mo index e77b0f35..acb792f9 100644 --- a/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndGasBoilerParallel.mo +++ b/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndGasBoilerParallel.mo @@ -1,18 +1,23 @@ within BESMod.Systems.Hydraulical.Generation.Tests; model HeatPumpAndGasBoilerParallel "Test case for parallel heat pump and gas boiler" - extends PartialTest( redeclare + extends PartialTest(redeclare BESMod.Systems.Hydraulical.Generation.HeatPumpAndGasBoilerParallel generation( - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.LookUpTable2D (dataTable= - AixLib.DataBase.HeatPump.EN255.Vitocal350AWI114()), - redeclare BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2D + (redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableData2D.EN14511.Vitocal251A08 + datTab), + redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 + safCtrPar, + redeclare + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP parHeaPum, + redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, redeclare - BESMod.Systems.RecordsCollection.Movers.DefaultMover - parPum, - redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor + BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen, redeclare BESMod.Systems.RecordsCollection.Valves.DefaultThreeWayValve parThrWayVal)); diff --git a/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndGasBoilerSeries.mo b/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndGasBoilerSeries.mo index ec59e253..eb6dd7db 100644 --- a/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndGasBoilerSeries.mo +++ b/BESMod/Systems/Hydraulical/Generation/Tests/HeatPumpAndGasBoilerSeries.mo @@ -1,18 +1,23 @@ within BESMod.Systems.Hydraulical.Generation.Tests; model HeatPumpAndGasBoilerSeries "Test case for serial heat pump and gas boiler" - extends PartialTest( redeclare + extends PartialTest(redeclare BESMod.Systems.Hydraulical.Generation.HeatPumpAndGasBoilerSerial generation( - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.LookUpTable2D (dataTable= - AixLib.DataBase.HeatPump.EN255.Vitocal350AWI114()), - redeclare BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2D + (redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableData2D.EN14511.Vitocal251A08 + datTab), + redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 + safCtrPar, + redeclare + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP parHeaPum, + redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, redeclare - BESMod.Systems.RecordsCollection.Movers.DefaultMover - parPum, - redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor + BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen, redeclare AixLib.DataBase.Boiler.General.Boiler_Vitogas200F_11kW parBoi)); extends Modelica.Icons.Example; diff --git a/BESMod/Systems/Hydraulical/Generation/Tests/PartialTest.mo b/BESMod/Systems/Hydraulical/Generation/Tests/PartialTest.mo index fb07a70c..ad41c99c 100644 --- a/BESMod/Systems/Hydraulical/Generation/Tests/PartialTest.mo +++ b/BESMod/Systems/Hydraulical/Generation/Tests/PartialTest.mo @@ -13,14 +13,13 @@ partial model PartialTest dTTra_nominal=fill(10, generation.nParallelDem), m_flow_nominal=fill(0.317, generation.nParallelDem), Q_flow_nominal=fill(sum(systemParameters.QBui_flow_nominal), generation.nParallelDem), - TOda_nominal=systemParameters.TOda_nominal, dpDem_nominal=fill(0, generation.nParallelDem), TDem_nominal=fill(systemParameters.THydSup_nominal[1], generation.nParallelDem), - TAmb=systemParameters.TAmbHyd, dpDemOld_design=fill(0, generation.nParallelDem)) annotation (choicesAllMatching=true, Placement(transformation(extent={{-50,-44},{24,28}}))); + IBPSA.Fluid.MixingVolumes.MixingVolume vol[generation.nParallelDem]( redeclare final package Medium = IBPSA.Media.Water, each final energyDynamics=generation.energyDynamics, diff --git a/BESMod/Systems/Hydraulical/Generation/Tests/SolarThermalAndHeatPumpDetailed.mo b/BESMod/Systems/Hydraulical/Generation/Tests/SolarThermalAndHeatPumpDetailed.mo index a5c5e0a0..26564ed5 100644 --- a/BESMod/Systems/Hydraulical/Generation/Tests/SolarThermalAndHeatPumpDetailed.mo +++ b/BESMod/Systems/Hydraulical/Generation/Tests/SolarThermalAndHeatPumpDetailed.mo @@ -3,19 +3,28 @@ model SolarThermalAndHeatPumpDetailed "Test for SolarThermalAndHeatPumpDetailed" extends PartialTest(redeclare BESMod.Systems.Hydraulical.Generation.DetailedSolarThermalWithHeatPump generation( - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.LookUpTable2D (dataTable= - AixLib.DataBase.HeatPump.EN14511.Vitocal200AWO201()), - redeclare BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2D + (redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableData2D.EN14511.Vitocal251A08 + datTab), + redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 + safCtrPar, + redeclare + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP parHeaPum, redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, - redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor + redeclare + BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultSolarThermal + BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermal.DefaultSolarThermal solarThermalParas, - redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPumSolThe, - redeclare BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover + parPumSolThe, + redeclare + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea)); extends Modelica.Icons.Example; diff --git a/BESMod/Systems/Hydraulical/Generation/Tests/SolarThermalAndHeatPumpSimple.mo b/BESMod/Systems/Hydraulical/Generation/Tests/SolarThermalAndHeatPumpSimple.mo index cad1863d..48facc9d 100644 --- a/BESMod/Systems/Hydraulical/Generation/Tests/SolarThermalAndHeatPumpSimple.mo +++ b/BESMod/Systems/Hydraulical/Generation/Tests/SolarThermalAndHeatPumpSimple.mo @@ -3,19 +3,29 @@ model SolarThermalAndHeatPumpSimple "Test for SolarThermalAndHeatPumpSimple" extends PartialTest(redeclare BESMod.Systems.Hydraulical.Generation.SimpleSolarThermalWithHeatPump generation( - redeclare model PerDataMainHP = - AixLib.DataBase.HeatPump.PerformanceData.VCLibMap, - redeclare BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultHP + redeclare model RefrigerantCycleHeatPumpHeating = + AixLib.Fluid.HeatPumps.ModularReversible.RefrigerantCycle.TableData2D + (redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Data.TableData2D.EN14511.Vitocal251A08 + datTab), + redeclare + AixLib.Fluid.HeatPumps.ModularReversible.Controls.Safety.Data.Wuellhorst2021 + safCtrPar, + redeclare + BESMod.Systems.Hydraulical.Generation.RecordsCollection.HeatPumps.DefaultHP parHeaPum, - redeclare package Medium_eva = IBPSA.Media.Air, - redeclare BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor + redeclare package MediumEva = IBPSA.Media.Air, + redeclare + BESMod.Systems.RecordsCollection.TemperatureSensors.DefaultSensor parTemSen, redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum, - redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPumSolThe, + redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover + parPumSolThe, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultSolarThermal + BESMod.Systems.Hydraulical.Generation.RecordsCollection.SolarThermal.DefaultSolarThermal parSolThe, - redeclare BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + redeclare + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea)); extends Modelica.Icons.Example; diff --git a/BESMod/Systems/Hydraulical/Transfer/Functions/GetAverageVolumeOfWater.mo b/BESMod/Systems/Hydraulical/Transfer/Functions/GetAverageVolumeOfWater.mo index f7eab54e..21fd7793 100644 --- a/BESMod/Systems/Hydraulical/Transfer/Functions/GetAverageVolumeOfWater.mo +++ b/BESMod/Systems/Hydraulical/Transfer/Functions/GetAverageVolumeOfWater.mo @@ -1,4 +1,4 @@ -within BESMod.Systems.Hydraulical.Transfer.Functions; +within BESMod.Systems.Hydraulical.Transfer.Functions; function GetAverageVolumeOfWater "Calculate the average water volume for the whole heating unit based on the type of the unit and the installed heating load" input Modelica.Units.SI.HeatFlowRate Q_flow_nominal "Nominal heat flow rate"; diff --git a/BESMod/Systems/RecordsCollection/Movers/AutomaticConfigurationData.mo b/BESMod/Systems/RecordsCollection/Movers/AutomaticConfigurationData.mo index 064b020c..a9eb08ae 100644 --- a/BESMod/Systems/RecordsCollection/Movers/AutomaticConfigurationData.mo +++ b/BESMod/Systems/RecordsCollection/Movers/AutomaticConfigurationData.mo @@ -2,15 +2,8 @@ within BESMod.Systems.RecordsCollection.Movers; record AutomaticConfigurationData "Automatic configuration for BES Library" extends AixLib.Fluid.Movers.Data.Generic( - final motorEfficiency(V_flow={0}, eta={0.7}), - final hydraulicEfficiency(V_flow={0}, eta={0.7}), - final speeds_rpm={speed_rpm_nominal}, - final constantSpeed_rpm=speed_rpm_nominal, - final speeds=speeds_rpm/speed_rpm_nominal, - final constantSpeed=constantSpeed_rpm/speed_rpm_nominal, final speed_nominal=1, final motorCooledByFluid=false, - final use_powerCharacteristic=false, final pressure(V_flow={V_flowCurve[i] * m_flow_nominal / rho for i in 1:size(V_flowCurve, 1)}, dp={dpCurve[i] * dp_nominal for i in 1:size(dpCurve, 1)})); parameter Modelica.Units.SI.MassFlowRate m_flow_nominal diff --git a/BESMod/Utilities/TimeConstantEstimation/BaseClasses/PartialEstimation.mo b/BESMod/Utilities/TimeConstantEstimation/BaseClasses/PartialEstimation.mo index 666e7027..908fd830 100644 --- a/BESMod/Utilities/TimeConstantEstimation/BaseClasses/PartialEstimation.mo +++ b/BESMod/Utilities/TimeConstantEstimation/BaseClasses/PartialEstimation.mo @@ -20,7 +20,7 @@ partial model PartialEstimation "Partial model for estimation of time constants" dTTra_nominal={max(hydraulic.transfer.dTTra_nominal)}, f_design={2}, redeclare - BESMod.Systems.Hydraulical.Generation.RecordsCollection.DefaultElectricHeater + BESMod.Systems.Hydraulical.Generation.RecordsCollection.ElectricHeater.DefaultElectricHeater parEleHea, redeclare BESMod.Systems.RecordsCollection.Movers.DefaultMover parPum), redeclare diff --git a/BESMod/Utilities/TimeConstantEstimation/BaseClasses/RadiatorEN442_2.mo b/BESMod/Utilities/TimeConstantEstimation/BaseClasses/RadiatorEN442_2.mo index cf42b65c..a7a95c7b 100644 --- a/BESMod/Utilities/TimeConstantEstimation/BaseClasses/RadiatorEN442_2.mo +++ b/BESMod/Utilities/TimeConstantEstimation/BaseClasses/RadiatorEN442_2.mo @@ -1,4 +1,4 @@ -within BESMod.Utilities.TimeConstantEstimation.BaseClasses; +within BESMod.Utilities.TimeConstantEstimation.BaseClasses; model RadiatorEN442_2 "Dynamic radiator for space heating" extends IBPSA.Fluid.Interfaces.PartialTwoPortInterface( show_T=true, diff --git a/BESMod/package.mo b/BESMod/package.mo index 8b44b78b..4dbce408 100644 --- a/BESMod/package.mo +++ b/BESMod/package.mo @@ -3,12 +3,12 @@ package BESMod extends Modelica.Icons.Package; annotation ( - version="0.4.0", + version="0.5.0", uses( Modelica(version="4.0.0"), SDF(version="0.4.2"), - AixLib(version="1.4.0"), - IBPSA(version="4.0.0")), + IBPSA(version="4.0.0"), + AixLib(version="2.1.0")), conversion( from( version="0.2.2", diff --git a/dependencies.json b/dependencies.json index c7427336..02d4fc76 100644 --- a/dependencies.json +++ b/dependencies.json @@ -10,8 +10,8 @@ "optional": { "AixLib": { "url": "https://github.com/RWTH-EBC/AixLib", - "commit": "c32721d85b83a6952eb70c80af24fc19d347dc64", - "default_branch": "development", + "commit": "fcf8bd30a526e7a423f444ad244a518164bda76e", + "default_branch": "main", "mo": "AixLib//package.mo" }, "Buildings": {