From e026e02a5a64db8c5b1bb510a59e55f86f93b6b0 Mon Sep 17 00:00:00 2001 From: kuzha Date: Wed, 21 Aug 2019 17:58:19 -0700 Subject: [PATCH] Merge branch 'master'; solve conflicts --- .gitignore | 9 +- .travis.yml | 2 +- .../Examples/ChillerSetPointControl.mo | 10 +- Buildings/Examples/Tutorial/Boiler/System3.mo | 2 +- .../SingleZone/EconModulationControlChart.png | Bin 31549 -> 30457 bytes ...ultizone_Examples_ChimneyShaftNoVolume.txt | 14 +-- ...tizone_Examples_ChimneyShaftWithVolume.txt | 16 +-- ...olingCoilHumidifyingHeating_ClosedLoop.txt | 4 +- ...CoolingCoilHumidifyingHeating_OpenLoop.txt | 4 +- ...ed_Equipment_Validation_ElectricHeater.txt | 10 +- ...t_Validation_IntegratedPrimaryLoadSide.txt | 22 ++-- ..._Validation_IntegratedPrimaryPlantSide.txt | 20 ++-- ...oled_Equipment_Validation_PumpParallel.txt | 10 +- ...es_IntegratedPrimaryLoadSideEconomizer.txt | 26 ++--- ...s_IntegratedPrimarySecondaryEconomizer.txt | 26 ++--- ...onIntegratedPrimarySecondaryEconomizer.txt | 22 ++-- ...led_Examples_DXCooledAirsideEconomizer.txt | 18 ++-- ...s_Controls_Predictors_Examples_BESTEST.txt | 8 +- ...sts_Test4NodesFeeder_BalancedStepUp_DD.txt | 53 ++++++---- ...Test4NodesFeeder_UnbalancedStepDown_YD.txt | 50 ++++----- ...s_Electrical_Examples_RenewableSources.txt | 20 ++-- ...ntrols_Examples_ChillerSetPointControl.txt | 19 ++-- ...rPlant_DataCenterContinuousTimeControl.txt | 4 +- ...lerPlant_DataCenterDiscreteTimeControl.txt | 4 +- ...ples_ChillerPlant_DataCenterRenewables.txt | 6 +- ...gs_Examples_DualFanDualDuct_ClosedLoop.txt | 47 +++++---- ...es_HydronicHeating_TwoRoomsWithStorage.txt | 26 ++--- ..._BuildingVAV_Examples_OneFloor_OneZone.txt | 6 +- ..._BuildingVAV_Examples_TwoFloor_TwoZone.txt | 12 +-- ...gVAV_ThermalZones_Validation_MultiZone.txt | 6 +- ...AV_ThermalZones_Validation_ThermalZone.txt | 4 +- ...Examples_Tutorial_SpaceCooling_System2.txt | 4 +- ...Examples_Tutorial_SpaceCooling_System3.txt | 6 +- ...ngs_Examples_VAVCO2_VAVSystemCTControl.txt | 60 +++++------ ...uildings_Examples_VAVReheat_ASHRAE2006.txt | 39 ++++--- ...ildings_Examples_VAVReheat_Guideline36.txt | 33 +++--- ...amples_HeatingCoolingHotWater3Clusters.txt | 18 ++-- ...eatingCoolingHotWater3ClustersBaseCase.txt | 16 +-- ...gCooling_Examples_IdealSystem3Clusters.txt | 10 +- ...s_Validation_Plant_Carnot_T_ClosedLoop.txt | 18 ++-- ...g_Plants_Validation_Plant_T_ClosedLoop.txt | 8 +- ...on_HeatingCoolingHotwaterTimeSeries_dT.txt | 8 +- ...ingCooling_Validation_IdealSmallSystem.txt | 10 +- ...ors_Dampers_Examples_VAVBoxExponential.txt | 16 +-- ...rs_Examples_BoilerPolynomialClosedLoop.txt | 12 +-- ...ldings_Fluid_Examples_FlowSystem_Basic.txt | 8 +- ..._Fluid_Examples_FlowSystem_Simplified1.txt | 8 +- ..._Fluid_Examples_FlowSystem_Simplified2.txt | 8 +- ...es_Performance_PressureDrop_ParallelDp.txt | 13 +-- ...es_Performance_PressureDrop_SeriesFlow.txt | 13 +-- ...rmance_PressureDrop_SeriesParallelFlow.txt | 12 +-- .../Buildings_Fluid_Examples_SimpleHouse.txt | 10 +- ...I_ExportContainers_Validation_RoomHVAC.txt | 14 +-- ...s_Fluid_FixedResistances_Examples_Pipe.txt | 7 +- ...tances_Validation_PlugFlowPipes_MSLAIT.txt | 30 +++--- ..._Validation_PlugFlowPipes_MSLAIT2Nodes.txt | 18 ++-- ...s_Validation_PlugFlowPipes_PlugFlowAIT.txt | 12 +-- ...aseClasses_Examples_HexElementSensible.txt | 16 +-- ...ngTowers_Examples_FixedApproachWetBulb.txt | 6 +- ...angers_CoolingTowers_Examples_YorkCalc.txt | 18 ++-- ...XCoils_AirCooled_Examples_SpaceCooling.txt | 22 ++-- ...id_HeatExchangers_Examples_AirHeater_T.txt | 10 +- ...rs_Examples_DryCoilCounterFlowMassFlow.txt | 7 +- ...rs_Examples_DryCoilCounterFlowPControl.txt | 4 +- ...Exchangers_Examples_DryCoilDiscretized.txt | 20 ++-- ..._HeatExchangers_Examples_WaterCooler_T.txt | 10 +- ..._HeatExchangers_Examples_WaterHeater_T.txt | 8 +- ...rs_Examples_WetCoilCounterFlowMassFlow.txt | 7 +- ...rs_Examples_WetCoilCounterFlowPControl.txt | 4 +- ...ers_Radiators_Examples_RadiatorEN442_2.txt | 14 +-- ...ngers_Validation_ConstantEffectiveness.txt | 7 +- ...ers_Validation_DryCoilEffectivenessNTU.txt | 15 +-- ...ation_WetCoilDiscretizedInitialization.txt | 6 +- ...lDiscretizedInitializationPerfectGases.txt | 6 +- ...uid_Interfaces_Examples_HeaterCooler_u.txt | 18 ++-- ...Fluid_Interfaces_Examples_Humidifier_u.txt | 50 ++++----- ...hangers_Examples_ConstantEffectiveness.txt | 7 +- ...lidation_ConstantEffectivenessZeroFlow.txt | 7 +- ...nstantEffectivenessZeroFlowBothStreams.txt | 7 +- ...alidation_MixingVolumeHeatMoisturePort.txt | 15 +-- ...ses_Validation_MixingVolumeHeatPortAir.txt | 15 +-- ...ngVolumes_Validation_CoupledVolumesAir.txt | 7 +- ...CoupledVolumesSpecializedAirPerfectGas.txt | 7 +- ...ngs_Fluid_Movers_Examples_ClosedLoop_y.txt | 4 +- ...gs_Fluid_Movers_Examples_PumpsParallel.txt | 20 ++-- ...id_Movers_Validation_FlowControlled_dp.txt | 16 +-- ...overs_Validation_FlowControlled_m_flow.txt | 17 ++-- ...ngs_Fluid_Movers_Validation_PowerExact.txt | 16 +-- ...luid_Movers_Validation_PowerSimplified.txt | 16 +-- ...Movers_Validation_PumpCurveDerivatives.txt | 4 +- ...s_Fluid_Movers_Validation_Pump_stratos.txt | 18 ++-- ...Movers_Validation_SpeedControlled_Nrpm.txt | 20 ++-- ...id_Movers_Validation_SpeedControlled_y.txt | 22 ++-- ...rs_Validation_SpeedControlled_y_linear.txt | 12 +-- ...Conversions_Examples_To_VolumeFraction.txt | 17 ++-- ...ildings_Fluid_Sensors_Examples_Density.txt | 15 +-- ...gs_Fluid_Sensors_Examples_MassFraction.txt | 15 +-- ...SolarCollectors_Examples_Concentrating.txt | 13 +-- ...uid_SolarCollectors_Examples_FlatPlate.txt | 13 +-- ...Fluid_SolarCollectors_Examples_Tubular.txt | 13 +-- ...ces_Examples_TraceSubstancesFlowSource.txt | 14 +-- ...Examples_StratifiedEnhancedInternalHex.txt | 4 +- ...ed_Constructions_Examples_ExteriorWall.txt | 12 +-- ...ctions_Examples_ExteriorWallTwoWindows.txt | 16 +-- ...ctions_Examples_ExteriorWallWithWindow.txt | 16 +-- ...Detailed_Examples_ElectroChromicWindow.txt | 6 +- ..._Detailed_Examples_FFD_WindowWithShade.txt | 18 ++-- ...tailed_Examples_FFD_WindowWithoutShade.txt | 24 ++--- ...malZones_Detailed_Examples_MixedAirCO2.txt | 8 +- ...ed_Validation_BESTEST_Cases6xx_Case600.txt | 12 +-- ...ed_Validation_BESTEST_Cases6xx_Case610.txt | 12 +-- ...ed_Validation_BESTEST_Cases6xx_Case620.txt | 12 +-- ...ed_Validation_BESTEST_Cases6xx_Case630.txt | 12 +-- ...ed_Validation_BESTEST_Cases6xx_Case640.txt | 12 +-- ...ed_Validation_BESTEST_Cases6xx_Case650.txt | 8 +- ...ed_Validation_BESTEST_Cases9xx_Case900.txt | 12 +-- ...ed_Validation_BESTEST_Cases9xx_Case920.txt | 12 +-- ...ed_Validation_BESTEST_Cases9xx_Case940.txt | 12 +-- ...ed_Validation_BESTEST_Cases9xx_Case950.txt | 8 +- ...ed_Validation_BESTEST_Cases9xx_Case960.txt | 12 +-- ...dOrder_Examples_SimpleRoomFourElements.txt | 4 +- ...cedOrder_Examples_SimpleRoomOneElement.txt | 4 +- ...Order_Examples_SimpleRoomThreeElements.txt | 4 +- ...edOrder_Examples_SimpleRoomTwoElements.txt | 4 +- ....Validation.OverAYear_usingOneYearData.mos | 1 - ...bsequences.Validation.Enable_TOut_hOut.mos | 2 - ...izers.Validation.Controller_Mod_DamLim.mos | 1 - ...bsequences.Validation.Enable_TOut_hOut.mos | 2 - ...alUnits.Reheat.Validation.DamperValves.mos | 2 - ...alDuct.Controls.Examples.RoomMixingBox.mos | 4 +- ...ngs.Examples.VAVCO2.VAVSystemCTControl.mos | 6 -- ...g.Plants.Validation.Plant_T_ClosedLoop.mos | 3 +- ...es.Psychrometrics.Examples.Density_pTX.mos | 1 - ...lities.Psychrometrics.Examples.Phi_pTX.mos | 1 - Buildings/Resources/Scripts/travis/Makefile | 2 +- Buildings/Resources/Scripts/travis/bin/dymola | 2 +- Buildings/package.mo | 4 +- bin/runUnitTests.py | 95 +++++++++++------- 138 files changed, 880 insertions(+), 959 deletions(-) diff --git a/.gitignore b/.gitignore index 57ad189aa76..3e035801954 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,10 @@ stop stop. Thumbs.db # Ignore files created by the unit tests. -simulator.log +simulator*.log +comparison*.log +unitTests*.log +funnel_comp # Files in top-level directory ##################################### @@ -36,7 +39,7 @@ simulator.log /build -# Temporary files generated by emacs # +# Temporary files generated by emacs ###################################### *~ \#*\# @@ -65,4 +68,4 @@ Buildings/Resources/src/fluid/heatpumps/calibration/doc/build/doctrees # Spawn temporary directories ######################################### -tmp-eplus-* \ No newline at end of file +tmp-eplus-* diff --git a/.travis.yml b/.travis.yml index 60e08bcc910..007c5c589b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -53,7 +53,7 @@ env: before_install: - if [[ "$TEST_ARG" == *test-dymola* ]]; then - docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola-2019fd01-x86_64; + docker login -u "$DOCKER_USERNAME" -p "$DOCKER_PASSWORD" && docker pull "$DOCKER_USERNAME"/travis_ubuntu-1804_dymola-2020-x86_64; chmod +x Buildings/Resources/Scripts/travis/bin/dymola; cp Buildings/Resources/Scripts/travis/bin/dymola $HOME/bin/; fi; diff --git a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo index 16fe63fa181..19c5c1c3aaa 100644 --- a/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo +++ b/Buildings/Examples/ChillerPlant/BaseClasses/Controls/Examples/ChillerSetPointControl.mo @@ -65,13 +65,13 @@ model ChillerSetPointControl extent={{-10,-10},{10,10}}, origin={-170,30}))); Buildings.Controls.Continuous.LimPID limPID( + controllerType=Modelica.Blocks.Types.SimpleController.PI, reverseAction=true, y_start=1, yMin=0, k=10, Ti=0.01, - Td=10, - initType=Modelica.Blocks.Types.InitPID.SteadyState) + Td=10) "PI controller" annotation (Placement(transformation( extent={{-10,-10},{10,10}}, origin={-130,30}))); @@ -153,7 +153,7 @@ equation color={255,0,255}, smooth=Smooth.None)); connect(gain.y, pum.m_flow_in) annotation (Line( - points={{107,-8},{116.4,-8},{116.4,-9.2},{122,-9.2}}, + points={{107,-8},{116.4,-8},{116.4,-9},{122,-9}}, color={0,0,127}, smooth=Smooth.None)); connect(sou2.T_in, sine.y) annotation (Line( @@ -216,6 +216,10 @@ equation Documentation(revisions="