OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed: remove embedded 'parameters' namespace in ParamGroup

Browse Source 
inconsistent and unnecessary.

this is purely a cosmetic change, the only exception was a function with
the generic name 'split', which was renamed to splitParam to avoid confusion.
This commit is contained in:
Arne Morten Kvarving
2017-04-28 15:32:52 +02:00
parent eeadc43cad
commit f5999e3fcb
42 changed files with 78 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/test_equil.cpp
View File

@@ -123,7 +123,7 @@ BOOST_AUTO_TEST_CASE (PhasePressure)
std::shared_ptr<UnstructuredGrid>
G(create_grid_cart3d(10, 1, 10), destroy_grid);
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
{
using Opm::unit::kilogram;
using Opm::unit::meter;
@@ -169,7 +169,7 @@ BOOST_AUTO_TEST_CASE (CellSubset)
std::shared_ptr<UnstructuredGrid>
G(create_grid_cart3d(10, 1, 10), destroy_grid);
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
{
using Opm::unit::kilogram;
using Opm::unit::meter;
@@ -272,7 +272,7 @@ BOOST_AUTO_TEST_CASE (RegMapping)
std::shared_ptr<UnstructuredGrid>
G(create_grid_cart3d(10, 1, 10), destroy_grid);
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
{
using Opm::unit::kilogram;
using Opm::unit::meter;

16
tests/test_linearsolver.cpp
View File

@@ -109,7 +109,7 @@ void createRandomVectors(int NN, std::vector<double>& x, std::vector<double>& b,
}
}
void run_test(const Opm::parameter::ParameterGroup& param)
void run_test(const Opm::ParameterGroup& param)
{
int N=4;
auto mat = createLaplacian(N);
@@ -126,7 +126,7 @@ void run_test(const Opm::parameter::ParameterGroup& param)
BOOST_AUTO_TEST_CASE(DefaultTest)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
param.insertParameter(std::string("linsolver_max_iterations"), std::string("200"));
param.insertParameter(std::string("linsolver_verbosity"), std::string("2"));
run_test(param);
@@ -135,7 +135,7 @@ BOOST_AUTO_TEST_CASE(DefaultTest)
#ifdef HAVE_DUNE_ISTL
BOOST_AUTO_TEST_CASE(CGAMGTest)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
param.insertParameter(std::string("linsolver"), std::string("istl"));
param.insertParameter(std::string("linsolver_type"), std::string("1"));
param.insertParameter(std::string("linsolver_max_iterations"), std::string("200"));
@@ -145,7 +145,7 @@ BOOST_AUTO_TEST_CASE(CGAMGTest)
BOOST_AUTO_TEST_CASE(CGILUTest)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
param.insertParameter(std::string("linsolver"), std::string("istl"));
param.insertParameter(std::string("linsolver_type"), std::string("0"));
param.insertParameter(std::string("linsolver_max_iterations"), std::string("200"));
@@ -155,7 +155,7 @@ BOOST_AUTO_TEST_CASE(CGILUTest)
BOOST_AUTO_TEST_CASE(BiCGILUTest)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
param.insertParameter(std::string("linsolver"), std::string("istl"));
param.insertParameter(std::string("linsolver_type"), std::string("2"));
param.insertParameter(std::string("linsolver_max_iterations"), std::string("200"));
@@ -166,7 +166,7 @@ BOOST_AUTO_TEST_CASE(BiCGILUTest)
#if defined(HAS_DUNE_FAST_AMG) || DUNE_VERSION_NEWER(DUNE_ISTL, 2, 3)
BOOST_AUTO_TEST_CASE(FastAMGTest)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
param.insertParameter(std::string("linsolver"), std::string("istl"));
param.insertParameter(std::string("linsolver_type"), std::string("3"));
param.insertParameter(std::string("linsolver_max_iterations"), std::string("200"));
@@ -176,7 +176,7 @@ BOOST_AUTO_TEST_CASE(FastAMGTest)
BOOST_AUTO_TEST_CASE(KAMGTest)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
param.insertParameter(std::string("linsolver"), std::string("istl"));
param.insertParameter(std::string("linsolver_type"), std::string("4"));
param.insertParameter(std::string("linsolver_max_iterations"), std::string("200"));
@@ -188,7 +188,7 @@ BOOST_AUTO_TEST_CASE(KAMGTest)
#if HAVE_PETSC
BOOST_AUTO_TEST_CASE(PETScTest)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
param.insertParameter(std::string("linsolver"), std::string("petsc"));
param.insertParameter(std::string("ksp_type"), std::string("cg"));
param.insertParameter(std::string("pc_type"), std::string("jacobi"));

8
tests/test_parallel_linearsolver.cpp
View File

@@ -42,7 +42,7 @@
#include <cstdlib>
#include <string>
void run_test(const Opm::parameter::ParameterGroup& param)
void run_test(const Opm::ParameterGroup& param)
{
int N=100;
int start, end, istart, iend;
@@ -63,7 +63,7 @@ void run_test(const Opm::parameter::ParameterGroup& param)
#ifdef HAVE_DUNE_ISTL
BOOST_AUTO_TEST_CASE(CGAMGTest)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
param.insertParameter(std::string("linsolver"), std::string("istl"));
param.insertParameter(std::string("linsolver_type"), std::string("1"));
param.insertParameter(std::string("linsolver_max_iterations"), std::string("200"));
@@ -72,7 +72,7 @@ BOOST_AUTO_TEST_CASE(CGAMGTest)
BOOST_AUTO_TEST_CASE(CGILUTest)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
param.insertParameter(std::string("linsolver"), std::string("istl"));
param.insertParameter(std::string("linsolver_type"), std::string("0"));
param.insertParameter(std::string("linsolver_max_iterations"), std::string("200"));
@@ -81,7 +81,7 @@ BOOST_AUTO_TEST_CASE(CGILUTest)
BOOST_AUTO_TEST_CASE(BiCGILUTest)
{
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
param.insertParameter(std::string("linsolver"), std::string("istl"));
param.insertParameter(std::string("linsolver_type"), std::string("2"));
param.insertParameter(std::string("linsolver_max_iterations"), std::string("200"));

6
tests/test_param.cpp
View File

@@ -64,7 +64,7 @@ BOOST_AUTO_TEST_CASE(commandline_syntax_init)
"/group/item=overridingstring",
0 };
const std::size_t argc = argv.size() - 1;
parameter::ParameterGroup p(argc, argv.data());
ParameterGroup p(argc, argv.data());
BOOST_CHECK(p.get<std::string>("topitem") == "somestring");
std::ostringstream os;
p.writeParamToStream(os);
@@ -92,7 +92,7 @@ BOOST_AUTO_TEST_CASE(xml_syntax_init)
"unhandledargument",
0};
const std::size_t argc = argv.size() - 1;
parameter::ParameterGroup p(argc, argv.data(), false);
ParameterGroup p(argc, argv.data(), false);
BOOST_CHECK(p.get<std::string>("topitem") == "somestring");
std::ostringstream os;
p.writeParamToStream(os);
@@ -120,5 +120,5 @@ BOOST_AUTO_TEST_CASE(failing_strict_xml_syntax_init)
"unhandledargument",
0 };
const std::size_t argc = argv.size() - 1;
BOOST_CHECK_THROW(parameter::ParameterGroup p(argc, argv.data()), std::runtime_error);
BOOST_CHECK_THROW(ParameterGroup p(argc, argv.data()), std::runtime_error);
}

10
tests/test_satfunc.cpp
View File

@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE (GwsegStandard)
//std::cout << "==================================== GwsegStandard ====================================" << std::endl;
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
Opm::GridManager gm(1, 1, 10, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
@@ -148,7 +148,7 @@ BOOST_AUTO_TEST_CASE (GwsegEPSBase)
//std::cout << "==================================== GwsegEPSBase ====================================" << std::endl;
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
Opm::GridManager gm(1, 1, 10, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
@@ -234,7 +234,7 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_A)
//std::cout << "==================================== GwsegEPS_A ====================================" << std::endl;
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
Opm::GridManager gm(1, 1, 10, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
@@ -486,7 +486,7 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_C)
//std::cout << "==================================== GwsegEPS_C ====================================" << std::endl;
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
Opm::GridManager gm(1, 1, 10, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());
@@ -589,7 +589,7 @@ BOOST_AUTO_TEST_CASE (GwsegEPS_D)
//std::cout << "==================================== GwsegEPS_D ====================================" << std::endl;
Opm::parameter::ParameterGroup param;
Opm::ParameterGroup param;
Opm::GridManager gm(1, 1, 10, 1.0, 1.0, 5.0);
const UnstructuredGrid& grid = *(gm.c_grid());

2
tests/test_shadow.cpp
View File

@@ -23,7 +23,7 @@ BOOST_AUTO_TEST_CASE(shadowPorosity)
const double defaultPorosity = 1.0;
const double newPorosity = 0.5;
parameter::ParameterGroup param;
ParameterGroup param;
IncompPropertiesBasic basic (param, 2, 1);
IncompPropertiesShadow shadow (basic);
BOOST_CHECK_CLOSE (*(shadow.porosity()), defaultPorosity, 0.001);