diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/Base/Interfaces.mo" "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/Base/Interfaces.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/Base/Interfaces.mo" 2022-03-10 09:57:37.756144096 +0000 +++ "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/Base/Interfaces.mo" 2022-03-10 09:58:20.712149538 +0000 @@ -544,7 +544,7 @@ partial model AddHeat "Additional heat port" - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC T + Modelica.Units.NonSI.Temperature_degC T "Temperature of conductor"; SI.HeatFlowRate Q_flow "Dissipated heat of conductor"; Base.Interfaces.Thermal_n heat "heat port" @@ -577,7 +577,7 @@ partial model AddHeatV "Additional vector heat port" parameter Integer m_heat(final min=1) = 1 "number of heat conductors"; - Modelica.SIunits.Conversions.NonSIunits.Temperature_degC[m_heat] T + Modelica.Units.NonSI.Temperature_degC[m_heat] T "Temperature of heat conductors"; SI.HeatFlowRate[m_heat] Q_flow "Dissipated heat of conductors"; Base.Interfaces.ThermalV_n heat(final m=m_heat) "vector heat port" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/Base/Types.mo" "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/Base/Types.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/Base/Types.mo" 2022-03-10 09:57:37.756144096 +0000 +++ "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/Base/Types.mo" 2022-03-10 09:58:20.416149500 +0000 @@ -143,7 +143,7 @@ constant RefFrame inert= "inert" "inertial"; type ReferenceAngle "reference angle" - extends Modelica.SIunits.Angle; + extends Modelica.Units.SI.Angle; function equalityConstraint input ReferenceAngle[2] theta_p; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/Control/Modulation.mo" "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/Control/Modulation.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/Control/Modulation.mo" 2022-03-10 09:57:37.760144095 +0000 +++ "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/Control/Modulation.mo" 2022-03-10 09:58:19.984149446 +0000 @@ -1236,7 +1236,7 @@ model SVMlogic "Logical part for SVM" - parameter Modelica.SIunits.Time T_pwm "cycle time pwm"; + parameter Modelica.Units.SI.Time T_pwm "cycle time pwm"; inner Modelica.StateGraph.StateGraphRoot stateGraphRoot annotation (Placement(transformation(extent={{-240,260},{-200,280}}, rotation=0))); @@ -1254,7 +1254,7 @@ origin={-240,-70}, extent={{-10,-10},{10,10}}, rotation=270))); - Modelica.StateGraph.StepWithSignal sector2 + Modelica.StateGraph.StepWithSignal sector2(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,170},{138,190}}, rotation =0))); Modelica.StateGraph.TransitionWithSignal t1 @@ -1287,10 +1287,10 @@ Modelica.StateGraph.Alternative Alternative2 annotation (Placement(transformation(extent={{-58,124},{218,276}}, rotation =0))); - Modelica.StateGraph.Step Step1 + Modelica.StateGraph.Step Step1(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{ -94,190},{-74,210}}, rotation=0))); - Modelica.StateGraph.Step Step2 + Modelica.StateGraph.Step Step2(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{ -94,30},{-74,50}}, rotation=0))); Modelica.StateGraph.Alternative Alternative3 @@ -1305,10 +1305,10 @@ annotation (Placement(transformation(extent={{-4,228},{16,248}}, rotation=0))); Modelica.StateGraph.TransitionWithSignal t4 annotation (Placement(transformation(extent={{-2,152},{18,172}}, rotation=0))); - Modelica.StateGraph.Step Step3 + Modelica.StateGraph.Step Step3(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{ 28,152},{48,172}}, rotation=0))); - Modelica.StateGraph.Step Step4 + Modelica.StateGraph.Step Step4(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{ 26,68},{46,88}}, rotation=0))); Modelica.StateGraph.TransitionWithSignal t5 @@ -1333,17 +1333,17 @@ annotation (Placement(transformation(extent={{88,86},{108,106}}, rotation=0))); Modelica.StateGraph.TransitionWithSignal t10 annotation (Placement(transformation(extent={{88,50},{108,70}}, rotation=0))); - Modelica.StateGraph.StepWithSignal sector3 + Modelica.StateGraph.StepWithSignal sector3(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,134},{138,154}}, rotation =0))); - Modelica.StateGraph.StepWithSignal sector1 + Modelica.StateGraph.StepWithSignal sector1(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,228},{138,248}}, rotation =0))); - Modelica.StateGraph.StepWithSignal sector6 + Modelica.StateGraph.StepWithSignal sector6(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,-8},{138,12}}, rotation=0))); - Modelica.StateGraph.StepWithSignal sector5 + Modelica.StateGraph.StepWithSignal sector5(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,50},{138,70}}, rotation=0))); - Modelica.StateGraph.StepWithSignal sector4 + Modelica.StateGraph.StepWithSignal sector4(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{118,86},{138,106}}, rotation= 0))); Modelica.StateGraph.Transition t11(enableTimer=true, waitTime=T_pwm) @@ -1401,7 +1401,7 @@ Modelica.Blocks.Interfaces.BooleanOutput trigger annotation (Placement(transformation(extent={{300,100},{340,140}}, rotation =0))); - Modelica.StateGraph.InitialStep InitialStep1 + Modelica.StateGraph.InitialStep InitialStep1(nIn = 1, nOut = 1) annotation (Placement(transformation(extent={{-280,110},{-260,130}}, rotation=0))); Modelica.Blocks.Logical.Or Or1 @@ -1914,7 +1914,7 @@ model SVMpwm "Block generating the pwm pulses for SVM" - parameter Modelica.SIunits.Time T_pwm; + parameter Modelica.Units.SI.Time T_pwm; inner Modelica.StateGraph.StateGraphRoot stateGraphRoot annotation (Placement(transformation(extent={{-180,160},{-140,180}}, rotation=0))); @@ -2316,6 +2316,7 @@

