ibpsa · LauraMaier · Jun 13, 2022 · Jun 14, 2022 · Jun 14, 2022 · Jun 14, 2022
diff --git a/IBPSA/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo b/IBPSA/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mo
@@ -6,7 +6,7 @@ model ReaderTMY3HDirNor
         Modelica.Utilities.Files.loadResource("modelica://IBPSA/Resources/weatherdata/USA_IL_Chicago-OHare.Intl.AP.725300_TMY3.mos"),
       HSou=IBPSA.BoundaryConditions.Types.RadiationDataSource.Input_HGloHor_HDifHor)
     "Weather data reader with radiation data obtained from the inputs' connectors"
-    annotation (Placement(transformation(extent={{68,-10},{88,10}})));
+    annotation (Placement(transformation(extent={{68,-8},{88,12}})));
 protected
   Modelica.Blocks.Sources.Sine HGloHor1(
     f=1/86400,
@@ -31,12 +31,13 @@ equation
           {-34,6}}, color={0,0,127}));
   connect(HGloHor1.y, add.u2) annotation (Line(points={{-67,-20},{-50.5,-20},{-50.5,
           -6},{-34,-6}}, color={0,0,127}));
-  connect(add.y, weaDatInpCon.HGloHor_in) annotation (Line(points={{-11,0},{28,0},
-          {28,-13},{67,-13}}, color={0,0,127}));
+  connect(add.y, weaDatInpCon.HGloHor_in) annotation (Line(points={{-11,0},{28,
+          0},{28,-11},{67,-11}},
+                              color={0,0,127}));
   connect(add.y, gaiHDifHor.u) annotation (Line(points={{-11,0},{-6,0},{-6,0},{
           -6,20},{-2,20}},   color={0,0,127}));
   connect(gaiHDifHor.y, weaDatInpCon.HDifHor_in) annotation (Line(points={{21,20},
-          {21,20},{50,20},{50,-7.6},{67,-7.6}},   color={0,0,127}));
+          {50,20},{50,-7.5},{67,-7.5}},           color={0,0,127}));
   annotation (experiment(StopTime=86400, Tolerance=1e-06),
 __Dymola_Commands(file="modelica://IBPSA/Resources/Scripts/Dymola/BoundaryConditions/WeatherData/Validation/ReaderTMY3HDirNor.mos"
         "Simulate and plot"),

diff --git a/IBPSA/Electrical/AC/OnePhase/Conversion/Examples/ACACTransformerFull.mo b/IBPSA/Electrical/AC/OnePhase/Conversion/Examples/ACACTransformerFull.mo
@@ -33,8 +33,7 @@ model ACACTransformerFull
     offset=0,
     height=-4000*0.8) "Load power consumption profile"
     annotation (Placement(transformation(extent={{70,40},{50,60}})));
