diff --git a/examples/telemac3d/NonLinearWave/doc/NonLinearWave.tex b/examples/telemac3d/NonLinearWave/doc/NonLinearWave.tex index 22c7ea147691d8ba46aede754d17e043ab72b592..9a32629c626804fb550c6fda603259e9cdac553b 100644 --- a/examples/telemac3d/NonLinearWave/doc/NonLinearWave.tex +++ b/examples/telemac3d/NonLinearWave/doc/NonLinearWave.tex @@ -60,6 +60,13 @@ accurate. The time step is 0.0025~s for a simulated period of 33~s. +Default solver for propagation GMRES (= 7) is used (rather than old choice +conjugate residual = 2 or conjugate gradient = 1) as quite more efficient. +It enables to set the accuracy for propagation to its default value (10$^{-8}$). +Residual conjugate (= 2) is chosen to solve PPE which is more efficient here +compared to GMRES (= 7) or conjugate gradient (= 1), but accuracy for PPE is to +be set to 10$^{-6}$. + \subsection{Physical parameters} No diffusion is considered. diff --git a/examples/telemac3d/NonLinearWave/f3d_nonlinearwave.slf b/examples/telemac3d/NonLinearWave/f3d_nonlinearwave.slf index 53001250e9600fdde7d842cc750fa0d17ae33d5f..aec2b10eb285951fe4f47c479bbf7db96198cc34 100644 --- a/examples/telemac3d/NonLinearWave/f3d_nonlinearwave.slf +++ b/examples/telemac3d/NonLinearWave/f3d_nonlinearwave.slf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f5b1c88cf94660502e0003d913d89d3815adb49864b723c6d812f02fd5ce8ba8 +oid sha256:e45b24ec753d448c511b74cb57c05f3ce5e96642c3f8e76940a2685da29cf4ff size 3299052 diff --git a/examples/telemac3d/NonLinearWave/t3d_nonlinearwave.cas b/examples/telemac3d/NonLinearWave/t3d_nonlinearwave.cas index a8f0df766e3682583465a85581bbe45e58ecdfe7..6f643b81303a9d8b6729f8999628e596f0670ab8 100644 --- a/examples/telemac3d/NonLinearWave/t3d_nonlinearwave.cas +++ b/examples/telemac3d/NonLinearWave/t3d_nonlinearwave.cas @@ -67,10 +67,11 @@ NUMBER OF SUB ITERATIONS FOR NON LINEARITIES : 2 / FREE SURFACE GRADIENT COMPATIBILITY : 1. / -SOLVER FOR PROPAGATION : 2 +SOLVER FOR PROPAGATION : 7 / QUITE MORE EFFICIENT THAN 2 NUMBER OF HORIZONTAL LEVELS = 10 / SCHEME FOR ADVECTION OF VELOCITIES = 4 +SCHEME OPTION FOR ADVECTION OF VELOCITIES = 1 / IMPLICITATION FOR DEPTH = 0.50 IMPLICITATION FOR VELOCITIES = 0.50 @@ -78,21 +79,15 @@ IMPLICITATION FOR VELOCITIES = 0.50 VARIABLES FOR 2D GRAPHIC PRINTOUTS = 'U,V,B,S' VARIABLES FOR 3D GRAPHIC PRINTOUTS = 'Z,U,V,W,DP' / +VERTICAL TURBULENCE MODEL : 1 COEFFICIENT FOR HORIZONTAL DIFFUSION OF VELOCITIES : 0. COEFFICIENT FOR VERTICAL DIFFUSION OF VELOCITIES : 0. / SOLVER FOR PPE = 2 ACCURACY FOR PPE = 1.E-6 -MAXIMUM NUMBER OF ITERATIONS FOR PPE = 1000 / NON-HYDROSTATIC VERSION : YES / LAW OF BOTTOM FRICTION= 0 / -/ DEFAULT VALUES UNTIL V8P0 KEPT FOR NON REGRESSION -SCHEME OPTION FOR ADVECTION OF VELOCITIES = 1 -ACCURACY FOR PROPAGATION = 1.E-6 -/ -/ DEFAULT VALUES UNTIL V8P5 KEPT FOR NON REGRESSION -/ -VERTICAL TURBULENCE MODEL = 1 +MASS-BALANCE = YES diff --git a/examples/telemac3d/NonLinearWave/vnv_non_linear_wave.py b/examples/telemac3d/NonLinearWave/vnv_non_linear_wave.py index 95c5bfd6038b368d91aa670a85f0d40262f16b1a..c67b858542c178e8125d8d05ad782ae3d7c6bd83 100644 --- a/examples/telemac3d/NonLinearWave/vnv_non_linear_wave.py +++ b/examples/telemac3d/NonLinearWave/vnv_non_linear_wave.py @@ -56,17 +56,17 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_1:T3DRES', 'f3d_nonlinearwave.slf', - eps=[1.E-9]) + eps=[1.E-10]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T3DRES', 'f3d_nonlinearwave.slf', - eps=[1.E-9]) + eps=[1.E-10]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_1:T3DRES', 'vnv_2:T3DRES', - eps=[1.E-9]) + eps=[1.E-10]) def _post(self):