diff --git a/examples/telemac3d/canal/f3d_canal.slf b/examples/telemac3d/canal/f3d_canal.slf index 201bf710dc4f9480d9965f5b76982a7eb95071d7..8a5aeda349d376c5d78c971b1cd339463314e1eb 100644 --- a/examples/telemac3d/canal/f3d_canal.slf +++ b/examples/telemac3d/canal/f3d_canal.slf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1beb0696f3d4e01b33f1eb57bf740e0de8d9118b2831a6ba80a609176730dad6 +oid sha256:d2556444de7a3b5a30c5154acc19cd597227d74b2d547cc43139258b1bdc7964 size 208780 diff --git a/examples/telemac3d/canal/f3d_canal_nonhydro.slf b/examples/telemac3d/canal/f3d_canal_nonhydro.slf index f9d5243070d42290532c8fac97781cc45e3b9e0f..7facd4fa68c41a9b552d4d1e029b4d816300c1c2 100644 --- a/examples/telemac3d/canal/f3d_canal_nonhydro.slf +++ b/examples/telemac3d/canal/f3d_canal_nonhydro.slf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0ab434380ced6d67e74709bf106ac6e550b63f7eb2d4dff793e773c94ee3e65f +oid sha256:7324165e56217d90b671c0b0164f447513be1802838c388a20b72d24d13920b6 size 208780 diff --git a/examples/telemac3d/canal/f3d_canal_nonhydro_Z_Q_1.slf b/examples/telemac3d/canal/f3d_canal_nonhydro_Z_Q_1.slf index 499056538456481794c069f8bf00a9e8e04597a9..96bd390043bfe0aad49b00ae95f7e18251e4f662 100644 --- a/examples/telemac3d/canal/f3d_canal_nonhydro_Z_Q_1.slf +++ b/examples/telemac3d/canal/f3d_canal_nonhydro_Z_Q_1.slf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3f6ae7e512561cbba126eb5c7ac4f4132ebd330f83f65fa1eaf3964737dd34af +oid sha256:38d4d93523fffbf51d1711e2eafc0fa08f09055c05c130979822fd3318f84b02 size 208780 diff --git a/examples/telemac3d/canal/f3d_canal_nonhydro_vit.slf b/examples/telemac3d/canal/f3d_canal_nonhydro_vit.slf index f8f9fc53583274d52729aa5641d9be640e4a9879..6fd843359a0a9ebf020b983036cc4af046790887 100644 --- a/examples/telemac3d/canal/f3d_canal_nonhydro_vit.slf +++ b/examples/telemac3d/canal/f3d_canal_nonhydro_vit.slf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfabf7dee989b9184f3aab216f0808a7d6427aa19fc6d5bf0286ceddbb749d3e +oid sha256:9876dc8fc3a067c84cac07bd0a7845ff6d04391fcd2f1b9d57d9c4f33715cf67 size 208780 diff --git a/examples/telemac3d/canal/restart_canal_hydro.slf b/examples/telemac3d/canal/restart_canal_hydro.slf index b911b91932f4d65fc54d0940a021f98136485c15..74d17d04ebbe89ef36f42499452445b5416b0caa 100644 --- a/examples/telemac3d/canal/restart_canal_hydro.slf +++ b/examples/telemac3d/canal/restart_canal_hydro.slf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:177299e085932dfa207a0efd813c2f042ffb5f81c21060358396cf0833fc2efd +oid sha256:840eccea0fc85f9b174f14bbeb12be686f8716f24636a4b5d98175ee1854d101 size 796240 diff --git a/examples/telemac3d/canal/restart_canal_hydro_par.slf b/examples/telemac3d/canal/restart_canal_hydro_par.slf index ce8960f27cd6e71bd09727a1b021606262bd5513..a0a19b45f3792c28fe3f3c82396720f226a6a869 100644 --- a/examples/telemac3d/canal/restart_canal_hydro_par.slf +++ b/examples/telemac3d/canal/restart_canal_hydro_par.slf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7f53b8b077fb17f4b3778db36ee978f1c0ae3d2a22f306c5ab60ab362d39094a -size 796208 +oid sha256:6f7513a52c5963116eac276967442cd6bcfa17638dc8663d2fcaf485bb03a015 +size 796240 diff --git a/examples/telemac3d/canal/restart_canal_nonhydro.slf b/examples/telemac3d/canal/restart_canal_nonhydro.slf index 7a326fe6c6177911f2090dad16eadbd8cd68c13f..ae23cfc564521d8d8e29a9d3d0bbf3aa60bb9f07 100644 --- a/examples/telemac3d/canal/restart_canal_nonhydro.slf +++ b/examples/telemac3d/canal/restart_canal_nonhydro.slf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:58e077eacf814935a4db64648f4034859d142106ad9485e6fe817645f0e7ed24 +oid sha256:ac4a5203af21befc84d0d4759e8401d22fb8043cddd5c16b7cdb4e8195698ba1 size 949528 diff --git a/examples/telemac3d/canal/restart_canal_nonhydro_par.slf b/examples/telemac3d/canal/restart_canal_nonhydro_par.slf index 3de935d63be77e2d9187c31a9c44eeb80e1508d4..3d95f6e9197646180568e55b5221b7e882561b9a 100644 --- a/examples/telemac3d/canal/restart_canal_nonhydro_par.slf +++ b/examples/telemac3d/canal/restart_canal_nonhydro_par.slf @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d7a97f30ae3a6ed762ba168a36aedfd221234a225378c1f6b36775960380d6ec -size 949496 +oid sha256:56a48b96fe8fd062cc47aeea731c05b60fb1c174f35505435f7fe132983649f4 +size 949528 diff --git a/examples/telemac3d/canal/t3d_canal-hydro_from_restart.cas b/examples/telemac3d/canal/t3d_canal-hydro_from_restart.cas index aa002282088d818a79e1893439671966e7cdd023..9f61556c0ddde1b93b6adba9e6b13dca85f934a3 100644 --- a/examples/telemac3d/canal/t3d_canal-hydro_from_restart.cas +++ b/examples/telemac3d/canal/t3d_canal-hydro_from_restart.cas @@ -55,6 +55,3 @@ IMPLICITATION FOR VELOCITIES = 0.6 / FIN DES REGLAGES JMH / NON-HYDROSTATIC VERSION : NO -/ -/ DEFAULT VALUE UNTIL V8P5 KEPT FOR NON REGRESSION -TREATMENT OF NEGATIVE DEPTHS = 1 diff --git a/examples/telemac3d/canal/t3d_canal-hydro_restart.cas b/examples/telemac3d/canal/t3d_canal-hydro_restart.cas index 69289fa3e1690a48671a05bb47816999eaaa278c..b698cf5e6d016ca6da050edfbae998dad6405dd4 100644 --- a/examples/telemac3d/canal/t3d_canal-hydro_restart.cas +++ b/examples/telemac3d/canal/t3d_canal-hydro_restart.cas @@ -57,6 +57,3 @@ IMPLICITATION FOR VELOCITIES = 0.6 / FIN DES REGLAGES JMH / NON-HYDROSTATIC VERSION : NO -/ -/ DEFAULT VALUE UNTIL V8P5 KEPT FOR NON REGRESSION -TREATMENT OF NEGATIVE DEPTHS = 1 diff --git a/examples/telemac3d/canal/t3d_canal-nonhydro.cas b/examples/telemac3d/canal/t3d_canal-nonhydro.cas index 40c823a72dabc1fb7d301a9b845d61159220f646..ec081aa2331b9ca3f21325caf1793fae6aa12949 100644 --- a/examples/telemac3d/canal/t3d_canal-nonhydro.cas +++ b/examples/telemac3d/canal/t3d_canal-nonhydro.cas @@ -43,8 +43,6 @@ NUMBER OF HORIZONTAL LEVELS = 10 PRESCRIBED FLOWRATES : 0.;50. PRESCRIBED ELEVATIONS : 0.5;0. / -TIDAL FLATS = NO -/ VARIABLES FOR 2D GRAPHIC PRINTOUTS = U,V,H,B,S VARIABLES FOR 3D GRAPHIC PRINTOUTS = Z,U,V,W MASS-BALANCE = YES @@ -78,6 +76,3 @@ NON-HYDROSTATIC VERSION : YES / SYSTEMES LINEAIRES DE L'OPTION NON-HYDROSTATIQUE / SOLVER FOR PPE = 6 -/ -/ DEFAULT VALUE UNTIL V8P5 KEPT FOR NON REGRESSION -TREATMENT OF NEGATIVE DEPTHS = 1 diff --git a/examples/telemac3d/canal/t3d_canal-nonhydro_Z_Q_1.cas b/examples/telemac3d/canal/t3d_canal-nonhydro_Z_Q_1.cas index 53c8ca08d15285cdd907c9edbf84f3cb5c605b32..597b667ec69534473a12b5c4c8df0717ca2a6ecb 100644 --- a/examples/telemac3d/canal/t3d_canal-nonhydro_Z_Q_1.cas +++ b/examples/telemac3d/canal/t3d_canal-nonhydro_Z_Q_1.cas @@ -24,8 +24,6 @@ PRESCRIBED FLOWRATES : 0.;50. PRESCRIBED ELEVATIONS : 0.5;0. STAGE-DISCHARGE CURVES : 1;0 / -TIDAL FLATS = NO -/ VARIABLES FOR 2D GRAPHIC PRINTOUTS = U,V,H,B,S VARIABLES FOR 3D GRAPHIC PRINTOUTS = Z,U,V,W MASS-BALANCE = YES @@ -59,6 +57,3 @@ NON-HYDROSTATIC VERSION : YES / SYSTEMES LINEAIRES DE L'OPTION NON-HYDROSTATIQUE / SOLVER FOR PPE = 6 -/ -/ DEFAULT VALUE UNTIL V8P5 KEPT FOR NON REGRESSION -TREATMENT OF NEGATIVE DEPTHS = 1 diff --git a/examples/telemac3d/canal/t3d_canal-nonhydro_from_restart.cas b/examples/telemac3d/canal/t3d_canal-nonhydro_from_restart.cas index ffb3eb4ed76f76057abaedff5cd329261f6debdb..e429687128f193c13c7c601e46dd8fd3e2c074ec 100644 --- a/examples/telemac3d/canal/t3d_canal-nonhydro_from_restart.cas +++ b/examples/telemac3d/canal/t3d_canal-nonhydro_from_restart.cas @@ -24,8 +24,6 @@ NUMBER OF HORIZONTAL LEVELS = 10 PRESCRIBED FLOWRATES : 0.;50. PRESCRIBED ELEVATIONS : 0.5;0. / -TIDAL FLATS = NO -/ VARIABLES FOR 2D GRAPHIC PRINTOUTS = U,V,H,B,S VARIABLES FOR 3D GRAPHIC PRINTOUTS = Z,U,V,W MASS-BALANCE = YES @@ -59,6 +57,3 @@ NON-HYDROSTATIC VERSION : YES / SYSTEMES LINEAIRES DE L'OPTION NON-HYDROSTATIQUE / SOLVER FOR PPE = 6 -/ -/ DEFAULT VALUE UNTIL V8P5 KEPT FOR NON REGRESSION -TREATMENT OF NEGATIVE DEPTHS = 1 diff --git a/examples/telemac3d/canal/t3d_canal-nonhydro_restart.cas b/examples/telemac3d/canal/t3d_canal-nonhydro_restart.cas index d77d84f58779c08a3e0bce1513941dd2c01b9fb3..c78d93ee4d3f25fe2df969a6846b183c446f583a 100644 --- a/examples/telemac3d/canal/t3d_canal-nonhydro_restart.cas +++ b/examples/telemac3d/canal/t3d_canal-nonhydro_restart.cas @@ -26,8 +26,6 @@ NUMBER OF HORIZONTAL LEVELS = 10 PRESCRIBED FLOWRATES : 0.;50. PRESCRIBED ELEVATIONS : 0.5;0. / -TIDAL FLATS = NO -/ VARIABLES FOR 2D GRAPHIC PRINTOUTS = U,V,H,B,S VARIABLES FOR 3D GRAPHIC PRINTOUTS = Z,U,V,W MASS-BALANCE = YES @@ -61,6 +59,3 @@ NON-HYDROSTATIC VERSION : YES / SYSTEMES LINEAIRES DE L'OPTION NON-HYDROSTATIQUE / SOLVER FOR PPE = 6 -/ -/ DEFAULT VALUE UNTIL V8P5 KEPT FOR NON REGRESSION -TREATMENT OF NEGATIVE DEPTHS = 1 diff --git a/examples/telemac3d/canal/t3d_canal-nonhydro_vit.cas b/examples/telemac3d/canal/t3d_canal-nonhydro_vit.cas index bc626ac602ac522eb03d80300867b9580812f05a..683aa44a8e5e7d9443f7d658b2e092c6d0e50774 100644 --- a/examples/telemac3d/canal/t3d_canal-nonhydro_vit.cas +++ b/examples/telemac3d/canal/t3d_canal-nonhydro_vit.cas @@ -1,23 +1,5 @@ VELOCITY VERTICAL PROFILES : 2;2 / -/ 136 s sur HP C3700 : 5.3 -/ 75 s sur HP C3700 : 5.5 25/11/2004 -/ 84 s sur HP C3700 : 5.5 04/03/2005 -/ (longueur de melange corrigee -/ + nouvelle diffusion) -/ 68 s sur HP C3700 : 5.6 24/08/2005 -/ 59 s sur HP C3700 : 5.6 14/10/2005 -/ 56 s sur HP C3700 : 5.7 14/02/2007 (Nag:??s, Dell:42 s) -/ -/ version 5.8 : passage a l'equation d'onde et solveur direct -/ 54 s sur HP C3700 : 5.8 26/07/2007 (Nag:136 s, Dell:47 s) -/ -/ version 5.9 : retour au solveur 2 -/ 51 s sur HP C3700 : 5.9 21/08/2008 (Nag:140 s, Dell:?? s) -/ -/ version 6.2 : -/ 54 s sur HP C3700 : 25/05/2012 -/ TITLE = 'TELEMAC 3D : CANAL' / BOUNDARY CONDITIONS FILE : geo_canal_466.cli @@ -41,8 +23,6 @@ NUMBER OF HORIZONTAL LEVELS = 10 PRESCRIBED VELOCITIES : 0.;0.666411 PRESCRIBED ELEVATIONS : 0.5;0. / -TIDAL FLATS = NO -/ VARIABLES FOR 2D GRAPHIC PRINTOUTS = U,V,H,B,S VARIABLES FOR 3D GRAPHIC PRINTOUTS = Z,U,V,W MASS-BALANCE = YES @@ -76,6 +56,3 @@ NON-HYDROSTATIC VERSION : YES / SYSTEMES LINEAIRES DE L'OPTION NON-HYDROSTATIQUE / SOLVER FOR PPE = 6 -/ -/ DEFAULT VALUE UNTIL V8P5 KEPT FOR NON REGRESSION -TREATMENT OF NEGATIVE DEPTHS = 1 diff --git a/examples/telemac3d/canal/t3d_canal.cas b/examples/telemac3d/canal/t3d_canal.cas index 0fb340c9c5dfd310d7a59044b95adc9847d8f0bb..336182e850f7fef34775ebbcb966b41c5ad1d62a 100644 --- a/examples/telemac3d/canal/t3d_canal.cas +++ b/examples/telemac3d/canal/t3d_canal.cas @@ -68,6 +68,3 @@ IMPLICITATION FOR VELOCITIES = 0.6 / FIN DES REGLAGES JMH / NON-HYDROSTATIC VERSION : NO -/ -/ DEFAULT VALUE UNTIL V8P5 KEPT FOR NON REGRESSION -TREATMENT OF NEGATIVE DEPTHS = 1 diff --git a/examples/telemac3d/canal/vnv_canal.py b/examples/telemac3d/canal/vnv_canal.py index 2e840a04b4d64196f7b2219dbaa2b4d3f1234949..664b47cbe244101718f497e10ee4d6ac0b16ca22 100644 --- a/examples/telemac3d/canal/vnv_canal.py +++ b/examples/telemac3d/canal/vnv_canal.py @@ -204,17 +204,17 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_3:T3DRES', 'f3d_canal_nonhydro.slf', - eps=[1.E-8]) + eps=[1.E-11]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_4:T3DRES', 'f3d_canal_nonhydro.slf', - eps=[1.E-8]) + eps=[1.E-7]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_3:T3DRES', 'vnv_4:T3DRES', - eps=[1.E-8]) + eps=[1.E-7]) # Comparison with the restart file used to continue. self.check_epsilons('vnv_6:T3DRST', @@ -254,22 +254,22 @@ class VnvStudy(AbstractVnvStudy): # Comparison between one way and intermediate step, parallel run. self.check_epsilons('vnv_4:T3DRES', 'vnv_13:T3DRES', - eps=[1.E-11]) + eps=[1.E-10]) # Comparison with the last time frame of the reference file (stage-discharge curve). self.check_epsilons('vnv_14:T3DRES', 'f3d_canal_nonhydro_Z_Q_1.slf', - eps=[1.E-6]) + eps=[1.E-13]) # Comparison with the last time frame of the reference file (stage-discharge curve). self.check_epsilons('vnv_15:T3DRES', 'f3d_canal_nonhydro_Z_Q_1.slf', - eps=[1.E-6]) + eps=[1.E-8]) # Comparison between sequential and parallel run (stage-discharge curve). self.check_epsilons('vnv_14:T3DRES', 'vnv_15:T3DRES', - eps=[1.E-6]) + eps=[1.E-8]) # Comparison with the last time frame of the reference file, sequential run # (prescribed velocity + velocity vertical profiles = 2).