diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/Icons/partialPVIcon.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/Icons/partialPVIcon.mo index 11d6cc6b39..d1d66b34b9 100644 --- a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/Icons/partialPVIcon.mo +++ b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/Icons/partialPVIcon.mo @@ -1,40 +1,70 @@ within IBPSA.Electrical.BaseClasses.PV.BaseClasses.Icons; partial model partialPVIcon "Partial model for basic PV model icon" annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100, - -80},{100,80}}), graphics={ - Rectangle(extent={{-50,80},{50,-80}},lineColor={215,215,215},fillColor={215,215,215}, + -100},{100,100}}), graphics={ + Rectangle(extent={{-100,100},{100,-100}}, + lineColor={215,215,215},fillColor={215,215,215}, fillPattern = FillPattern.Solid), - Rectangle(extent={{-46,18},{-18,-10}}, + Rectangle(extent={{-62,18},{-34,-10}}, lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{-14,18},{14,-10}}, + Rectangle(extent={{-30,18},{-2,-10}}, lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{18,18},{46,-10}}, + Rectangle(extent={{2,18},{30,-10}}, lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{-46,-14},{-18,-42}}, + Rectangle(extent={{-62,-14},{-34,-42}}, lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{-14,-14},{14,-42}}, + Rectangle(extent={{-30,-14},{-2,-42}}, lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{18,-14},{46,-42}}, - lineColor={0,0,255},fillColor={0,0,255}, + Rectangle(extent={{2,-14},{30,-42}},lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{-46,-46},{-18,-74}},lineColor={0,0,255},fillColor={0,0,255}, + Rectangle(extent={{-62,-46},{-34,-74}},lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{-14,50},{14,22}},lineColor={0,0,255},fillColor={0,0,255}, + Rectangle(extent={{-30,50},{-2,22}},lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{18,50},{46,22}},lineColor={0,0,255},fillColor={0,0,255}, + Rectangle(extent={{2,50},{30,22}}, lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{-46,50},{-18,22}},lineColor={0,0,255},fillColor={0,0,255}, + Rectangle(extent={{-62,50},{-34,22}},lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{-14,-46},{14,-74}},lineColor={0,0,255},fillColor={0,0,255}, + Rectangle(extent={{-30,-46},{-2,-74}},lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Rectangle(extent={{18,-46},{46,-74}},lineColor={0,0,255},fillColor={0,0,255}, + Rectangle(extent={{2,-46},{30,-74}}, lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{-94,50},{-66,22}},lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{-94,18},{-66,-10}}, + lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{-94,-14},{-66,-42}}, + lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{-94,-46},{-66,-74}}, + lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{34,50},{62,22}}, lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{34,18},{62,-10}}, lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{34,-14},{62,-42}},lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{34,-46},{62,-74}},lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{66,-46},{94,-74}},lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{66,-14},{94,-42}},lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{66,18},{94,-10}}, lineColor={0,0,255},fillColor={0,0,255}, + fillPattern = FillPattern.Solid), + Rectangle(extent={{66,50},{94,22}}, lineColor={0,0,255},fillColor={0,0,255}, fillPattern = FillPattern.Solid), - Text(extent={{-44,84},{40,50}}, lineColor={0,0,255},textString= "%name")}), - Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-80}, - {100,80}}))); + Text( + extent={{-150,150},{150,110}}, + textString="%name", + textColor={0,0,255})}), + Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ + 100,100}}))); end partialPVIcon; diff --git a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PartialPVElectricalTwoDiodes.mo b/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PartialPVElectricalTwoDiodes.mo deleted file mode 100644 index 0602f6a99a..0000000000 --- a/IBPSA/Electrical/BaseClasses/PV/BaseClasses/PartialPVElectricalTwoDiodes.mo +++ /dev/null @@ -1,76 +0,0 @@ -within IBPSA.Electrical.BaseClasses.PV.BaseClasses; -partial model PartialPVElectricalTwoDiodes - "2 diodes model for PV I-V characteristics with temp. dependency based on 9 parameters" - extends IBPSA.Electrical.BaseClasses.PV.BaseClasses.PartialPVElectrical( - redeclare IBPSA.Electrical.Data.PV.TwoDiodesData data); - - replaceable parameter IBPSA.Electrical.Data.PV.TwoDiodesData data - constrainedby IBPSA.Electrical.Data.PV.TwoDiodesData - "PV Panel data definition" annotation (choicesAllMatching); - - // Parameters from module data sheet - - final parameter Real c1( - unit = "m2/V") = data.c1 - "1st coefficient IPho"; - - final parameter Real c2( - unit = "m2/(kV.K)") = data.c2 - "2nd coefficient IPho"; - - final parameter Real cs1( - unit = "A/K3") = data.cs1 - "1st coefficient ISat1"; - - final parameter Real cs2( - unit = "A/K5") = data.cs2 - "2nd coefficient ISat2"; - - final parameter Real R_sh( - unit = "V/A") = data.R_sh - "Parallel resistance"; - - final parameter Real R_s( - unit = "V/A") = data.R_s - "Serial resistance"; - - Modelica.Units.SI.ElectricCurrent I_s1 - "Saturation current diode 1"; - - Modelica.Units.SI.ElectricCurrent I_s2 - "Saturation current diode 2"; - - Modelica.Units.SI.Voltage Ut - "Temperature voltage"; - - output Modelica.Blocks.Interfaces.RealOutput I( - unit="A", start = 0.0) - "Module current" - annotation (Placement(transformation(extent={{100,-60},{120,-40}}), - iconTransformation(extent={{100,-60},{120,-40}}))); - -equation - Ut =k*TCel/e; - - I_ph =(c1 + c2*0.001*TCel)*HGloTil; - - I_s1 =cs1*TCel*TCel*TCel*Modelica.Math.exp(-(Eg0*e)/(k*TCel)); - - I_s2 =cs2*sqrt(TCel*TCel*TCel*TCel*TCel)*Modelica.Math.exp(-(Eg0*e)/(2.0*k*TCel)); - - eta=if noEvent(HGloTil <= Modelica.Constants.eps*10) then 0 else P/(HGloTil* - A_mod*n_mod); - annotation ( - Documentation(info=" -
- This is a partial 2 diodes electrical model of a PV module. -
- ", revisions=" --This is a 2 diodes MPP controlled electrical model of a PV module. -
-", revisions=" -