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 #1102 from jokva/stack-allocd-items

Browse Source 
Use new DeckItem constructor interface.
This commit is contained in:
Joakim Hove
2016-11-11 11:07:34 +01:00
committed by GitHub
parent f9fa1a6a8c afde06c39f
commit d53d3b8a96
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tests/test_equil.cpp
View File

@@ -64,39 +64,39 @@ static Opm::EquilRecord mkEquilRecord( double datd, double datp,
double zgoc, double pcgo_goc ) { double zgoc, double pcgo_goc ) {
using namespace Opm; using namespace Opm;
auto dd = DeckItem::make< double >( "datdep" ); DeckItem dd( "datdep", double() );
dd.push_back( datd ); dd.push_back( datd );
Opm::Dimension dd_dim( "dddim", 1 ); Opm::Dimension dd_dim( "dddim", 1 );
dd.push_backDimension( dd_dim, dd_dim ); dd.push_backDimension( dd_dim, dd_dim );
auto dp = DeckItem::make< double >( "datps" ); DeckItem dp( "datps", double() );
dp.push_back( datp ); dp.push_back( datp );
Opm::Dimension dp_dim( "dpdim", 1 ); Opm::Dimension dp_dim( "dpdim", 1 );
dp.push_backDimension( dp_dim, dp_dim ); dp.push_backDimension( dp_dim, dp_dim );
auto zw = DeckItem::make< double >( "zwoc" ); DeckItem zw( "zwoc", double() );
zw.push_back( zwoc ); zw.push_back( zwoc );
Opm::Dimension zw_dim( "zwdim", 1 ); Opm::Dimension zw_dim( "zwdim", 1 );
zw.push_backDimension( zw_dim, zw_dim ); zw.push_backDimension( zw_dim, zw_dim );
auto pcow = DeckItem::make< double >( "pcow" ); DeckItem pcow( "pcow", double() );
pcow.push_back( pcow_woc ); pcow.push_back( pcow_woc );
Opm::Dimension pcow_dim( "pcowdim", 1 ); Opm::Dimension pcow_dim( "pcowdim", 1 );
pcow.push_backDimension( pcow_dim, pcow_dim ); pcow.push_backDimension( pcow_dim, pcow_dim );
auto zg = DeckItem::make< double >( "zgoc" ); DeckItem zg( "zgoc", double() );
zg.push_back( zgoc ); zg.push_back( zgoc );
Opm::Dimension zg_dim( "zgdim", 1 ); Opm::Dimension zg_dim( "zgdim", 1 );
zg.push_backDimension( zg_dim, zg_dim ); zg.push_backDimension( zg_dim, zg_dim );
auto pcgo = DeckItem::make< double >( "pcgo" ); DeckItem pcgo( "pcgo", double() );
pcgo.push_back( pcgo_goc ); pcgo.push_back( pcgo_goc );
Opm::Dimension pcgo_dim( "pcgodim", 1 ); Opm::Dimension pcgo_dim( "pcgodim", 1 );
pcgo.push_backDimension( pcgo_dim, pcgo_dim ); pcgo.push_backDimension( pcgo_dim, pcgo_dim );
auto i1 = DeckItem::make< int >( "i1" ); DeckItem i1( "i1", int() );
auto i2 = DeckItem::make< int >( "i2" ); DeckItem i2( "i2", int() );
auto i3 = DeckItem::make< int >( "i3" ); DeckItem i3( "i3", int() );
i1.push_back( 0 ); i1.push_back( 0 );
i2.push_back( 0 ); i2.push_back( 0 );
i3.push_back( 0 ); i3.push_back( 0 );