Master ibpsa merge #1373
Closed
Master ibpsa merge #1373
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# Conflicts: # IDEAS/.copiedFiles.txt # IDEAS/Airflow/Multizone/BaseClasses/Examples/WindPressureProfile.mo # IDEAS/Airflow/Multizone/BaseClasses/PartialOneWayFlowElement.mo # IDEAS/Airflow/Multizone/BaseClasses/powerLawFixedM.mo # IDEAS/Airflow/Multizone/BaseClasses/windPressureProfile.mo # IDEAS/Airflow/Multizone/Coefficient_V_flow.mo # IDEAS/Airflow/Multizone/Coefficient_m_flow.mo # IDEAS/Airflow/Multizone/EffectiveAirLeakageArea.mo # IDEAS/Airflow/Multizone/Examples/PressurizationData.mo # IDEAS/Airflow/Multizone/Examples/TrickleVent.mo # IDEAS/Airflow/Multizone/MediumColumn.mo # IDEAS/Airflow/Multizone/MediumColumnDynamic.mo # IDEAS/Airflow/Multizone/Orifice.mo # IDEAS/Airflow/Multizone/Point_m_flow.mo # IDEAS/Airflow/Multizone/Points_m_flow.mo # IDEAS/Airflow/Multizone/Table_V_flow.mo # IDEAS/Airflow/Multizone/Table_m_flow.mo # IDEAS/Airflow/Multizone/Validation/OneWayFlow.mo # IDEAS/BoundaryConditions/SolarGeometry/BaseClasses/IncidenceAngle.mo # IDEAS/BoundaryConditions/SolarGeometry/BaseClasses/SolarAzimuth.mo # IDEAS/BoundaryConditions/SolarGeometry/BaseClasses/ZenithAngle.mo # IDEAS/BoundaryConditions/SolarGeometry/IncidenceAngle.mo # IDEAS/BoundaryConditions/SolarGeometry/ZenithAngle.mo # IDEAS/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mo # IDEAS/BoundaryConditions/SolarIrradiation/BaseClasses/RelativeAirMass.mo # IDEAS/BoundaryConditions/SolarIrradiation/BaseClasses/SkyBrightness.mo # IDEAS/BoundaryConditions/SolarIrradiation/BaseClasses/SkyClearness.mo # IDEAS/BoundaryConditions/SolarIrradiation/DiffusePerez.mo # IDEAS/BoundaryConditions/SolarIrradiation/DirectTiltedSurface.mo # IDEAS/BoundaryConditions/Validation/BESTEST/WD100.mo # IDEAS/BoundaryConditions/Validation/BESTEST/WD200.mo # IDEAS/BoundaryConditions/Validation/BESTEST/WD300.mo # IDEAS/BoundaryConditions/Validation/BESTEST/WD400.mo # IDEAS/BoundaryConditions/Validation/BESTEST/WD500.mo # IDEAS/BoundaryConditions/Validation/BESTEST/WD600.mo # IDEAS/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo # IDEAS/BoundaryConditions/WeatherData/BaseClasses/ConvertTime.mo # IDEAS/BoundaryConditions/WeatherData/ReaderTMY3.mo # IDEAS/Controls/Continuous/Examples/SignalRanker.mo # IDEAS/Controls/Continuous/SignalRanker.mo # IDEAS/Controls/SetPoints/SupplyReturnTemperatureReset.mo # IDEAS/Fluid/Actuators/Dampers/Validation/PressureIndependent.mo # IDEAS/Fluid/Chillers/BaseClasses/Carnot.mo # IDEAS/Fluid/Chillers/BaseClasses/PartialCarnot_y.mo # IDEAS/Fluid/Chillers/Validation/CarnotVerifyCOP.mo # IDEAS/Fluid/Chillers/Validation/CarnotVerifyEtaCarnot.mo # IDEAS/Fluid/Chillers/Validation/Carnot_TEva_2ndLaw.mo # IDEAS/Fluid/Delays/DelayFirstOrder.mo # IDEAS/Fluid/Examples/SimpleHouse.mo # IDEAS/Fluid/FMI/ExportContainers/Examples/FMUs/Fan.mo # IDEAS/Fluid/FMI/ExportContainers/Examples/FMUs/HVACZones.mo # IDEAS/Fluid/FMI/ExportContainers/Examples/FMUs/Heater_T.mo # IDEAS/Fluid/FMI/ExportContainers/Examples/FMUs/Humidifier_u.mo # IDEAS/Fluid/FMI/ExportContainers/Examples/FMUs/PressureDrop.mo # IDEAS/Fluid/FMI/Validation/HeaterFan.mo # IDEAS/Fluid/FMI/Validation/HeaterFanPressureDriven.mo # IDEAS/Fluid/FMI/Validation/HeaterFan_noReverseFlow.mo # IDEAS/Fluid/FixedResistances/BaseClasses/PlugFlowPipe.mo # IDEAS/Fluid/FixedResistances/HydraulicDiameter.mo # IDEAS/Fluid/FixedResistances/PlugFlowPipe.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/convectionResistanceCircularPipe.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesOneUTube.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalResistancesTwoUTube.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalHEX.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/PartialInternalResistances.mo # IDEAS/Fluid/Geothermal/Borefields/BaseClasses/HeatTransfer/ThermalResponseFactors/gFunction.mo # IDEAS/Fluid/HeatExchangers/BaseClasses/HADryCoil.mo # IDEAS/Fluid/HeatExchangers/BaseClasses/PartialEffectiveness.mo # IDEAS/Fluid/HeatExchangers/BaseClasses/PartialEffectivenessNTU.mo # IDEAS/Fluid/HeatExchangers/BaseClasses/WetCoilDryWetRegime.mo # IDEAS/Fluid/HeatExchangers/BaseClasses/WetCoilWetRegime.mo # IDEAS/Fluid/HeatExchangers/EvaporatorCondenser.mo # IDEAS/Fluid/HeatExchangers/HeaterCooler_u.mo # IDEAS/Fluid/HeatExchangers/WetCoilEffectivenessNTU.mo # IDEAS/Fluid/Humidifiers/Humidifier_u.mo # IDEAS/Fluid/Interfaces/ConservationEquation.mo # IDEAS/Fluid/Interfaces/Examples/Humidifier_u.mo # IDEAS/Fluid/Interfaces/FourPortFlowResistanceParameters.mo # IDEAS/Fluid/Interfaces/LumpedVolumeDeclarations.mo # IDEAS/Fluid/Interfaces/PartialEightPortInterface.mo # IDEAS/Fluid/Interfaces/PartialFourPortInterface.mo # IDEAS/Fluid/Interfaces/PartialTwoPortInterface.mo # IDEAS/Fluid/MixingVolumes/BaseClasses/MixingVolumeHeatMoisturePort.mo # IDEAS/Fluid/MixingVolumes/BaseClasses/MixingVolumeHeatPort.mo # IDEAS/Fluid/MixingVolumes/BaseClasses/PartialMixingVolume.mo # IDEAS/Fluid/Movers/BaseClasses/Characteristics/power.mo # IDEAS/Fluid/Movers/BaseClasses/FlowMachineInterface.mo # IDEAS/Fluid/Movers/BaseClasses/PartialFlowMachine.mo # IDEAS/Fluid/Movers/BaseClasses/PowerInterface.mo # IDEAS/Fluid/Movers/Data/Generic.mo # IDEAS/Fluid/Movers/Examples/MoverParameter.mo # IDEAS/Fluid/Movers/FlowControlled_dp.mo # IDEAS/Fluid/Movers/FlowControlled_m_flow.mo # IDEAS/Fluid/Movers/SpeedControlled_Nrpm.mo # IDEAS/Fluid/Movers/SpeedControlled_y.mo # IDEAS/Fluid/Movers/UsersGuide.mo # IDEAS/Fluid/Movers/Validation/PowerExact.mo # IDEAS/Fluid/Movers/Validation/PowerSimplified.mo # IDEAS/Fluid/Sensors/Examples/PPM.mo # IDEAS/Fluid/SolarCollectors/Validation/package.mo # IDEAS/Fluid/Sources/Examples/Outside_CpData.mo # IDEAS/Fluid/Sources/Examples/Outside_CpData_Angles.mo # IDEAS/Fluid/Sources/Examples/Outside_CpData_Specification.mo # IDEAS/Fluid/Sources/MassFlowSource_T.mo # IDEAS/Fluid/Sources/MassFlowSource_WeatherData.mo # IDEAS/Fluid/Sources/MassFlowSource_h.mo # IDEAS/Fluid/Sources/Outside_CpData.mo # IDEAS/Fluid/Sources/Outside_CpLowRise.mo # IDEAS/Fluid/Sources/Validation/Outside_CpData_Directions.mo # IDEAS/Fluid/Storage/BaseClasses/PartialStratified.mo # IDEAS/Fluid/Storage/ExpansionVessel.mo # IDEAS/Media/Air.mo # IDEAS/Media/Refrigerants/R410A/package.mo # IDEAS/Media/Specialized/Water/TemperatureDependentDensity.mo # IDEAS/Media/Steam.mo # IDEAS/Media/Water.mo # IDEAS/Resources/C-Sources/fileWriterFree.c # IDEAS/Resources/C-Sources/fileWriterStructure.c # IDEAS/Resources/C-Sources/getTimeSpan.c # IDEAS/Resources/Data/Utilities/IO/Files/Examples/CSVReader/Data.txt # IDEAS/Resources/Images/Fluid/Movers/Validation/PowerExact.png # IDEAS/Resources/Images/Fluid/Movers/Validation/PowerExact.svg # IDEAS/Resources/Images/Fluid/Movers/Validation/PowerSimplified.png # IDEAS/Resources/Images/Fluid/Movers/Validation/PowerSimplified.svg # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_ChimneyShaftWithVolume.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_ClosedDoors.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_OneEffectiveAirLeakageArea.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_OneOpenDoor.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_PressurizationData.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_ReverseBuoyancy.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_ReverseBuoyancy3Zones.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Examples_TrickleVent.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Airflow_Multizone_Validation_OneWayFlow.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Controls_Continuous_Examples_LimPIDWithReset.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Controls_Continuous_Examples_SignalRanker.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Examples_FlowSystem_Simplified1.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Examples_FlowSystem_Simplified2.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Examples_FlowSystem_Simplified4.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Examples_SimpleHouse.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZone.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FMI_ExportContainers_Examples_FMUs_HVACZones.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FMI_ExportContainers_Examples_FMUs_ThermalZone.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FMI_ExportContainers_Examples_FMUs_ThermalZones.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FixedResistances_Validation_PlugFlowPipes_PlugFlowAIT.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_FixedResistances_Validation_PlugFlowPipes_TransportWaterAir.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_ActiveBeams_Examples_HeatingOnly.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Examples_AirHeater_u.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Examples_WaterCooler_T.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Examples_WaterHeater_u.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Validation_ConstantEffectiveness.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Validation_DryCoilEffectivenessNTU.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_HeatExchangers_Validation_WetCoilEffectivenessNTU.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Examples_ClosedLoop_y.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Examples_MoverParameter.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Validation_ControlledFlowMachine.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Validation_ControlledFlowMachineDynamic.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Validation_PumpCurveDerivatives.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Validation_SpeedControlled_Nrpm.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_Fluid_Movers_Validation_SpeedControlled_y.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Examples_SimpleRoomFourElements.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Examples_SimpleRoomOneElement.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Examples_SimpleRoomThreeElements.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Examples_SimpleRoomTwoElements.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase11.txt # IDEAS/Resources/ReferenceResults/Dymola/IDEAS_ThermalZones_ReducedOrder_Validation_VDI6007_TestCase7.txt # IDEAS/Resources/Scripts/Dymola/Airflow/Multizone/Examples/PressurizationData.mos # IDEAS/Resources/Scripts/Dymola/Fluid/HeatExchangers/Validation/WetCoilEffectivenessNTU.mos # IDEAS/Resources/Scripts/Dymola/Fluid/Movers/Validation/PowerExact.mos # IDEAS/Resources/Scripts/Dymola/Fluid/Movers/Validation/PowerSimplified.mos # IDEAS/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpData.mos # IDEAS/Resources/Scripts/Dymola/Fluid/Sources/Examples/Outside_CpData_Angles.mos # IDEAS/Resources/Scripts/travis/dymola/dymola # IDEAS/Resources/Scripts/travis/omc/omc # IDEAS/RunUnitTests.py # IDEAS/ThermalZones/ReducedOrder/EquivalentAirTemperature/BaseClasses/PartialVDI6007.mo # IDEAS/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElements.mo # IDEAS/ThermalZones/ReducedOrder/Examples/SimpleRoomFourElementsTraceSubstance.mo # IDEAS/ThermalZones/ReducedOrder/Examples/SimpleRoomOneElement.mo # IDEAS/ThermalZones/ReducedOrder/Examples/SimpleRoomThreeElements.mo # IDEAS/ThermalZones/ReducedOrder/Examples/SimpleRoomTwoElements.mo # IDEAS/ThermalZones/ReducedOrder/RC/OneElement.mo # IDEAS/ThermalZones/ReducedOrder/SolarGain/CorrectionGDoublePane.mo # IDEAS/Utilities/Math/Examples/Polynomial.mo # IDEAS/Utilities/Math/Functions/BaseClasses/der_spliceFunction.mo # IDEAS/Utilities/Math/Functions/Examples/SpliceFunctionDerivativeCheck.mo # IDEAS/Utilities/Math/Polynomial.mo # IDEAS/Utilities/Psychrometrics/TWetBul_TDryBulPhi.mo # IDEAS/Utilities/Psychrometrics/TWetBul_TDryBulXi.mo # IDEAS/Utilities/Time/CalendarTime.mo
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.