-  IBPSA.Electrical.AC.OnePhase.Conversion.ACACTransformerFull
-                                                              tra_cc(
+  IBPSA.Electrical.AC.OnePhase.Conversion.ACACTransformerFull tra_cc(
     VABase=4000,
     R1=0.01,
     L1=0.01,

diff --git a/IBPSA/Electrical/AC/package.mo b/IBPSA/Electrical/AC/package.mo
@@ -146,4 +146,4 @@ Added documentation.
 </li>
 </ul>
 </html>"));
-end AC;
+end AC;
diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/Icons/package.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/Icons/package.mo
@@ -0,0 +1,17 @@
+within IBPSA.Electrical.BaseClasses.PV.BaseClasses;
+package Icons
+ annotation(Documentation(info="<html>
+<p>
+This package contains icons for the models in
+<a href=\"modelica://IBPSA.Electrical.BaseClasses.PV.BaseClasses\">IBPSA.Electrical.BaseClasses.PV.BaseClasses</a>.
+</p>
+</html>",
+        revisions="<html>
+<ul>
+<li>
+Oct 6, 2023, by Laura Maier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end Icons;
diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/Icons/package.order b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/Icons/package.order
@@ -0,0 +1 @@
+partialPVIcon
diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/Icons/partialPVIcon.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/Icons/partialPVIcon.mo
@@ -0,0 +1,77 @@
+within IBPSA.Electrical.BaseClasses.PV.BaseClasses.Icons;
+partial model partialPVIcon "Partial model for basic PV model icon"
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
+            -100},{100,100}}),                                  graphics={
+    Rectangle(extent={{-100,100},{100,-100}},
+                                         lineColor={215,215,215},fillColor={215,215,215},
+            fillPattern =                                                                              FillPattern.Solid),
+    Rectangle(extent={{-62,30},{-34,2}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                     FillPattern.Solid),
+    Rectangle(extent={{-30,30},{-2,2}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                    FillPattern.Solid),
+    Rectangle(extent={{2,30},{30,2}}, lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                   FillPattern.Solid),
+    Rectangle(extent={{-62,-2},{-34,-30}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                       FillPattern.Solid),
+    Rectangle(extent={{-30,-2},{-2,-30}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{2,-2},{30,-30}}, lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                     FillPattern.Solid),
+    Rectangle(extent={{-62,-34},{-34,-62}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                        FillPattern.Solid),
+    Rectangle(extent={{-30,62},{-2,34}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                     FillPattern.Solid),
+    Rectangle(extent={{2,62},{30,34}}, lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                    FillPattern.Solid),
+    Rectangle(extent={{-62,62},{-34,34}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{-30,-34},{-2,-62}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                       FillPattern.Solid),
+    Rectangle(extent={{2,-34},{30,-62}}, lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{-94,62},{-66,34}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{-94,30},{-66,2}}, lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{-94,-2},{-66,-30}},
+                                         lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{-94,-34},{-66,-62}},
+                                         lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{34,62},{62,34}},  lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{34,30},{62,2}},   lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{34,-2},{62,-30}}, lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{34,-34},{62,-62}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{66,-34},{94,-62}},lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{66,-2},{94,-30}}, lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{66,30},{94,2}},   lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+    Rectangle(extent={{66,62},{94,34}},  lineColor={0,0,255},fillColor={0,0,255},
+            fillPattern =                                                                      FillPattern.Solid),
+                                        Text(
+        extent={{-150,150},{150,110}},
+        textString="%name",
+        textColor={0,0,255})}),
+      Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{
+            100,100}})),
+            Documentation(info="<html>
+<p>
+This is a partial model containing the base icon of the PV-related models.
+</p>
+</html>",
+        revisions="<html>
+<ul>
+<li>
+Oct 6, 2023, by Laura Maier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end partialPVIcon;
diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/AirMass.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/AirMass.mo
@@ -0,0 +1,43 @@
+within IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical;
+block AirMass
+  "Air mass calculation depening on zenith angle and height of object"
+  extends Modelica.Blocks.Icons.Block;
+  parameter Modelica.Units.SI.Height alt "Height of object";
+
+  Modelica.Blocks.Interfaces.RealInput zenAng(final unit="rad", final displayUnit="deg") "Zenith angle for object"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+  Modelica.Blocks.Interfaces.RealOutput airMas(final unit="1")
+    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+protected
+  Modelica.Units.SI.Angle zen "Zenith angle internal use";
+equation
+// Restriction for zenith angle
+ zen = if zenAng <= Modelica.Constants.pi/2 then
+ zenAng
+ else
+ Modelica.Constants.pi/2 "Zenith angle";
+
+  airMas =
+  exp(-0.0001184*alt)/(cos(zen) + 0.5057*(96.080 -
+                  zen*180/Modelica.Constants.pi)^(-1.634)) "Air mass";
+
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+        Documentation(info="<html><p>The model computes the air mass, which is the number of particles in the atmosphere.</br>
+        It bases on an exact empirical approach by Kasten et al. and bases on the zenith angle of the object as well as its height.</p>
+        <h4>References</h4>
+<p>
+Kasten, F., &amp; Young, A. T. (1989). Revised optical air mass tables and 
+approximation formula. Applied optics, 28(22), 4735-4738.
+<a href=\"https://doi.org/10.1364/AO.28.004735\">
+https://doi.org/10.1364/AO.28.004735</a>
+</p></html>",
+revisions="<html>
+<ul>
+<li>
+Jan 11, 2023, by Laura Maier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AirMass;
diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/AirMassModifier.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/AirMassModifier.mo
@@ -0,0 +1,84 @@
+within IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical;
+block AirMassModifier
+  "This block computes the air mass modifier based on selected PV technology"
+  extends Modelica.Blocks.Icons.Block;
+
+  parameter PVType PVTecTyp=IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.MonoSI
+    "Type of PV technology";
+
+  Modelica.Blocks.Interfaces.RealInput airMas(final unit="1") "Air mass of atmosphere"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+  Modelica.Blocks.Interfaces.RealOutput airMasMod(final unit="1")
+    "Air mass modifier depending on PV technology"
+    annotation (Placement(transformation(extent={{100,-10},{120,10}})));
+
+// Air mass parameters based on PV technology. Mono-Si technology as default value
+protected
+  parameter Real b0=if PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.MonoSI
+       then 0.935823 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.PolySI
+       then 0.918093 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.ThinFilmSI
+       then 0.938110 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.ThreeJuncAmorphous
+       then 1.10044085 else 0.935823 "Regression parameter 0 to calculate air mass modifier";
+  parameter Real b1=if PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.MonoSI
+       then 0.054289 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.PolySI
+       then 0.086257 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.ThinFilmSI
+       then 0.062191 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.ThreeJuncAmorphous
+       then -0.06142323 else 0.054289 "Regression parameter 1 to calculate air mass modifier";
+  parameter Real b2=if PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.MonoSI
+       then -0.008677 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.PolySI
+       then -0.024459 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.ThinFilmSI
+       then -0.015021 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.ThreeJuncAmorphous
+       then -0.00442732 else -0.008677 "Regression parameter 2 to calculate air mass modifier";
+  parameter Real b3=if PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.MonoSI
+       then 0.000527 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.PolySI
+       then 0.002816 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.ThinFilmSI
+       then 0.001217 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.ThreeJuncAmorphous
+       then 0.000631504 else 0.000527 "Regression parameter 3 to calculate air mass modifier";
+  parameter Real b4=if PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.MonoSI
+       then -0.000011 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.PolySI
+       then -0.000126 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.ThinFilmSI
+       then -0.000034 elseif PVTecTyp == IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical.PVType.ThreeJuncAmorphous
+       then -0.000019184 else -0.000011 "Regression parameter 4 to calculate air mass modifier";
+
+equation
+
+airMasMod =if (b0 + b1*(airMas^1) + b2*(airMas^2) + b3*(airMas^3) + b4*(airMas^4)) <=
+    0 then 0 else b0 + b1*(airMas^1) + b2*(airMas^2) + b3*(airMas^3) + b4*(
+    airMas^4);
+
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false)), Diagram(
+        coordinateSystem(preserveAspectRatio=false)),
+        Documentation(info="<html><p>The model computes the air mass modifier.</br>
+        The air mass modifier depends on the PV technology type and is automatically parameterized.</br>
+        The computation results from five parameters which have been determined empirically.
+        The parameters are found in Fanney et al. and De Soto et al.</br>
+        Even though the studies find a neglible influence on the overall PV performance,
+        this model accounts for a change in parameters based on the selected PV technology type.</br>
+        The air mass modifier is used to account for a change in the absorption ratio of a PV module
+        compared to standard conditions.</p>
+        <h4>References</h4>
+<p>
+Fanney, A. H., Dougherty, B. P., &amp; Davis, M. W. (2003). 
+Short-term characterization of building integrated photovoltaic panels. 
+J. Sol. Energy Eng., 125(1), 13-20.
+<a href=\"https://doi.org/10.1115/1.1531642\">
+https://doi.org/10.1115/1.1531642</a>
+</p>
+<p>
+De Soto, W., Klein, S. A., &amp; Beckman, W. A. (2006). 
+Improvement and validation of a model for photovoltaic array performance. 
+Solar energy, 80(1), 78-88.
+<a href=\"https://doi.org/10.1016/j.solener.2005.06.010\">
+https://doi.org/10.1016/j.solener.2005.06.010</a>
+</p>
+
+</html>",
+revisions="<html>
+<ul>
+<li>
+Jan 11, 2023, by Laura Maier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end AirMassModifier;
diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/PVType.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/PVType.mo
@@ -0,0 +1,22 @@
+within IBPSA.Electrical.BaseClasses.PV.BaseClasses.PVOptical;
+type PVType = enumeration(
+    MonoSI
+      "Single-crystalline Silicon PV technology",
+    PolySI "Poly-crystalline Silicon PV technology",
+    ThinFilmSI
+      "Thin film Silicon PV technology",
+    ThreeJuncAmorphous "Three-junction amorphous PV technology")
+ "Enumeration to define definition of the PV technology"
+  annotation(Documentation(info="<html>
+<p>
+Enumeration to define the PV material type used in the PV models.
+</p>
+</html>",
+        revisions="<html>
+<ul>
+<li>
+Oct 6, 2023, by Laura Maier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/package.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/package.mo
@@ -0,0 +1,19 @@
+within IBPSA.Electrical.BaseClasses.PV.BaseClasses;
+package PVOptical "Models for computing irradiance-related boundary conditions for PV systems"
+
+
+ annotation(Documentation(info="<html>
+<p>
+This package contains base classes that are used to construct the models extending from
+<a href=\"modelica://IBPSA.Electrical.BaseClasses.PV.PVOpticalAbsRat\">IBPSA.Electrical.BaseClasses.PV.PVOpticalAbsRat</a>.
+</p>
+</html>",
+        revisions="<html>
+<ul>
+<li>
+Oct 6, 2023, by Laura Maier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PVOptical;
diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/package.order b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/package.order
@@ -0,0 +1,3 @@
+AirMass
+AirMassModifier
+PVType