Merge branch 'issue1478_BESTEST_weatherfiles' into issue1477_diffuseR…

…adiation_AND_issue1478_issue1478_BESTEST_weatherfiles
ibpsa · Sep 16, 2021 · 7efcab2 · 7efcab2
2 parents ade5d66 + 6beeeee
commit 7efcab2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mo b/IBPSA/BoundaryConditions/SolarIrradiation/BaseClasses/Examples/SkyBrightness.mo
@@ -71,7 +71,7 @@ This example computes the sky brightness.
 <ul>
 <li>
 May 2, 2021, by Ettore Zanetti:<br/>
-Changed extraterrestrial radiation and added time dependant correlation.<br/>
+Changed extraterrestrial radiation and added time dependent correlation.<br/>
 This is for
 <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1477\">IBPSA, #1477</a>.
 </li>

diff --git a/IBPSA/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo b/IBPSA/BoundaryConditions/Validation/IsotropicAndPerezDiffuseRadiation.mo
@@ -13,6 +13,10 @@ model IsotropicAndPerezDiffuseRadiation
   parameter Modelica.SIunits.Angle azi(
     displayUnit="deg")
     "Azimuth angle";
+<<<<<<< HEAD
+=======
+  parameter Modelica.SIunits.Length alt "Location altitude above sea level";
+>>>>>>> issue1478_BESTEST_weatherfiles
   parameter Real rho=0.2
     "Ground reflectance";
   SolarIrradiation.DirectTiltedSurface HDir(

diff --git a/IBPSA/BoundaryConditions/WeatherData/ReaderTMY3.mo b/IBPSA/BoundaryConditions/WeatherData/ReaderTMY3.mo
@@ -233,7 +233,7 @@ block ReaderTMY3 "Reader for TMY3 weather data"
     "Time zone";
   final parameter Modelica.SIunits.Length alt(displayUnit="m")=
     IBPSA.BoundaryConditions.WeatherData.BaseClasses.getAltitudeLocationTMY3(filNam)
-    "Altitude";
+    "Location altitude above sea level";
 
 protected
   final parameter Modelica.SIunits.Time[2] timeSpan=
@@ -521,10 +521,10 @@ First implementation.
   block Altitude "Generate constant signal of type Real"
     extends Modelica.Blocks.Icons.Block;
 
-    parameter Modelica.SIunits.Length Altitude "Altitude";
+    parameter Modelica.SIunits.Length Altitude "Location altitude above sea level";
 
     Modelica.Blocks.Interfaces.RealOutput y(
-      unit="m") "Altitude of the location"
+      unit="m") "Location altitude above sea level"
       annotation (Placement(transformation(extent={{100,-10},{120,10}})));
   equation
     y = Altitude;
@@ -538,8 +538,8 @@ First implementation.
             textString="Altitude")}),
     Documentation(info="<html>
 <p>
-Block to output the Altitude of the location.
-This block is added so that the Altitude is displayed
+Block to output the altitude of the location.
+This block is added so that the altitude is displayed
 with a comment in the GUI of the weather bus connector.
 </p>
 <h4>Implementation</h4>