From bf1d1d8912949519832014be08ec9c5cc99b0a29 Mon Sep 17 00:00:00 2001
From: Fabien Souille <fabien.souille@edf.fr>
Date: Fri, 21 Feb 2025 10:48:53 +0100
Subject: [PATCH] [src] removing low Cf warning, fix CW id in friction by
domains
---
documentation/telemac2d/user/latex/appendix5.tex | 2 +-
sources/telemac2d/friction_calc.f | 6 ------
sources/telemac2d/friction_read.f | 4 ++--
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/documentation/telemac2d/user/latex/appendix5.tex b/documentation/telemac2d/user/latex/appendix5.tex
index c35570f661..63c855b7a9 100644
--- a/documentation/telemac2d/user/latex/appendix5.tex
+++ b/documentation/telemac2d/user/latex/appendix5.tex
@@ -94,7 +94,7 @@ Ch\'{e}zy & 2 & CHEZ & Roughness coefficient \\ \hline
Strickler & 3 & STRI & Roughness coefficient \\ \hline
Manning & 4 & MANN & Roughness coefficient \\ \hline
Nikuradse & 5 & NIKU & Roughness coefficient \\ \hline
-Colebrook-White & 7 & COWH & Roughness coefficient\newline Manning coefficient \\ \hline
+Colebrook-White & 6 & COWH & Roughness coefficient\newline Manning coefficient \\ \hline
\end{tabular}
diff --git a/sources/telemac2d/friction_calc.f b/sources/telemac2d/friction_calc.f
index 575cb5903e..45b5d50227 100644
--- a/sources/telemac2d/friction_calc.f
+++ b/sources/telemac2d/friction_calc.f
@@ -240,12 +240,6 @@
WRITE(LU,*) "CHECK 'FRICTION COEFFICIENT' "
WRITE(LU,*) "OR 'LAW OF BOTTOM FRICTION' "
ENDIF
- IF (CF%R(I) .LT. 2.D-4) THEN
- WRITE(LU,*) "WARNING: EXTREMLY LOW VALUE OF FRICTION"
- WRITE(LU,*) "CF = ", CF%R(I)
- WRITE(LU,*) "CHECK 'FRICTION COEFFICIENT' "
- WRITE(LU,*) "OR 'LAW OF BOTTOM FRICTION' "
- ENDIF
ENDDO
ENDIF
ENDIF
diff --git a/sources/telemac2d/friction_read.f b/sources/telemac2d/friction_read.f
index ff81196d9f..9cfebe2529 100644
--- a/sources/telemac2d/friction_read.f
+++ b/sources/telemac2d/friction_read.f
@@ -218,13 +218,13 @@
STOP
ENDIF
READ(NCOF,*,END=999,ERR=901) (CHAINE(J),J=1,N),LAW,R1
- FRTAB%ADR(IZONE)%P%RTYPE = 6
+ FRTAB%ADR(IZONE)%P%RTYPE = 7
FRTAB%ADR(IZONE)%P%RCOEF = R1
FRTAB%ADR(IZONE)%P%NDEF = 0.D0
N = N + 2
CASE('COWH')
READ(NCOF,*,END=999,ERR=907) (CHAINE(J),J=1,N),LAW,R1,R2
- FRTAB%ADR(IZONE)%P%RTYPE = 7
+ FRTAB%ADR(IZONE)%P%RTYPE = 6
FRTAB%ADR(IZONE)%P%RCOEF = R1
FRTAB%ADR(IZONE)%P%NDEF = R2
N = N + 3
--
GitLab