add tests for fixes to ticket:4258

- update also the existing tests

flattening/modelica/redeclare/ComparePSD.mo

@@ -754,6 +754,17 @@ end ComparePSD;
 //   end for;
 // end Noise.PRNG$Linear.Seed;
 //
+// function Noise.PRNG$WhiteNoise.PSD.PDF
+//   input Real instance(quantity = "Time", unit = "s");
+//   input Integer[:] states_in;
+//   output Real rand;
+//   input Real[2] interval = {-1.0, 1.0};
+//   output Integer[size(states_in, 1)] states_out;
+// algorithm
+//   (rand, states_out) := Noise.PRNG$WhiteNoise.RNG(instance, states_in, 1);
+//   rand := rand * (interval[2] - interval[1]) + interval[1];
+// end Noise.PRNG$WhiteNoise.PSD.PDF;
+//
 // function Noise.PRNG$WhiteNoise.RNG
 //   input Real instance(quantity = "Time", unit = "s");
 //   input Integer[:] states_in;
@@ -836,17 +847,6 @@ end ComparePSD;
 //   end for;
 // end Noise.PRNG$WhiteNoise.Seed;
 //
-// function Noise.PSD.PDF
-//   input Real instance(quantity = "Time", unit = "s");
-//   input Integer[:] states_in;
-//   output Real rand;
-//   input Real[2] interval = {-1.0, 1.0};
-//   output Integer[size(states_in, 1)] states_out;
-// algorithm
-//   (rand, states_out) := Noise.PRNG$WhiteNoise.RNG(instance, states_in, 1);
-//   rand := rand * (interval[2] - interval[1]) + interval[1];
-// end Noise.PSD.PDF;
-//
 // function Noise.RNG.SampleBased.RNG_MRG
 //   input Real instance(quantity = "Time", unit = "s");
 //   input Integer[:] states_in;

simulation/modelica/inheritances/Makefile

@@ -3,8 +3,8 @@ TEST = ../../../rtest -v
 TESTFILES = \
 MoonLanding.mos \
 OneArgBaseFunction.mos \
-
-
+Ticket4258a.mos \
+Ticket4258b.mos \
 
 
 # test that currently fail. Move up when fixed. 

simulation/modelica/inheritances/Ticket4258a.mo

