Skip to content

Commit bf66b23

Browse files
authored
Merge pull request #4041 from HansOlsson/RemoveUnitErrorChanging
Remove unit error changing
2 parents 182301b + ccb3636 commit bf66b23

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/DcdcInverter.mo

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ model DcdcInverter "DC-DC inverter"
113113
k=1,
114114
T=Tmf,
115115
initType=Modelica.Blocks.Types.Init.InitialOutput,
116-
y_start=VMax)
116+
y_start=0)
117117
annotation (Placement(transformation(extent={{60,50},{80,70}})));
118118
equation
119119
connect(iMotSensor.p, pin_nMot) annotation (Line(points={{-50,-80},{

Modelica/Electrical/Machines/Examples/ControlledDCDrives/Utilities/IdealDcDc.mo

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ model IdealDcDc "Ideal DC-DC inverter"
2828
Modelica.Blocks.Continuous.Integrator powerController(
2929
initType=Modelica.Blocks.Types.Init.InitialOutput,
3030
y_start=0,
31-
k=1/Ti) annotation (Placement(transformation(extent={{30,10},{10,30}})));
31+
k=1/Ti/unitVoltage) annotation (Placement(transformation(extent={{30,10},{10,30}})));
3232
Modelica.Electrical.Analog.Basic.Ground groundMotor annotation (Placement(
3333
transformation(
3434
extent={{-10,10},{10,-10}},
@@ -45,6 +45,8 @@ model IdealDcDc "Ideal DC-DC inverter"
4545
annotation (Placement(transformation(extent={{90,-112},{110,-92}})));
4646
Modelica.Blocks.Interfaces.RealInput vRef
4747
annotation (Placement(transformation(extent={{-140,-20},{-100,20}})));
48+
protected
49+
constant SI.Voltage unitVoltage=1 annotation(HideResult=true);
4850
equation
4951
connect(signalCurrent.p, powerBat.nc)
5052
annotation (Line(points={{10,70},{20,70}}, color={0,0,255}));

Modelica/Electrical/Machines/Examples/SynchronousMachines/SMEE_LoadDump.mo

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,7 @@ model SMEE_LoadDump
9999
extent={{-10,-10},{10,10}},
100100
rotation=270,
101101
origin={30,-50})));
102-
Modelica.Blocks.Math.Gain setPointGain(k=(smeeData.VsNominal/wNominal)/
103-
unitMagneticFlux)
102+
Modelica.Blocks.Math.Gain setPointGain(k=(smeeData.VsNominal/wNominal))
104103
annotation (Placement(transformation(extent={{-50,-90},{-70,-70}})));
105104
Machines.Sensors.VoltageQuasiRMSSensor voltageQuasiRMSSensor(ToSpacePhasor1(y(
106105
each start=1E-3, each fixed=true))) annotation (Placement(

Modelica/Magnetic/FundamentalWave/Examples/BasicMachines/SynchronousMachines/SMEE_LoadDump.mo

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,7 @@ model SMEE_LoadDump
104104
extent={{-10,-10},{10,10}},
105105
rotation=270,
106106
origin={30,-50})));
107-
Modelica.Blocks.Math.Gain setPointGain(k=(smeeData.VsNominal/wNominal)/
108-
unitMagneticFlux)
107+
Modelica.Blocks.Math.Gain setPointGain(k=(smeeData.VsNominal/wNominal))
109108
annotation (Placement(transformation(extent={{-50,-90},{-70,-70}})));
110109
Modelica.Electrical.Machines.Sensors.VoltageQuasiRMSSensor voltageQuasiRMSSensor(
111110
ToSpacePhasor1(y(each start=1E-3, each fixed=true))) annotation (

0 commit comments

Comments
 (0)