OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

disable json input for boost 1.48

Browse Source
This commit is contained in:
Arne Morten Kvarving 2020-02-17 14:10:01 +01:00
parent 76682497e8
commit 226a6cb434
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/simulators/linalg/setupPropertyTree.cpp
View File

@ -21,6 +21,7 @@
#include <opm/simulators/linalg/setupPropertyTree.hpp> #include <opm/simulators/linalg/setupPropertyTree.hpp>
#include <boost/version.hpp>
#include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/json_parser.hpp>
namespace Opm namespace Opm
@ -35,9 +36,12 @@ boost::property_tree::ptree
setupPropertyTree(const FlowLinearSolverParameters& p) setupPropertyTree(const FlowLinearSolverParameters& p)
{ {
boost::property_tree::ptree prm; boost::property_tree::ptree prm;
#if BOOST_VERSION / 100 % 1000 > 48
if (p.linear_solver_configuration_json_file_ != "none") { if (p.linear_solver_configuration_json_file_ != "none") {
boost::property_tree::read_json(p.linear_solver_configuration_json_file_, prm); boost::property_tree::read_json(p.linear_solver_configuration_json_file_, prm);
} else { } else
#endif
{
prm.put("tol", p.linear_solver_reduction_); prm.put("tol", p.linear_solver_reduction_);
prm.put("maxiter", p.linear_solver_maxiter_); prm.put("maxiter", p.linear_solver_maxiter_);
prm.put("verbosity", p.linear_solver_verbosity_); prm.put("verbosity", p.linear_solver_verbosity_);

4
tests/test_flexiblesolver.cpp
View File

@ -21,10 +21,12 @@
#define BOOST_TEST_MODULE OPM_test_FlexibleSolver #define BOOST_TEST_MODULE OPM_test_FlexibleSolver
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/version.hpp>
#include <dune/common/version.hh> #include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) #if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) && \
BOOST_VERSION / 100 % 1000 > 48
#include <opm/simulators/linalg/FlexibleSolver.hpp> #include <opm/simulators/linalg/FlexibleSolver.hpp>

4
tests/test_preconditionerfactory.cpp
View File

@ -21,10 +21,12 @@
#define BOOST_TEST_MODULE OPM_test_PreconditionerFactory #define BOOST_TEST_MODULE OPM_test_PreconditionerFactory
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
#include <boost/version.hpp>
#include <dune/common/version.hh> #include <dune/common/version.hh>
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) #if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6) && \
BOOST_VERSION / 100 % 1000 > 48
#include <opm/simulators/linalg/PreconditionerFactory.hpp> #include <opm/simulators/linalg/PreconditionerFactory.hpp>
#include <opm/simulators/linalg/FlexibleSolver.hpp> #include <opm/simulators/linalg/FlexibleSolver.hpp>