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

Merge pull request #2020 from joakim-hove/make-equilrecord

Browse Source 
Use new EquilRecord from opm-common
This commit is contained in:
Atgeirr Flø Rasmussen 2019-09-24 08:28:21 +02:00 committed by GitHub
commit 20fdd62569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebos/equil/equilibrationhelpers.hh
View File

@ -34,8 +34,6 @@
#include <opm/material/fluidstates/SimpleModularFluidState.hpp> #include <opm/material/fluidstates/SimpleModularFluidState.hpp>
#include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp> #include <opm/material/fluidmatrixinteractions/EclMaterialLawManager.hpp>
// due to a bug in Equil.hpp, cstddef must be included before Equil.hpp
#include <cstddef>
#include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp> #include <opm/parser/eclipse/EclipseState/InitConfig/Equil.hpp>
#include <memory> #include <memory>

52
tests/test_equil.cc
View File

@ -161,57 +161,7 @@ static Opm::EquilRecord mkEquilRecord( double datd, double datp,
double zwoc, double pcow_woc, double zwoc, double pcow_woc,
double zgoc, double pcgo_goc ) double zgoc, double pcgo_goc )
{ {
using namespace Opm; return Opm::EquilRecord( datd, datp, zwoc, pcow_woc, zgoc, pcgo_goc, true, true, 0);
DeckItem dd( "datdep", double() );
dd.push_back( datd );
Opm::Dimension dd_dim( "dddim", 1 );
dd.push_backDimension( dd_dim, dd_dim );
DeckItem dp( "datps", double() );
dp.push_back( datp );
Opm::Dimension dp_dim( "dpdim", 1 );
dp.push_backDimension( dp_dim, dp_dim );
DeckItem zw( "zwoc", double() );
zw.push_back( zwoc );
Opm::Dimension zw_dim( "zwdim", 1 );
zw.push_backDimension( zw_dim, zw_dim );
DeckItem pcow( "pcow", double() );
pcow.push_back( pcow_woc );
Opm::Dimension pcow_dim( "pcowdim", 1 );
pcow.push_backDimension( pcow_dim, pcow_dim );
DeckItem zg( "zgoc", double() );
zg.push_back( zgoc );
Opm::Dimension zg_dim( "zgdim", 1 );
zg.push_backDimension( zg_dim, zg_dim );
DeckItem pcgo( "pcgo", double() );
pcgo.push_back( pcgo_goc );
Opm::Dimension pcgo_dim( "pcgodim", 1 );
pcgo.push_backDimension( pcgo_dim, pcgo_dim );
DeckItem i1( "i1", int() );
DeckItem i2( "i2", int() );
DeckItem i3( "i3", int() );
i1.push_back( 0 );
i2.push_back( 0 );
i3.push_back( 0 );
DeckRecord rec;
rec.addItem( std::move( dd ) );
rec.addItem( std::move( dp ) );
rec.addItem( std::move( zw ) );
rec.addItem( std::move( pcow ) );
rec.addItem( std::move( zg ) );
rec.addItem( std::move( pcgo ) );
rec.addItem( std::move( i1 ) );
rec.addItem( std::move( i2 ) );
rec.addItem( std::move( i3 ) );
return EquilRecord( rec );
} }
void test_PhasePressure(); void test_PhasePressure();