@@ -0,0 +1,27 @@
+model simple_BasicHX_water_gas
+  import SI = Modelica.SIunits;
+  parameter SI.AbsolutePressure p_start = 101325 "Initial value of pressure";
+  parameter SI.Temperature T_start = 293.15 "Initial value of temperature";
+  parameter Modelica.Fluid.Types.ModelStructure pipeModelStructure = Modelica.Fluid.Types.ModelStructure.a_v_b;
+  package Medium1 = Modelica.Media.IdealGases.SingleGases.N2;
+  package Medium2 = Modelica.Media.Water.ConstantPropertyLiquidWater "Medium model";
+  inner Modelica.Fluid.System system(T_ambient = T_start, p_ambient = p_start, m_flow_small = 1e-6, momentumDynamics = Modelica.Fluid.Types.Dynamics.DynamicFreeInitial, energyDynamics = Modelica.Fluid.Types.Dynamics.DynamicFreeInitial, massDynamics = Modelica.Fluid.Types.Dynamics.DynamicFreeInitial) annotation(Placement(transformation(extent = {{-90, 70}, {-70, 90}})));
+  Modelica.Fluid.Sources.MassFlowSource_T Ambient_in(redeclare package Medium = Medium1, T = 273.15 + 80, nPorts = 1, use_m_flow_in = true) annotation(Placement(visible = true, transformation(origin = {-24, -52}, extent = {{-10, -10}, {10, 10}}, rotation = 90)));
+  Modelica.Fluid.Sources.Boundary_pT Ambient_out(redeclare package Medium = Medium1, T = 273.15 + 80, nPorts = 1, p = p_start) annotation(Placement(visible = true, transformation(origin = {-24, 12}, extent = {{10, -10}, {-10, 10}}, rotation = 90)));
+  Modelica.Fluid.Sources.Boundary_pT Ambient2_out(redeclare package Medium = Medium2, T = T_start, nPorts = 1, p = p_start) annotation(Placement(visible = true, transformation(origin = {-72, -36}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  Modelica.Fluid.Sources.MassFlowSource_T Ambient2_in(redeclare package Medium = Medium2, T = T_start, nPorts = 1, use_m_flow_in = true) annotation(Placement(visible = true, transformation(origin = {16, -4}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
+  Modelica.Blocks.Sources.RealExpression ramp_m_dot1(y = 0 + 1 / 2 * (Modelica.Math.tanh(2 * 1 * (time - 60)) + 1) * 1) annotation(Placement(visible = true, transformation(origin = {-44, -76}, extent = {{-6, -6}, {6, 6}}, rotation = 0)));
+  Modelica.Blocks.Sources.RealExpression ramp_m_dot2(y = 0 + 1 / 2 * (Modelica.Math.tanh(2 * 1 * (time - 60)) + 1) * 1) annotation(Placement(visible = true, transformation(origin = {44, 0}, extent = {{-6, -6}, {6, 6}}, rotation = 0)));
+  Modelica.Fluid.Examples.HeatExchanger.BaseClasses.BasicHX WT_Nachreformer(redeclare package Medium_1 = Medium1, redeclare package Medium_2 = Medium2, redeclare model HeatTransfer_1 = Modelica.Fluid.Pipes.BaseClasses.HeatTransfer.LocalPipeFlowHeatTransfer, redeclare model HeatTransfer_2 = Modelica.Fluid.Pipes.BaseClasses.HeatTransfer.LocalPipeFlowHeatTransfer, redeclare model FlowModel_1 = Modelica.Fluid.Pipes.BaseClasses.FlowModels.DetailedPipeFlow, redeclare model FlowModel_2 = Modelica.Fluid.Pipes.BaseClasses.FlowModels.DetailedPipeFlow, T_start_1 = T_start, T_start_2 = T_start, Twall_start = T_start, area_h_1 = 1, area_h_2 = 1, c_wall = 477, crossArea_1 = 0.1, crossArea_2 = 0.01, dT = 0, k_wall = 15, length = 1, m_flow_start_1 = 0, m_flow_start_2 = 0, modelStructure_1 = pipeModelStructure, modelStructure_2 = pipeModelStructure, nNodes = 5, p_a_start1 = p_start, p_a_start2 = p_start, p_b_start1 = p_start, p_b_start2 = p_start, perimeter_1 = 0.3, perimeter_2 = 0.3, rho_wall(displayUnit = "kg/m3") = 8000, s_wall = 0.003) annotation(Placement(visible = true, transformation(origin = {-24, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 90)));
+
+equation
+      connect(WT_Nachreformer.port_b2, Ambient2_out.ports[1]) annotation(Line(points = {{-28, -30}, {-28, -30}, {-28, -36}, {-62, -36}, {-62, -36}}, color = {0, 127, 255}));
+      connect(Ambient2_in.ports[1], WT_Nachreformer.port_a2) annotation(Line(points = {{6, -4}, {-20, -4}, {-20, -8}, {-20, -8}}, color = {0, 127, 255}));
+  connect(ramp_m_dot2.y, Ambient2_in.m_flow_in) annotation(Line(points = {{50.6, 0}, {39.3, 0}, {39.3, 4}, {26, 4}}, color = {0, 0, 127}));
+  connect(ramp_m_dot1.y, Ambient_in.m_flow_in) annotation(Line(points = {{-38, -76}, {-32, -76}, {-32, -62}, {-32, -62}}, color = {0, 0, 127}));
+  connect(WT_Nachreformer.port_b1, Ambient_out.ports[1]) annotation(Line(points = {{-24, -12}, {-24, -12}, {-24, 2}, {-24, 2}}, color = {0, 127, 255}));
+  connect(Ambient_in.ports[1], WT_Nachreformer.port_a1) annotation(Line(points = {{-24, -42}, {-24, -42}, {-24, -28}, {-24, -28}}, color = {0, 127, 255}));
+  annotation(Documentation(info = "<html>
+
+</html>"), experiment(StopTime = 200, StartTime = 0, Tolerance = 1e-5, Interval = 0.2), __OpenModelica_simulationFlags(jacobian = "coloredNumerical", s = "dassl", lv = "LOG_STATS"));
+end simple_BasicHX_water_gas;

simulation/modelica/inheritances/Ticket4258a.mos

@@ -0,0 +1,27 @@
+// name:     Ticket4258a.mos [BUG: #4258]
+// keywords: proper unique scopes for redeclares
+// cflags: -d=nogen
+// status:   correct
+// treardown_command: rm -rf simple_BasicHX_water_gas*
+//
+// Checks the redeclares create unique scopes
+//
+//
+
+loadModel(Modelica); getErrorString();
+loadFile("Ticket4258a.mo"); getErrorString();
+simulate(simple_BasicHX_water_gas); getErrorString();
+
+// Result:
+// true
+// ""
+// true
+// ""
+// record SimulationResult
+//     resultFile = "simple_BasicHX_water_gas_res.mat",
+//     simulationOptions = "startTime = 0.0, stopTime = 200.0, numberOfIntervals = 1000, tolerance = 1e-005, method = 'dassl', fileNamePrefix = 'simple_BasicHX_water_gas', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
+//     messages = ""
+// end SimulationResult;
+// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
+// "
+// endResult

simulation/modelica/inheritances/Ticket4258b.mo

@@ -0,0 +1,40 @@
+model Eco
+replaceable package MediumFG=Modelica.Media.IdealGases.MixtureGases.FlueGasSixComponents constrainedby
+    Modelica.Media.Interfaces.PartialMedium;
+replaceable package MediumST=Modelica.Media.Water.StandardWater constrainedby
+    Modelica.Media.Interfaces.PartialMedium;
+  Modelica.Fluid.Pipes.DynamicPipe FGchannel(redeclare package Medium = MediumFG, diameter = 1, length = 1, use_HeatTransfer = false)  annotation(
+    Placement(visible = true, transformation(origin = {-30, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+Modelica.Fluid.Pipes.DynamicPipe STbundle(redeclare package Medium =MediumST , diameter = 0.1, length = 10, nParallel = 10, use_HeatTransfer = false)  annotation(
+    Placement(visible = true, transformation(origin = {30, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+Modelica.Fluid.Sources.MassFlowSource_T GT(redeclare package Medium = MediumFG, T = 873, nPorts = 1, use_m_flow_in = true)  annotation(
+    Placement(visible = true, transformation(origin = {-70, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+Modelica.Fluid.Sources.Boundary_ph Stack(redeclare package Medium = MediumFG, nPorts = 1)  annotation(
+    Placement(visible = true, transformation(origin = {-70, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+Modelica.Blocks.Sources.Ramp GTexhFlow(duration = 10, height = 130, offset = 1, startTime = 1)  annotation(
+    Placement(visible = true, transformation(origin = {-110, 10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+Modelica.Fluid.Sources.MassFlowSource_h FWpump(redeclare package Medium =MediumST, h = 2.6e6, nPorts = 1, use_m_flow_in = true)  annotation(
+    Placement(visible = true, transformation(origin = {70, -30}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
+Modelica.Fluid.Sources.Boundary_ph STsink(redeclare package Medium =MediumST, h = 2.6e6, nPorts = 1, p = 90e5)  annotation(
+    Placement(visible = true, transformation(origin = {70, 10}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
+Modelica.Blocks.Sources.Ramp FWflow(duration = 10, height = 20, startTime = 1)  annotation(
+    Placement(visible = true, transformation(origin = {110, -30}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
+inner Modelica.Fluid.System system annotation(
+    Placement(visible = true, transformation(origin = {-110, 90}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  equation
+  connect(FWpump.m_flow_in, FWflow.y) annotation(
+    Line(points = {{80, -22}, {91, -22}, {91, -30}, {99, -30}}, color = {0, 0, 127}));
+  connect(STbundle.port_b, STsink.ports[1]) annotation(
+    Line(points = {{40, 10}, {60, 10}, {60, 10}, {60, 10}}, color = {0, 127, 255}));
+  connect(FWpump.ports[1], STbundle.port_a) annotation(
+    Line(points = {{60, -30}, {8, -30}, {8, 10}, {20, 10}, {20, 10}}, color = {0, 127, 255}));
+  connect(GTexhFlow.y, GT.m_flow_in) annotation(
+    Line(points = {{-98, 10}, {-92, 10}, {-92, 18}, {-80, 18}, {-80, 18}}, color = {0, 0, 127}));
+  connect(FGchannel.port_b, Stack.ports[1]) annotation(
+    Line(points = {{-20, 10}, {-14, 10}, {-14, -30}, {-60, -30}}, color = {0, 127, 255}));
+  connect(GT.ports[1], FGchannel.port_a) annotation(
+    Line(points = {{-60, 10}, {-40, 10}}, color = {0, 127, 255}));
+  annotation(
+    Diagram(coordinateSystem(extent = {{-120, -100}, {120, 100}})));
+end Eco;
+

simulation/modelica/inheritances/Ticket4258b.mos

@@ -0,0 +1,24 @@
+// name:     Ticket4258a.mos [BUG: #4258]
+// keywords: proper unique scopes for redeclares
+// cflags: -d=nogen
+// status:   correct
+// treardown_command: rm -rf Eco*
+//
+// Checks the redeclares create unique scopes
+//
+//
+
+loadModel(Modelica); getErrorString();
+loadFile("Ticket4258b.mo"); getErrorString();
+buildModel(Eco); getErrorString();
+
+// Result:
+// true
+// ""
+// true
+// ""
+// {"Eco","Eco_init.xml"}
+// "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
+// Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
+// "
+// endResult