ibpsa · LauraMaier · Jun 13, 2022 · Jun 14, 2022 · Jun 14, 2022 · Jun 14, 2022
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/OnePhase/Loads/Capacitive.mo b/IBPSA/Electrical/AC/OnePhase/Loads/Capacitive.mo
@@ -55,7 +55,8 @@ equation
   annotation (
     defaultComponentName="loa",
     Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}),      graphics={
+            -100},{100,100}}),
+   graphics={
         Rectangle(
           extent={{-80,40},{80,-40}},
           lineColor={0,0,0},

diff --git a/IBPSA/Electrical/AC/ThreePhasesBalanced/Loads/Capacitive.mo b/IBPSA/Electrical/AC/ThreePhasesBalanced/Loads/Capacitive.mo
@@ -6,7 +6,8 @@ model Capacitive "Model of a capacitive and resistive load"
   annotation (
   defaultComponentName="loa",
   Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}),      graphics={
+            -100},{100,100}}),
+   graphics={
         Rectangle(
           extent={{-80,80},{80,-80}},
           lineColor={0,0,0},

diff --git a/IBPSA/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo b/IBPSA/Electrical/AC/ThreePhasesBalanced/Loads/Examples/ThreePhases.mo
@@ -175,7 +175,8 @@ equation
       color={0,120,120},
       smooth=Smooth.None));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}),        graphics={
+            -100},{100,100}}),
+   graphics={
         Text(
           extent={{-60,100},{60,80}},
           textColor={0,0,0},

diff --git a/IBPSA/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Impedances.mo b/IBPSA/Electrical/AC/ThreePhasesUnbalanced/Loads/Examples/Impedances.mo
@@ -73,7 +73,8 @@ equation
       color={127,0,127},
       smooth=Smooth.None));
   annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,
-            -100},{100,100}}),      graphics={Text(
+            -100},{100,100}}),
+   graphics={Text(
           extent={{-80,80},{0,74}},
           textColor={0,0,0},
           pattern=LinePattern.Dash,

diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/AirMass.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PVOptical/AirMass.mo
@@ -0,0 +1,44 @@
+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.</br>
+It is based on an 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,93 @@
+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) + 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.</p>
+<p>
+The air mass modifier depends on the PV technology type and is automatically parameterized.
+</p>
+<p>
+The computation results from five parameters which have been determined empirically.
+The parameters are found in Fanney et al. 2003 and De Soto et al. 2006.
+</p>
+<p>
+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.
+</p>
+<p>
+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,20 @@
+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"
+  extends Modelica.Icons.Package;
+
+ 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
diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PartialPVElectrical.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PartialPVElectrical.mo
@@ -0,0 +1,99 @@
+within IBPSA.Electrical.BaseClasses.PV.BaseClasses;
+partial model PartialPVElectrical
+  "Partial electrical model for PV module model"
+
+  replaceable parameter Data.PV.Generic dat constrainedby
+    IBPSA.Electrical.Data.PV.Generic "PV Panel data definition"
+    annotation (choicesAllMatching);
+
+    // Adjustable parameters
+
+  parameter Integer nMod "Number of connected PV modules";
+
+  final parameter Modelica.Units.SI.Area AMod=dat.AMod
+    "Area of one module (housing)";
+
+  final parameter Integer nSer=dat.nSer
+    "Number of cells connected in series on the PV panel";
+
+  final parameter Integer nPar=dat.nPar
+    "Number of parallel connected cells within the PV module";
+
+  final parameter Modelica.Units.SI.Energy Eg0 = dat.Eg0
+    "Band gap energy under standard conditions";
+
+  Modelica.Units.SI.ElectricCurrent IPh(min=0) "Photo current";
+  Modelica.Blocks.Interfaces.RealInput TCel(final unit="K",final displayUnit="degC")
+    "Cell temperature"
+    annotation (Placement(transformation(extent={{-140,20},{-100,60}})));
+
+public
+  Modelica.Blocks.Interfaces.RealInput absRadRat(final unit="1")
+    "Ratio of absorbed radiation under operating conditions to standard conditions"
+    annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
+  Modelica.Blocks.Interfaces.RealInput HGloTil(final unit="W/m2")
+    "Total solar irradiance on the tilted surface"
+    annotation (Placement(transformation(extent={{-140,-60},{-100,-20}})));
+  Modelica.Blocks.Interfaces.RealOutput eta(final unit="1")
+    "Efficiency of the PV module under operating conditions"
+    annotation (Placement(transformation(extent={{100,-60},{120,-40}})));
+  Modelica.Blocks.Interfaces.RealOutput P(final unit="W")
+    "DC power output"
+    annotation (Placement(transformation(extent={{100,40},{120,60}})));
+
+protected
+  final constant Real e(unit = "C") = Modelica.Constants.F/Modelica.Constants.N_A
+    "Elementary charge";
+  final constant Real k(unit = "J/K") = Modelica.Constants.R/Modelica.Constants.N_A
+    "Boltzmann constant";
+
+  annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-120,-100},
+            {100,100}}),
+   graphics={
+     Rectangle(
+      lineColor={0,0,0},
+      fillColor={255,255,255},
+      fillPattern=FillPattern.Solid,
+      extent={{-100,100},{100,-100}}),
+        Line(
+          points={{-66,-64},{-66,88}},
+          color={0,0,0},
+          arrow={Arrow.None,Arrow.Filled},
+          thickness=0.5),
+        Line(
+          points={{-66,-64},{64,-64}},
+          color={0,0,0},
+          arrow={Arrow.None,Arrow.Filled},
+          thickness=0.5),
+        Text(
+          extent={{-72,80},{-102,68}},
+          lineThickness=0.5,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="I"),
+        Text(
+          extent={{80,-80},{50,-92}},
+          lineThickness=0.5,
+          fillColor={255,255,255},
+          fillPattern=FillPattern.Solid,
+          textString="U"),
+        Line(
+          points={{-66,54},{-66,54},{-6,54},{12,50},{22,42},{32,28},{38,8},{
+              42,-14},{44,-44},{44,-64}},
+          color={0,0,0},
+          thickness=0.5,
+          smooth=Smooth.Bezier)}),                               Diagram(
+        coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100,100}})),
+    Documentation(info="<html>
+    <p>
+    This is a partial model for the electrical surrogate models of a photovoltaic module.
+    </p>
+</html>", revisions="<html>
+<ul>
+<li>
+Nov 17, 2022, by Laura Maier:<br/>
+First implementation.
+</li>
+</ul>
+</html>"));
+end PartialPVElectrical;