Use separate files for model parameter struct.

CMakeLists_files.cmake

@@ -36,6 +36,7 @@ list (APPEND MAIN_SOURCE_FILES
 	opm/autodiff/SimulatorIncompTwophaseAd.cpp
 	opm/autodiff/TransportSolverTwophaseAd.cpp
 	opm/autodiff/BlackoilPropsAdFromDeck.cpp
+	opm/autodiff/BlackoilModelParameters.cpp
 	opm/autodiff/WellDensitySegmented.cpp
 	opm/autodiff/LinearisedBlackoilResidual.cpp
 	)
@@ -98,6 +99,7 @@ list (APPEND PUBLIC_HEADER_FILES
 	opm/autodiff/BlackoilModel_impl.hpp
 	opm/autodiff/BlackoilModelBase.hpp
 	opm/autodiff/BlackoilModelBase_impl.hpp
+	opm/autodiff/BlackoilModelParameters.hpp
 	opm/autodiff/BlackoilPropsAdFromDeck.hpp
 	opm/autodiff/BlackoilPropsAdInterface.hpp
 	opm/autodiff/CPRPreconditioner.hpp

opm/autodiff/BlackoilModelParameters.cpp

@@ -0,0 +1,67 @@
+/*
+  Copyright 2015 SINTEF ICT, Applied Mathematics.
+
+  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 3 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/>.
+*/
+
+#include <opm/autodiff/BlackoilModelParameters.hpp>
+#include <opm/core/utility/parameters/ParameterGroup.hpp>
+
+namespace Opm
+{
+
+
+    BlackoilModelParameters::BlackoilModelParameters()
+    {
+        // set default values
+        reset();
+    }
+
+
+
+
+    BlackoilModelParameters::BlackoilModelParameters( const parameter::ParameterGroup& param )
+    {
+        // set default values
+        reset();
+
+        // overload with given parameters
+        dp_max_rel_  = param.getDefault("dp_max_rel", dp_max_rel_);
+        ds_max_      = param.getDefault("ds_max", ds_max_);
+        dr_max_rel_  = param.getDefault("dr_max_rel", dr_max_rel_);
+        max_residual_allowed_ = param.getDefault("max_residual_allowed", max_residual_allowed_);
+        tolerance_mb_    = param.getDefault("tolerance_mb", tolerance_mb_);
+        tolerance_cnv_   = param.getDefault("tolerance_cnv", tolerance_cnv_);
+        tolerance_wells_ = param.getDefault("tolerance_wells", tolerance_wells_ );
+    }
+
+
+
+
+    void BlackoilModelParameters::reset()
+    {
+        // default values for the solver parameters
+        dp_max_rel_      = 1.0e9;
+        ds_max_          = 0.2;
+        dr_max_rel_      = 1.0e9;
+        max_residual_allowed_ = 1e7;
+        tolerance_mb_    = 1.0e-5;
+        tolerance_cnv_   = 1.0e-2;
+        tolerance_wells_ = 5.0e-1;
+    }
+
+
+} // namespace Opm

opm/autodiff/BlackoilModelParameters.hpp

@@ -0,0 +1,58 @@
+/*
+  Copyright 2015 SINTEF ICT, Applied Mathematics.
+
+  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 3 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/>.
+*/
+
+#ifndef OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED
+#define OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED
+
+namespace Opm
+{
+
+    namespace parameter { class ParameterGroup; }
+
+    /// Solver parameters for the BlackoilModel.
+    struct BlackoilModelParameters
+    {
+        /// Max relative change in pressure in single iteration.
+        double dp_max_rel_;
+        /// Max absolute change in saturation in single iteration.
+        double ds_max_;
+        /// Max relative change in gas-oil or oil-gas ratio in single iteration.
+        double dr_max_rel_;
+        /// Absolute max limit for residuals.
+        double max_residual_allowed_;
+        /// Relative mass balance tolerance (total mass balance error).
+        double tolerance_mb_;
+        /// Local convergence tolerance (max of local saturation errors).
+        double tolerance_cnv_;
+        /// Well convergence tolerance.
+        double tolerance_wells_;
+
+        /// Construct from user parameters or defaults.
+        explicit BlackoilModelParameters( const parameter::ParameterGroup& param );
+
+        /// Construct with default parameters.
+        BlackoilModelParameters();
+
+        /// Set default parameters.
+        void reset();
+    };
+
+} // namespace Opm
+
+#endif // OPM_BLACKOILMODELPARAMETERS_HEADER_INCLUDED