Merge branch 'devel' into 'master'

release: version 4.18.0

See merge request !252

docs/en/calculators/pab/passe_rangees_periodiques.md

+# Nature-like fish passage with riprap in periodic rows
+
+It is stated on p.16 of the design guide for nature-like fishways
+(Larinier et al., 2006)[^passe_rangees_periodiques1] that rock-rigged fishways
+in periodic rows are similar to fish ladders, and their design criteria are identical to those of.
+
+It is therefore possible to use the various tools in the "[fish ladder](pab.md)" module
+module to design this type of device.
+In particular, the "[cloisons](cloisons.md)" tool can be used to enter the various
+dimensional characteristics of weirs (widths, overflow dimensions) and pseudo-basins
+pseudo-basins (length, width, mid-radius), which can be used to indirectly
+indirectly retrieve the sill height (\(p\)) and useful block height (\(k\)) parameters
+in the generated geometry table.
+Porosity (ratio between the free passage between the blocks and the total width
+width of the pseudo-wall) is not entered directly, but this parameter can be
+be deduced and examined elsewhere if necessary.
+
+According to this principle, each overhanging portion of the partition must be entered
+as an indentation or slot, as well as the dimension of the top of the blocks if the latter
+are flooded within the operating range of the device.
+In the case of notches, particular attention should be paid to the type of
+(thick or thin) in order to accurately reflect the conditions of flooding by the
+downstream of the weir.
+
+It is also possible to use the "[pre-dams](prebarrage.md)" tool (the equations
+implemented are the same as in the "[cloisons](cloisons.md)" tool),
+if the device is affected by complex feed modes,
+with, for example, overflows from the weir to different basins in the system
+(a less frequent case for a riprap pass in periodic rows).
+
+An example of a pass can be accessed directly via [this link](https://cassiopee.g-eau.fr/#/loadsession/app%2Fexamples%2Fpasse_rangees_periodiques.json).
+
+
+[^passe_rangees_periodiques1]: Larinier, Michel, Dominique Courret, et Peggy Gomes. 2006. « Guide technique pour la conception des passes à poissons “naturelles” ». Rapport GHAPPE RA. Compagnie Nationale du Rhône / Agence de l’Eau Adour Garonne. http://dx.doi.org/10.13140/RG.2.1.1834.8562.

docs/en/calculators/pam/macrorugo_remous.md

+# Backwater curve for a rock-ramp fishpass
+
+This module can be used to simulate the backwater curve of a
+[simple macro-roughness fishway](macrorugo.md) in order to determine the
+downstream flooding level of the fishway.
+
+## Operating principle
+
+The parameters of this module are :
+
+- The choice of the ["simple" rock-ramp fishpass](macrorugo.md) module among
+those present in the work session which will be used to perform the
+calculation 
+- The water level downstream of the pass 
+- The space step used to discretise the curve calculation.
+
+N.B. : As the backwater curve can only be calculated for one set of
+parameters, the [simple rock-ramp fishpass](macrorugo.md) module
+cannot contain [varied parameters](../../general/principe_fonctionnement.md).
+
+The theoretical calculation carried out in the macro-roughness channel
+corresponds to the calculation of the water line in a uniform regime where the
+slope of the water is equal to the slope of the bottom of the channel.
+The rock-ramp fishpass module is used here to calculate the slope of the water
+in the non-uniform case.
+The fluvial backwater curve is then calculated from the water level
+downstream using the [trapezoid integration method](../../methodes_numeriques/integration_trapezes.md).
+
+This module is based on [the module for calculating the backwater curve of a
+section](../hsl/courbe_remous.md) to calculate and display the results.

docs/en/calculators/pam/macrorugo_theorie.md

@@ -146,7 +146,7 @@ For the cylindrical form of the blocks, \(\sigma\) is equal to \(\pi / 4\) and f
 
 ### Ratio between the average speed downstream of a block and the maximum speed *r*
 
-The values of (\r\) depends on the block shapes (Cassan et al., 2014[^2] et Tran et al. 2016 [^3]):
+The values of \(r\) depends on the block shapes (Cassan et al., 2014[^2] et Tran et al. 2016 [^3]):
 
 - round : \(r_Q=1.1\)
 - "rounded face" shape : \(r=1.2\)
@@ -240,4 +240,4 @@ $$C_f = \frac{2}{(5.1 \mathrm{log} (h/k_s)+6)^2}$$
 
 [^4]: Larinier, Michel, Courret, D., Gomes, P., 2006. Guide technique pour la conception des passes à poissons “naturelles,” Rapport GHAPPE RA. Compagnie Nationale du Rhône / Agence de l’Eau Adour Garonne. http://dx.doi.org/10.13140/RG.2.1.1834.8562
 
-[^5]: Rice C. E., Kadavy K. C., et Robinson K. M., 1998. Roughness of Loose Rock Riprap on Steep Slopes. Journal of Hydraulic Engineering 124, 179‑85. https://doi.org/10.1061/(ASCE)0733-9429(1998)124:2(179)
+[^5]: Rice C. E., Kadavy K. C., et Robinson K. M., 1998. Roughness of Loose Rock Riprap on Steep Slopes. Journal of Hydraulic Engineering 124, 179-85. https://doi.org/10.1061/(ASCE)0733-9429(1998)124:2(179)