diff --git a/MSL/Electrical/Analog/Interfaces/OnePort.mo b/MSL/Electrical/Analog/Interfaces/OnePort.mo index 664b62b..f19ef47 100644 --- a/MSL/Electrical/Analog/Interfaces/OnePort.mo +++ b/MSL/Electrical/Analog/Interfaces/OnePort.mo @@ -4,10 +4,10 @@ partial model OnePort 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"; - replaceable ADMSL.MSL.Electrical.Analog.Interfaces.PositivePin p + ADMSL.MSL.Electrical.Analog.Interfaces.PositivePin p "Positive pin (potential p.v > n.v for positive voltage drop v)" annotation (Placement( transformation(extent={{-110,-10},{-90,10}}, rotation=0))); - replaceable ADMSL.MSL.Electrical.Analog.Interfaces.NegativePin n "Negative pin" + ADMSL.MSL.Electrical.Analog.Interfaces.NegativePin n "Negative pin" annotation (Placement(transformation(extent={{ 110,-10},{90,10}}, rotation=0))); equation diff --git a/T1/Electrical/Analog/Basic/Ground.mo b/T1/Electrical/Analog/Basic/Ground.mo index 66aa09c..21b73ab 100644 --- a/T1/Electrical/Analog/Basic/Ground.mo +++ b/T1/Electrical/Analog/Basic/Ground.mo @@ -1,7 +1,7 @@ within ADMSL.T1.Electrical.Analog.Basic; model Ground "AD version of Modelica.Electrical.Analog.Basic.Ground" extends ADMSL.Utilities.GradientInfo; - extends Modelica.Electrical.Analog.Basic.Ground; + extends ADMSL.MSL.Electrical.Analog.Basic.Ground; redeclare ADMSL.T1.Electrical.Analog.Interfaces.Pin p(NG=NG); equation diff --git a/T1/Electrical/Analog/Basic/Inductor.mo b/T1/Electrical/Analog/Basic/Inductor.mo index 5f610a8..d6e1131 100644 --- a/T1/Electrical/Analog/Basic/Inductor.mo +++ b/T1/Electrical/Analog/Basic/Inductor.mo @@ -1,8 +1,16 @@ within ADMSL.T1.Electrical.Analog.Basic; model Inductor "AD version of Modelica.Electrical.Analog.Basic.Inductor" - extends ADMSL.T1.Electrical.Analog.Interfaces.OnePort(i(start=0)); + // extends ADMSL.T1.Electrical.Analog.Interfaces.OnePort(i(start=0)); + + /*extends ADMSL.MSL.Electrical.Analog.Basic.Inductor; + redeclare replaceable partial model Port = ADMSL.T1.Electrical.Analog.Interfaces.OnePort; + extends Port; */ + + extends ADMSL.MSL.Electrical.Analog.Basic.Inductor( + redeclare replaceable partial model Port = ADMSL.T1.Electrical.Analog.Interfaces.OnePort); + //extends Modelica.Electrical.Analog.Interfaces.OnePort(i(start=0)); - parameter SI.Inductance L(start=1) "Inductance"; + // parameter SI.Inductance L(start=1) "Inductance"; parameter Real g_L[NG] = zeros(NG) "The gradient of inductance"; equation @@ -11,7 +19,7 @@ equation g_v[ad_i] = g_L[ad_i] * der(i) + L * der(g_i[ad_i]) ; end for; - L*der(i) = v; + /* L*der(i) = v; annotation ( Documentation(info="

The linear inductor connects the branch voltage v with the branch current i by v = L * di/dt. The Inductance L is allowed to be positive, or zero.

@@ -50,5 +58,5 @@ equation extent={{-150,90},{150,50}}, textString="%name", lineColor={0,0,255})})); - + */ end Inductor; diff --git a/T1/Electrical/Analog/Interfaces/OnePort.mo b/T1/Electrical/Analog/Interfaces/OnePort.mo index 9444411..811e3fe 100644 --- a/T1/Electrical/Analog/Interfaces/OnePort.mo +++ b/T1/Electrical/Analog/Interfaces/OnePort.mo @@ -2,8 +2,12 @@ within ADMSL.T1.Electrical.Analog.Interfaces; partial model OnePort "AD version of Modelica.Electrical.Analog.Interfaces.OnePort" extends ADMSL.Utilities.GradientInfo; + extends ADMSL.MSL.Electrical.Analog.Interfaces.OnePort; - SI.Voltage v "Voltage drop between the two pins (= p.v - n.v)"; + redeclare ADMSL.T1.Electrical.Analog.Interfaces.NegativePin n(NG=NG); + redeclare ADMSL.T1.Electrical.Analog.Interfaces.PositivePin p(NG=NG); + + /* SI.Voltage v "Voltage drop between the two pins (= p.v - n.v)"; SI.Current i "Current flowing from pin p to pin n"; ADMSL.T1.Electrical.Analog.Interfaces.PositivePin p(NG=NG) @@ -13,7 +17,7 @@ partial model OnePort ADMSL.T1.Electrical.Analog.Interfaces.NegativePin n(NG=NG) "Negative pin" annotation (Placement(transformation(extent={{ - 110,-10},{90,10}}, rotation=0))); + 110,-10},{90,10}}, rotation=0)));*/ Real g_v[NG]; Real g_i[NG]; @@ -26,7 +30,7 @@ equation g_i[ad_i] = p.g_i[ad_i]; end for; - v = p.v - n.v; + /*v = p.v - n.v; 0 = p.i + n.i; i = p.i; annotation ( @@ -67,5 +71,5 @@ equation extent={{90,45},{110,25}}, lineColor={160,160,164}, textString="i")})); - + */ end OnePort;