From c5fd9ddb48ee3f9cae39ba1ceecf02181f3a21c8 Mon Sep 17 00:00:00 2001
From: Andreas Lauser <and@poware.org>
Date: Fri, 10 Mar 2017 11:23:51 +0100
Subject: [PATCH] make the unit tests to explicitly use flow_legacy instead of
 flow

the results of `flow_legacy` and `flow_ebos` are not bit-wise
identical. The same tests using `flow_ebos` should to be added when
re-organizing the unit tests the next time.
---
 compareECLFiles.cmake     | 8 ++++----
 opm/autodiff/FlowMain.hpp | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake
index 455a32dac..36c7fa63c 100644
--- a/compareECLFiles.cmake
+++ b/compareECLFiles.cmake
@@ -93,10 +93,10 @@ opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-regressionTest.sh "")
 set(abs_tol 2e-2)
 set(rel_tol 1e-5)
 
-add_test_compareECLFiles(spe1 SPE1CASE2 flow ${abs_tol} ${rel_tol} compareECLFiles "")
+add_test_compareECLFiles(spe1 SPE1CASE2 flow_legacy ${abs_tol} ${rel_tol} compareECLFiles "")
 add_test_compareECLFiles(spe1 SPE1CASE1 flow_sequential ${abs_tol} ${rel_tol} compareECLFiles "")
-add_test_compareECLFiles(spe3 SPE3CASE1 flow ${abs_tol} ${rel_tol} compareECLFiles "")
-add_test_compareECLFiles(spe9 SPE9_CP_SHORT flow ${abs_tol} ${rel_tol} compareECLFiles "")
+add_test_compareECLFiles(spe3 SPE3CASE1 flow_legacy ${abs_tol} ${rel_tol} compareECLFiles "")
+add_test_compareECLFiles(spe9 SPE9_CP_SHORT flow_legacy ${abs_tol} ${rel_tol} compareECLFiles "")
 add_test_compareECLFiles(msw_2d_h 2D_H__ flow_multisegment ${abs_tol} ${rel_tol} compareECLFiles "")
 
 # Restart tests
@@ -113,7 +113,7 @@ endforeach()
 # Init tests
 opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-init-regressionTest.sh "")
 
-foreach(sim flow flow_ebos)
+foreach(sim flow_legacy flow_ebos)
   add_test_compareECLFiles(norne NORNE_ATW2013 ${sim} ${abs_tol} ${rel_tol} compareECLInitFiles /init)
 endforeach()
 
diff --git a/opm/autodiff/FlowMain.hpp b/opm/autodiff/FlowMain.hpp
index a71bf6d73..407cf3dbb 100644
--- a/opm/autodiff/FlowMain.hpp
+++ b/opm/autodiff/FlowMain.hpp
@@ -311,7 +311,7 @@ namespace Opm
                 const std::string version = moduleVersionName();
                 std::cout << "**********************************************************************\n";
                 std::cout << "*                                                                    *\n";
-                std::cout << "*                   This is Flow (version " << version << ")"
+                std::cout << "*            This is flow_legacy (version " << version << ")"
                           << std::string(26 - version.size(), ' ') << "*\n";
                 std::cout << "*                                                                    *\n";
                 std::cout << "* Flow is a simulator for fully implicit three-phase black-oil flow, *\n";