testing all three solution strategies for test_threecomponents_ptflash

and also, the reference result comparison is added.

opm/material/constraintsolvers/PTFlash.hpp

@@ -2,6 +2,7 @@
 // vi: set et ts=4 sw=4 sts=4:
 /*
   Copyright 2022 NORCE.
+  Copyright 2022 SINTEF Digital, Mathematics and Cybernetics.
 
   This file is part of the Open Porous Media project (OPM).
 
@@ -1209,11 +1210,14 @@ protected:
             }
 
         }
-        throw std::runtime_error("Successive substitution composition update did not converge within maxIterations");
+        if (!newton_afterwards) {
+            throw std::runtime_error(
+                    "Successive substitution composition update did not converge within maxIterations");
+        }
     }
     
 };//end PTFlash
 
 } // namespace Opm
 
-#endif
+#endif

opm/material/fluidsystems/ThreeComponentFluidSystem.hh

@@ -1,3 +1,28 @@
+// -*- mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
+// vi: set et ts=4 sw=4 sts=4:
+/*
+  Copyright 2022 SINTEF Digital, Mathematics and Cybernetics.
+
+  This file is part of the Open Porous Media project (OPM).
+
+  OPM is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 2 of the License, or
+  (at your option) any later version.
+
+  OPM is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with OPM.  If not, see <http://www.gnu.org/licenses/>.
+
+  Consult the COPYING file in the top-level source directory of this
+  module for the precise wording of the license and the list of
+  copyright holders.
+*/
+
 #ifndef OPM_THREECOMPONENTFLUIDSYSTEM_HH
 #define OPM_THREECOMPONENTFLUIDSYSTEM_HH
 
@@ -195,4 +220,4 @@ namespace Opm {
 
     };
 }
-#endif //OPM_THREECOMPONENTFLUIDSYSTEM_HH
+#endif //OPM_THREECOMPONENTFLUIDSYSTEM_HH

opm/material/viscositymodels/LBCco2rich.hpp

@@ -27,8 +27,8 @@
  * \copydoc Opm::ViscosityModels
  */
 
-#ifndef LBC_MODIFIED_HPP
-#define LBC_MODIFIED_HPP
+#ifndef OPM_LBC_CO2RICH_HPP
+#define OPM_LBC_CO2RICH_HPP
 
 #include <cmath>
 #include <vector>
@@ -130,4 +130,4 @@ public:
 
 }; // namespace Opm
 
-#endif // LBC_co2rich_HPP
+#endif // OPM_LBC_CO2RICH_HPP