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

Merge pull request #3285 from akva2/co2_table_encapsulate

Browse Source 
CO2: encapsulate CO2Tables
This commit is contained in:
Bård Skaflestad
2022-12-22 16:29:09 +01:00
committed by GitHub
parent 79cb28f8ca b58c682f62
commit 92aaa54526
9 changed files with 74 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tests/test_components.cpp
View File

@@ -59,11 +59,6 @@
#include <opm/material/common/UniformTabulated2DFunction.hpp>
namespace Opm {
namespace ComponentsTest {
#include <opm/material/components/co2tables.inc>
}}
#include <dune/common/parallel/mpihelper.hh>
template <class Scalar, class Evaluation>
@@ -103,7 +98,7 @@ void testAllComponents()
checkComponent<Opm::Air<Scalar>, Evaluation>();
checkComponent<Opm::Brine<Scalar, H2O>, Evaluation>();
checkComponent<Opm::CO2<Scalar, Opm::ComponentsTest::CO2Tables>, Evaluation>();
checkComponent<Opm::CO2<Scalar>, Evaluation>();
checkComponent<Opm::C1<Scalar>, Evaluation>();
checkComponent<Opm::C10<Scalar>, Evaluation>();
checkComponent<Opm::DNAPL<Scalar>, Evaluation>();

2
tests/test_fluidsystems.cpp
View File

@@ -250,7 +250,7 @@ void testAllFluidSystems()
}
// Brine -- CO2
{ typedef Opm::BrineCO2FluidSystem<Scalar, CO2Tables> FluidSystem;
{ typedef Opm::BrineCO2FluidSystem<Scalar> FluidSystem;
checkFluidSystem<Scalar, FluidSystem, FluidStateEval, LhsEval>(); }
// H2O -- N2