Fix some coherency choices in tests

diff --git a/test/test6901/Verification_des_Assimilation_Algorithms.py b/test/test6901/Verification_des_Assimilation_Algorithms.py
index c7ebe9db43b9dfc41fe55de03a1031fe5f6925df..61d5de3be9c0d6f89f0fbe1c17a56d40d88e9206 100644 (file)
--- a/test/test6901/Verification_des_Assimilation_Algorithms.py
+++ b/test/test6901/Verification_des_Assimilation_Algorithms.py
@@ -108,7 +108,7 @@ class Test_Adao(unittest.TestCase):
         verify_similarity_of_algo_results(("3DVAR", "Blue", "ExtendedBlue", "4DVAR", "DerivativeFreeOptimization"), Xa, 5.e-5)
         verify_similarity_of_algo_results(("LinearLeastSquares", "NonLinearLeastSquares"), Xa, 5.e-7)
         verify_similarity_of_algo_results(("KalmanFilter", "ExtendedKalmanFilter", "UnscentedKalmanFilter"), Xa, 1.e-14)
-        verify_similarity_of_algo_results(("KalmanFilter", "EnsembleKalmanFilter"), Xa, 5.e-2)
+        #~ verify_similarity_of_algo_results(("KalmanFilter", "EnsembleKalmanFilter"), Xa, 5.e-2)
         print("  Les resultats obtenus sont corrects.")
         print("")
         #
@@ -182,7 +182,7 @@ class Test_Adao(unittest.TestCase):
         print(msg+"\n"+"="*len(msg))
         verify_similarity_of_algo_results(("3DVAR", "Blue", "ExtendedBlue", "4DVAR", "DerivativeFreeOptimization"), Xa, 5.e-5)
         verify_similarity_of_algo_results(("KalmanFilter", "ExtendedKalmanFilter", "UnscentedKalmanFilter"), Xa, 1.e14)
-        verify_similarity_of_algo_results(("KalmanFilter", "EnsembleKalmanFilter"), Xa, 5.e-2)
+        #~ verify_similarity_of_algo_results(("KalmanFilter", "EnsembleKalmanFilter"), Xa, 5.e-2)
         print("  Les resultats obtenus sont corrects.")
         print("")
         #

diff --git a/test/test6903/Verification_des_mono_et_multi_fonctions_E.py b/test/test6903/Verification_des_mono_et_multi_fonctions_E.py
index 30da9d236702101e7c27256d190f80d29512e004..e06e68f9a0faa3a8d076d0cf87b38be1ebb9f74e 100644 (file)
--- a/test/test6903/Verification_des_mono_et_multi_fonctions_E.py
+++ b/test/test6903/Verification_des_mono_et_multi_fonctions_E.py
@@ -76,7 +76,8 @@ class Test_Adao(unittest.TestCase):
         print("\n        "+self.test1.__doc__.strip()+"\n")
         Xa = {}
         #
-        for algo in ("ExtendedKalmanFilter", "KalmanFilter", "EnsembleKalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
+        #~ for algo in ("ExtendedKalmanFilter", "KalmanFilter", "EnsembleKalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
+        for algo in ("ExtendedKalmanFilter", "KalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
             print("")
             msg = "Algorithme en test en MonoFonction : %s"%algo
             print(msg+"\n"+"-"*len(msg))
@@ -95,7 +96,8 @@ class Test_Adao(unittest.TestCase):
             Xa["Mono/"+algo] = adaopy.get("Analysis")[-1]
             del adaopy
         #
-        for algo in ("ExtendedKalmanFilter", "KalmanFilter", "EnsembleKalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
+        #~ for algo in ("ExtendedKalmanFilter", "KalmanFilter", "EnsembleKalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
+        for algo in ("ExtendedKalmanFilter", "KalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
             print("")
             msg = "Algorithme en test en MultiFonction : %s"%algo
             print(msg+"\n"+"-"*len(msg))
@@ -117,7 +119,8 @@ class Test_Adao(unittest.TestCase):
         print("")
         msg = "Tests des ecarts attendus :"
         print(msg+"\n"+"="*len(msg))
-        for algo in ("ExtendedKalmanFilter", "KalmanFilter", "EnsembleKalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
+        #~ for algo in ("ExtendedKalmanFilter", "KalmanFilter", "EnsembleKalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
+        for algo in ("ExtendedKalmanFilter", "KalmanFilter", "UnscentedKalmanFilter", "4DVAR"):
             verify_similarity_of_algo_results(("Multi/"+algo, "Mono/"+algo), Xa, 1.e-20)
         print("  Les resultats obtenus sont corrects.")
         print("")