diff --git a/MSL/Thermal/HeatTransfer/Interfaces/HeatPort.mo b/MSL/Thermal/HeatTransfer/Interfaces/HeatPort.mo new file mode 100644 index 0000000..f5980c5 --- /dev/null +++ b/MSL/Thermal/HeatTransfer/Interfaces/HeatPort.mo @@ -0,0 +1,6 @@ +within ADMSL.MSL.Thermal.HeatTransfer.Interfaces; +partial connector HeatPort + "AD version of Modelica.Thermal.HeatTransfer.Interfaces.HeatPort" + extends Modelica.Thermal.HeatTransfer.Interfaces.HeatPort; + +end HeatPort; diff --git a/MSL/Thermal/HeatTransfer/Interfaces/HeatPort_a.mo b/MSL/Thermal/HeatTransfer/Interfaces/HeatPort_a.mo new file mode 100644 index 0000000..4af0883 --- /dev/null +++ b/MSL/Thermal/HeatTransfer/Interfaces/HeatPort_a.mo @@ -0,0 +1,18 @@ +within ADMSL.MSL.Thermal.HeatTransfer.Interfaces; +connector HeatPort_a + "AD version of Modelica.Thermal.HeatTransfer.Interfaces.HeatPort_a" + extends HeatPort; + annotation (Icon(graphics={ Rectangle( + extent={{-118,58},{4,-50}}, + lineColor={191,0,0}, + fillColor={191,0,0}, + fillPattern=FillPattern.Solid)}), Diagram(graphics={ + Rectangle( + extent={{-50,34},{50,-66}}, + lineColor={191,0,0}, + fillColor={191,0,0}, + fillPattern=FillPattern.Solid), Text( + extent={{-120,104},{100,44}}, + lineColor={191,0,0}, + textString="%name")})); +end HeatPort_a; diff --git a/MSL/Thermal/HeatTransfer/Interfaces/package.mo b/MSL/Thermal/HeatTransfer/Interfaces/package.mo new file mode 100644 index 0000000..6982f91 --- /dev/null +++ b/MSL/Thermal/HeatTransfer/Interfaces/package.mo @@ -0,0 +1,5 @@ +within ADMSL.MSL.Thermal.HeatTransfer; +package Interfaces "The AD version of Modelica.Electrical.HeatTransfer.Interfaces" +extends Modelica.Icons.InterfacesPackage; + +end Interfaces; diff --git a/MSL/Thermal/HeatTransfer/Interfaces/package.order b/MSL/Thermal/HeatTransfer/Interfaces/package.order new file mode 100644 index 0000000..4e26e72 --- /dev/null +++ b/MSL/Thermal/HeatTransfer/Interfaces/package.order @@ -0,0 +1,2 @@ +HeatPort +HeatPort_a diff --git a/MSL/Thermal/HeatTransfer/package.mo b/MSL/Thermal/HeatTransfer/package.mo new file mode 100644 index 0000000..ee39764 --- /dev/null +++ b/MSL/Thermal/HeatTransfer/package.mo @@ -0,0 +1,3 @@ +within ADMSL.MSL.Thermal; +package HeatTransfer "The AD version of Modelica.Thermal.HeatTransfer" +end HeatTransfer; diff --git a/MSL/Thermal/HeatTransfer/package.order b/MSL/Thermal/HeatTransfer/package.order new file mode 100644 index 0000000..8f81df7 --- /dev/null +++ b/MSL/Thermal/HeatTransfer/package.order @@ -0,0 +1 @@ +Interfaces diff --git a/MSL/Thermal/package.mo b/MSL/Thermal/package.mo new file mode 100644 index 0000000..551d5f1 --- /dev/null +++ b/MSL/Thermal/package.mo @@ -0,0 +1,3 @@ +within ADMSL.MSL; +package Thermal "The considered components from Modelica.Thermal" +end Thermal; diff --git a/MSL/Thermal/package.order b/MSL/Thermal/package.order new file mode 100644 index 0000000..2dc6ac8 --- /dev/null +++ b/MSL/Thermal/package.order @@ -0,0 +1 @@ +HeatTransfer diff --git a/T1/Electrical/Analog/Basic/intermediate/Conductor.mo b/T1/Electrical/Analog/Basic/intermediate/Conductor.mo deleted file mode 100644 index 238ef6c..0000000 --- a/T1/Electrical/Analog/Basic/intermediate/Conductor.mo +++ /dev/null @@ -1,54 +0,0 @@ -within ADMSL.T1.Electrical.Analog.Basic.intermediate; -class Conductor "AD version of Modelica.Electrical.Analog.Basic.Conductor" - extends MSL.Electrical.Analog.Basic.Conductor( - redeclare replaceable class OnePort = - Interfaces.OnePort, - redeclare replaceable class ConditionalHeatPort = - Interfaces.ConditionalHeatPort0); - extends ADMSL.Utilities.GradientInfo; - - parameter Real g_G[NG] = zeros(NG) - "gradient of Conductance at temperature T_ref"; - parameter Real g_T_ref[NG] = zeros(NG) "gradient Reference temperature"; - parameter Real g_alpha[NG] = zeros(NG) - "gradient of Temperature coefficient of conductance "; - - Real g_G_actual[NG]; - -protected - Real T_1111; - Real g_T_1111[NG]; - - Real T_111; - Real g_T_111[NG]; - - Real D_11; - Real g_D_11[NG]; - - Real T_1; - Real g_T_1[NG]; - -equation - // G_actual = G/(1 + alpha*(T_heatPort - T_ref)); - T_1111 = T_heatPort - T_ref; - g_T_1111[1:NG] = g_T_heatPort[1:NG] - g_T_ref[1:NG]; - - T_111 = alpha * T_1111; - g_T_111[1:NG] = g_alpha[1:NG] * T_111 + alpha * g_T_111[1:NG]; - - 1/D_11 = 1 + T_111; - g_D_11[1:NG] = - g_T_111[1:NG] * D_11 * D_11; - - T_1 = G * D_11; - g_T_1[1:NG] = g_G[1:NG] * D_11 + G * g_D_11[1:NG]; - - // G_actual = T_1 - g_G_actual[1:NG] = g_T_1[1:NG]; - - // i = G_actual*v; - g_i[1:NG] = g_G_actual[1:NG] * v + G_actual * g_v[1:NG]; - - //LossPower = v*i; - g_LossPower[1:NG] = g_v[1:NG] * i + v * g_i[1:NG]; - -end Conductor; diff --git a/T1/Electrical/Analog/Basic/intermediate/Resistor.mo b/T1/Electrical/Analog/Basic/intermediate/Resistor.mo deleted file mode 100644 index 608efe8..0000000 --- a/T1/Electrical/Analog/Basic/intermediate/Resistor.mo +++ /dev/null @@ -1,51 +0,0 @@ -within ADMSL.T1.Electrical.Analog.Basic.intermediate; -class Resistor "AD version of Modelica.Electrical.Analog.Basic.Resistor" - extends MSL.Electrical.Analog.Basic.Resistor( - redeclare replaceable class OnePort = - Interfaces.OnePort, - redeclare replaceable class ConditionalHeatPort = - Interfaces.ConditionalHeatPort0); - extends ADMSL.Utilities.GradientInfo; - - parameter Real g_R[NG] = zeros(NG) "The gradient of resistance"; - parameter Real g_T_ref[NG] = zeros(NG) - "The gradient of reference temperature"; - parameter Real g_alpha[NG] = zeros(NG) - "The gradient of temperature coefficients"; - - Real g_R_actual[NG]; - -protected - Real T_1111; - Real g_T_1111[NG]; - - Real T_111; - Real g_T_111[NG]; - - Real T_11; - Real g_T_11[NG]; - - Real T_1; - Real g_T_1[NG]; - -equation - T_1111 = T_heatPort - T_ref; - g_T_1111[1:NG] = g_T_heatPort[1:NG] - g_T_ref[1:NG]; - - T_111 = alpha * T_1111; - g_T_111[1:NG] = g_alpha[1:NG] * T_1111 + alpha * g_T_1111[1:NG]; - - T_11 = 1 + T_111; - g_T_11[1:NG] = g_T_111[1:NG]; - - T_1 = R * T_11; - g_T_1[1:NG] = g_R[1:NG] * T_11 + R * g_T_11[1:NG]; - - //R_actual = T_1; - g_R_actual[1:NG] = g_T_1[1:NG]; - - g_v[1:NG] = g_R_actual[1:NG] * i + R_actual * g_i[1:NG]; - - g_LossPower[1:NG] = g_v[1:NG] * i + v * g_i[1:NG]; - -end Resistor; diff --git a/T1/Electrical/Analog/Basic/intermediate/ResistorWithHeatPort.mo b/T1/Electrical/Analog/Basic/intermediate/ResistorWithHeatPort.mo deleted file mode 100644 index 98fdb62..0000000 --- a/T1/Electrical/Analog/Basic/intermediate/ResistorWithHeatPort.mo +++ /dev/null @@ -1,7 +0,0 @@ -within ADMSL.T1.Electrical.Analog.Basic.intermediate; -class ResistorWithHeatPort - "AD version of Modelica.Electrical.Analog.Basic.ResistorWithHeatPort" - extends Resistor( - redeclare replaceable class ConditionalHeatPort = - Interfaces.ConditionalHeatPort1); -end ResistorWithHeatPort; diff --git a/T1/Electrical/Analog/Basic/intermediate/package.order b/T1/Electrical/Analog/Basic/intermediate/package.order deleted file mode 100644 index 1f7b122..0000000 --- a/T1/Electrical/Analog/Basic/intermediate/package.order +++ /dev/null @@ -1,3 +0,0 @@ -Resistor -ResistorWithHeatPort -Conductor