Merge pull request #18 from Deltares/fix-partial-homotopic-bottom-level

Fix the declaration of the water levels in partial homotopic

Author: k-horvath-deltares

src/rtctools_channel_flow/modelica/Deltares/ChannelFlow/Hydraulic/Branches/Internal/PartialHomotopic.mo

@@ -20,9 +20,8 @@ partial model PartialHomotopic
   input SI.Stress wind_stress_v(nominal = 1e-1) = 0.0; // Wind stress in y (v, northing) direction (= 0.5*pi radians, 90 degrees)
   // Flow
   SI.VolumeFlowRate[n_level_nodes + 1] Q(each nominal = abs(Q_nominal));
-  //Assumption: the minimum water level in the channel is at least the maximum bottom level at any part of the channel,
-  // thus for steep channels this assumption might be a bit restrictive, but operatinally still reasonable.
-  SI.Position[n_level_nodes] H(each min=max(H_b[1],H_b[n_level_nodes]));
+  // Water level
+  SI.Position[n_level_nodes] H(min = cat(1, max(H_b[1], H_b[2]), max(H_b[1:n_level_nodes - 2], max(H_b[2:n_level_nodes - 1], H_b[3:n_level_nodes])), max(H_b[n_level_nodes - 1], H_b[n_level_nodes])));
   // Array of Bottom Levels
   parameter SI.Position[n_level_nodes] H_b;
   // Length
@@ -57,14 +56,14 @@ partial model PartialHomotopic
   // Zero by default, which means that a fully implicit discretization is used.
   input SI.Duration semi_implicit_step_size = 0.0;
   // Substance flow rates
-  SI.VolumeFlowRate M[n_level_nodes + 1, medium.n_substances](each nominal = 10);
+  SI.VolumeFlowRate M[n_level_nodes + 1, HQUp.medium.n_substances](each nominal = 10);
   // Substance concentrations
-  SI.Density C[n_level_nodes, medium.n_substances](each min = 0, each nominal = 1);
+  SI.Density C[n_level_nodes, HQUp.medium.n_substances](each min = 0, each nominal = 1);
   // Nominal substance concentrations used in linearization
-  parameter Real C_nominal[medium.n_substances] = fill(1e-3, medium.n_substances);
+  parameter Real C_nominal[HQUp.medium.n_substances] = fill(1e-3, HQUp.medium.n_substances);
 protected
   SI.Stress _wind_stress;
-  Real[n_level_nodes] _dQ_sq_div_Adx(each unit = "m3/s2");
+  Real[n_level_nodes] _dQ_sq_div_Adx(each unit = "m^3/s^2");
   parameter SI.Angle rotation_rad = Deltares.Constants.D2R * rotation_deg; // Conversion to rotation in radians
   parameter SI.Distance dx = length / (n_level_nodes - 1);
   SI.Area[n_level_nodes] _friction;

src/rtctools_channel_flow/modelica/Deltares/ChannelFlow/Hydraulic/Branches/Internal/package.order

@@ -1,3 +1,3 @@
 BottomFrictionCoefficient
 PartialHomotopic
-PartialIDZ
+PartialIDZ