mirror of
https://gitlab.com/pamhyr/pamhyr2.git
synced 2026-10-30 03:20:41 +01:00
Merge branch 'hydraulics-structure' of gitlab-ssh.irstea.fr:theophile.terraz/pamhyr into hydraulics-structure
This commit is contained in:
Pierre-Antoine Rouby committed
commit
73ae571de1
2 files changed
+135
-42
No files matched your search
@@ -34,11 +34,7 @@ class NotDefined(BasicHS):
|
||||
)
|
||||
|
||||
self._type = "ND"
|
||||
self._data = [
|
||||
BHSValue("foo", float, 0.0, status=status),
|
||||
BHSValue("bar", float, 42.0, status=status),
|
||||
BHSValue("baz", int, 13, status=status),
|
||||
]
|
||||
self._data = []
|
||||
|
||||
|
||||
class SeuilDeversoir(BasicHS):
|
||||
@@ -51,8 +47,8 @@ class SeuilDeversoir(BasicHS):
|
||||
|
||||
self._type = "S1"
|
||||
self._data = [
|
||||
BHSValue("Cote", float, 1.0, status=status),
|
||||
BHSValue("Largeur", float, 1.0, status=status),
|
||||
BHSValue("Cote", float, 1.0, status=status),
|
||||
BHSValue("Coefficient de debit", float, 0.4, status=status),
|
||||
]
|
||||
|
||||
@@ -67,11 +63,11 @@ class SeuilTrapezoidal(BasicHS):
|
||||
|
||||
self._type = "S2"
|
||||
self._data = [
|
||||
BHSValue("Cote", float, 1.0, status=status),
|
||||
BHSValue("Largeur", float, 1.0, status=status),
|
||||
BHSValue("Tangeante du demi angle", float, 1.0, status=status),
|
||||
BHSValue("Cote", float, 1.0, status=status),
|
||||
BHSValue("Cote de mise en charge", float, 9999.999, status=status),
|
||||
BHSValue("Coefficient de debit", float, 0.4, status=status),
|
||||
BHSValue("Cote de mise en charge", float, 9999.0, status=status),
|
||||
BHSValue("Tangeante du demi angle", float, 0.0, status=status),
|
||||
]
|
||||
|
||||
|
||||
@@ -86,9 +82,9 @@ class SeuilTriangulaire(BasicHS):
|
||||
self._type = "S3"
|
||||
self._data = [
|
||||
BHSValue("Cote", float, 1.0, status=status),
|
||||
BHSValue("Tangeante du demi angle", float, 1.0, status=status),
|
||||
BHSValue("Cote de mise en charge", float, 9999.999, status=status),
|
||||
BHSValue("Coefficient de debit", float, 0.4, status=status),
|
||||
BHSValue("Cote de mise en charge", float, 9999.0, status=status),
|
||||
BHSValue("Tangeante du demi angle", float, 0.0, status=status),
|
||||
]
|
||||
|
||||
|
||||
@@ -102,13 +98,13 @@ class OrificeRectangulaire(BasicHS):
|
||||
|
||||
self._type = "OR"
|
||||
self._data = [
|
||||
BHSValue("Cote", float, 0.0, status=status),
|
||||
BHSValue("Largeur", float, 0.0, status=status),
|
||||
BHSValue("Cote de mise en charge", float, 9999.0,
|
||||
status=status),
|
||||
BHSValue("Cote de mise en charge maximale", float, 9999.0,
|
||||
BHSValue("Cote", float, 0.0, status=status),
|
||||
BHSValue("Cote de mise en charge", float, 9999.999,
|
||||
status=status),
|
||||
BHSValue("Coefficient de debit", float, 0.4, status=status),
|
||||
BHSValue("Cote de mise en charge maximale", float, 9999.999,
|
||||
status=status),
|
||||
]
|
||||
|
||||
|
||||
@@ -122,29 +118,29 @@ class OrificeCirculaire(BasicHS):
|
||||
|
||||
self._type = "OC"
|
||||
self._data = [
|
||||
BHSValue("Cote", float, 0.0, status=status),
|
||||
BHSValue("Diametre", float, 0.0, status=status),
|
||||
BHSValue("hauteur envasement", float, 9999.0, status=status),
|
||||
BHSValue("Cote", float, 0.0, status=status),
|
||||
BHSValue("hauteur envasement", float, 0.0, status=status),
|
||||
BHSValue("Coefficient de debit", float, 0.4, status=status),
|
||||
]
|
||||
|
||||
|
||||
class OrificeVoute(BasicHS):
|
||||
def __init__(self, id: int = -1, name: str = "",
|
||||
status=None):
|
||||
super(OrificeVoute, self).__init__(
|
||||
id=id, name=name,
|
||||
status=status
|
||||
)
|
||||
#class OrificeVoute(BasicHS):
|
||||
#def __init__(self, id: int = -1, name: str = "",
|
||||
#status=None):
|
||||
#super(OrificeVoute, self).__init__(
|
||||
#id=id, name=name,
|
||||
#status=status
|
||||
#)
|
||||
|
||||
self._type = "OV"
|
||||
self._data = [
|
||||
BHSValue("Cote", float, 1.0, status=status),
|
||||
BHSValue("Largeur", float, 1.0, status=status),
|
||||
BHSValue("Haut de la voute", float, 0.0, status=status),
|
||||
BHSValue("Bas de la voute", float, 0.0, status=status),
|
||||
BHSValue("Coefficient de debit", float, 0.4, status=status),
|
||||
]
|
||||
#self._type = "OV"
|
||||
#self._data = [
|
||||
#BHSValue("Cote", float, 1.0, status=status),
|
||||
#BHSValue("Largeur", float, 1.0, status=status),
|
||||
#BHSValue("Haut de la voute", float, 0.0, status=status),
|
||||
#BHSValue("Bas de la voute", float, 0.0, status=status),
|
||||
#BHSValue("Coefficient de debit", float, 0.4, status=status),
|
||||
#]
|
||||
|
||||
|
||||
class VanneRectangulaire(BasicHS):
|
||||
@@ -157,10 +153,11 @@ class VanneRectangulaire(BasicHS):
|
||||
|
||||
self._type = "V1"
|
||||
self._data = [
|
||||
BHSValue("Cote", float, 1.0, status=status),
|
||||
BHSValue("Ouverture", float, 1.0, status=status),
|
||||
BHSValue("Largeur", float, 1.0, status=status),
|
||||
BHSValue("Cote", float, 0.0, status=status),
|
||||
BHSValue("Coefficient de debit", float, 0.4, status=status),
|
||||
BHSValue("Ouverture", float, 1.0, status=status),
|
||||
BHSValue("Ouverture maximale", float, 1.0, status=status),
|
||||
]
|
||||
|
||||
|
||||
@@ -172,12 +169,13 @@ class VanneRectangulaireSimplifiee(BasicHS):
|
||||
status=status
|
||||
)
|
||||
|
||||
self._type = "V1"
|
||||
self._type = "V2"
|
||||
self._data = [
|
||||
BHSValue("Cote", float, 1.0, status=status),
|
||||
BHSValue("Ouverture", float, 1.0, status=status),
|
||||
BHSValue("Largeur", float, 1.0, status=status),
|
||||
BHSValue("Cote", float, 0.0, status=status),
|
||||
BHSValue("Coefficient de debit", float, 0.4, status=status),
|
||||
BHSValue("Ouverture", float, 1.0, status=status),
|
||||
BHSValue("Ouverture maximale", float, 1.0, status=status),
|
||||
]
|
||||
|
||||
|
||||
@@ -222,7 +220,7 @@ BHS_types = {
|
||||
"S3": SeuilTriangulaire,
|
||||
"OR": OrificeRectangulaire,
|
||||
"OC": OrificeCirculaire,
|
||||
"OV": OrificeVoute,
|
||||
#"OV": OrificeVoute,
|
||||
"V1": VanneRectangulaire,
|
||||
"V2": VanneRectangulaireSimplifiee,
|
||||
"BO": Borda,
|
||||
|
||||
Reference in new issue
Block a user