PWM generation for space vector modulation, as done e.g. by TI's TMSM320P14 DSP.
A duty ratio a=1 indicates a continuously closed upper switch of the first inverter leg. At a duty ratio a=0, the turn-on time during each PWM period is equally distributed to the lower and upper switch and the resulting mean value of the phase voltage u_a0 is zero. At a duty ratio a=-1, the lower switch is continuously closed, etc.

")); + end SVMpwm; model SVMsector1p4 "Sector 1-4" @@ -2578,7 +2579,7 @@ model TriggeredPulse "Edge triggered pulse" - parameter Modelica.SIunits.Time T_pulse=1e-3 "width of triggered pulse"; + parameter Modelica.Units.SI.Time T_pulse=1e-3 "width of triggered pulse"; Modelica.Blocks.Logical.Timer Timer1(y(start=0)) annotation (Placement(transformation(extent={{-10,-40},{10,-20}}, rotation= 0))); @@ -2691,6 +2692,7 @@ lineColor={0,0,255}, textString= "%name")})); + end TriggeredPulse; model DutyRatioToCycle "Duty ratio to duty cycle transform" @@ -2745,7 +2747,9 @@ Modifications needed for adaptation to Spot are mentioned in info-layer of the corresponding models.

")); + end SpaceVector; + annotation (preferredView="info", Documentation(info="

Asynchronous and synchronous PWM control of inverter-gates, three- and one-phase.

diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/GenerationACabc.mo" "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/GenerationACabc.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/GenerationACabc.mo" 2022-03-10 09:57:37.760144095 +0000 +++ "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/GenerationACabc.mo" 2022-03-10 09:58:17.616149145 +0000 @@ -55,7 +55,7 @@ w_ini) "steam turbo-goup with generator-rotor" annotation (Placement( transformation(extent={{-10,-10},{10,10}}, rotation=0))); protected - final parameter Modelica.SIunits.Time h=(sum(turboGroup.par.J_turb) + + final parameter Modelica.Units.SI.Time h=(sum(turboGroup.par.J_turb) + turboGroup.par.J_gen + sum(turboGroup.par.J_aux))*w_nom^2/(2 *generator.par.S_nom) "inertia cst turb + gen"; @@ -107,12 +107,12 @@ transformation(extent={{-10,-10},{10,10}}, rotation=0))); protected final parameter Real[3] gr2=diagonal(GT.par.ratio)*GT.par.ratio/GT.par.ratio[end]^2; - final parameter Modelica.SIunits.Inertia J_red=(GT.par.J_turb + GT.par.J_comp) - *gr2[1] + GT.par.J_gear1*gr2[1:2] + GT.par.J_gear2*gr2[2:3] + (GT.par.J_acc - + GT.par.J_cpl + GT.par.J_gen) "gear reduced inertia"; - final parameter Modelica.SIunits.Time h=J_red*w_nom^2/(2*generator.par.S_nom); + final parameter Modelica.Units.SI.Inertia J_red=(GT.par.J_turb + GT.par.J_comp) + *gr2[1] + GT.par.J_gear1*gr2[1:2] + GT.par.J_gear2*gr2[2:3] + (GT.par.J_acc + + GT.par.J_cpl + GT.par.J_gen) "gear reduced inertia"; + final parameter Modelica.Units.SI.Time h=J_red*w_nom^2/(2*generator.par.S_nom); equation assert(abs(2*pi*generator.par.f_nom/(generator.par.pp* GT.par.rpm_nom*Base.Types.rpm2w) - 1) < 1e-3, @@ -174,7 +174,7 @@ "hydro turbine with generator-rotor" annotation (Placement(transformation(extent={{-10,-10},{10,10}}, rotation=0))); protected - final parameter Modelica.SIunits.Time h=(hydro.par.J_turb + hydro.par.J_gen) + final parameter Modelica.Units.SI.Time h=(hydro.par.J_turb + hydro.par.J_gen) *w_nom^2/(2*generator.par.S_nom); @@ -231,7 +231,7 @@ "Diesel engine with generator-rotor" annotation (Placement(transformation(extent={{-10,-10},{10,10}}, rotation=0))); protected - final parameter Modelica.SIunits.Time h=(diesel.par.J_turb + diesel.par.J_gen) + final parameter Modelica.Units.SI.Time h=(diesel.par.J_turb + diesel.par.J_gen) *w_nom^2/(2*generator.par.S_nom); @@ -305,7 +305,7 @@ choice(redeclare Spot.Control.Governors.GovernorConst governor "constant"), choice(redeclare Spot.Control.Governors.Governor1st governor "1st order")), Placement(transformation(extent={{-60,30},{-40,50}}, rotation=0))); - parameter Modelica.SIunits.Time H=10 "inertia cst turb + gen"; + parameter Modelica.Units.SI.Time H=10 "inertia cst turb + gen"; replaceable Spot.Mechanics.TurboGroups.SingleMassTG rotor( final w_ini=w_ini, final H=H, @@ -560,7 +560,7 @@ parameter Spot.Base.Types.Voltage v_ini(unit="pu")=1 "initial terminal voltage" annotation(Dialog(enable=system.steadyIni and (iniType==Base.Types.v_alpha or iniType==Base.Types.v_p or iniType==Base.Types.v_q))); - parameter Modelica.SIunits.Angle alpha_ini=system.alpha0 + parameter Modelica.Units.SI.Angle alpha_ini=system.alpha0 "initial voltage phase angle" annotation(Dialog(enable=system.steadyIni and iniType==Base.Types.v_alpha)); parameter Spot.Base.Types.Power p_ini(unit="pu")=1 @@ -603,7 +603,7 @@ choice(redeclare Spot.Control.Governors.Governor1st governor "1st order")), Placement(transformation(extent={{-60,50},{-40,70}}, rotation=0))); - parameter Modelica.SIunits.Time H=10 "inertia cst turb + gen"; + parameter Modelica.Units.SI.Time H=10 "inertia cst turb + gen"; protected final parameter SI.AngularVelocity w_nom=2*pi*generator.par.f_nom/generator.par.pp "nominal angular velocity"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/GenerationACdqo.mo" "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/GenerationACdqo.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/GenerationACdqo.mo" 2022-03-10 09:57:37.760144095 +0000 +++ "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/GenerationACdqo.mo" 2022-03-10 09:58:17.432149123 +0000 @@ -57,7 +57,7 @@ annotation (Placement( transformation(extent={{-10,-10},{10,10}}, rotation=0))); protected - final parameter Modelica.SIunits.Time h=(sum(turboGroup.par.J_turb) + + final parameter Modelica.Units.SI.Time h=(sum(turboGroup.par.J_turb) + turboGroup.par.J_gen + sum(turboGroup.par.J_aux))*w_nom^2/(2 *generator.par.S_nom) "inertia cst turb + gen"; @@ -108,12 +108,12 @@ transformation(extent={{-10,-10},{10,10}}, rotation=0))); protected final parameter Real[3] gr2=diagonal(GT.par.ratio)*GT.par.ratio/GT.par.ratio[end]^2; - final parameter Modelica.SIunits.Inertia J_red=(GT.par.J_turb + GT.par.J_comp) - *gr2[1] + GT.par.J_gear1*gr2[1:2] + GT.par.J_gear2*gr2[2:3] + (GT.par.J_acc - + GT.par.J_cpl + GT.par.J_gen) "gear reduced inertia"; - final parameter Modelica.SIunits.Time h=J_red*w_nom^2/(2*generator.par.S_nom); + final parameter Modelica.Units.SI.Inertia J_red=(GT.par.J_turb + GT.par.J_comp) + *gr2[1] + GT.par.J_gear1*gr2[1:2] + GT.par.J_gear2*gr2[2:3] + (GT.par.J_acc + + GT.par.J_cpl + GT.par.J_gen) "gear reduced inertia"; + final parameter Modelica.Units.SI.Time h=J_red*w_nom^2/(2*generator.par.S_nom); equation assert(abs(2*pi*generator.par.f_nom/(generator.par.pp* GT.par.rpm_nom*Base.Types.rpm2w) - 1) < 1e-3, @@ -176,7 +176,7 @@ "hydro turbine with generator-rotor" annotation (Placement(transformation(extent={{-10,-10},{10,10}}, rotation=0))); protected - final parameter Modelica.SIunits.Time h=(hydro.par.J_turb + hydro.par.J_gen) + final parameter Modelica.Units.SI.Time h=(hydro.par.J_turb + hydro.par.J_gen) *w_nom^2/(2*generator.par.S_nom); @@ -234,7 +234,7 @@ "Diesel engine with generator-rotor" annotation (Placement(transformation(extent={{-10,-10},{10,10}}, rotation=0))); protected - final parameter Modelica.SIunits.Time h=(diesel.par.J_turb + diesel.par.J_gen) + final parameter Modelica.Units.SI.Time h=(diesel.par.J_turb + diesel.par.J_gen) *w_nom^2/(2*generator.par.S_nom); @@ -307,7 +307,7 @@ choice(redeclare Spot.Control.Governors.GovernorConst governor "constant"), choice(redeclare Spot.Control.Governors.Governor1st governor "1st order")), Placement(transformation(extent={{-60,30},{-40,50}}, rotation=0))); - parameter Modelica.SIunits.Time H=10 "inertia cst turb + gen"; + parameter Modelica.Units.SI.Time H=10 "inertia cst turb + gen"; replaceable Spot.Mechanics.TurboGroups.SingleMassTG rotor( final w_ini=w_ini, final H=H, @@ -565,7 +565,7 @@ parameter Spot.Base.Types.Voltage v_ini(unit="pu")=1 "initial terminal voltage" annotation(Dialog(enable=system.steadyIni and (iniType==Base.Types.v_alpha or iniType==Base.Types.v_p or iniType==Base.Types.v_q))); - parameter Modelica.SIunits.Angle alpha_ini=system.alpha0 + parameter Modelica.Units.SI.Angle alpha_ini=system.alpha0 "initial voltage phase angle" annotation(Dialog(enable=system.steadyIni and iniType==Base.Types.v_alpha)); parameter Spot.Base.Types.Power p_ini(unit="pu")=1 @@ -608,7 +608,7 @@ choice(redeclare Spot.Control.Governors.Governor1st governor "1st order")), Placement(transformation(extent={{-60,50},{-40,70}}, rotation=0))); - parameter Modelica.SIunits.Time H=10 "inertia cst turb + gen"; + parameter Modelica.Units.SI.Time H=10 "inertia cst turb + gen"; protected final parameter SI.AngularVelocity w_nom=2*pi*generator.par.f_nom/generator.par.pp "nominal angular velocity"; diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/Semiconductors/Ideal.mo" "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/Semiconductors/Ideal.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/Semiconductors/Ideal.mo" 2022-03-10 09:57:37.760144095 +0000 +++ "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/Semiconductors/Ideal.mo" 2022-03-10 09:58:16.704149031 +0000 @@ -13,7 +13,7 @@ annotation(Evaluate=true); parameter Real[:] cT_loss=fill(0,0) "{cT1,cT2,...} T-coef thermal losses" annotation(Evaluate=true); - parameter SI.Temp_K T0_loss=300 "reference T for cT_loss expansion" + parameter SI.Temperature T0_loss=300 "reference T for cT_loss expansion" annotation(Dialog(enable=size(cT_loss,1)>0), Evaluate=true); annotation ( Documentation( @@ -32,6 +32,7 @@ where q denotes the dissipated heat per switching operation at nominal voltage and current, averaged over 'on' and 'off'.
A generalisation to powers of i and v is straightforward.

