From be2bb04b6b3bcf9bb6287fa11b05f2b30094e6aa Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Tue, 2 Jun 2020 11:11:47 -0700
Subject: [PATCH 1/2] Corrected white space
---
IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo | 2 +-
.../BaseClasses/PartialDamperExponential.mo | 4 ++--
.../Fluid/Actuators/BaseClasses/exponentialDamper.mo | 2 +-
IBPSA/Fluid/Actuators/Dampers/Validation/package.mo | 12 ++++++------
4 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo b/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
index 95167e4676..2617cfac53 100644
--- a/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
+++ b/IBPSA/Fluid/Actuators/BaseClasses/ActuatorSignal.mo
@@ -26,7 +26,7 @@ model ActuatorSignal
origin={0,120})));
Modelica.Blocks.Interfaces.RealOutput y_actual
- "Actual actuator position"
+ "Actual actuator position"
annotation (Placement(transformation(extent={{40,60},{60,80}})));
// Classes used to implement the filtered opening
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo b/IBPSA/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo
index bd88a54cef..3d264ad36e 100644
--- a/IBPSA/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo
+++ b/IBPSA/Fluid/Actuators/BaseClasses/PartialDamperExponential.mo
@@ -165,11 +165,11 @@ mass flow rate m_flow_nominal
, the nominal velocity
v_nominal
and the density of the medium.
-ASHRAE 825-RP lists the following parameter values as typical (note that the
+ASHRAE 825-RP lists the following parameter values as typical (note that the
default values in the model correspond to opposed blades).
-
| opposed blades | single blades |
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/exponentialDamper.mo b/IBPSA/Fluid/Actuators/BaseClasses/exponentialDamper.mo
index df8fe3a53e..c277684fe6 100644
--- a/IBPSA/Fluid/Actuators/BaseClasses/exponentialDamper.mo
+++ b/IBPSA/Fluid/Actuators/BaseClasses/exponentialDamper.mo
@@ -11,7 +11,7 @@ function exponentialDamper
input Real yL "Lower value for damper curve";
input Real yU "Upper value for damper curve";
output Real kThetaSqRt(min=0)
- "Square root of loss coefficient, = sqrt(pressure drop/dynamic pressure)";
+ "Square root of loss coefficient, sqrt(pressure drop/dynamic pressure)";
protected
Real yC(min=0, max=1, unit="")
"y constrained to 0 <= y <= 1 to avoid numerical problems";
diff --git a/IBPSA/Fluid/Actuators/Dampers/Validation/package.mo b/IBPSA/Fluid/Actuators/Dampers/Validation/package.mo
index d01bd04e0b..b3f0323f79 100644
--- a/IBPSA/Fluid/Actuators/Dampers/Validation/package.mo
+++ b/IBPSA/Fluid/Actuators/Dampers/Validation/package.mo
@@ -4,15 +4,15 @@ package Validation "Collection of validation models"
annotation (Documentation(info="
-This package contains validation models for the classes in
+This package contains validation models for the classes in
IBPSA.Fluid.Actuators.Dampers.
-Note that most validation models contain simple input data which may not be realistic,
-but for which the correct output can be obtained through an analytic solution.
-The examples plot various outputs, which have been verified against these solutions.
-These model outputs are stored as reference data and used for continuous validation
-whenever models in the library change.
+Note that most validation models contain simple input data which may not be realistic,
+but for which the correct output can be obtained through an analytic solution.
+The examples plot various outputs, which have been verified against these solutions.
+These model outputs are stored as reference data and used for continuous validation
+whenever models in the library change.
"));
end Validation;
From 093e93a72ff749854c5a3915b4b84b38d1c493ec Mon Sep 17 00:00:00 2001
From: Michael Wetter
Date: Tue, 2 Jun 2020 11:20:31 -0700
Subject: [PATCH 2/2] Changed permission to 644
---
IBPSA/Fluid/Actuators/BaseClasses/Examples/package.order | 0
IBPSA/Fluid/Actuators/BaseClasses/package.order | 0
IBPSA/Fluid/Actuators/Dampers/Examples/package.order | 0
IBPSA/Fluid/Actuators/Dampers/Exponential.mo | 0
IBPSA/Fluid/Actuators/Dampers/package.order | 0
IBPSA/Fluid/Actuators/Motors/Examples/package.order | 0
IBPSA/Fluid/Actuators/Motors/package.order | 0
IBPSA/Fluid/Actuators/Valves/Examples/package.order | 0
IBPSA/Fluid/Actuators/Valves/package.order | 0
IBPSA/Fluid/Actuators/package.order | 0
IBPSA/Fluid/BaseClasses/FlowModels/package.order | 0
IBPSA/Fluid/Delays/Examples/package.order | 0
IBPSA/Fluid/Delays/package.order | 0
IBPSA/Fluid/HeatExchangers/Examples/package.order | 0
IBPSA/Fluid/HeatExchangers/HeaterCooler_u.mo | 0
IBPSA/Fluid/HeatExchangers/PrescribedOutlet.mo | 0
IBPSA/Fluid/HeatExchangers/Radiators/Examples/package.order | 0
IBPSA/Fluid/HeatExchangers/Radiators/package.order | 0
IBPSA/Fluid/HeatExchangers/Validation/package.order | 0
IBPSA/Fluid/HeatExchangers/package.order | 0
IBPSA/Fluid/Movers/BaseClasses/package.order | 0
IBPSA/Fluid/Movers/package.order | 0
IBPSA/Fluid/Storage/Examples/package.order | 0
IBPSA/Fluid/Storage/package.order | 0
IBPSA/Media/package.order | 0
...id_HeatExchangers_Examples_DryCoilEffectivenessNTUPControl.txt | 0
...id_HeatExchangers_Examples_DryCoilEffectivenessNTUMassFlow.txt | 0
.../Fluid/HeatExchangers/BaseClasses/Examples/HADryCoil.mos | 0
.../HeatExchangers/Examples/DryCoilEffectivenessNTUMassFlow.mos | 0
.../HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mos | 0
30 files changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 IBPSA/Fluid/Actuators/BaseClasses/Examples/package.order
mode change 100755 => 100644 IBPSA/Fluid/Actuators/BaseClasses/package.order
mode change 100755 => 100644 IBPSA/Fluid/Actuators/Dampers/Examples/package.order
mode change 100755 => 100644 IBPSA/Fluid/Actuators/Dampers/Exponential.mo
mode change 100755 => 100644 IBPSA/Fluid/Actuators/Dampers/package.order
mode change 100755 => 100644 IBPSA/Fluid/Actuators/Motors/Examples/package.order
mode change 100755 => 100644 IBPSA/Fluid/Actuators/Motors/package.order
mode change 100755 => 100644 IBPSA/Fluid/Actuators/Valves/Examples/package.order
mode change 100755 => 100644 IBPSA/Fluid/Actuators/Valves/package.order
mode change 100755 => 100644 IBPSA/Fluid/Actuators/package.order
mode change 100755 => 100644 IBPSA/Fluid/BaseClasses/FlowModels/package.order
mode change 100755 => 100644 IBPSA/Fluid/Delays/Examples/package.order
mode change 100755 => 100644 IBPSA/Fluid/Delays/package.order
mode change 100755 => 100644 IBPSA/Fluid/HeatExchangers/Examples/package.order
mode change 100755 => 100644 IBPSA/Fluid/HeatExchangers/HeaterCooler_u.mo
mode change 100755 => 100644 IBPSA/Fluid/HeatExchangers/PrescribedOutlet.mo
mode change 100755 => 100644 IBPSA/Fluid/HeatExchangers/Radiators/Examples/package.order
mode change 100755 => 100644 IBPSA/Fluid/HeatExchangers/Radiators/package.order
mode change 100755 => 100644 IBPSA/Fluid/HeatExchangers/Validation/package.order
mode change 100755 => 100644 IBPSA/Fluid/HeatExchangers/package.order
mode change 100755 => 100644 IBPSA/Fluid/Movers/BaseClasses/package.order
mode change 100755 => 100644 IBPSA/Fluid/Movers/package.order
mode change 100755 => 100644 IBPSA/Fluid/Storage/Examples/package.order
mode change 100755 => 100644 IBPSA/Fluid/Storage/package.order
mode change 100755 => 100644 IBPSA/Media/package.order
mode change 100755 => 100644 IBPSA/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUPControl.txt
mode change 100755 => 100644 IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUMassFlow.txt
mode change 100755 => 100644 IBPSA/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HADryCoil.mos
mode change 100755 => 100644 IBPSA/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUMassFlow.mos
mode change 100755 => 100644 IBPSA/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mos
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/Examples/package.order b/IBPSA/Fluid/Actuators/BaseClasses/Examples/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Actuators/BaseClasses/package.order b/IBPSA/Fluid/Actuators/BaseClasses/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Actuators/Dampers/Examples/package.order b/IBPSA/Fluid/Actuators/Dampers/Examples/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Actuators/Dampers/Exponential.mo b/IBPSA/Fluid/Actuators/Dampers/Exponential.mo
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Actuators/Dampers/package.order b/IBPSA/Fluid/Actuators/Dampers/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Actuators/Motors/Examples/package.order b/IBPSA/Fluid/Actuators/Motors/Examples/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Actuators/Motors/package.order b/IBPSA/Fluid/Actuators/Motors/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Actuators/Valves/Examples/package.order b/IBPSA/Fluid/Actuators/Valves/Examples/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Actuators/Valves/package.order b/IBPSA/Fluid/Actuators/Valves/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Actuators/package.order b/IBPSA/Fluid/Actuators/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/BaseClasses/FlowModels/package.order b/IBPSA/Fluid/BaseClasses/FlowModels/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Delays/Examples/package.order b/IBPSA/Fluid/Delays/Examples/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Delays/package.order b/IBPSA/Fluid/Delays/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/HeatExchangers/Examples/package.order b/IBPSA/Fluid/HeatExchangers/Examples/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/HeatExchangers/HeaterCooler_u.mo b/IBPSA/Fluid/HeatExchangers/HeaterCooler_u.mo
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/HeatExchangers/PrescribedOutlet.mo b/IBPSA/Fluid/HeatExchangers/PrescribedOutlet.mo
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/HeatExchangers/Radiators/Examples/package.order b/IBPSA/Fluid/HeatExchangers/Radiators/Examples/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/HeatExchangers/Radiators/package.order b/IBPSA/Fluid/HeatExchangers/Radiators/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/HeatExchangers/Validation/package.order b/IBPSA/Fluid/HeatExchangers/Validation/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/HeatExchangers/package.order b/IBPSA/Fluid/HeatExchangers/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Movers/BaseClasses/package.order b/IBPSA/Fluid/Movers/BaseClasses/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Movers/package.order b/IBPSA/Fluid/Movers/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Storage/Examples/package.order b/IBPSA/Fluid/Storage/Examples/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Fluid/Storage/package.order b/IBPSA/Fluid/Storage/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Media/package.order b/IBPSA/Media/package.order
old mode 100755
new mode 100644
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUPControl.txt b/IBPSA/Resources/ReferenceResults/Dymola/Buildings_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUPControl.txt
old mode 100755
new mode 100644
diff --git a/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUMassFlow.txt b/IBPSA/Resources/ReferenceResults/Dymola/IBPSA_Fluid_HeatExchangers_Examples_DryCoilEffectivenessNTUMassFlow.txt
old mode 100755
new mode 100644
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HADryCoil.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatExchangers/BaseClasses/Examples/HADryCoil.mos
old mode 100755
new mode 100644
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUMassFlow.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUMassFlow.mos
old mode 100755
new mode 100644
diff --git a/IBPSA/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mos b/IBPSA/Resources/Scripts/Dymola/Fluid/HeatExchangers/Examples/DryCoilEffectivenessNTUPControl.mos
old mode 100755
new mode 100644