diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/DiodeCompare.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/DiodeCompare.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/DiodeCompare.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/DiodeCompare.mo" 2021-07-09 16:03:33.208691227 +0200 @@ -4,8 +4,8 @@ parameter Integer ns = 10 "Number of series connected cells"; parameter Integer nsModule = 2 "Number of series connected modules"; parameter Integer npModule = 2 "Number of parallel connected modules"; - parameter Modelica.SIunits.Voltage Vmin = -5.30 "Minimum voltage range"; - parameter Modelica.SIunits.Voltage Vmax = +0.75 "Maximum voltage range"; + parameter Modelica.Units.SI.Voltage Vmin = -5.30 "Minimum voltage range"; + parameter Modelica.Units.SI.Voltage Vmax = +0.75 "Maximum voltage range"; Modelica.Electrical.Analog.Semiconductors.ZDiode zDiode(useHeatPort = true, R = 1E8, Maxexp = 0.6292 / 0.04, Ids = 1.26092E-6, T = 298.15) annotation ( Placement(transformation(extent = {{-40, -40}, {-20, -20}}))); Modelica.Electrical.Analog.Sources.RampVoltage rampVoltage(duration = 1, startTime = 0, V = Vmax - Vmin, offset = Vmin) annotation ( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/MultiPhaseVoltageControlledConverter.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/MultiPhaseVoltageControlledConverter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/MultiPhaseVoltageControlledConverter.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/MultiPhaseVoltageControlledConverter.mo" 2021-07-09 16:03:33.160691430 +0200 @@ -6,13 +6,13 @@ Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {-40, 20}))); Modelica.Electrical.Analog.Basic.Ground groundDC annotation ( Placement(transformation(extent = {{-50, -20}, {-30, 0}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource voltageSource(f = 50, V = fill(400 / sqrt(3), 3)) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource voltageSource(f = 50, V = fill(400 / sqrt(3), 3)) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {40, 0}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundAC annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundAC annotation ( Placement(transformation(extent = {{30, -70}, {50, -50}}))); Modelica.Blocks.Sources.Ramp ramp(duration = 0.6, startTime = 0.2, height = 200, offset = -100) annotation ( Placement(transformation(extent = {{-60, -60}, {-40, -40}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {40, -30}))); equation connect(constantCurrent.n, converter.dc_p) annotation ( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/SinglePhaseVoltageControlledConverter.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/SinglePhaseVoltageControlledConverter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/SinglePhaseVoltageControlledConverter.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/ComponentTesting/SinglePhaseVoltageControlledConverter.mo" 2021-07-09 16:03:33.116691616 +0200 @@ -6,9 +6,9 @@ Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {-40, 0}))); Modelica.Electrical.Analog.Basic.Ground groundDC annotation ( Placement(transformation(extent = {{-50, -40}, {-30, -20}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Sources.VoltageSource voltageSource(f = 50, V = 100, phi = 0) annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Sources.VoltageSource voltageSource(f = 50, V = 100, phi = 0) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {40, 0}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundAC annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundAC annotation ( Placement(transformation(extent = {{30, -38}, {50, -18}}))); Modelica.Blocks.Sources.Ramp ramp(duration = 0.6, startTime = 0.2, height = 200, offset = -100) annotation ( Placement(transformation(extent = {{-60, -80}, {-40, -60}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Blocks/MPTrackerSample.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Blocks/MPTrackerSample.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Blocks/MPTrackerSample.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Blocks/MPTrackerSample.mo" 2021-07-09 16:03:33.048691904 +0200 @@ -1,13 +1,13 @@ within PhotoVoltaics.Components.Blocks; block MPTrackerSample "Sampling maximum power tracker" extends Modelica.Blocks.Icons.Block; - parameter Modelica.SIunits.Time startTime = 0 "Start time"; - parameter Modelica.SIunits.Time samplePeriod = 1 "Sample period"; - parameter Modelica.SIunits.Voltage VmpRef "Reference maximum power power of plant"; - parameter Modelica.SIunits.Current ImpRef "Reference maximum power current of plant"; + parameter Modelica.Units.SI.Time startTime = 0 "Start time"; + parameter Modelica.Units.SI.Time samplePeriod = 1 "Sample period"; + parameter Modelica.Units.SI.Voltage VmpRef "Reference maximum power power of plant"; + parameter Modelica.Units.SI.Current ImpRef "Reference maximum power current of plant"; parameter Integer n = 100 "Number of voltage and power discretizations"; - final parameter Modelica.SIunits.Voltage dv = VmpRef / n "Voltage change and maximum deviation"; - final parameter Modelica.SIunits.Power dpower = VmpRef * ImpRef / n "Power change and maximum deviation"; + final parameter Modelica.Units.SI.Voltage dv = VmpRef / n "Voltage change and maximum deviation"; + final parameter Modelica.Units.SI.Power dpower = VmpRef * ImpRef / n "Power change and maximum deviation"; Boolean firstTrigger(start = false, fixed = true) "First boolean sample trigger signal"; // Boolean secondTrigger "Second boolean sample trigger signal"; Boolean sampleTrigger "Boolean sample trigger signal"; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/ConvertersWithSampleMPTracker/DCConverter.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/ConvertersWithSampleMPTracker/DCConverter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/ConvertersWithSampleMPTracker/DCConverter.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/ConvertersWithSampleMPTracker/DCConverter.mo" 2021-07-09 16:03:32.960692275 +0200 @@ -6,13 +6,13 @@ extends PhotoVoltaics.Icons.Converter; extends PhotoVoltaics.Icons.MPTrackerSmall; - parameter Modelica.SIunits.Voltage VRef = 48 "Reference DC source voltage" annotation(Dialog(group="Converter")); - parameter Modelica.SIunits.Time Ti = 1E-6 "Internal integration time constant" annotation(Dialog(group="Converter")); + parameter Modelica.Units.SI.Voltage VRef = 48 "Reference DC source voltage" annotation(Dialog(group="Converter")); + parameter Modelica.Units.SI.Time Ti = 1E-6 "Internal integration time constant" annotation(Dialog(group="Converter")); - parameter Modelica.SIunits.Time startTime = 0 "Start time" annotation(Dialog(group="MP tracker")); - parameter Modelica.SIunits.Time samplePeriod = 1 "Sample period" annotation(Dialog(group="MP tracker")); - parameter Modelica.SIunits.Voltage VmpRef "Reference maximum power power of plant" annotation(Dialog(group="MP tracker")); - parameter Modelica.SIunits.Current ImpRef "Reference maximum power current of plant" annotation(Dialog(group="MP tracker")); + parameter Modelica.Units.SI.Time startTime = 0 "Start time" annotation(Dialog(group="MP tracker")); + parameter Modelica.Units.SI.Time samplePeriod = 1 "Sample period" annotation(Dialog(group="MP tracker")); + parameter Modelica.Units.SI.Voltage VmpRef "Reference maximum power power of plant" annotation(Dialog(group="MP tracker")); + parameter Modelica.Units.SI.Current ImpRef "Reference maximum power current of plant" annotation(Dialog(group="MP tracker")); parameter Integer n = 100 "Number of voltage and power discretizations" annotation(Dialog(group="MP tracker")); PhotoVoltaics.Components.Converters.DCConverter converter(final Ti=Ti, final VRef=VRef) annotation (Placement(transformation(extent={{40,-10},{60,10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/DCConverter.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/DCConverter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/DCConverter.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/DCConverter.mo" 2021-07-09 16:03:32.916692461 +0200 @@ -4,8 +4,8 @@ extends Modelica.Electrical.PowerConverters.Interfaces.DCDC.DCtwoPin2; extends .PhotoVoltaics.Icons.Converter; - parameter Modelica.SIunits.Voltage VRef = 48 "Reference DC source voltage"; - parameter Modelica.SIunits.Time Ti = 1E-6 "Internal integration time constant"; + parameter Modelica.Units.SI.Voltage VRef = 48 "Reference DC source voltage"; + parameter Modelica.Units.SI.Time Ti = 1E-6 "Internal integration time constant"; Modelica.Blocks.Interfaces.RealInput vDCRef(final unit = "V") "DC voltage" annotation ( Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin={-60,-120}), iconTransformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin={-60,-120}))); Modelica.Electrical.Analog.Sources.SignalVoltage signalVoltage annotation ( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/MultiPhaseConverter.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/MultiPhaseConverter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/MultiPhaseConverter.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/MultiPhaseConverter.mo" 2021-07-09 16:03:32.872692647 +0200 @@ -5,18 +5,18 @@ extends Modelica.Electrical.PowerConverters.Interfaces.DCAC.DCtwoPin; extends .PhotoVoltaics.Icons.Converter; - Modelica.Electrical.MultiPhase.Interfaces.PositivePlug ac "AC output" + Modelica.Electrical.Polyphase.Interfaces.PositivePlug ac "AC output" annotation (Placement(transformation(extent={{90,-10},{110,10}}))); Modelica.Blocks.Interfaces.RealInput vDCRef(final unit = "V") "DC voltage" annotation ( Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin={-60,-120}), iconTransformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin={-60,-120}))); - parameter Modelica.SIunits.Frequency f = 50 "Frequency"; - parameter Modelica.SIunits.Voltage VRef = 400 + parameter Modelica.Units.SI.Frequency f = 50 "Frequency"; + parameter Modelica.Units.SI.Voltage VRef = 400 "Reference line to line voltage"; - parameter Modelica.SIunits.Time Ti = 1E-6 + parameter Modelica.Units.SI.Time Ti = 1E-6 "Internal integration time constant"; - Modelica.SIunits.Power powerDC = vDC * iDC "Power of DC side"; + Modelica.Units.SI.Power powerDC = vDC * iDC "Power of DC side"; Modelica.Electrical.Analog.Sources.SignalVoltage signalVoltage annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin={-100,0}))); @@ -43,12 +43,12 @@ extent={{10,-10},{-10,10}}, rotation=0, origin={30,0}))); - Modelica.Electrical.MultiPhase.Sources.SignalCurrent signalCurrent + Modelica.Electrical.Polyphase.Sources.SignalCurrent signalCurrent annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=90, origin={60,50}))); - Modelica.Electrical.MultiPhase.Basic.Star star annotation (Placement( + Modelica.Electrical.Polyphase.Basic.Star star annotation (Placement( transformation( extent={{-10,-10},{10,10}}, rotation=270, @@ -59,7 +59,7 @@ Modelica.Blocks.Math.RectangularToPolar rectangularToPolar annotation (Placement(transformation(extent={{20,-70},{0,-50}}))); - Modelica.Electrical.MultiPhase.Sensors.VoltageSensor voltageSensorAC(final m=3) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.VoltageSensor voltageSensorAC(final m=3) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={90,50}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/QuasiStaticMultiPhaseConverter.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/QuasiStaticMultiPhaseConverter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/QuasiStaticMultiPhaseConverter.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/QuasiStaticMultiPhaseConverter.mo" 2021-07-09 16:03:32.716693306 +0200 @@ -3,10 +3,10 @@ extends Modelica.Electrical.PowerConverters.Interfaces.DCAC.DCtwoPin; extends .PhotoVoltaics.Interfaces.QuasiStatic.ACplug; extends .PhotoVoltaics.Icons.Converter; - parameter Modelica.SIunits.Voltage VRef = 400 "Reference line to line voltage"; - parameter Modelica.SIunits.Time Ti = 1E-6 "Internal integration time constant"; - Modelica.SIunits.Power powerDC = vDC * iDC "Power of DC side"; - Modelica.SIunits.Power powerAC = Modelica.ComplexMath.real(vAC * Modelica.ComplexMath.conj(iAC)) "Complex apparent power of AC side"; + parameter Modelica.Units.SI.Voltage VRef = 400 "Reference line to line voltage"; + parameter Modelica.Units.SI.Time Ti = 1E-6 "Internal integration time constant"; + Modelica.Units.SI.Power powerDC = vDC * iDC "Power of DC side"; + Modelica.Units.SI.Power powerAC = Modelica.ComplexMath.real(vAC * Modelica.ComplexMath.conj(iAC)) "Complex apparent power of AC side"; Modelica.Blocks.Interfaces.RealInput vDCRef(final unit = "V") "DC voltage" annotation ( Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin={-60,-120}), iconTransformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin={-60,-120}))); Modelica.Electrical.Analog.Sources.SignalVoltage signalVoltage annotation ( @@ -19,23 +19,23 @@ Placement(transformation(extent = {{-10, 10}, {10, -10}}, rotation = 270, origin = {-30, 0}))); Sources.Electrical.VariableUnrootedMultiPhaseCurrentSource variableCurrentSource(final m = m) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {50, 30}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star(final m = m) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star(final m = m) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {50, 0}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.PowerSensor powerSensor(final m = m) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.PowerSensor powerSensor(final m = m) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {50, 60}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sensors.PotentialSensor potentialSensor(final m = m) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Sensors.PotentialSensor potentialSensor(final m = m) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {80, -10}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Blocks.ToSpacePhasor toSpacePhasor(final m = m) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Blocks.ToSpacePhasor toSpacePhasor(final m = m) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 180, origin = {60, -50}))); Modelica.ComplexBlocks.ComplexMath.ComplexToReal complexToReal annotation ( Placement(transformation(extent = {{20, 60}, {0, 80}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Blocks.FromSpacePhasor fromSpacePhasor(final m = m) annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Blocks.FromSpacePhasor fromSpacePhasor(final m = m) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {10, 10}))); Modelica.Electrical.Machines.SpacePhasors.Blocks.FromPolar fromPolar annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {10, -20}))); Modelica.Electrical.Machines.SpacePhasors.Blocks.ToPolar toPolar annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 180, origin = {30, -50}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground ground annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground ground annotation ( Placement(transformation(extent = {{40, -40}, {60, -20}}))); Modelica.Blocks.Continuous.Integrator integrator(k=sqrt(3)/VRef/Ti) annotation ( Placement(transformation(extent = {{-30, -60}, {-10, -40}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/QuasiStaticSinglePhaseConverter.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/QuasiStaticSinglePhaseConverter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/QuasiStaticSinglePhaseConverter.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Converters/QuasiStaticSinglePhaseConverter.mo" 2021-07-09 16:03:32.648693595 +0200 @@ -3,10 +3,10 @@ extends Modelica.Electrical.PowerConverters.Interfaces.DCAC.DCtwoPin; extends .PhotoVoltaics.Interfaces.QuasiStatic.ACpins; extends .PhotoVoltaics.Icons.Converter; - parameter Modelica.SIunits.Voltage VRef = 400 / sqrt(3) "Reference voltage"; - parameter Modelica.SIunits.Time Ti = 1E-6 "Internal integration time constant"; - Modelica.SIunits.Power powerDC = vDC * iDC "Power of DC side"; - Modelica.SIunits.Power powerAC = Modelica.ComplexMath.real(vAC * Modelica.ComplexMath.conj(iAC)) "Complex apparent power of AC side"; + parameter Modelica.Units.SI.Voltage VRef = 400 / sqrt(3) "Reference voltage"; + parameter Modelica.Units.SI.Time Ti = 1E-6 "Internal integration time constant"; + Modelica.Units.SI.Power powerDC = vDC * iDC "Power of DC side"; + Modelica.Units.SI.Power powerAC = Modelica.ComplexMath.real(vAC * Modelica.ComplexMath.conj(iAC)) "Complex apparent power of AC side"; Modelica.Blocks.Interfaces.RealInput vDCRef(final unit = "V") "DC voltage" annotation ( Placement(transformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin={-60,-120}), iconTransformation(extent = {{-20, -20}, {20, 20}}, rotation = 90, origin={-60,-120}))); Modelica.Electrical.Analog.Sources.SignalVoltage signalVoltage annotation ( @@ -19,9 +19,9 @@ Placement(transformation(extent = {{-10, 10}, {10, -10}}, rotation = 270, origin = {-30, 0}))); Sources.Electrical.VariableUnrootedSinglePhaseCurrentSource variableCurrentSource annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {90, 30}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Sensors.PowerSensor powerSensor annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Sensors.PowerSensor powerSensor annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {90, 60}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Sensors.VoltageSensor potentialSensor annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Sensors.VoltageSensor potentialSensor annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {60, 10}))); Modelica.ComplexBlocks.ComplexMath.ComplexToReal complexToReal annotation ( Placement(transformation(extent = {{40, 60}, {20, 80}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Diodes/Diode2Module.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Diodes/Diode2Module.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Diodes/Diode2Module.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Diodes/Diode2Module.mo" 2021-07-09 16:03:32.464694372 +0200 @@ -1,20 +1,20 @@ within PhotoVoltaics.Components.Diodes; model Diode2Module "Diode model with four different sections including breakthrough" extends .PhotoVoltaics.Interfaces.PartialDiode; - parameter Modelica.SIunits.Voltage Bv = 5.1 "Breakthrough voltage"; - parameter Modelica.SIunits.Current Ibv = 0.7 "Breakthrough knee current"; + parameter Modelica.Units.SI.Voltage Bv = 5.1 "Breakthrough voltage"; + parameter Modelica.Units.SI.Current Ibv = 0.7 "Breakthrough knee current"; parameter Real Nbv = 0.74 "Breakthrough emission coefficient"; parameter Integer ns = 1 "Number of series connected cells per module"; parameter Integer nsModule(final min = 1) = 1 "Number of series connected modules"; parameter Integer npModule(final min = 1) = 1 "Number of parallel connected modules"; - final parameter Modelica.SIunits.Voltage VtRef = Modelica.Constants.k * TRef / Q "Reference voltage equivalent of temperature"; - final parameter Modelica.SIunits.Voltage VBv = (-m * Nbv * log(IdsRef * Nbv / Ibv) * VtRef) - Bv "Voltage limit of approximation of breakthrough"; - final parameter Modelica.SIunits.Current IdsRef = IRef / (exp(VRef / m / VtRef) - 1) "Reference saturation current"; - final parameter Modelica.SIunits.Voltage VNegLin = (-VRef / m / VtRef * (Nbv * m * VtRef)) - Bv "Limit of linear range left of breakthrough"; - Modelica.SIunits.Voltage VNeg "Limit of linear negative voltage range"; - Modelica.SIunits.Voltage vCell = v / ns / nsModule "Cell voltage"; - Modelica.SIunits.Voltage vModule = v / nsModule "Module voltage"; - Modelica.SIunits.Current iModule = i / npModule "Module current"; + final parameter Modelica.Units.SI.Voltage VtRef = Modelica.Constants.k * TRef / Q "Reference voltage equivalent of temperature"; + final parameter Modelica.Units.SI.Voltage VBv = (-m * Nbv * log(IdsRef * Nbv / Ibv) * VtRef) - Bv "Voltage limit of approximation of breakthrough"; + final parameter Modelica.Units.SI.Current IdsRef = IRef / (exp(VRef / m / VtRef) - 1) "Reference saturation current"; + final parameter Modelica.Units.SI.Voltage VNegLin = (-VRef / m / VtRef * (Nbv * m * VtRef)) - Bv "Limit of linear range left of breakthrough"; + Modelica.Units.SI.Voltage VNeg "Limit of linear negative voltage range"; + Modelica.Units.SI.Voltage vCell = v / ns / nsModule "Cell voltage"; + Modelica.Units.SI.Voltage vModule = v / nsModule "Module voltage"; + Modelica.Units.SI.Current iModule = i / npModule "Module current"; equation // Voltage limit of negative range VNeg = m * Vt * log(Vt / VtRef); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Diodes/Diode2exp.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Diodes/Diode2exp.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Diodes/Diode2exp.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/Diodes/Diode2exp.mo" 2021-07-09 16:03:32.400694642 +0200 @@ -1,8 +1,8 @@ within PhotoVoltaics.Components.Diodes; model Diode2exp "Diode with two superimposed exponential functions" extends .PhotoVoltaics.Interfaces.PartialDiode; - parameter Modelica.SIunits.Voltage Bv = 5.1 "Breakthrough voltage"; - parameter Modelica.SIunits.Current Ibv = 0.7 "Breakthrough knee current"; + parameter Modelica.Units.SI.Voltage Bv = 5.1 "Breakthrough voltage"; + parameter Modelica.Units.SI.Current Ibv = 0.7 "Breakthrough knee current"; parameter Real Nbv = 0.74 "Breakthrough emission coefficient"; equation i = Ids * (exp(v / m / Vt) - 1) - Ibv * exp(-(v + Bv) / (Nbv * m * Vt)) + v / R; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimpleCell.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimpleCell.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimpleCell.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimpleCell.mo" 2021-07-09 16:03:32.336694914 +0200 @@ -17,8 +17,8 @@ final nsModule=1, final npModule=1)); final parameter Real m(start = 2, fixed = false) "Ideality factor of diode"; - final parameter Modelica.SIunits.Current IsdRef(start = 1E-4, fixed = false) "Reference saturation current of cell"; - final parameter Modelica.SIunits.Current IphRef = moduleData.IscRef "Reference photo current of cell"; + final parameter Modelica.Units.SI.Current IsdRef(start = 1E-4, fixed = false) "Reference saturation current of cell"; + final parameter Modelica.Units.SI.Current IphRef = moduleData.IscRef "Reference photo current of cell"; initial equation IphRef = IsdRef * (exp(moduleData.VocCellRef / m / moduleData.VtCellRef) - 1); IphRef = IsdRef * (exp(moduleData.VmpCellRef / m / moduleData.VtCellRef) - 1) + moduleData.ImpRef; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimpleModuleSymmetric.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimpleModuleSymmetric.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimpleModuleSymmetric.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimpleModuleSymmetric.mo" 2021-07-09 16:03:32.280695150 +0200 @@ -18,13 +18,13 @@ final alphaRef=moduleData.alphaIsc)); final parameter Real m(start = 2, fixed = false) "Ideality factor of diode"; - final parameter Modelica.SIunits.Current IsdRef(start = 1E-4, fixed = false) "Reference saturation current of cell"; - final parameter Modelica.SIunits.Current IphRef = moduleData.IscRef "Reference photo current of cell"; - Modelica.SIunits.Voltage vCell = v / moduleData.ns "Cell voltage"; - Modelica.SIunits.Current iCell = i "Cell current"; - Modelica.SIunits.Current iCellGenerating = -iCell "Negative cell current (generating)"; - Modelica.SIunits.Power powerCell = vCell * iCell "Cell power"; - Modelica.SIunits.Power powerCellGenerating = vCell * iCellGenerating "Negative power consumption (generating)"; + final parameter Modelica.Units.SI.Current IsdRef(start = 1E-4, fixed = false) "Reference saturation current of cell"; + final parameter Modelica.Units.SI.Current IphRef = moduleData.IscRef "Reference photo current of cell"; + Modelica.Units.SI.Voltage vCell = v / moduleData.ns "Cell voltage"; + Modelica.Units.SI.Current iCell = i "Cell current"; + Modelica.Units.SI.Current iCellGenerating = -iCell "Negative cell current (generating)"; + Modelica.Units.SI.Power powerCell = vCell * iCell "Cell power"; + Modelica.Units.SI.Power powerCellGenerating = vCell * iCellGenerating "Negative power consumption (generating)"; initial equation IphRef = IsdRef * (exp(moduleData.VocCellRef / m / moduleData.VtCellRef) - 1); IphRef = IsdRef * (exp(moduleData.VmpCellRef / m / moduleData.VtCellRef) - 1) + moduleData.ImpRef; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimplePlantSymmetric.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimplePlantSymmetric.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimplePlantSymmetric.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SimplePlantSymmetric.mo" 2021-07-09 16:03:32.224695387 +0200 @@ -19,18 +19,18 @@ parameter Integer nsModule(final min = 1) = 1 "Number of series connected modules"; parameter Integer npModule(final min = 1) = 1 "Number of parallel connected modules"; final parameter Real m(start = 2, fixed = false) "Ideality factor of diode"; - final parameter Modelica.SIunits.Current IsdRef(start = 1E-4, fixed = false) "Reference saturation current of cell"; - final parameter Modelica.SIunits.Current IphRef = moduleData.IscRef "Reference photo current of cell"; - Modelica.SIunits.Voltage vCell = v / moduleData.ns / nsModule "Cell voltage"; - Modelica.SIunits.Current iCell = i / npModule "Cell current"; - Modelica.SIunits.Current iCellGenerating = -iCell "Negative cell current (generating)"; - Modelica.SIunits.Power powerCell = vCell * iCell "Cell power"; - Modelica.SIunits.Power powerCellGenerating = vCell * iCellGenerating "Negative power consumption (generating)"; - Modelica.SIunits.Voltage vModule = v / nsModule "Module voltage"; - Modelica.SIunits.Current iModule = i / npModule "Modile current"; - Modelica.SIunits.Current iModuleGenerating = -iModule "Negative module current (generating)"; - Modelica.SIunits.Power powerModule = vModule * iModule "Module power"; - Modelica.SIunits.Power powerModuleGenerating = vModule * iModuleGenerating "Negative module power (generating)"; + final parameter Modelica.Units.SI.Current IsdRef(start = 1E-4, fixed = false) "Reference saturation current of cell"; + final parameter Modelica.Units.SI.Current IphRef = moduleData.IscRef "Reference photo current of cell"; + Modelica.Units.SI.Voltage vCell = v / moduleData.ns / nsModule "Cell voltage"; + Modelica.Units.SI.Current iCell = i / npModule "Cell current"; + Modelica.Units.SI.Current iCellGenerating = -iCell "Negative cell current (generating)"; + Modelica.Units.SI.Power powerCell = vCell * iCell "Cell power"; + Modelica.Units.SI.Power powerCellGenerating = vCell * iCellGenerating "Negative power consumption (generating)"; + Modelica.Units.SI.Voltage vModule = v / nsModule "Module voltage"; + Modelica.Units.SI.Current iModule = i / npModule "Modile current"; + Modelica.Units.SI.Current iModuleGenerating = -iModule "Negative module current (generating)"; + Modelica.Units.SI.Power powerModule = vModule * iModule "Module power"; + Modelica.Units.SI.Power powerModuleGenerating = vModule * iModuleGenerating "Negative module power (generating)"; initial equation IphRef = IsdRef * (exp(moduleData.VocCellRef / m / moduleData.VtCellRef) - 1); IphRef = IsdRef * (exp(moduleData.VmpCellRef / m / moduleData.VtCellRef) - 1) + moduleData.ImpRef; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SolarPyramidDCConverter.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SolarPyramidDCConverter.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SolarPyramidDCConverter.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Components/SimplePhotoVoltaics/SolarPyramidDCConverter.mo" 2021-07-09 16:03:32.196695505 +0200 @@ -4,17 +4,17 @@ extends Modelica.Thermal.HeatTransfer.Interfaces.PartialConditionalHeatPort(T = 298.15); extends Modelica.Electrical.PowerConverters.Interfaces.ACDC.DCtwoPin; parameter Records.ModuleData moduleData "Module parameters" annotation (choicesAllMatching = true, Placement(transformation(extent={{40,-88},{60,-68}}))); - parameter Modelica.SIunits.Angle sunAzimuth = 0 "Azimuth of sun" annotation(Dialog(group="Irradiance")); - parameter Modelica.SIunits.Angle sunHeight = 1.0471975511965976 "Height of sun" annotation(Dialog(group="Irradiance")); - parameter Modelica.SIunits.Irradiance irradiance = 1000 "Irradiance" annotation(Dialog(group="Irradiance")); - - parameter Modelica.SIunits.Voltage VRef = 48 "Reference DC source voltage" annotation(Dialog(group="Converter")); - parameter Modelica.SIunits.Time Ti = 1E-6 "Internal integration time constant" annotation(Dialog(group="Converter")); - - parameter Modelica.SIunits.Time startTime = 0 "Start time" annotation(Dialog(group="MP tracker")); - parameter Modelica.SIunits.Time samplePeriod = 1 "Sample period" annotation(Dialog(group="MP tracker")); - parameter Modelica.SIunits.Voltage VmpRef "Reference maximum power power of plant" annotation(Dialog(group="MP tracker")); - parameter Modelica.SIunits.Current ImpRef "Reference maximum power current of plant" annotation(Dialog(group="MP tracker")); + parameter Modelica.Units.SI.Angle sunAzimuth = 0 "Azimuth of sun" annotation(Dialog(group="Irradiance")); + parameter Modelica.Units.SI.Angle sunHeight = 1.0471975511965976 "Height of sun" annotation(Dialog(group="Irradiance")); + parameter Modelica.Units.SI.Irradiance irradiance = 1000 "Irradiance" annotation(Dialog(group="Irradiance")); + + parameter Modelica.Units.SI.Voltage VRef = 48 "Reference DC source voltage" annotation(Dialog(group="Converter")); + parameter Modelica.Units.SI.Time Ti = 1E-6 "Internal integration time constant" annotation(Dialog(group="Converter")); + + parameter Modelica.Units.SI.Time startTime = 0 "Start time" annotation(Dialog(group="MP tracker")); + parameter Modelica.Units.SI.Time samplePeriod = 1 "Sample period" annotation(Dialog(group="MP tracker")); + parameter Modelica.Units.SI.Voltage VmpRef "Reference maximum power power of plant" annotation(Dialog(group="MP tracker")); + parameter Modelica.Units.SI.Current ImpRef "Reference maximum power current of plant" annotation(Dialog(group="MP tracker")); parameter Integer n = 100 "Number of voltage and power discretizations" annotation(Dialog(group="MP tracker")); parameter Real shadow1(final min=0, final max=1)=0 "Shadow of module 1"; @@ -98,31 +98,31 @@ Modelica.Blocks.Interfaces.RealInput azimuth "Azimuth of first solar panel" annotation (Placement(transformation(extent={{-140,-80},{-100,-40}}))); Modelica.Blocks.Interfaces.RealInput gamma "Angle of inclination of each solar panel" annotation (Placement(transformation(extent={{-140,40},{-100,80}}))); // Voltages - Modelica.SIunits.Voltage v1 = module1.v "Voltage of module 1"; - Modelica.SIunits.Voltage v2 = module2.v "Voltage of module 2"; - Modelica.SIunits.Voltage v3 = module3.v "Voltage of module 3"; - Modelica.SIunits.Voltage v4 = module4.v "Voltage of module 4"; + Modelica.Units.SI.Voltage v1 = module1.v "Voltage of module 1"; + Modelica.Units.SI.Voltage v2 = module2.v "Voltage of module 2"; + Modelica.Units.SI.Voltage v3 = module3.v "Voltage of module 3"; + Modelica.Units.SI.Voltage v4 = module4.v "Voltage of module 4"; // Currents - Modelica.SIunits.Current i1(start=0) = module1.i "Current of module 1"; - Modelica.SIunits.Current i2(start=0) = module2.i "Current of module 2"; - Modelica.SIunits.Current i3(start=0) = module3.i "Current of module 3"; - Modelica.SIunits.Current i4(start=0) = module4.i "Current of module 4"; - Modelica.SIunits.Current iGenerating1 = module1.iGenerating "Negativ current of module 1 (generating)"; - Modelica.SIunits.Current iGenerating2 = module2.iGenerating "Negativ current of module 2 (generating)"; - Modelica.SIunits.Current iGenerating3 = module3.iGenerating "Negativ current of module 3 (generating)"; - Modelica.SIunits.Current iGenerating4 = module4.iGenerating "Negativ current of module 4 (generating)"; + Modelica.Units.SI.Current i1(start=0) = module1.i "Current of module 1"; + Modelica.Units.SI.Current i2(start=0) = module2.i "Current of module 2"; + Modelica.Units.SI.Current i3(start=0) = module3.i "Current of module 3"; + Modelica.Units.SI.Current i4(start=0) = module4.i "Current of module 4"; + Modelica.Units.SI.Current iGenerating1 = module1.iGenerating "Negativ current of module 1 (generating)"; + Modelica.Units.SI.Current iGenerating2 = module2.iGenerating "Negativ current of module 2 (generating)"; + Modelica.Units.SI.Current iGenerating3 = module3.iGenerating "Negativ current of module 3 (generating)"; + Modelica.Units.SI.Current iGenerating4 = module4.iGenerating "Negativ current of module 4 (generating)"; // Power - Modelica.SIunits.Power power1 = module1.power "Power of module 1"; - Modelica.SIunits.Power power2 = module2.power "Power of module 2"; - Modelica.SIunits.Power power3 = module3.power "Power of module 3"; - Modelica.SIunits.Power power4 = module4.power "Power of module 4"; - Modelica.SIunits.Power power = power1+power2+power3+power4 "Total power of all four modules"; - - Modelica.SIunits.Power powerGenerating1 = module1.powerGenerating "Negative power consumption (generating) of module 1"; - Modelica.SIunits.Power powerGenerating2 = module2.powerGenerating "Negative power consumption (generating) of module 2"; - Modelica.SIunits.Power powerGenerating3 = module3.powerGenerating "Negative power consumption (generating) of module 3"; - Modelica.SIunits.Power powerGenerating4 = module4.powerGenerating "Negative power consumption (generating) of module 4"; - Modelica.SIunits.Power powerGenerating = powerGenerating1+powerGenerating2+powerGenerating3+powerGenerating4 "Total negative power consumption (generating) of all four modules"; + Modelica.Units.SI.Power power1 = module1.power "Power of module 1"; + Modelica.Units.SI.Power power2 = module2.power "Power of module 2"; + Modelica.Units.SI.Power power3 = module3.power "Power of module 3"; + Modelica.Units.SI.Power power4 = module4.power "Power of module 4"; + Modelica.Units.SI.Power power = power1+power2+power3+power4 "Total power of all four modules"; + + Modelica.Units.SI.Power powerGenerating1 = module1.powerGenerating "Negative power consumption (generating) of module 1"; + Modelica.Units.SI.Power powerGenerating2 = module2.powerGenerating "Negative power consumption (generating) of module 2"; + Modelica.Units.SI.Power powerGenerating3 = module3.powerGenerating "Negative power consumption (generating) of module 3"; + Modelica.Units.SI.Power powerGenerating4 = module4.powerGenerating "Negative power consumption (generating) of module 4"; + Modelica.Units.SI.Power powerGenerating = powerGenerating1+powerGenerating2+powerGenerating3+powerGenerating4 "Total negative power consumption (generating) of all four modules"; Converters.ConvertersWithSampleMPTracker.DCConverter dcConverter1( final VRef=VRef, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMP.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMP.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMP.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMP.mo" 2021-07-09 16:03:31.672697721 +0200 @@ -15,9 +15,9 @@ PhotoVoltaics.Components.Converters.QuasiStaticSinglePhaseConverter converter annotation (Placement(transformation(extent={{20,-10},{40,10}}))); PhotoVoltaics.Components.Blocks.MPTrackerSample mpTracker(VmpRef = moduleData.VmpRef, ImpRef = moduleData.ImpRef) annotation ( Placement(transformation(extent = {{0, -60}, {20, -40}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundAC annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundAC annotation ( Placement(transformation(extent = {{70, -40}, {90, -20}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Sources.VoltageSource voltageSource(f = 50, V = 230, phi = 0, + Modelica.Electrical.QuasiStatic.SinglePhase.Sources.VoltageSource voltageSource(f = 50, V = 230, phi = 0, gamma(fixed=true, start=0)) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {80, 0}))); Modelica.Electrical.Analog.Sensors.PowerSensor powerSensor annotation ( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMP3.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMP3.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMP3.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMP3.mo" 2021-07-09 16:03:31.632697891 +0200 @@ -15,14 +15,14 @@ PhotoVoltaics.Components.Converters.QuasiStaticMultiPhaseConverter converter annotation (Placement(transformation(extent={{20,-10},{40,10}}))); PhotoVoltaics.Components.Blocks.MPTrackerSample mpTracker(VmpRef = moduleData.VmpRef, ImpRef = moduleData.ImpRef) annotation ( Placement(transformation(extent = {{0, -60}, {20, -40}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Basic.Ground groundAC annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Basic.Ground groundAC annotation ( Placement(transformation(extent = {{70, -70}, {90, -50}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Sources.VoltageSource voltageSource(f = 50, V = fill(400 / sqrt(3), 3), + Modelica.Electrical.QuasiStatic.Polyphase.Sources.VoltageSource voltageSource(f = 50, V = fill(400 / sqrt(3), 3), gamma(fixed=true, start=0)) annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {80, 0}))); Modelica.Electrical.Analog.Sensors.PowerSensor powerSensor annotation ( Placement(transformation(extent = {{-20, 10}, {0, 30}}))); - Modelica.Electrical.QuasiStationary.MultiPhase.Basic.Star star annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Basic.Star star annotation ( Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 270, origin = {80, -30}))); parameter PhotoVoltaics.Records.SHARP_NU_S5_E3E moduleData annotation ( Placement(transformation(extent = {{60, 60}, {80, 80}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMultiPhase.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMultiPhase.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMultiPhase.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SimpleModuleMultiPhase.mo" 2021-07-09 16:03:31.544698263 +0200 @@ -8,17 +8,17 @@ Placement(visible = true, transformation(origin={-60,0}, extent = {{-10, -10}, {10, 10}}, rotation = 0))); Modelica.Electrical.Analog.Sensors.PowerSensor powerSensor annotation ( Placement(transformation(extent={{-40,40},{-20,60}}))); - Modelica.Electrical.MultiPhase.Basic.Star star annotation (Placement( + Modelica.Electrical.Polyphase.Basic.Star star annotation (Placement( transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={80,-60}))); Modelica.Electrical.Analog.Basic.Ground ground annotation (Placement(transformation(extent={{70,-96},{90,-76}}))); - Modelica.Electrical.MultiPhase.Sources.CosineVoltage cosineVoltage( - freqHz=fill(50, 3), + Modelica.Electrical.Polyphase.Sources.CosineVoltage cosineVoltage( + f = fill(50, 3), V=fill(400*sqrt(2/3), 3), - phase=-Modelica.Electrical.MultiPhase.Functions.symmetricOrientation(3)) + phase=-Modelica.Electrical.Polyphase.Functions.symmetricOrientation(3)) annotation (Placement( transformation( extent={{-10,-10},{10,10}}, @@ -43,12 +43,12 @@ samplePeriod=0.1) annotation (Placement(transformation(extent={{-30,-20},{-10,0}}))); PhotoVoltaics.Components.Converters.MultiPhaseConverter converter annotation (Placement(transformation(extent={{-10,20},{10,40}}))); parameter PhotoVoltaics.Records.SHARP_NU_S5_E3E moduleData annotation (Placement(transformation(extent={{60,60},{80,80}}))); - Modelica.Electrical.MultiPhase.Sensors.PowerSensor powerSensorGrid annotation (Placement(transformation(extent={{20,20},{40,40}}))); - Modelica.Electrical.MultiPhase.Sensors.VoltageQuasiRMSSensor voltageQuasiRMSSensor(m=3) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.PowerSensor powerSensorGrid annotation (Placement(transformation(extent={{20,20},{40,40}}))); + Modelica.Electrical.Polyphase.Sensors.VoltageQuasiRMSSensor voltageQuasiRMSSensor(m=3) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={50,-30}))); - Modelica.Electrical.MultiPhase.Sensors.CurrentQuasiRMSSensor currentQuasiRMSSensor(final m=3) annotation (Placement(transformation( + Modelica.Electrical.Polyphase.Sensors.CurrentQuasiRMSSensor currentQuasiRMSSensor(final m=3) annotation (Placement(transformation( extent={{-10,-10},{10,10}}, rotation=270, origin={80,10}))); @@ -57,9 +57,9 @@ Modelica.Blocks.Math.Gain gain(final k=3) annotation (Placement(transformation(extent={{0,-90},{-20,-70}}))); - Modelica.SIunits.Power powerDC = powerSensor.power "DC power"; - Modelica.SIunits.Power powerAC = powerSensorGrid.power "AC real power"; - Modelica.SIunits.ApparentPower aparrentPowerAC = powerFactorActual.u2 "AC apparent power"; + Modelica.Units.SI.Power powerDC = powerSensor.power "DC power"; + Modelica.Units.SI.Power powerAC = powerSensorGrid.power "AC real power"; + Modelica.Units.SI.ApparentPower aparrentPowerAC = powerFactorActual.u2 "AC apparent power"; Real powerFactorAC = powerFactorActual.y "Actual power factor"; Modelica.Blocks.Nonlinear.Limiter limiter(uMax=Modelica.Constants.inf, uMin=Modelica.Constants.small) annotation (Placement(transformation(extent={{-28,-90},{-48,-70}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SolarPyramidBatteryCharge.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SolarPyramidBatteryCharge.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SolarPyramidBatteryCharge.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Examples/SolarPyramidBatteryCharge.mo" 2021-07-09 16:03:31.404698855 +0200 @@ -24,7 +24,7 @@ origin={20,-2}))); parameter PhotoVoltaics.Records.SHARP_NU_S5_E3E moduleData annotation (Placement(transformation(extent={{60,60},{80,80}}))); - Modelica.SIunits.Conversions.NonSIunits.Angle_deg gamma_deg = Modelica.SIunits.Conversions.to_deg(solarPyramid.gamma); + Modelica.Units.NonSI.Angle_deg gamma_deg = Modelica.Units.Conversions.to_deg(solarPyramid.gamma); equation connect(gammaRamp.y, solarPyramid.gamma) annotation (Line(points={{-59,20},{-54,20},{-54,6},{-42,6}}, color={0,0,127})); connect(azimuthConst.y, solarPyramid.azimuth) annotation (Line(points={{-59,-20},{-50,-20},{-50,-6},{-42,-6}}, color={0,0,127})); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/PartialComponent.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/PartialComponent.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/PartialComponent.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/PartialComponent.mo" 2021-07-09 16:03:31.096700158 +0200 @@ -6,15 +6,15 @@ Evaluate = true, HideResult = true, choices(checkBox = true)); - parameter Modelica.SIunits.Irradiance constantIrradiance = 1000 "Constant solar irradiance, if useConstantIrradiance = true" annotation ( + parameter Modelica.Units.SI.Irradiance constantIrradiance = 1000 "Constant solar irradiance, if useConstantIrradiance = true" annotation ( Dialog(enable = useConstantIrradiance)); parameter Records.ModuleData moduleData "Module parameters" annotation ( choicesAllMatching = true, Placement(transformation(extent = {{60, 60}, {80, 80}}))); - Modelica.SIunits.Current i = p.i "Current"; - Modelica.SIunits.Current iGenerating = -i "Negative current (generating)"; - Modelica.SIunits.Power power = v * i "Power"; - Modelica.SIunits.Power powerGenerating = v * iGenerating "Negative power consumption (generating)"; + Modelica.Units.SI.Current i = p.i "Current"; + Modelica.Units.SI.Current iGenerating = -i "Negative current (generating)"; + Modelica.Units.SI.Power power = v * i "Power"; + Modelica.Units.SI.Power powerGenerating = v * iGenerating "Negative power consumption (generating)"; Modelica.Blocks.Interfaces.RealInput variableIrradiance(unit = "W/m2") if not useConstantIrradiance "Solar irradiance" annotation ( Placement(transformation(extent = {{20, -20}, {-20, 20}}, rotation = 90, origin = {0, 120}), iconTransformation(extent = {{20, -20}, {-20, 20}}, rotation = 90, origin = {0, 120}))); Modelica.Blocks.Sources.Constant const(final k = constantIrradiance) if useConstantIrradiance annotation ( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/PartialDiode.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/PartialDiode.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/PartialDiode.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/PartialDiode.mo" 2021-07-09 16:03:31.072700259 +0200 @@ -2,23 +2,23 @@ partial model PartialDiode "Diode with one exponential function" extends Modelica.Electrical.Analog.Interfaces.OnePort(v(start = 0)); extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort(T = 298.15); - constant Modelica.SIunits.Charge Q = 1.6021766208E-19 "Elementary charge of electron"; + constant Modelica.Units.SI.Charge Q = 1.6021766208E-19 "Elementary charge of electron"; parameter Real m = 1 "Ideality factor of diode"; - parameter Modelica.SIunits.Resistance R = 1E8 "Parallel ohmic resistance"; - parameter Modelica.SIunits.Temperature TRef = 298.15 "Reference temperature" annotation ( + parameter Modelica.Units.SI.Resistance R = 1E8 "Parallel ohmic resistance"; + parameter Modelica.Units.SI.Temperature TRef = 298.15 "Reference temperature" annotation ( Dialog(group = "Reference data")); - parameter Modelica.SIunits.Voltage VRef(min = Modelica.Constants.small) = 0.6292 "Reference voltage > 0, i.e. open circuit voltage, at TRef" annotation ( + parameter Modelica.Units.SI.Voltage VRef(min = Modelica.Constants.small) = 0.6292 "Reference voltage > 0, i.e. open circuit voltage, at TRef" annotation ( Dialog(group = "Reference data")); - parameter Modelica.SIunits.Current IRef(min = Modelica.Constants.small) = 8.540 "Reference current > 0, i.e. short circuit current, at TRef" annotation ( + parameter Modelica.Units.SI.Current IRef(min = Modelica.Constants.small) = 8.540 "Reference current > 0, i.e. short circuit current, at TRef" annotation ( Dialog(group = "Reference data")); - parameter Modelica.SIunits.LinearTemperatureCoefficient alphaI = +0.00053 "Temperature coefficient of reference current at TRef" annotation ( + parameter Modelica.Units.SI.LinearTemperatureCoefficient alphaI = +0.00053 "Temperature coefficient of reference current at TRef" annotation ( Dialog(group = "Reference data")); - parameter Modelica.SIunits.LinearTemperatureCoefficient alphaV = -0.00340 "Temperature coefficient of reference voltage at TRef*" annotation ( + parameter Modelica.Units.SI.LinearTemperatureCoefficient alphaV = -0.00340 "Temperature coefficient of reference voltage at TRef*" annotation ( Dialog(group = "Reference data")); - Modelica.SIunits.Voltage Vt "Voltage equivalent of temperature (k*T/Q)"; - Modelica.SIunits.Voltage VRefActual "Reference voltage w.r.t. actual temperature"; - Modelica.SIunits.Current IRefActual "Reference current w.r.t. actual temperature"; - Modelica.SIunits.Current Ids "Saturation current"; + Modelica.Units.SI.Voltage Vt "Voltage equivalent of temperature (k*T/Q)"; + Modelica.Units.SI.Voltage VRefActual "Reference voltage w.r.t. actual temperature"; + Modelica.Units.SI.Current IRefActual "Reference current w.r.t. actual temperature"; + Modelica.Units.SI.Current Ids "Saturation current"; equation // Temperature dependent voltage Vt = Modelica.Constants.k * T_heatPort / Q; diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/QuasiStatic/ACpins.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/QuasiStatic/ACpins.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/QuasiStatic/ACpins.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/QuasiStatic/ACpins.mo" 2021-07-09 16:03:31.016700497 +0200 @@ -1,13 +1,13 @@ within PhotoVoltaics.Interfaces.QuasiStatic; partial model ACpins "Single phase AC pins" import Modelica.ComplexMath.conj; - Modelica.Electrical.QuasiStationary.SinglePhase.Interfaces.PositivePin ac_p "AC positive pin" annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Interfaces.PositivePin ac_p "AC positive pin" annotation ( Placement(transformation(extent={{90,50},{110,70}}))); - Modelica.Electrical.QuasiStationary.SinglePhase.Interfaces.NegativePin ac_n "AC negative pin" annotation ( + Modelica.Electrical.QuasiStatic.SinglePhase.Interfaces.NegativePin ac_n "AC negative pin" annotation ( Placement(transformation(extent={{90,-70},{110,-50}}))); - Modelica.SIunits.ComplexVoltage vAC = ac_p.v - ac_n.v "AC potential"; - Modelica.SIunits.ComplexCurrent iAC = ac_p.i "AC current"; - Modelica.SIunits.ComplexPower apparentPowerAC = vAC.*conj(iAC) "AC apparent power"; + Modelica.Units.SI.ComplexVoltage vAC = ac_p.v - ac_n.v "AC potential"; + Modelica.Units.SI.ComplexCurrent iAC = ac_p.i "AC current"; + Modelica.Units.SI.ComplexPower apparentPowerAC = vAC.*conj(iAC) "AC apparent power"; annotation (Documentation(info="

This model provides single phase AC quasi static pins.

")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/QuasiStatic/ACplug.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/QuasiStatic/ACplug.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/QuasiStatic/ACplug.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Interfaces/QuasiStatic/ACplug.mo" 2021-07-09 16:03:30.996700580 +0200 @@ -2,11 +2,11 @@ partial model ACplug "AC multi phase plug" import Modelica.ComplexMath.conj; parameter Integer m(final min = 3) = 3 "Number of phases"; - Modelica.Electrical.QuasiStationary.MultiPhase.Interfaces.PositivePlug ac(final m = m) "AC output" annotation ( + Modelica.Electrical.QuasiStatic.Polyphase.Interfaces.PositivePlug ac(final m = m) "AC output" annotation ( Placement(transformation(extent = {{90, -10}, {110, 10}}))); - Modelica.SIunits.ComplexVoltage vAC[m] = ac.pin[:].v "AC potential"; - Modelica.SIunits.ComplexCurrent iAC[m] = ac.pin[:].i "AC current"; - Modelica.SIunits.ComplexPower apparentPowerAC[m] = vAC.*conj(iAC) "AC apparent power"; + Modelica.Units.SI.ComplexVoltage vAC[m] = ac.pin[:].v "AC potential"; + Modelica.Units.SI.ComplexCurrent iAC[m] = ac.pin[:].i "AC current"; + Modelica.Units.SI.ComplexPower apparentPowerAC[m] = vAC.*conj(iAC) "AC apparent power"; annotation (Documentation(info="

This model provides a multi phase AC quasi static plug.

")); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Records/ModuleData.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Records/ModuleData.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Records/ModuleData.mo" 2021-07-09 16:02:46.404891883 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Records/ModuleData.mo" 2021-07-09 16:03:30.508702646 +0200 @@ -2,29 +2,29 @@ record ModuleData "Data of PV module" extends Modelica.Icons.Record; parameter String moduleName = "Generic"; - parameter Modelica.SIunits.Temperature TRef = 298.15 "Reference temperature" annotation ( + parameter Modelica.Units.SI.Temperature TRef = 298.15 "Reference temperature" annotation ( Dialog(group = "Reference data")); - parameter Modelica.SIunits.Irradiance irradianceRef = 1000 "Reference solar irradiance" annotation ( + parameter Modelica.Units.SI.Irradiance irradianceRef = 1000 "Reference solar irradiance" annotation ( Dialog(group = "Reference data")); - parameter Modelica.SIunits.Voltage VocRef(min = Modelica.Constants.small) = 30.2 "Reference open circuit module voltage > 0 at TRref" annotation ( + parameter Modelica.Units.SI.Voltage VocRef(min = Modelica.Constants.small) = 30.2 "Reference open circuit module voltage > 0 at TRref" annotation ( Dialog(group = "Reference data")); - final parameter Modelica.SIunits.Voltage VocCellRef = VocRef / ns "Reference open circuit cell voltage > 0 at TRref"; - parameter Modelica.SIunits.Current IscRef(min = Modelica.Constants.small) = 8.54 "Reference short circuit current > 0 at TRref and irradianceRef" annotation ( + final parameter Modelica.Units.SI.Voltage VocCellRef = VocRef / ns "Reference open circuit cell voltage > 0 at TRref"; + parameter Modelica.Units.SI.Current IscRef(min = Modelica.Constants.small) = 8.54 "Reference short circuit current > 0 at TRref and irradianceRef" annotation ( Dialog(group = "Reference data")); - parameter Modelica.SIunits.Voltage VmpRef(min = Modelica.Constants.small) = 24.0 "Reference maximum power module voltage > 0 at TRref" annotation ( + parameter Modelica.Units.SI.Voltage VmpRef(min = Modelica.Constants.small) = 24.0 "Reference maximum power module voltage > 0 at TRref" annotation ( Dialog(group = "Reference data")); - final parameter Modelica.SIunits.Voltage VmpCellRef = VmpRef / ns "Reference maximum power cell voltage > 0 at TRref"; - parameter Modelica.SIunits.Current ImpRef(min = Modelica.Constants.small) = 7.71 "Reference maximum power current > 0 at TRref and irradianceRef" annotation ( + final parameter Modelica.Units.SI.Voltage VmpCellRef = VmpRef / ns "Reference maximum power cell voltage > 0 at TRref"; + parameter Modelica.Units.SI.Current ImpRef(min = Modelica.Constants.small) = 7.71 "Reference maximum power current > 0 at TRref and irradianceRef" annotation ( Dialog(group = "Reference data")); - parameter Modelica.SIunits.LinearTemperatureCoefficient alphaIsc = +0.00053 "Temperature coefficient of reference short circuit current at TRref" annotation ( + parameter Modelica.Units.SI.LinearTemperatureCoefficient alphaIsc = +0.00053 "Temperature coefficient of reference short circuit current at TRref" annotation ( Dialog(group = "Reference data")); - parameter Modelica.SIunits.LinearTemperatureCoefficient alphaVoc = -0.00340 "Temperature coefficient of reference open circuit module voltage at TRref" annotation ( + parameter Modelica.Units.SI.LinearTemperatureCoefficient alphaVoc = -0.00340 "Temperature coefficient of reference open circuit module voltage at TRref" annotation ( Dialog(group = "Reference data")); parameter Integer ns = 1 "Number of series connected cells"; parameter Integer nb = 1 "Number of bypass diodes per module"; - parameter Modelica.SIunits.Voltage BvCell = 18 "Breakthrough cell voltage" annotation ( + parameter Modelica.Units.SI.Voltage BvCell = 18 "Breakthrough cell voltage" annotation ( Dialog(group = "Breakthrough data")); - parameter Modelica.SIunits.Current Ibv = 1 "Breakthrough knee current" annotation ( + parameter Modelica.Units.SI.Current Ibv = 1 "Breakthrough knee current" annotation ( Dialog(group = "Breakthrough data")); parameter Real Nbv = 0.74 "Breakthrough emission coefficient" annotation ( Dialog(group = "Breakthrough data")); @@ -32,8 +32,8 @@ parameter Modelica.SIunits.Resistance RsCell = 0 "Series resistance of cell" annotation(Dialog(group = "Non-ideal effects")); parameter Modelica.SIunits.Resistance RshCell = 1E8 "Shunt resistance of cell" annotation(Dialog(group = "Non-ideal effects")); */ - final parameter Modelica.SIunits.Voltage VtCellRef = Modelica.Constants.k * TRef / Q "Reference temperature voltage of cell"; - constant Modelica.SIunits.Charge Q = 1.6021766208E-19 "Elementary charge of electron"; + final parameter Modelica.Units.SI.Voltage VtCellRef = Modelica.Constants.k * TRef / Q "Reference temperature voltage of cell"; + constant Modelica.Units.SI.Charge Q = 1.6021766208E-19 "Elementary charge of electron"; annotation ( defaultComponentName = "moduleData", defaultComponentPrefixes = "parameter", diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Blocks/PowerRamp.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Blocks/PowerRamp.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Blocks/PowerRamp.mo" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Blocks/PowerRamp.mo" 2021-07-09 16:03:29.772705762 +0200 @@ -1,9 +1,9 @@ within PhotoVoltaics.Sources.Blocks; block PowerRamp "Generate ramp signal based logarithmic range" parameter Real height = 1 "Height of ramps"; - parameter Modelica.SIunits.Time duration(min = 0.0, start = 2) "Duration of ramp (= 0.0 gives a Step)"; + parameter Modelica.Units.SI.Time duration(min = 0.0, start = 2) "Duration of ramp (= 0.0 gives a Step)"; parameter Real offset = 0 "Offset of output signal"; - parameter Modelica.SIunits.Time startTime = 0 "Output = offset for time < startTime"; + parameter Modelica.Units.SI.Time startTime = 0 "Output = offset for time < startTime"; parameter Real ref = 1 "Reference value, determined by ref * 10 ^ (ramp function)"; extends Modelica.Blocks.Interfaces.SO; equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Blocks/TriangleAndStep.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Blocks/TriangleAndStep.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Blocks/TriangleAndStep.mo" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Blocks/TriangleAndStep.mo" 2021-07-09 16:03:29.732705932 +0200 @@ -1,10 +1,10 @@ within PhotoVoltaics.Sources.Blocks; block TriangleAndStep "Multiple steps and triangles" - parameter Modelica.SIunits.Time T = 1 "Total time of varying outputs"; + parameter Modelica.Units.SI.Time T = 1 "Total time of varying outputs"; parameter Integer stepNumber = 5 "Number of steps"; parameter Real stepHeight = 1 "Total step height"; parameter Real stepOffset = 0 "Offset"; - parameter Modelica.SIunits.Time startTime = 0 "Start time"; + parameter Modelica.Units.SI.Time startTime = 0 "Start time"; parameter Real triangleHeight = 1 "Height of triangle output"; parameter Real triangleOffset = 0 "Offset of triangle output"; Modelica.Blocks.Sources.Ramp ramp( diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/IdealBattery.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/IdealBattery.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/IdealBattery.mo" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/IdealBattery.mo" 2021-07-09 16:03:29.620706406 +0200 @@ -2,27 +2,27 @@ model IdealBattery "Re-chargeable ideal battery without loss" parameter Integer ns(min = 1) = 1 "Number of series cells"; parameter Integer np(min = 1) = 1 "Number of parallel cells"; - parameter Modelica.SIunits.Voltage V1Cell "Maximum cell voltage > V0Cell"; - parameter Modelica.SIunits.Voltage V0Cell "Minimum cell voltage < V1Cell"; - final parameter Modelica.SIunits.Voltage V1 = V1Cell*ns "Maximum battery voltage > V0"; - final parameter Modelica.SIunits.Voltage V0 = V0Cell*ns "Maximum battery voltage < V1"; + parameter Modelica.Units.SI.Voltage V1Cell "Maximum cell voltage > V0Cell"; + parameter Modelica.Units.SI.Voltage V0Cell "Minimum cell voltage < V1Cell"; + final parameter Modelica.Units.SI.Voltage V1 = V1Cell*ns "Maximum battery voltage > V0"; + final parameter Modelica.Units.SI.Voltage V0 = V0Cell*ns "Maximum battery voltage < V1"; parameter Boolean allowOvercharge = false "Allows overcharging without error"; parameter Boolean allowUndercharge = false "Allows undercharging without error"; - parameter Modelica.SIunits.Energy ECell + parameter Modelica.Units.SI.Energy ECell "Total cell energy between V0Cell and V1Cell"; - final parameter Modelica.SIunits.Capacitance CCell = 2 * ECell / (V1Cell ^ 2 - V0Cell ^ 2) + final parameter Modelica.Units.SI.Capacitance CCell = 2 * ECell / (V1Cell ^ 2 - V0Cell ^ 2) "Total charge of battery"; - parameter Modelica.SIunits.Voltage ViniCell = V1Cell "Initial cell voltage"; - Modelica.SIunits.Voltage v = pin_p.v - pin_n.v "Battery voltage"; - Modelica.SIunits.Voltage vCell = v / ns "Cell voltage"; - Modelica.SIunits.Current i = capacitor.i "Battery current"; - Modelica.SIunits.Current iCell = i / np "Cell current"; - Modelica.SIunits.Power power = v * i "Battery power"; - Modelica.SIunits.Power powerCell = power/ns/np "Cell power"; - Modelica.SIunits.Energy energy "Energy"; - Modelica.SIunits.Energy energyCell "Cell energy"; + parameter Modelica.Units.SI.Voltage ViniCell = V1Cell "Initial cell voltage"; + Modelica.Units.SI.Voltage v = pin_p.v - pin_n.v "Battery voltage"; + Modelica.Units.SI.Voltage vCell = v / ns "Cell voltage"; + Modelica.Units.SI.Current i = capacitor.i "Battery current"; + Modelica.Units.SI.Current iCell = i / np "Cell current"; + Modelica.Units.SI.Power power = v * i "Battery power"; + Modelica.Units.SI.Power powerCell = power/ns/np "Cell power"; + Modelica.Units.SI.Energy energy "Energy"; + Modelica.Units.SI.Energy energyCell "Cell energy"; Modelica.Electrical.Analog.Basic.Capacitor capacitor(final C = CCell * np / ns, v(start = ns * ViniCell, fixed = true)) annotation(Placement(transformation(extent = {{-10, -10}, {10, 10}}))); Modelica.Electrical.Analog.Interfaces.PositivePin pin_p "Positive pin" annotation(Placement(transformation(extent = {{-110, -10}, {-90, 10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/SignalCurrent.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/SignalCurrent.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/SignalCurrent.mo" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/SignalCurrent.mo" 2021-07-09 16:03:29.572706609 +0200 @@ -1,16 +1,16 @@ within PhotoVoltaics.Sources.Electrical; model SignalCurrent "Generic current source using the input signal as source current" extends Modelica.Electrical.Analog.Interfaces.ConditionalHeatPort(T = 298.15); - parameter Modelica.SIunits.Temperature TRef = 298.15 "Reference temperature"; - parameter Modelica.SIunits.Current IRef = 1 "Reference current at reference irradiance and reference temperature"; - parameter Modelica.SIunits.Irradiance irradianceRef = 1000 "Reference solar irradiance"; - parameter Modelica.SIunits.LinearTemperatureCoefficient alphaRef = 0 "Temperature coefficient of reference current at TRref"; + parameter Modelica.Units.SI.Temperature TRef = 298.15 "Reference temperature"; + parameter Modelica.Units.SI.Current IRef = 1 "Reference current at reference irradiance and reference temperature"; + parameter Modelica.Units.SI.Irradiance irradianceRef = 1000 "Reference solar irradiance"; + parameter Modelica.Units.SI.LinearTemperatureCoefficient alphaRef = 0 "Temperature coefficient of reference current at TRref"; Modelica.Electrical.Analog.Interfaces.PositivePin p annotation ( Placement(transformation(extent = {{-110, -10}, {-90, 10}}))); Modelica.Electrical.Analog.Interfaces.NegativePin n annotation ( Placement(transformation(extent = {{110, -10}, {90, 10}}))); - Modelica.SIunits.Voltage v "Voltage drop between the two pins (= p.v - n.v)"; - Modelica.SIunits.Current i "Current flowing from pin p to pin n as input signal"; + Modelica.Units.SI.Voltage v "Voltage drop between the two pins (= p.v - n.v)"; + Modelica.Units.SI.Current i "Current flowing from pin p to pin n as input signal"; Modelica.Blocks.Interfaces.RealInput irradiance(unit = "W/m2") "Irradiance" annotation ( Placement(transformation(origin = {0, 70}, extent = {{-20, -20}, {20, 20}}, rotation = 270))); equation diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/VariableUnrootedMultiPhaseCurrentSource.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/VariableUnrootedMultiPhaseCurrentSource.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/VariableUnrootedMultiPhaseCurrentSource.mo" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/VariableUnrootedMultiPhaseCurrentSource.mo" 2021-07-09 16:03:29.548706711 +0200 @@ -1,6 +1,6 @@ within PhotoVoltaics.Sources.Electrical; model VariableUnrootedMultiPhaseCurrentSource "Unrooted variable multi phase AC current source" - extends Modelica.Electrical.QuasiStationary.MultiPhase.Interfaces.OnePort; + extends Modelica.Electrical.QuasiStatic.Polyphase.Interfaces.OnePort; import Modelica.Constants.pi; Modelica.ComplexBlocks.Interfaces.ComplexInput I[m] annotation ( Placement(transformation(origin = {0, 100}, extent = {{-20, -20}, {20, 20}}, rotation = 270))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/VariableUnrootedSinglePhaseCurrentSource.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/VariableUnrootedSinglePhaseCurrentSource.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/VariableUnrootedSinglePhaseCurrentSource.mo" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Electrical/VariableUnrootedSinglePhaseCurrentSource.mo" 2021-07-09 16:03:29.516706847 +0200 @@ -1,6 +1,6 @@ within PhotoVoltaics.Sources.Electrical; model VariableUnrootedSinglePhaseCurrentSource "Unrooted variable multi phase AC current source" - extends Modelica.Electrical.QuasiStationary.SinglePhase.Interfaces.OnePort; + extends Modelica.Electrical.QuasiStatic.SinglePhase.Interfaces.OnePort; import Modelica.Constants.pi; Modelica.ComplexBlocks.Interfaces.ComplexInput I annotation ( Placement(transformation(origin = {0, 100}, extent = {{-20, -20}, {20, 20}}, rotation = 270))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/Irradiance.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/Irradiance.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/Irradiance.mo" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/Irradiance.mo" 2021-07-09 16:03:29.476707015 +0200 @@ -8,32 +8,32 @@ parameter Integer startMonth(final min = 1, final max = 12) = 9 "Month"; parameter Integer startYear = 2016 "Year"; parameter Integer TimeZone = 1 "Time zone"; - parameter Modelica.SIunits.Angle longitude = 0.2856929452589518 "Longitude"; - parameter Modelica.SIunits.Angle latitude = 0.8418964085999744 "Latitude"; - parameter Modelica.SIunits.Irradiance irradianceRef = 1000 "Reference solar irradiance"; - parameter Modelica.SIunits.Angle gamma = 10 * pi / 180 "Angle of PV module with w.r.t. horizontal plane"; - parameter Modelica.SIunits.Angle azimuth = 0 "Azimuth of the PV module orientation"; + parameter Modelica.Units.SI.Angle longitude = 0.2856929452589518 "Longitude"; + parameter Modelica.Units.SI.Angle latitude = 0.8418964085999744 "Latitude"; + parameter Modelica.Units.SI.Irradiance irradianceRef = 1000 "Reference solar irradiance"; + parameter Modelica.Units.SI.Angle gamma = 10 * pi / 180 "Angle of PV module with w.r.t. horizontal plane"; + parameter Modelica.Units.SI.Angle azimuth = 0 "Azimuth of the PV module orientation"; Integer startDayOfYear(start = dayOfTheYear(startDay, startMonth, startYear), fixed = true) "Start day of year in simulation"; Integer dayOfYear(final start = dayOfTheYear(startDay, startMonth, startYear), fixed = true) "Actual day of year"; Integer daysOfYear(final start = dayOfTheYear(31, 12, startYear), fixed = true) "Total number of days of year"; Integer year(final start = startYear, fixed = true) "Actual year"; - Modelica.SIunits.Angle Jprime(final start = dayOfTheYear(startDay, startMonth, startYear) / dayOfTheYear(31, 12, startYear) * 2 * pi, fixed = true) "Equivalent Angle of the day of the year w.r.t. total number of days"; + Modelica.Units.SI.Angle Jprime(final start = dayOfTheYear(startDay, startMonth, startYear) / dayOfTheYear(31, 12, startYear) * 2 * pi, fixed = true) "Equivalent Angle of the day of the year w.r.t. total number of days"; Real delta_J; Real timeequation_J; - Modelica.SIunits.Conversions.NonSIunits.Time_day localTimeDays "Local time in days"; + Modelica.Units.NonSI.Time_day localTimeDays "Local time in days"; Integer localDays "Locale day"; - Modelica.SIunits.Time localTime "Local time"; - Modelica.SIunits.Conversions.NonSIunits.Time_hour localTimeHours "Local time in unit hours"; - Modelica.SIunits.Conversions.NonSIunits.Time_hour LocalMeanTimeHours "Local mean time in unit hours"; - Modelica.SIunits.Conversions.NonSIunits.Time_hour trueMeanTimeHours "True mean time in unit hours"; - Modelica.SIunits.Angle hoursAngle "Hours angle"; - Modelica.SIunits.Angle sunHeight "Sun height"; - Modelica.SIunits.Angle sunAzimuth1 "Sun azimuth before 12 p.m."; - Modelica.SIunits.Angle sunAzimuth2 "Sun azimuth after 12 p.m."; - Modelica.SIunits.Angle sunAzimuth "Sun azimuth"; - Modelica.SIunits.Angle angleOfIncidence "Angle of incidence between a vector in sun direction and a normal vector"; - Modelica.SIunits.Irradiance directIrradianceHorizontal "Direct irradiance on the horizontal in W/m^2"; - Modelica.SIunits.Irradiance directIrradianceInclined "Direct irradiance on the inclined plane in w/m^2"; + Modelica.Units.SI.Time localTime "Local time"; + Modelica.Units.NonSI.Time_hour localTimeHours "Local time in unit hours"; + Modelica.Units.NonSI.Time_hour LocalMeanTimeHours "Local mean time in unit hours"; + Modelica.Units.NonSI.Time_hour trueMeanTimeHours "True mean time in unit hours"; + Modelica.Units.SI.Angle hoursAngle "Hours angle"; + Modelica.Units.SI.Angle sunHeight "Sun height"; + Modelica.Units.SI.Angle sunAzimuth1 "Sun azimuth before 12 p.m."; + Modelica.Units.SI.Angle sunAzimuth2 "Sun azimuth after 12 p.m."; + Modelica.Units.SI.Angle sunAzimuth "Sun azimuth"; + Modelica.Units.SI.Angle angleOfIncidence "Angle of incidence between a vector in sun direction and a normal vector"; + Modelica.Units.SI.Irradiance directIrradianceHorizontal "Direct irradiance on the horizontal in W/m^2"; + Modelica.Units.SI.Irradiance directIrradianceInclined "Direct irradiance on the inclined plane in w/m^2"; Modelica.Blocks.Interfaces.RealOutput irradiance "Irradiance of inclined area" annotation ( Placement(transformation(extent={{100,-10},{120,10}}))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/IrradianceFixedSun.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/IrradianceFixedSun.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/IrradianceFixedSun.mo" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/IrradianceFixedSun.mo" 2021-07-09 16:03:29.420707253 +0200 @@ -1,12 +1,12 @@ within PhotoVoltaics.Sources.Irradiance; model IrradianceFixedSun "Simple solar irradiance with fixed sun position" import Modelica.Constants.pi; - parameter Modelica.SIunits.Irradiance irradianceRef = 1000 "Reference solar irradiance"; - parameter Modelica.SIunits.Angle sunHeight "Sun height"; - parameter Modelica.SIunits.Angle sunAzimuth "Sun azimuth"; - Modelica.SIunits.Angle angleOfIncidence "Angle of incidence between a vector in sun direction and a normal vector"; - Modelica.SIunits.Irradiance directIrradianceHorizontal "Direct irradiance on the horizontal"; - Modelica.SIunits.Irradiance directIrradianceInclined "Direct irradiance on the inclined plane"; + parameter Modelica.Units.SI.Irradiance irradianceRef = 1000 "Reference solar irradiance"; + parameter Modelica.Units.SI.Angle sunHeight "Sun height"; + parameter Modelica.Units.SI.Angle sunAzimuth "Sun azimuth"; + Modelica.Units.SI.Angle angleOfIncidence "Angle of incidence between a vector in sun direction and a normal vector"; + Modelica.Units.SI.Irradiance directIrradianceHorizontal "Direct irradiance on the horizontal"; + Modelica.Units.SI.Irradiance directIrradianceInclined "Direct irradiance on the inclined plane"; Modelica.Blocks.Interfaces.RealOutput irradiance annotation(Placement(transformation(extent = {{100, -10}, {120, 10}}))); Modelica.Blocks.Interfaces.RealInput gamma annotation(Placement(visible = true, transformation(origin={-120,60}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin={-120,60}, extent = {{-20, -20}, {20, 20}}, rotation = 0))); Modelica.Blocks.Interfaces.RealInput azimuth annotation(Placement(visible = true, transformation(origin={-120,-60}, extent = {{-20, -20}, {20, 20}}, rotation = 0), iconTransformation(origin={-120,-60}, extent = {{-20, -20}, {20, 20}}, rotation = 0))); diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/IrradianceVariableLocation.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/IrradianceVariableLocation.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/IrradianceVariableLocation.mo" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/Sources/Irradiance/IrradianceVariableLocation.mo" 2021-07-09 16:03:29.360707507 +0200 @@ -8,30 +8,30 @@ parameter Integer startMonth(final min = 1, final max = 12) = 9 "Month"; parameter Integer startYear = 2016 "Year"; parameter Integer TimeZone = 1 "Time zone"; - parameter Modelica.SIunits.Angle longitude = 0.2856929452589518 "Longitude"; - parameter Modelica.SIunits.Angle latitude = 0.8418964085999744 "Latitude"; - parameter Modelica.SIunits.Irradiance irradianceRef = 1000 "Reference solar irradiance"; + parameter Modelica.Units.SI.Angle longitude = 0.2856929452589518 "Longitude"; + parameter Modelica.Units.SI.Angle latitude = 0.8418964085999744 "Latitude"; + parameter Modelica.Units.SI.Irradiance irradianceRef = 1000 "Reference solar irradiance"; Integer startDayOfYear(start = dayOfTheYear(startDay, startMonth, startYear)) "Start day of year in simulation"; Integer dayOfYear(final start = dayOfTheYear(startDay, startMonth, startYear)) "Actual day of year"; Integer daysOfYear(final start = dayOfTheYear(31, 12, startYear)) "Total number of days of year"; Integer year(final start = startYear) "Actual year"; - Modelica.SIunits.Angle Jprime(final start = dayOfTheYear(startDay, startMonth, startYear) / dayOfTheYear(31, 12, startYear) * 2 * pi) "Equivalent Angle of the day of the year w.r.t. total number of days"; + Modelica.Units.SI.Angle Jprime(final start = dayOfTheYear(startDay, startMonth, startYear) / dayOfTheYear(31, 12, startYear) * 2 * pi) "Equivalent Angle of the day of the year w.r.t. total number of days"; Real delta_J; Real timeequation_J; - Modelica.SIunits.Conversions.NonSIunits.Time_day localTimeDays "Local time in days"; + Modelica.Units.NonSI.Time_day localTimeDays "Local time in days"; Integer localDays "Locale day"; - Modelica.SIunits.Time localTime "Local time"; - Modelica.SIunits.Conversions.NonSIunits.Time_hour localTimeHours "Local time in unit hours"; - Modelica.SIunits.Conversions.NonSIunits.Time_hour LocalMeanTimeHours "Local mean time in unit hours"; - Modelica.SIunits.Conversions.NonSIunits.Time_hour trueMeanTimeHours "True mean time in unit hours"; - Modelica.SIunits.Angle hoursAngle "Hours angle"; - Modelica.SIunits.Angle sunHeight "Sun height"; - Modelica.SIunits.Angle sunAzimuth1 "Sun azimuth before 12 p.m."; - Modelica.SIunits.Angle sunAzimuth2 "Sun azimuth after 12 p.m."; - Modelica.SIunits.Angle sunAzimuth "Sun azimuth"; - Modelica.SIunits.Angle angleOfIncidence "Angle of incidence between a vector in sun direction and a normal vector"; - Modelica.SIunits.Irradiance directIrradianceHorizontal "Direct irradiance on the horizontal in W/m^2"; - Modelica.SIunits.Irradiance directIrradianceInclined "Direct irradiance on the inclined plane in w/m^2"; + Modelica.Units.SI.Time localTime "Local time"; + Modelica.Units.NonSI.Time_hour localTimeHours "Local time in unit hours"; + Modelica.Units.NonSI.Time_hour LocalMeanTimeHours "Local mean time in unit hours"; + Modelica.Units.NonSI.Time_hour trueMeanTimeHours "True mean time in unit hours"; + Modelica.Units.SI.Angle hoursAngle "Hours angle"; + Modelica.Units.SI.Angle sunHeight "Sun height"; + Modelica.Units.SI.Angle sunAzimuth1 "Sun azimuth before 12 p.m."; + Modelica.Units.SI.Angle sunAzimuth2 "Sun azimuth after 12 p.m."; + Modelica.Units.SI.Angle sunAzimuth "Sun azimuth"; + Modelica.Units.SI.Angle angleOfIncidence "Angle of incidence between a vector in sun direction and a normal vector"; + Modelica.Units.SI.Irradiance directIrradianceHorizontal "Direct irradiance on the horizontal in W/m^2"; + Modelica.Units.SI.Irradiance directIrradianceInclined "Direct irradiance on the inclined plane in w/m^2"; Modelica.Blocks.Interfaces.RealOutput irradiance "Irradiance of inclined area" annotation(Placement(transformation(extent = {{100, -10}, {120, 10}}))); Modelica.Blocks.Interfaces.RealInput gamma "Inclination angle of area" annotation (Placement( visible=true, diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/openmodelica.metadata.json" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/openmodelica.metadata.json" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/openmodelica.metadata.json" 2021-07-09 16:03:33.248691058 +0200 @@ -1 +1 @@ -{"path":"PhotoVoltaics", "sha":"d537eb1c72b7c4175d8d61881a7a3d4410ba7184", "support":"support", "uses":{"Modelica":"3.2.3"}, "version":"1.6.0", "zipfile":"https://github.com/christiankral/PhotoVoltaics/archive/d537eb1c72b7c4175d8d61881a7a3d4410ba7184.zip"} +{"path": "PhotoVoltaics", "sha": "d537eb1c72b7c4175d8d61881a7a3d4410ba7184", "support": "support", "uses": {"Modelica": "4.0.0"}, "version": "1.6.0", "zipfile": "https://github.com/christiankral/PhotoVoltaics/archive/d537eb1c72b7c4175d8d61881a7a3d4410ba7184.zip", "extraInfo": "Conversion script /var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/Modelica 4.0.0+maint.om//Resources/Scripts/Conversion/ConvertModelica_from_3.2.3_to_4.0.0.mos was applied"} \ No newline at end of file diff -ur "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/package.mo" "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/package.mo" --- "/var/lib/hudson/saved_omc/libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/package.mo" 2021-07-09 16:02:46.420891814 +0200 +++ "converted-libraries/.openmodelica/libraries/PhotoVoltaics 1.6.0/package.mo" 2021-07-09 16:03:33.240691092 +0200 @@ -1,19 +1,30 @@ -package PhotoVoltaics +package PhotoVoltaics extends Modelica.Icons.Package; - annotation (preferredView="info", + + + + + + + + + + + + + + + + + + annotation( + preferredView = "info", version = "1.6.0", versionDate = "2020-02-02", - uses(Modelica(version = "3.2.3")), - Icon(coordinateSystem, graphics={ Ellipse(origin = {36, 75}, fillColor = {255, 255, 127}, - fillPattern = FillPattern.Solid, extent = {{0, 1}, {40, -39}}, endAngle = 360), Rectangle(origin = {-60, -9}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, - fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Rectangle(origin = {0, -7}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, - fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Rectangle(origin = {-60, -61}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, - fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Rectangle(origin = {0, -61}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, - fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Rectangle(origin = {60, -61}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, - fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Rectangle(origin = {60, -5}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, - fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Line(origin = {18, 34}, points = {{4, 10}, {-84, -16}}), Line(origin = {-12, 70}, points = {{34, -6}, {-34, 6}}), Line(points = {{36, 30}, {28, 16}}, color = {28, 108, 200})}), - Documentation(info=" + uses(Modelica(version = "4.0.0")), + Icon(coordinateSystem, graphics = {Ellipse(origin = {36, 75}, fillColor = {255, 255, 127}, fillPattern = FillPattern.Solid, extent = {{0, 1}, {40, -39}}, endAngle = 360), Rectangle(origin = {-60, -9}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Rectangle(origin = {0, -7}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Rectangle(origin = {-60, -61}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Rectangle(origin = {0, -61}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Rectangle(origin = {60, -61}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Rectangle(origin = {60, -5}, lineColor = {85, 85, 255}, fillColor = {85, 85, 255}, fillPattern = FillPattern.Solid, extent = {{-10, 11}, {10, -9}}), Line(origin = {18, 34}, points = {{4, 10}, {-84, -16}}), Line(origin = {-12, 70}, points = {{34, -6}, {-34, 6}}), Line(points = {{36, 30}, {28, 16}}, color = {28, 108, 200})}), + Documentation(info = "

Modelica library for the simulation of photo voltaic cells, modules and plants. The library provides:

@@ -77,4 +88,4 @@ second price at library award of the 13th Modelica Confernce, Regensburg 2019.

")); -end PhotoVoltaics; +end PhotoVoltaics; \ No newline at end of file