")); + end SCparameter; partial model IdealCharacteristic "Ideal diode characteristic" diff -ur "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/openmodelica.metadata.json" "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/openmodelica.metadata.json" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/openmodelica.metadata.json" 2022-03-10 09:57:37.760144095 +0000 +++ "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/openmodelica.metadata.json" 2022-03-10 09:58:23.860149936 +0000 @@ -1 +1 @@ -{"path":"Spot", "sha":"b5c084ca0cbb13ba137ac2c449240410cecfaaf1", "support":"noSupport", "uses":{"Modelica":"3.2.1"}, "version":"0.706.1-master", "zipfile":"https://github.com/modelica-3rdparty/Spot/archive/b5c084ca0cbb13ba137ac2c449240410cecfaaf1.zip"} +{"path": "Spot", "sha": "b5c084ca0cbb13ba137ac2c449240410cecfaaf1", "support": "noSupport", "uses": {"Modelica": "4.0.0"}, "version": "0.706.1-master", "zipfile": "https://github.com/modelica-3rdparty/Spot/archive/b5c084ca0cbb13ba137ac2c449240410cecfaaf1.zip", "extraInfo": "Conversion script /home/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 "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/package.mo" "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/package.mo" --- "/home/hudson/saved_omc/libraries/.openmodelica/libraries/Spot 0.706.1-master/package.mo" 2022-03-10 09:57:37.760144095 +0000 +++ "converted-libraries/.openmodelica/libraries/Spot 0.706.1-master/package.mo" 2022-03-10 09:58:16.624149020 +0000 @@ -1,7 +1,7 @@ within ; package Spot "Power-systems SPOT" extends Spot.Base.Icons.Library; - import SI = Modelica.SIunits; + import Modelica.Units.SI; import SIpu = Spot.Base.Types; import Modelica.Constants.pi; import Spot.Base.Types.d2r; @@ -892,7 +892,34 @@ ")); end System; -annotation (preferredView="info", + + + + + + + + + + + + + + + + + + + + + + + + + + + + annotation (preferredView="info", version="0.706.1", versionDate="2014-04-09", Settings(NewStateSelection=true), @@ -905,5 +932,5 @@

The Modelica package is free software; it can be redistributed and/or modified under the terms of the Modelica license, see the license conditions and the accompanying disclaimer here.

"), - uses(Modelica(version="3.2.1"))); + uses(Modelica(version= "4.0.0"))); end Spot;