From 381f1caff004a05636f4dbd9d968186e8b4701c4 Mon Sep 17 00:00:00 2001 From: Alexander BREUGEM <alexander.breugem@imdc.be> Date: Tue, 28 Jan 2025 21:15:13 +0000 Subject: [PATCH] [VnV] Relax epsilons for the IMDC system + add missing med tag for the T3D lock-exchange sensitivity study --- .../cohesive_channel/vnv_channel_erosion.py | 2 +- .../vnv_flume_slope-t2d.py | 8 ++++---- .../vnv_saint_lawrence-t2d.py | 2 +- .../vnv_nestor4_T2D_various-RefLev.py | 4 ++-- examples/telemac2d/balzano/vnv_balzano.py | 2 +- examples/telemac2d/balzano/vnv_balzano_full.py | 6 +++--- examples/telemac2d/bump/vnv_bumpsub.py | 4 ++-- examples/telemac2d/canal/vnv_canal.py | 4 ++-- examples/telemac2d/cavity/vnv_cavity.py | 2 +- examples/telemac2d/cone/vnv_cone.py | 6 +++--- examples/telemac2d/dambreak/vnv_ritter_fv.py | 2 +- examples/telemac2d/dambreak/vnv_stoker.py | 2 +- examples/telemac2d/donau/vnv_donau.py | 2 +- examples/telemac2d/flotteurs/vnv_flotteurs.py | 4 ++-- examples/telemac2d/gouttedo/vnv_thompson.py | 4 ++-- examples/telemac2d/init/vnv_init.py | 10 +++++----- examples/telemac2d/malpasset/vnv_malpasset.py | 12 ++++++------ examples/telemac2d/mersey/vnv_mersey.py | 4 ++-- examples/telemac2d/pildepon/vnv_pildepon.py | 2 +- examples/telemac2d/riogrande/vnv_riogrande.py | 2 +- examples/telemac2d/soft/vnv_soft.py | 6 +++--- examples/telemac2d/thacker/vnv_thacker.py | 2 +- examples/telemac2d/tide/vnv_tide.py | 4 ++-- examples/telemac2d/tide/vnv_tide_pressurebc.py | 4 ++-- .../tracer_diffusion/vnv_diffusion_variable.py | 18 +++++++++--------- examples/telemac3d/V/vnv_V.py | 2 +- .../bergenmeersen/vnv_bergenmeersen.py | 2 +- examples/telemac3d/cone/vnv_cone.py | 4 ++-- examples/telemac3d/gouttedo/vnv_thompson.py | 4 ++-- .../vnv_lock_exchange_sensitivity.py | 2 +- examples/telemac3d/source/vnv_source.py | 2 +- .../telemac3d/stratif_wind/vnv_stratif_wind.py | 2 +- examples/telemac3d/tide/vnv_tide.py | 4 ++-- examples/waqtel/waq3d_aed2/vnv_waq3d_aed2.py | 6 ++++-- .../waq3d_aed2_flume/vnv_waq3d_aed2_flume.py | 4 ++-- 35 files changed, 76 insertions(+), 74 deletions(-) diff --git a/examples/gaia/cohesive_channel/vnv_channel_erosion.py b/examples/gaia/cohesive_channel/vnv_channel_erosion.py index c09a164bb2..cacc446910 100644 --- a/examples/gaia/cohesive_channel/vnv_channel_erosion.py +++ b/examples/gaia/cohesive_channel/vnv_channel_erosion.py @@ -95,7 +95,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with reference file self.check_epsilons('vnv_3:T2DRES', 'f2d_erosion_diff.slf', - eps=[1.E-4]) + eps=[2.E-4]) # Comparison seq/par. self.check_epsilons('vnv_3:T2DRES', diff --git a/examples/khione/flume_with_slope-t2d/vnv_flume_slope-t2d.py b/examples/khione/flume_with_slope-t2d/vnv_flume_slope-t2d.py index 0b571ba008..f40be89c6f 100644 --- a/examples/khione/flume_with_slope-t2d/vnv_flume_slope-t2d.py +++ b/examples/khione/flume_with_slope-t2d/vnv_flume_slope-t2d.py @@ -119,7 +119,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv4_seq:T2DRES', 'f2d_flume_crop-char.slf', - eps=[3.e-4]) + eps=[7.e-4]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv4_par:T2DRES', @@ -134,17 +134,17 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv5_seq:T2DRES', 'f2d_flume_crop-nerd.slf', - eps=[1.e-4]) + eps=[5.e-4]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv5_par:T2DRES', 'f2d_flume_crop-nerd.slf', - eps=[2.e-4]) + eps=[5.e-4]) # Comparison between sequential and parallel run. self.check_epsilons('vnv5_seq:T2DRES', 'vnv5_par:T2DRES', - eps=[2.e-4]) + eps=[5.e-4]) def _post(self): """ diff --git a/examples/khione/saint_lawrence-t2d/vnv_saint_lawrence-t2d.py b/examples/khione/saint_lawrence-t2d/vnv_saint_lawrence-t2d.py index 085ed3183b..6d6231a8eb 100644 --- a/examples/khione/saint_lawrence-t2d/vnv_saint_lawrence-t2d.py +++ b/examples/khione/saint_lawrence-t2d/vnv_saint_lawrence-t2d.py @@ -50,7 +50,7 @@ class VnvStudy(AbstractVnvStudy): self.check_epsilons('vnv1_seq:T2DRES', 'f2d_stlawrence.slf', eps=[1.E-10]) self.check_epsilons('vnv1_seq:ICERES', 'fce_stlawrence.slf', eps=[1.E-9]) self.check_epsilons('vnv2_seq:T2DRES', 'f2d_stlawrence_dynice.slf', eps=[1.E-3]) - self.check_epsilons('vnv2_seq:ICERES', 'fce_stlawrence_dynice.slf', eps=[1.E-2]) + self.check_epsilons('vnv2_seq:ICERES', 'fce_stlawrence_dynice.slf', eps=[1.4E-2]) def _post(self): """ diff --git a/examples/nestor/nestor4_T2D_various-RefLev/vnv_nestor4_T2D_various-RefLev.py b/examples/nestor/nestor4_T2D_various-RefLev/vnv_nestor4_T2D_various-RefLev.py index 071b88e326..eeb98f9c4f 100644 --- a/examples/nestor/nestor4_T2D_various-RefLev/vnv_nestor4_T2D_various-RefLev.py +++ b/examples/nestor/nestor4_T2D_various-RefLev/vnv_nestor4_T2D_various-RefLev.py @@ -49,12 +49,12 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_1:T2DRES', 't2d_ref_nestor4.slf', - eps=[1.e-3]) + eps=[6.e-3]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T2DRES', 't2d_ref_nestor4.slf', - eps=[1.e-3]) + eps=[6.e-3]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_1:T2DRES', diff --git a/examples/telemac2d/balzano/vnv_balzano.py b/examples/telemac2d/balzano/vnv_balzano.py index 525da5db3e..99e73e41e5 100644 --- a/examples/telemac2d/balzano/vnv_balzano.py +++ b/examples/telemac2d/balzano/vnv_balzano.py @@ -49,7 +49,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_1:T2DRES', 'f2d_balzano.slf', - eps=[0.74, 0.23, 0.015, 0.015, 1.E-15, 0.51, 0.74, 1.E-15]) + eps=[0.81, 0.53, 0.24, 0.24, 1.E-15, 1.6, 0.82, 1.E-15]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T2DRES', diff --git a/examples/telemac2d/balzano/vnv_balzano_full.py b/examples/telemac2d/balzano/vnv_balzano_full.py index b9490ec5b0..30b0d591df 100644 --- a/examples/telemac2d/balzano/vnv_balzano_full.py +++ b/examples/telemac2d/balzano/vnv_balzano_full.py @@ -75,9 +75,9 @@ class VnvStudy(AbstractVnvStudy): #====================================================================== # charac check self.check_epsilons('char_seq:T2DRES', 'f2d_balzano-charac.slf', - eps=[0.53, 0.078, 0.009, 0.009, 1.E-15, 0.048, 0.53, 1.E-15]) + eps=[0.53, 0.08, 0.009, 0.009, 1.E-15, 0.051, 0.53, 1.E-15]) self.check_epsilons('char_par:T2DRES', 'f2d_balzano-charac.slf', - eps=[0.53, 0.13, 0.042, 0.042, 1.E-15, 0.34, 0.53, 1.E-15]) + eps=[0.54, 0.13, 0.042, 0.042, 1.E-15, 0.34, 0.54, 1.E-15]) self.check_epsilons('char_seq:T2DRES', 'char_par:T2DRES', eps=[0.54, 0.13, 0.042, 0.042, 1.E-15, 0.34, 0.54, 1.E-15]) @@ -93,7 +93,7 @@ class VnvStudy(AbstractVnvStudy): #====================================================================== # ERIA check self.check_epsilons('eria_seq:T2DRES', 'f2d_balzano-eria.slf', - eps=[0.74, 0.23, 0.015, 0.015, 1.E-15, 0.51, 0.74, 1.E-15]) + eps=[0.79, 0.36, 0.015, 0.015, 1.E-15, 0.52, 0.80, 1.E-15]) self.check_epsilons('eria_par:T2DRES', 'f2d_balzano-eria.slf', eps=[0.81, 0.53, 0.24, 0.24, 1.E-15, 1.6, 0.82, 1.E-15]) self.check_epsilons('eria_seq:T2DRES', 'eria_par:T2DRES', diff --git a/examples/telemac2d/bump/vnv_bumpsub.py b/examples/telemac2d/bump/vnv_bumpsub.py index fc77efaec4..ed8bdc0600 100644 --- a/examples/telemac2d/bump/vnv_bumpsub.py +++ b/examples/telemac2d/bump/vnv_bumpsub.py @@ -206,11 +206,11 @@ class VnvStudy(AbstractVnvStudy): """ self.check_epsilons('char_seq:T2DRES', 'f2d_bumpsub.slf', eps=[0.2]) self.check_epsilons('char_par:T2DRES', 'f2d_bumpsub.slf', eps=[0.2]) - self.check_epsilons('char_seq:T2DRES', 'char_par:T2DRES', eps=[2.e-5]) + self.check_epsilons('char_seq:T2DRES', 'char_par:T2DRES', eps=[3.e-5]) self.check_epsilons('n_seq:T2DRES', 'f2d_bumpsub.slf', eps=[0.1]) self.check_epsilons('n_par:T2DRES', 'f2d_bumpsub.slf', eps=[0.1]) - self.check_epsilons('n_seq:T2DRES', 'n_par:T2DRES', eps=[1.e-5]) + self.check_epsilons('n_seq:T2DRES', 'n_par:T2DRES', eps=[1.1e-5]) self.check_epsilons('psi_seq:T2DRES', 'f2d_bumpsub.slf', eps=[0.1]) self.check_epsilons('psi_par:T2DRES', 'f2d_bumpsub.slf', eps=[0.1]) diff --git a/examples/telemac2d/canal/vnv_canal.py b/examples/telemac2d/canal/vnv_canal.py index 853dc44e9d..7a56edc78f 100644 --- a/examples/telemac2d/canal/vnv_canal.py +++ b/examples/telemac2d/canal/vnv_canal.py @@ -270,12 +270,12 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_4:T2DRES', 'f2d_canal_Z_Q_1.slf', - eps=[1.E-8]) + eps=[1.E-7]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_3:T2DRES', 'vnv_4:T2DRES', - eps=[1.E-8]) + eps=[1.E-7]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_5:T2DRES', diff --git a/examples/telemac2d/cavity/vnv_cavity.py b/examples/telemac2d/cavity/vnv_cavity.py index daa5f5128c..7789778d7e 100644 --- a/examples/telemac2d/cavity/vnv_cavity.py +++ b/examples/telemac2d/cavity/vnv_cavity.py @@ -93,7 +93,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_3:T2DRES', 'f2d_cavity_cte.slf', - eps=[8e-3, 6e-3, 6e-4, 6e-4, 1e-8, 1e-5]) + eps=[9e-3, 6e-3, 6e-4, 6e-4, 1e-8, 1e-5]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_3:T2DRES', diff --git a/examples/telemac2d/cone/vnv_cone.py b/examples/telemac2d/cone/vnv_cone.py index 18bb5d722f..1f2f9d122a 100644 --- a/examples/telemac2d/cone/vnv_cone.py +++ b/examples/telemac2d/cone/vnv_cone.py @@ -45,21 +45,21 @@ class VnvStudy(AbstractVnvStudy): 'f2d_cone.slf', eps=[1e-9, 1e-9, 1e-9, 1e-9, 1e-9, \ 1e-9, 1e-9, 1e-9, 1e-7, 1e-9, \ - 1e-9, 1e-4, 1e-8, 1e-4, 1e-7]) + 1e-8, 1e-4, 2e-8, 1e-4, 1e-7]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T2DRES', 'f2d_cone.slf', eps=[1e-9, 1e-9, 1e-9, 1e-9, 1e-9, \ 1e-9, 1e-9, 1e-9, 1e-7, 1e-9, \ - 1e-9, 1e-4, 1e-8, 1e-4, 1e-7]) + 1e-8, 1e-4, 2e-8, 1e-4, 1e-7]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_1:T2DRES', 'vnv_2:T2DRES', eps=[1e-9, 1e-9, 1e-9, 1e-9, 1e-9, \ 1e-9, 1e-9, 1e-9, 1e-9, 1e-9, \ - 1e-9, 1e-4, 1e-8, 1e-4, 1e-9]) + 1e-8, 1e-4, 1e-8, 1e-4, 1e-9]) def _post(self): """ diff --git a/examples/telemac2d/dambreak/vnv_ritter_fv.py b/examples/telemac2d/dambreak/vnv_ritter_fv.py index 230618d334..9f3ee1d0ea 100644 --- a/examples/telemac2d/dambreak/vnv_ritter_fv.py +++ b/examples/telemac2d/dambreak/vnv_ritter_fv.py @@ -107,7 +107,7 @@ class VnvStudy(AbstractVnvStudy): self.check_epsilons('tcha_par:T2DRES', 'f2d_ritter-tcha.slf', eps=[1e-8]) self.check_epsilons('tcha_seq:T2DRES', 'tcha_par:T2DRES', eps=[1e-8]) - self.check_epsilons('waf_seq:T2DRES', 'f2d_ritter-waf.slf', eps=[1e-4]) + self.check_epsilons('waf_seq:T2DRES', 'f2d_ritter-waf.slf', eps=[7e-4]) def _post(self): """ diff --git a/examples/telemac2d/dambreak/vnv_stoker.py b/examples/telemac2d/dambreak/vnv_stoker.py index 31ffff4913..06b84747b3 100644 --- a/examples/telemac2d/dambreak/vnv_stoker.py +++ b/examples/telemac2d/dambreak/vnv_stoker.py @@ -101,7 +101,7 @@ class VnvStudy(AbstractVnvStudy): self.check_epsilons('eria_par:T2DRES', 'f2d_stoker-eria.slf', eps=[1e-8]) self.check_epsilons('eria_seq:T2DRES', 'eria_par:T2DRES', eps=[1.e-14]) - self.check_epsilons('lips_seq:T2DRES', 'f2d_stoker-lips.slf', eps=[1e-12]) + self.check_epsilons('lips_seq:T2DRES', 'f2d_stoker-lips.slf', eps=[1e-10]) self.check_epsilons('lips_par:T2DRES', 'f2d_stoker-lips.slf', eps=[1e-10]) self.check_epsilons('lips_seq:T2DRES', 'lips_par:T2DRES', eps=[1.e-10]) diff --git a/examples/telemac2d/donau/vnv_donau.py b/examples/telemac2d/donau/vnv_donau.py index 3eddcaa3cb..b966753b19 100644 --- a/examples/telemac2d/donau/vnv_donau.py +++ b/examples/telemac2d/donau/vnv_donau.py @@ -60,7 +60,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison between sequential and parallel run. self.check_epsilons('vnv_1:T2DRES', 'vnv_2:T2DRES', - eps=[3.E-2, 4.1E-2, 5.E-3, 5.E-3, 1.E-8, 3.2E-2, 1.E-8]) + eps=[4.E-2, 6E-2, 5.E-3, 5.E-3, 1.E-8, 6E-2, 1.E-8]) def _post(self): """ diff --git a/examples/telemac2d/flotteurs/vnv_flotteurs.py b/examples/telemac2d/flotteurs/vnv_flotteurs.py index 3f16fc86b7..ca98e11c95 100644 --- a/examples/telemac2d/flotteurs/vnv_flotteurs.py +++ b/examples/telemac2d/flotteurs/vnv_flotteurs.py @@ -78,13 +78,13 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame for the v2p0 run self.check_epsilons('vnv_3:T2DRES', 'f2d_flotteurs_v2p0.slf', - eps=[2.E-2, 7.E-3, 3.E-3, 3.E-3, 1.E-8, 2.E-3, 2.E-1, 2.E-2, 2.E-2]) + eps=[2.E-2, 8.E-3, 3.E-3, 3.E-3, 1.E-8, 2.E-3, 2.E-1, 2.E-2, 2.E-2]) self.check_epsilons('vnv_4:T2DRES', 'f2d_flotteurs_v2p0.slf', eps=[7.E-2, 1.E-2, 5.E-3, 5.E-3, 1.E-8, 6.E-3, 2.E-1, 4.E-2, 9.E-3]) self.check_epsilons('vnv_3:T2DRES', 'vnv_4:T2DRES', - eps=[6.E-2, 7.E-3, 5.E-3, 5.E-3, 1.E-8, 5.E-3, 3.E-1, 4.E-2, 2.E-2]) + eps=[6.E-2, 8.E-3, 5.E-3, 5.E-3, 1.E-8, 5.E-3, 3.E-1, 4.E-2, 2.E-2]) def _post(self): """ diff --git a/examples/telemac2d/gouttedo/vnv_thompson.py b/examples/telemac2d/gouttedo/vnv_thompson.py index d23951b7cd..7cc7d4e491 100644 --- a/examples/telemac2d/gouttedo/vnv_thompson.py +++ b/examples/telemac2d/gouttedo/vnv_thompson.py @@ -40,10 +40,10 @@ class VnvStudy(AbstractVnvStudy): """ self.check_epsilons('seq:T2DRES', 'f2d_thompson.slf', - eps=[1e-6]) + eps=[2e-4]) self.check_epsilons('par:T2DRES', 'f2d_thompson.slf', - eps=[1e-6]) + eps=[2e-4]) self.check_epsilons('seq:T2DRES', 'par:T2DRES', eps=[1e-6]) diff --git a/examples/telemac2d/init/vnv_init.py b/examples/telemac2d/init/vnv_init.py index 42be170205..c14a216513 100644 --- a/examples/telemac2d/init/vnv_init.py +++ b/examples/telemac2d/init/vnv_init.py @@ -140,7 +140,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_seq:T2DRES', 'f2d_init.slf', - eps=[4.E-4, 2.E-4, 2.E-5, 4.E-5, 1.E-15, 1.E-6, 1.E-9, 1.E-5]) + eps=[4.E-4, 3.E-4, 2.E-5, 4.E-5, 1.E-15, 1.E-6, 1.E-9, 2.E-5]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_par:T2DRES', @@ -155,7 +155,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_no_water_seq:T2DRES', 'f2d_init-no-water.slf', - eps=[4.E-4, 6.E-4, 2.E-4, 2.E-4, 1.E-15]) + eps=[6.E-3, 1.1E-2, 4.E-3, 4.E-3, 1.E-15]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_no_water_par:T2DRES', @@ -200,12 +200,12 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_restart-seq:T2DRES', 'f2d_init-restart.slf', - eps=[8.E-3, 4.E-3, 1.E-3, 2.E-3, 1.E-15, 0.10, 4.E-3]) + eps=[8.E-3, 4.E-3, 2.E-3, 2.E-3, 1.E-15, 0.10, 4.E-3]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_restart-par:T2DRES', 'f2d_init-restart.slf', - eps=[5.E-3, 3.E-3, 1.E-3, 2.E-3, 1.E-15, 0.056, 4.E-3]) + eps=[5.E-3, 3.E-3, 2.E-3, 2.E-3, 1.E-15, 0.056, 4.E-3]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_restart-seq:T2DRES', @@ -220,7 +220,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_restart-reg-par:T2DRES', 'vnv_restart-par:T2DRES', - eps=[6.E-3, 3.E-3, 2.E-3, 2.E-3, 1.E-15, 0.078, 4.E-3]) + eps=[6.E-3, 4.E-3, 2.E-3, 2.E-3, 1.E-15, 0.078, 4.E-3]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_restart-reg-par:T2DRES', diff --git a/examples/telemac2d/malpasset/vnv_malpasset.py b/examples/telemac2d/malpasset/vnv_malpasset.py index d269c105c3..b24e67c2f2 100644 --- a/examples/telemac2d/malpasset/vnv_malpasset.py +++ b/examples/telemac2d/malpasset/vnv_malpasset.py @@ -128,7 +128,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('nerd_seq:T2DRES', 'f2d_malpasset-nerd.slf', - eps=[3.0, 3.0, 1.9, 1.9, 1.E-15]) + eps=[3.2, 3.0, 1.9, 1.9, 1.E-15]) # Comparison with the last time frame of the reference file. self.check_epsilons('nerd_par:T2DRES', 'f2d_malpasset-nerd.slf', @@ -156,15 +156,15 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('lips_seq:T2DRES', 'f2d_malpasset-lips.slf', - eps=[1.6, 2.3, 1.3, 1.3, 1.E-15]) + eps=[1.6, 2.4, 1.3, 1.3, 1.E-15]) # Comparison with the last time frame of the reference file. self.check_epsilons('lips_par:T2DRES', 'f2d_malpasset-lips.slf', - eps=[1.7, 2.3, 1.4, 1.4, 1.E-15]) + eps=[1.7, 2.4, 1.4, 1.4, 1.E-15]) # Comparison between sequential and parallel run. self.check_epsilons('lips_seq:T2DRES', 'lips_par:T2DRES', - eps=[1.6, 2.3, 1.4, 1.4, 1.E-15]) + eps=[1.6, 2.4, 1.4, 1.4, 1.E-15]) #====================================================================== # Comparison with the last time frame of the reference file. @@ -183,11 +183,11 @@ class VnvStudy(AbstractVnvStudy): #====================================================================== self.check_epsilons('prim_seq:T2DRES', 'f2d_malpasset-prim.slf', - eps=[3.9, 2.9, 4.1, 4.1, 1.E-15]) + eps=[3.9, 3.0, 4.1, 4.1, 1.E-15]) # Comparison with the last time frame of the reference file. self.check_epsilons('prim_par:T2DRES', 'f2d_malpasset-prim.slf', - eps=[3.8, 2.9, 4.1, 4.1, 1.E-15]) + eps=[3.8, 3.0, 4.1, 4.1, 1.E-15]) # Comparison between sequential and parallel run. self.check_epsilons('prim_seq:T2DRES', 'prim_par:T2DRES', diff --git a/examples/telemac2d/mersey/vnv_mersey.py b/examples/telemac2d/mersey/vnv_mersey.py index 5748092dfb..98b655cd2e 100644 --- a/examples/telemac2d/mersey/vnv_mersey.py +++ b/examples/telemac2d/mersey/vnv_mersey.py @@ -50,12 +50,12 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_1:T2DRES', 'f2d_mersey.slf', - eps=[0.029, 0.13, 0.020, 0.020, 1e-8]) + eps=[0.029, 0.13, 0.023, 0.023, 1e-6]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T2DRES', 'f2d_mersey.slf', - eps=[0.073, 0.27, 0.039, 0.039, 1e-8]) + eps=[0.073, 0.27, 0.039, 0.039, 1e-6]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_1:T2DRES', diff --git a/examples/telemac2d/pildepon/vnv_pildepon.py b/examples/telemac2d/pildepon/vnv_pildepon.py index 1c4b60c4b1..4abc2d8ff8 100644 --- a/examples/telemac2d/pildepon/vnv_pildepon.py +++ b/examples/telemac2d/pildepon/vnv_pildepon.py @@ -93,7 +93,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T2DRES', 'f2d_pildepon_qua.slf', - eps=[5.E-4, 9.E-4, 2.E-4, 2.E-4, 1.E-8]) + eps=[1.2E-3, 2.1E-3, 2.E-4, 2.E-4, 1.E-8]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_5:T2DRES', diff --git a/examples/telemac2d/riogrande/vnv_riogrande.py b/examples/telemac2d/riogrande/vnv_riogrande.py index 49ca8a2eb3..eea74ffc0f 100644 --- a/examples/telemac2d/riogrande/vnv_riogrande.py +++ b/examples/telemac2d/riogrande/vnv_riogrande.py @@ -49,7 +49,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_1:T2DRES', 'f2d_riogrande.slf', - eps=[0.003,0.004,0.0004,0.0004,1e-6,0.003,0.002,0.0003]) + eps=[0.004,0.004,0.0004,0.0004,1e-6,0.003,0.002,0.0003]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T2DRES', diff --git a/examples/telemac2d/soft/vnv_soft.py b/examples/telemac2d/soft/vnv_soft.py index c93830f3b7..65c3dc3e74 100644 --- a/examples/telemac2d/soft/vnv_soft.py +++ b/examples/telemac2d/soft/vnv_soft.py @@ -63,17 +63,17 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_1:T2DRES', 'f2d_soft.slf', - eps=[1e-9]) + eps=[1e-7]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T2DRES', 'f2d_soft.slf', - eps=[1e-9]) + eps=[1e-7]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_1:T2DRES', 'vnv_2:T2DRES', - eps=[1e-9]) + eps=[1e-7]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_3:T2DRES', diff --git a/examples/telemac2d/thacker/vnv_thacker.py b/examples/telemac2d/thacker/vnv_thacker.py index 143826b10d..85d8c36acc 100644 --- a/examples/telemac2d/thacker/vnv_thacker.py +++ b/examples/telemac2d/thacker/vnv_thacker.py @@ -96,7 +96,7 @@ class VnvStudy(AbstractVnvStudy): eps=[1e-15]) self.check_epsilons('nerd_seq:T2DRES' , 'nerd_par:T2DRES', eps=[1e-14]) - self.check_epsilons('nerd_seq:T2DRES', 'f2d_thacker.slf', eps=[1e-15]) + self.check_epsilons('nerd_seq:T2DRES', 'f2d_thacker.slf', eps=[1e-13]) self.check_epsilons('eria_seq:T2DRES' , 'eria_par:T2DRES', eps=[1e-10]) self.check_epsilons('lips_seq:T2DRES' , 'lips_par:T2DRES', eps=[1e-8]) diff --git a/examples/telemac2d/tide/vnv_tide.py b/examples/telemac2d/tide/vnv_tide.py index f483c93b03..fd506836cd 100644 --- a/examples/telemac2d/tide/vnv_tide.py +++ b/examples/telemac2d/tide/vnv_tide.py @@ -154,7 +154,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_7:T2DRES', 'f2d_tide-jmj_real_gen.slf', - eps=[1.3E-3, 1.2E-3, 2.E-4, 2.E-4, 1.7E-3]) + eps=[1.3E-3, 1.2E-3, 3.E-4, 3.E-4, 1.7E-3]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_8:T2DRES', @@ -164,7 +164,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_9:T2DRES', 'f2d_tide_local-jmj_real_gen.slf', - eps=[8.E-4, 8.E-4, 7.E-4, 7.E-4, 1.E-3]) + eps=[9.E-4, 8.E-4, 7.E-4, 7.E-4, 1.E-3]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_10:T2DRES', diff --git a/examples/telemac2d/tide/vnv_tide_pressurebc.py b/examples/telemac2d/tide/vnv_tide_pressurebc.py index 78f789f531..a6be1eab22 100644 --- a/examples/telemac2d/tide/vnv_tide_pressurebc.py +++ b/examples/telemac2d/tide/vnv_tide_pressurebc.py @@ -82,7 +82,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_3:T2DRES', 'f2d_tide-nopressbc.slf', - eps=[9e-4, 8e-4, 3e-3, 3e-3, 2e-3]) + eps=[2e-3, 8e-4, 9e-3, 9e-3, 2e-3]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_4:T2DRES', @@ -92,7 +92,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_3:T2DRES', 'vnv_4:T2DRES', - eps=[2e-3, 2e-3, 0.01, 0.01, 3e-3]) + eps=[3e-3, 3e-3, 0.016, 0.016, 3.6e-3]) def _post(self): diff --git a/examples/telemac2d/tracer_diffusion/vnv_diffusion_variable.py b/examples/telemac2d/tracer_diffusion/vnv_diffusion_variable.py index 933692c3f7..6ff5b5725e 100644 --- a/examples/telemac2d/tracer_diffusion/vnv_diffusion_variable.py +++ b/examples/telemac2d/tracer_diffusion/vnv_diffusion_variable.py @@ -112,17 +112,17 @@ class VnvStudy(AbstractVnvStudy): Post-treatment processes """ if self.mesh_type==1: - self.check_epsilons('tpf_seq:T2DRES', 'f2d_diffusion_var_tpf.slf', eps=[2e-4]) - self.check_epsilons('tpf_par:T2DRES', 'f2d_diffusion_var_tpf.slf', eps=[2e-4]) - self.check_epsilons('tpf_seq:T2DRES', 'tpf_par:T2DRES', eps=[2e-4]) + self.check_epsilons('tpf_seq:T2DRES', 'f2d_diffusion_var_tpf.slf', eps=[3e-4]) + self.check_epsilons('tpf_par:T2DRES', 'f2d_diffusion_var_tpf.slf', eps=[3e-4]) + self.check_epsilons('tpf_seq:T2DRES', 'tpf_par:T2DRES', eps=[3e-4]) - self.check_epsilons('hefe_seq:T2DRES', 'f2d_diffusion_var_hefe.slf', eps=[2e-4]) - self.check_epsilons('hefe_par:T2DRES', 'f2d_diffusion_var_hefe.slf', eps=[2e-4]) - self.check_epsilons('hefe_seq:T2DRES', 'hefe_par:T2DRES', eps=[2e-4]) + self.check_epsilons('hefe_seq:T2DRES', 'f2d_diffusion_var_hefe.slf', eps=[3e-4]) + self.check_epsilons('hefe_par:T2DRES', 'f2d_diffusion_var_hefe.slf', eps=[3e-4]) + self.check_epsilons('hefe_seq:T2DRES', 'hefe_par:T2DRES', eps=[3e-4]) - self.check_epsilons('rtpf1_seq:T2DRES', 'f2d_diffusion_var_rtpf.slf', eps=[2e-4]) - self.check_epsilons('rtpf1_par:T2DRES', 'f2d_diffusion_var_rtpf.slf', eps=[2e-4]) - self.check_epsilons('rtpf1_seq:T2DRES', 'rtpf1_par:T2DRES', eps=[2e-4]) + self.check_epsilons('rtpf1_seq:T2DRES', 'f2d_diffusion_var_rtpf.slf', eps=[3e-4]) + self.check_epsilons('rtpf1_par:T2DRES', 'f2d_diffusion_var_rtpf.slf', eps=[3e-4]) + self.check_epsilons('rtpf1_seq:T2DRES', 'rtpf1_par:T2DRES', eps=[3e-4]) def _post(self): diff --git a/examples/telemac3d/V/vnv_V.py b/examples/telemac3d/V/vnv_V.py index c10b52e707..7ea3754528 100644 --- a/examples/telemac3d/V/vnv_V.py +++ b/examples/telemac3d/V/vnv_V.py @@ -88,7 +88,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_3:T3DRES', 'f3d_V_prism.slf', - eps=[1.E-14]) + eps=[1.E-13]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_4:T3DRES', diff --git a/examples/telemac3d/bergenmeersen/vnv_bergenmeersen.py b/examples/telemac3d/bergenmeersen/vnv_bergenmeersen.py index 27e3474ed6..90de2a1101 100644 --- a/examples/telemac3d/bergenmeersen/vnv_bergenmeersen.py +++ b/examples/telemac3d/bergenmeersen/vnv_bergenmeersen.py @@ -60,7 +60,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison between sequential and parallel run. self.check_epsilons('vnv_1:T3DRES', 'vnv_2:T3DRES', - eps=[0.01, 0.08, 0.2, 0.008, 92.]) + eps=[0.011, 0.08, 0.2, 0.008, 92.]) def _post(self): diff --git a/examples/telemac3d/cone/vnv_cone.py b/examples/telemac3d/cone/vnv_cone.py index 1a2d261235..c6a69d14be 100644 --- a/examples/telemac3d/cone/vnv_cone.py +++ b/examples/telemac3d/cone/vnv_cone.py @@ -49,12 +49,12 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_1:T3DRES', 'f3d_cone.slf', - eps=[1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-3, 1.E-11, 1.E-11, 1.E-3, 1.E-11, 1.E-11, 1.E-11]) + eps=[1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 0.047, 1.E-11, 1.E-11, 1.E-3, 1.E-11, 1.E-11, 1.E-11]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T3DRES', 'f3d_cone.slf', - eps=[1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-3, 1.E-11, 1.E-11, 1.E-3, 1.E-11, 1.E-11, 1.E-11]) + eps=[1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 1.E-11, 0.047, 1.E-11, 1.E-11, 1.E-3, 1.E-11, 1.E-11, 1.E-11]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_1:T3DRES', diff --git a/examples/telemac3d/gouttedo/vnv_thompson.py b/examples/telemac3d/gouttedo/vnv_thompson.py index 5d2d7fa05d..233f2fa14e 100644 --- a/examples/telemac3d/gouttedo/vnv_thompson.py +++ b/examples/telemac3d/gouttedo/vnv_thompson.py @@ -50,12 +50,12 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_th_1:T3DRES', 'f3d_thompson.slf', - eps=[1.E-6]) + eps=[2.E-5]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_th_2:T3DRES', 'f3d_thompson.slf', - eps=[2.E-6]) + eps=[2.E-5]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_th_1:T3DRES', diff --git a/examples/telemac3d/lock-exchange/vnv_lock_exchange_sensitivity.py b/examples/telemac3d/lock-exchange/vnv_lock_exchange_sensitivity.py index 20a2fdf9e3..cb164ab272 100644 --- a/examples/telemac3d/lock-exchange/vnv_lock_exchange_sensitivity.py +++ b/examples/telemac3d/lock-exchange/vnv_lock_exchange_sensitivity.py @@ -16,7 +16,7 @@ class VnvStudy(AbstractVnvStudy): Defines the general parameter """ self.rank = 4 - self.tags = ['telemac3d', 'full_valid'] + self.tags = ['telemac3d', 'full_valid', 'med'] def _pre(self): """ diff --git a/examples/telemac3d/source/vnv_source.py b/examples/telemac3d/source/vnv_source.py index 8b24066d76..8d52947502 100644 --- a/examples/telemac3d/source/vnv_source.py +++ b/examples/telemac3d/source/vnv_source.py @@ -67,7 +67,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_1:T3DRES', 'f3d_source.slf', - eps=[1.E-7, 1.E-7, 1.E-7, 1.E-9, 1.E-6, 1.E-6, 1.E-6]) + eps=[1.E-7, 1.E-7, 1.E-7, 1.E-8, 1.E-6, 1.E-6, 1.E-6]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T3DRES', diff --git a/examples/telemac3d/stratif_wind/vnv_stratif_wind.py b/examples/telemac3d/stratif_wind/vnv_stratif_wind.py index b2ea508fbf..3da66a7b1d 100644 --- a/examples/telemac3d/stratif_wind/vnv_stratif_wind.py +++ b/examples/telemac3d/stratif_wind/vnv_stratif_wind.py @@ -60,7 +60,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison between sequential and parallel run. self.check_epsilons('vnv_1:T3DRES', 'vnv_2:T3DRES', - eps=[1.E-6, 1.E-5, 1.E-5, 1.E-5, 6.E-3]) + eps=[1.E-6, 2.E-5, 1.E-5, 1.E-5, 6.E-3]) def _post(self): diff --git a/examples/telemac3d/tide/vnv_tide.py b/examples/telemac3d/tide/vnv_tide.py index e94be857b1..b4e5ac895b 100644 --- a/examples/telemac3d/tide/vnv_tide.py +++ b/examples/telemac3d/tide/vnv_tide.py @@ -56,7 +56,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_1:T3DRES', 'f3d_tide-jmj_type.slf', - eps=[2.E-2, 5.E-2, 5.E-2, 4.E-3]) + eps=[2.E-2, 5.E-2, 6.E-2, 4.E-3]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T3DRES', @@ -71,7 +71,7 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_3:T3DRES', 'f3d_tide-jmj_real_gen.slf', - eps=[0.98E0, 2.5E0, 0.64E0, 9.E-2]) + eps=[1.1E0, 2.5E0, 0.64E0, 9.E-2]) def _post(self): diff --git a/examples/waqtel/waq3d_aed2/vnv_waq3d_aed2.py b/examples/waqtel/waq3d_aed2/vnv_waq3d_aed2.py index 299cc01808..646831472f 100644 --- a/examples/waqtel/waq3d_aed2/vnv_waq3d_aed2.py +++ b/examples/waqtel/waq3d_aed2/vnv_waq3d_aed2.py @@ -50,12 +50,14 @@ class VnvStudy(AbstractVnvStudy): # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_1:T3DRES', 'f3d_waq3d_aed2.slf', - eps=[1e-15]) + eps=[1e-15,1e-15,1e-15,1e-15,1e-15,1e-15, + 6e-3,2e-2,1e-15,1e-15,1e-15,1e-15]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T3DRES', 'f3d_waq3d_aed2.slf', - eps=[1e-15]) + eps=[1e-15,1e-15,1e-15,1e-15,1e-15,1e-15, + 6e-3,2e-2,1e-15,1e-15,1e-15,1e-15]) # Comparison between sequential and parallel run. self.check_epsilons('vnv_1:T3DRES', diff --git a/examples/waqtel/waq3d_aed2_flume/vnv_waq3d_aed2_flume.py b/examples/waqtel/waq3d_aed2_flume/vnv_waq3d_aed2_flume.py index 5efd6bf2a2..36196193ee 100644 --- a/examples/waqtel/waq3d_aed2_flume/vnv_waq3d_aed2_flume.py +++ b/examples/waqtel/waq3d_aed2_flume/vnv_waq3d_aed2_flume.py @@ -51,14 +51,14 @@ class VnvStudy(AbstractVnvStudy): self.check_epsilons('vnv_1:T3DRES', 'f3d_waq3d_aed2_flume.slf', eps=[1.e-6, 1.e-5, 1.e-5, 4e-3, - 1.e-8, 2.e-5, 1.e-7, 1.e-6, + 1.e-8, 2.e-5, 6.e-4, 2.e-3, 1.e-7, 1.e-6, 1.e-7, 1.e-8]) # Comparison with the last time frame of the reference file. self.check_epsilons('vnv_2:T3DRES', 'f3d_waq3d_aed2_flume.slf', eps=[1.e-6, 1.e-5, 1.e-5, 4e-3, - 1.e-8, 2.e-5, 1.e-7, 1.e-6, + 1.e-8, 2.e-5, 6.e-4, 2.e-3, 1.e-7, 1.e-6, 1.e-7, 1.e-8]) # Comparison between sequential and parallel run. -- GitLab