OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-02 05:49:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #336 from andlaus/fix_extra_warnings

Browse Source 
fix extra compiler warnings
This commit is contained in:
Atgeirr Flø Rasmussen 2018-07-05 14:29:59 +02:00 committed by GitHub
commit ad6645b8d3
2 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/test_ecl_output.cc
View File

@ -104,12 +104,14 @@ initSimulator(const char *filename)
return std::unique_ptr<Simulator>(new Simulator); return std::unique_ptr<Simulator>(new Simulator);
} }
ERT::ert_unique_ptr< ecl_sum_type, ecl_sum_free > readsum( const std::string& base ) { ERT::ert_unique_ptr<ecl_sum_type, ecl_sum_free> readsum(const std::string& base);
return ERT::ert_unique_ptr< ecl_sum_type, ecl_sum_free >( ERT::ert_unique_ptr<ecl_sum_type, ecl_sum_free> readsum(const std::string& base)
ecl_sum_fread_alloc_case( base.c_str(), ":" ) {
); return ERT::ert_unique_ptr<ecl_sum_type, ecl_sum_free>(
ecl_sum_fread_alloc_case(base.c_str(), ":"));
} }
void test_summary();
void test_summary() void test_summary()
{ {
typedef typename TTAG(TestEclOutputTypeTag) TypeTag; typedef typename TTAG(TestEclOutputTypeTag) TypeTag;
@ -176,8 +178,9 @@ void test_summary()
CHECK_CLOSE(roip2, ecl_sum_get_general_var( resp, 1, "ROIP:2" ), 1e-3 ); CHECK_CLOSE(roip2, ecl_sum_get_general_var( resp, 1, "ROIP:2" ), 1e-3 );
} }
void test_readWriteWells() { void test_readWriteWells();
void test_readWriteWells()
{
using opt = Opm::data::Rates::opt; using opt = Opm::data::Rates::opt;
Opm::data::Rates r1, r2, rc1, rc2, rc3; Opm::data::Rates r1, r2, rc1, rc2, rc3;
@ -211,14 +214,14 @@ void test_readWriteWells() {
* the connection keys (active indices) and well names correspond to the * the connection keys (active indices) and well names correspond to the
* input deck. All other entries in the well structures are arbitrary. * input deck. All other entries in the well structures are arbitrary.
*/ */
w1.connections.push_back( { 88, rc1, 30.45, 123.45 } ); w1.connections.push_back( { 88, rc1, 30.45, 123.45, 0.0, 0.0, 0.0 } );
w1.connections.push_back( { 288, rc2, 33.19, 67.89 } ); w1.connections.push_back( { 288, rc2, 33.19, 67.89, 0.0, 0.0, 0.0 } );
w2.rates = r2; w2.rates = r2;
w2.bhp = 2.34; w2.bhp = 2.34;
w2.temperature = 4.56; w2.temperature = 4.56;
w2.control = 2; w2.control = 2;
w2.connections.push_back( { 188, rc3, 36.22, 19.28 } ); w2.connections.push_back( { 188, rc3, 36.22, 19.28, 0.0, 0.0, 0.0 } );
Opm::data::Wells wellRates; Opm::data::Wells wellRates;

12
tests/test_equil.cc
View File

@ -214,6 +214,7 @@ static Opm::EquilRecord mkEquilRecord( double datd, double datp,
return EquilRecord( rec ); return EquilRecord( rec );
} }
void test_PhasePressure();
void test_PhasePressure() void test_PhasePressure()
{ {
typedef std::vector<double> PVal; typedef std::vector<double> PVal;
@ -246,6 +247,7 @@ void test_PhasePressure()
CHECK_CLOSE(ppress[1][last ] , 166.5e3 , reltol); CHECK_CLOSE(ppress[1][last ] , 166.5e3 , reltol);
} }
void test_CellSubset();
void test_CellSubset() void test_CellSubset()
{ {
typedef std::vector<double> PVal; typedef std::vector<double> PVal;
@ -335,6 +337,7 @@ void test_CellSubset()
CHECK_CLOSE(ppress[1][last ] , 166.5e3 , reltol); CHECK_CLOSE(ppress[1][last ] , 166.5e3 , reltol);
} }
void test_RegMapping();
void test_RegMapping() void test_RegMapping()
{ {
typedef std::vector<double> PVal; typedef std::vector<double> PVal;
@ -422,6 +425,7 @@ void test_RegMapping()
CHECK_CLOSE(ppress[1][last ] , 166.5e3 , reltol); CHECK_CLOSE(ppress[1][last ] , 166.5e3 , reltol);
} }
void test_DeckAllDead();
void test_DeckAllDead() void test_DeckAllDead()
{ {
typedef TTAG(TestEquilTypeTag) TypeTag; typedef TTAG(TestEquilTypeTag) TypeTag;
@ -446,6 +450,7 @@ void test_DeckAllDead()
CHECK_CLOSE(pressures[1][last] , 1.504526940e7 , reltol); CHECK_CLOSE(pressures[1][last] , 1.504526940e7 , reltol);
} }
void test_CapillaryInversion();
void test_CapillaryInversion() void test_CapillaryInversion()
{ {
// Test setup. // Test setup.
@ -497,6 +502,7 @@ void test_CapillaryInversion()
} }
} }
void test_DeckWithCapillary();
void test_DeckWithCapillary() void test_DeckWithCapillary()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; typedef typename TTAG(TestEquilTypeTag) TypeTag;
@ -535,6 +541,7 @@ void test_DeckWithCapillary()
} }
} }
void test_DeckWithCapillaryOverlap();
void test_DeckWithCapillaryOverlap() void test_DeckWithCapillaryOverlap()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; typedef typename TTAG(TestEquilTypeTag) TypeTag;
@ -594,6 +601,7 @@ void test_DeckWithCapillaryOverlap()
} }
} }
void test_DeckWithLiveOil();
void test_DeckWithLiveOil() void test_DeckWithLiveOil()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; typedef typename TTAG(TestEquilTypeTag) TypeTag;
@ -671,6 +679,7 @@ void test_DeckWithLiveOil()
} }
} }
void test_DeckWithLiveGas();
void test_DeckWithLiveGas() void test_DeckWithLiveGas()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; typedef typename TTAG(TestEquilTypeTag) TypeTag;
@ -751,6 +760,7 @@ void test_DeckWithLiveGas()
} }
} }
void test_DeckWithRSVDAndRVVD();
void test_DeckWithRSVDAndRVVD() void test_DeckWithRSVDAndRVVD()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; typedef typename TTAG(TestEquilTypeTag) TypeTag;
@ -851,6 +861,7 @@ void test_DeckWithRSVDAndRVVD()
} }
void test_DeckWithPBVDAndPDVD();
void test_DeckWithPBVDAndPDVD() void test_DeckWithPBVDAndPDVD()
{ {
typedef typename TTAG(TestEquilTypeTag) TypeTag; typedef typename TTAG(TestEquilTypeTag) TypeTag;
@ -941,6 +952,7 @@ void test_DeckWithPBVDAndPDVD()
} }
} }
void test_DeckWithSwatinit();
void test_DeckWithSwatinit() void test_DeckWithSwatinit()
{ {
#if 0 #if 0