diff --git a/documentation/telemac2d/user/latex/appendix5.tex b/documentation/telemac2d/user/latex/appendix5.tex index c35570f661bbbb44fd9aa87a606a73006cca2741..63c855b7a9a7ee9ff18cd1859a7fe90acbf86e20 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 575cb5903e60d4da6bfee236b681a3deab0bdc0a..45b5d50227ff3ef776f2f82fd49e573ac93ded0a 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 ff81196d9f9fa30d2b8915efbe66b238f4676d44..9cfebe25291114d74f45ee3166387c2b241b801a 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