Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • otm/telemac-mascaret
1 result
Show changes
Commits on Source (2)
Latest changes
==============
MASCARET: Fix Bazin's friction Law
KHIONE: Addition of a new formula to compute under ice cover friction
A new default value of 0.02 m1/3/s is set for under cover friction
......@@ -17,6 +18,10 @@ TELEMAC-3D: New keywords SIGMA DISTRIBUTION OF PLANES and
PRESCRIBED ELEVATION OF PLANES to set vertical planes directly in the steering
file
PYTHON: TelemacFile.print_info now correctly displays the number of interface
points if any, as well as the number of boundary points and elements regardless
of the presence or not of a boundary conditions file.
TOMAWAC: fix time series for wave directions
MASCARET: Reference Documentation has been added
......
......@@ -426,11 +426,7 @@ class TelemacFile(HermesFile if HERMES_AVAIL else SerafinFile):
Returns the number of boundary elements
"""
if self._nelebd is None:
if self.boundary_file is not None:
self._nelebd = self.get_bnd_npoin()
else:
raise TelemacException(
"Can not read nelebd no boundary file was given")
self._nelebd = self.get_bnd_nelem()
return self._nelebd
......@@ -2084,22 +2080,17 @@ class TelemacFile(HermesFile if HERMES_AVAIL else SerafinFile):
if self.nptir == 0:
print(" - No parallel information")
else:
print(" - Number of interface points: {}".format(self.nptfr))
print(" - Number of interface points: {}".format(self.nptir))
print(" - Local ot Global numbering {}".format(self.knolg))
print()
print("~> Boundary info")
print()
if self.boundary_file is None:
print(" - No boundary file given")
else:
print(" - Boundary element type: {}"
.format(elem2str(self.typ_bnd_elem)))
print(" - Number of bnd points: {}".format(self.nptfr))
print(" - Number of bnd elements: {}".format(self.nelebd))
# TODO: display stuff on boundary values ?
print(" - Number of boundary points: {}".format(self.nptfr))
print(
" - Boundary element type: {}".format(elem2str(self.typ_bnd_elem))
)
print(" - Number of boundary elements: {}".format(self.nelebd))
print()
print("~> Data info")
......
......@@ -104,7 +104,7 @@ module M_DEBITANCE_S
!----------------------------------------------------
case(LOI_FROTTEMENT_BAZIN)
chezy = 45._DOUBLE / ( 1._DOUBLE + CF1 / RH1 )
chezy = 87._DOUBLE / ( 1._DOUBLE + CF1 / RH1**W12 )
end select
......
......@@ -90,7 +90,7 @@ CONTAINS
!----------------------------------------------------
! BAZIN Chezy(i) en fonction de RH et mb (fixe)
!----------------------------------------------------
chezy = 45._DOUBLE/(1._DOUBLE+cf1/rh1)
chezy = 87._DOUBLE / ( 1._DOUBLE + CF1 / RH1**W12 )
CALL PUSHCONTROL3B(4)
CASE DEFAULT
CALL PUSHCONTROL3B(0)
......
......@@ -89,9 +89,8 @@ MODULE M_DEBITANCE_S_D
!----------------------------------------------------
! BAZIN Chezy(i) en fonction de RH et mb (fixe)
!----------------------------------------------------
chezyd = -(45._DOUBLE*(cf1d*rh1-cf1*rh1d)/rh1**2/(1._DOUBLE+cf1/&
& rh1)**2)
chezy = 45._DOUBLE/(1._DOUBLE+cf1/rh1)
chezyd = 43.5_DOUBLE*(cf1*rh1d-2*cf1d*rh1)/(2._DOUBLE*rh1**W12*(cf1+rh1**W12)**2)
chezy = 87._DOUBLE/(1._DOUBLE+cf1/rh1**w12)
CASE DEFAULT
chezyd = 0.D0
END SELECT
......