From 80b26a5b8b7fae9fdbe62907872f9703ce4ece50 Mon Sep 17 00:00:00 2001 From: jelgerjansen Date: Fri, 7 Feb 2025 12:45:10 +0100 Subject: [PATCH 1/5] Remove import statements --- .../BaseClasses/BrighteningCoefficient.mo | 24 +++--- IBPSA/Controls/SetPoints/OccupancySchedule.mo | 8 +- IBPSA/Electrical/PhaseSystems/ThreePhase_d.mo | 19 +++-- IBPSA/Electrical/PhaseSystems/package.mo | 9 ++- IBPSA/Fluid/Actuators/Dampers/MixingBox.mo | 15 ++-- IBPSA/Fluid/BaseClasses/ActuatorFilter.mo | 15 ++-- .../BaseClasses/PartialEffectivenessNTU.mo | 60 ++++++++------- .../BaseClasses/epsilon_ntuZ.mo | 25 +++--- .../BaseClasses/ntu_epsilonZ.mo | 23 +++--- .../HeatExchangers/WetCoilEffectivenessNTU.mo | 69 +++++++++-------- .../BaseClasses/FlowMachineInterface.mo | 76 ++++++++++--------- .../Storage/BaseClasses/PartialStratified.mo | 11 ++- .../SolarGain/CorrectionGDoublePane.mo | 11 ++- 13 files changed, 211 insertions(+), 154 deletions(-) diff --git a/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo b/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo index 5dd03fecbe..0a5337ff56 100644 --- a/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo +++ b/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/BrighteningCoefficient.mo @@ -1,7 +1,6 @@ within IBPSA.BoundaryConditions.SolarIrradiation.BaseClasses; block BrighteningCoefficient "Circumsolar and horizon brightening coefficients" extends Modelica.Blocks.Icons.Block; - import H = IBPSA.Utilities.Math.Functions.regStep; Modelica.Blocks.Interfaces.RealInput zen( quantity="Angle", unit="rad", @@ -42,43 +41,42 @@ protected Real b7; Real b8; equation - b1 = H( + b1 = IBPSA.Utilities.Math.Functions.regStep( y1=1, y2=0, x=1.065 - skyCle, x_small=d); - b2 = H( + b2 = IBPSA.Utilities.Math.Functions.regStep( y1=1, y2=0, x=1.23 - skyCle, x_small=d); - b3 = H( + b3 = IBPSA.Utilities.Math.Functions.regStep( y1=1, y2=0, x=1.50 - skyCle, x_small=d); - b4 = H( + b4 = IBPSA.Utilities.Math.Functions.regStep( y1=1, y2=0, x=1.95 - skyCle, x_small=d); - b5 = H( + b5 = IBPSA.Utilities.Math.Functions.regStep( y1=1, y2=0, x=2.80 - skyCle, x_small=d); - - b6 = H( + b6 = IBPSA.Utilities.Math.Functions.regStep( y1=1, y2=0, x=4.50 - skyCle, x_small=d); - b7 = H( + b7 = IBPSA.Utilities.Math.Functions.regStep( y1=1, y2=0, x=6.20 - skyCle, x_small=d); - b8 = H( + b8 = IBPSA.Utilities.Math.Functions.regStep( y1=1, y2=0, x=skyCle - 6.20, @@ -119,6 +117,12 @@ This component computes the circumsolar and horizon brightening coefficients. ", revisions="