From f25592b33edc483d769ab97c96d090221c7b8bf3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Chi-Tu=C3=A2n=20Pham?= <chi-tuan.pham@edf.fr>
Date: Thu, 26 Dec 2024 17:50:10 +0100
Subject: [PATCH] [VnV][telemac3d] Update delwaq example with better choices
for a few keywords - TREATMENT OF NEGATIVE DEPTHS = 2 (new default value
since release 9.0) to improve mass conservation of water - use of gradient
conjugate to solve PPE (a little bit more efficient)
---
examples/telemac3d/delwaq/doc/delwaq.tex | 9 +++++++--
examples/telemac3d/delwaq/f3d_delwaq.slf | 2 +-
examples/telemac3d/delwaq/t3d_delwaq.cas | 22 +++++++++-------------
examples/telemac3d/delwaq/vnv_delwaq.py | 6 +++---
4 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/examples/telemac3d/delwaq/doc/delwaq.tex b/examples/telemac3d/delwaq/doc/delwaq.tex
index 0f1b6dd593..067f58141c 100644
--- a/examples/telemac3d/delwaq/doc/delwaq.tex
+++ b/examples/telemac3d/delwaq/doc/delwaq.tex
@@ -65,12 +65,17 @@ The time step is 0.1~s for a simulated period of 5~s.
The non-hydrostatic version is used.
To solve the advection, the LIPS scheme (default value)
is used for the velocities and tracers (scheme 5 + scheme option 4).
-The conjugate gradient
-is used for solving the propagation step (option 1) and
+GMRES is used for solving the propagation step (option 7) whereas the conjugate
+gradient (option 1) is used for solving the Poisson Pressure Equation as a
+little bit more efficient for this example and
the implicitation coefficients
for depth and velocities are respectively equal to 0.6 and 0.55
(= default value for velocity).
+Default value since release 9.0 for keyword \telkey{TREATMENT OF NEGATIVE DEPTHS}
+(= 2, i.e. flux control) is chosen to improve the mass-conservation of water
+(up to machine precision) and tracer.
+
\subsection{Physical parameters}
A mixing length model is used to model turbulence over the vertical
diff --git a/examples/telemac3d/delwaq/f3d_delwaq.slf b/examples/telemac3d/delwaq/f3d_delwaq.slf
index ebed4f95e9..81f02be2b8 100644
--- a/examples/telemac3d/delwaq/f3d_delwaq.slf
+++ b/examples/telemac3d/delwaq/f3d_delwaq.slf
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:f8c9ab4faec73e2617d4375375a9029862a69f4a01668b3a56c79a097d914843
+oid sha256:8508545fe4d3fcc9a107e7ccc35bb18e4545e7d7b1f973b47ccc76d4efaa5725
size 899964
diff --git a/examples/telemac3d/delwaq/t3d_delwaq.cas b/examples/telemac3d/delwaq/t3d_delwaq.cas
index a48613ce19..b256c7d45b 100644
--- a/examples/telemac3d/delwaq/t3d_delwaq.cas
+++ b/examples/telemac3d/delwaq/t3d_delwaq.cas
@@ -31,6 +31,8 @@ COUPLING WITH : 'DELWAQ'
/
/ HP C3700 compilateur HP : 39 s 08/06/2012
/
+TITLE = 'TELEMAC 3D : RIVIERE AVEC DEUX PILES DE PONT$'
+/
BOUNDARY CONDITIONS FILE : geo_delwaq.cli
GEOMETRY FILE : geo_delwaq.slf
LIQUID BOUNDARIES FILE : t3d_delwaq.qsl
@@ -51,7 +53,6 @@ DELWAQ STEERING FILE : dwq_delwaq.hyd
/----------------------------------------------------------------------
NUMBER OF HORIZONTAL LEVELS = 6
/
-TITLE = 'TELEMAC 3D : RIVIERE AVEC DEUX PILES DE PONT$'
TIME STEP = 0.1
NUMBER OF TIME STEPS = 50
GRAPHIC PRINTOUT PERIOD = 5
@@ -60,41 +61,36 @@ DELWAQ PRINTOUT PERIOD = 5
LISTING PRINTOUT PERIOD = 10
VARIABLES FOR 2D GRAPHIC PRINTOUTS = 'U,V,H,B,S'
VARIABLES FOR 3D GRAPHIC PRINTOUTS = Z,U,V,W
+/
LAW OF BOTTOM FRICTION = 3
FRICTION COEFFICIENT FOR THE BOTTOM = 40.
/
COEFFICIENT FOR HORIZONTAL DIFFUSION OF VELOCITIES = 0.005
HORIZONTAL TURBULENCE MODEL = 1
-/
-VERTICAL TURBULENCE MODEL = 2
+VERTICAL TURBULENCE MODEL = 2
COEFFICIENT FOR VERTICAL DIFFUSION OF VELOCITIES = 1.D-6
-MIXING LENGTH MODEL = 1 / OLD DEFAULT VALUE UNTIL V8P5
+MIXING LENGTH MODEL = 1 / OLD DEFAULT VALUE UNTIL V8P5
/
IMPLICITATION FOR DEPTH = 0.6
INITIAL CONDITIONS : 'ZERO ELEVATION'
PRESCRIBED FLOWRATES : 0.;62.
PRESCRIBED ELEVATIONS : 0.;0.
/
-/ CHANGE OF SOLVER TO RUN IN PARALLEL
-/
/ NON HYDROSTATIQUE
/
NON-HYDROSTATIC VERSION : YES
/
+MASS-BALANCE : YES
+/
/ SYSTEMES LINEAIRES DE L'OPTION NON-HYDROSTATIQUE
+SOLVER FOR PPE = 1
/
-SOLVER FOR PPE = 6
-ACCURACY FOR PPE = 1.E-5
+TREATMENT OF FLUXES AT THE BOUNDARIES : 2;2
/
NUMBER OF TRACERS = 1
NAMES OF TRACERS : 'TEMPERATURE GRAM PER LITER'
INITIAL VALUES OF TRACERS : 0.
-MASS-BALANCE : YES
-TREATMENT OF FLUXES AT THE BOUNDARIES : 2;2
/ ORIGINAL DATE OF TIME AFTER YEAR 1968 TO WORK WITH DELWAQ
/ WITHOUT ANY ERROR MESSAGE
ORIGINAL DATE OF TIME : 2019;1;23
-/
-/ DEFAULT VALUE UNTIL V8P5 KEPT FOR NON REGRESSION
-TREATMENT OF NEGATIVE DEPTHS = 1
diff --git a/examples/telemac3d/delwaq/vnv_delwaq.py b/examples/telemac3d/delwaq/vnv_delwaq.py
index a0d70902a4..671576cb7a 100644
--- a/examples/telemac3d/delwaq/vnv_delwaq.py
+++ b/examples/telemac3d/delwaq/vnv_delwaq.py
@@ -49,17 +49,17 @@ class VnvStudy(AbstractVnvStudy):
# Comparison with the last time frame of the reference file.
self.check_epsilons('vnv_1:T3DRES',
'f3d_delwaq.slf',
- eps=[1.E-8])
+ eps=[1.E-11])
# Comparison with the last time frame of the reference file.
self.check_epsilons('vnv_2:T3DRES',
'f3d_delwaq.slf',
- eps=[1.E-8])
+ eps=[1.E-11])
# Comparison between sequential and parallel run.
self.check_epsilons('vnv_1:T3DRES',
'vnv_2:T3DRES',
- eps=[1.E-8])
+ eps=[1.E-11])
def _post(self):
--
GitLab