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

Merge pull request #88 from joakim-hove/connection-updates

Browse Source 
Update sunbeam to use opm-common/2018.09
This commit is contained in:
Joakim Hove
2018-09-19 15:12:56 +02:00
committed by GitHub
parent 6d2a4b5daa 0a378bd49d
commit dcb4528e71
2 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -41,7 +41,7 @@ install:
- popd
- mkdir opm-common/build
- pushd opm-common/build
- git checkout release/sunbeam/2018.07
- git checkout release/sunbeam/2018.09
- cmake .. -DCMAKE_PREFIX_PATH=$INSTALL_ROOT
-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT
-DBUILD_TESTING=OFF

22
sunbeam/connection.cpp
View File

@@ -5,11 +5,11 @@
namespace {
std::string state( const Connection& c ) {
return WellCompletion::StateEnum2String( c.state );
return WellCompletion::StateEnum2String( c.state() );
}
std::string direction( const Connection& c ) {
return WellCompletion::DirectionEnum2String( c.dir );
return WellCompletion::DirectionEnum2String( c.dir() );
}
}
@@ -24,13 +24,13 @@ void sunbeam::export_Connection(py::module& module) {
.def_property_readonly( "J", &Connection::getJ )
.def_property_readonly( "K", &Connection::getK )
.def_property_readonly( "attached_to_segment", &Connection::attachedToSegment )
.def_readonly( "center_depth", &Connection::center_depth)
.def_property_readonly( "diameter", &Connection::getDiameter )
.def_readonly( "complnum", &Connection::complnum)
.def_readonly("number", &Connection::complnum) // This is deprecated; complnum is the "correct" proeprty name
.def_readonly( "sat_table_id", &Connection::sat_tableId)
.def_readonly( "segment_number", &Connection::segment_number)
.def_property_readonly( "skin_factor", &Connection::getSkinFactor )
.def_property_readonly( "transmissibility", &Connection::getConnectionTransmissibilityFactor )
.def_readonly( "well_pi", &Connection::wellPi );
.def_property_readonly( "center_depth", &Connection::depth)
.def_property_readonly( "rw", &Connection::rw)
.def_property_readonly( "complnum", &Connection::complnum)
.def_property_readonly( "number", &Connection::complnum) // This is deprecated; complnum is the "correct" proeprty name
.def_property_readonly( "sat_table_id", &Connection::satTableId)
.def_property_readonly( "segment_number", &Connection::segment)
.def_property_readonly( "CF", &Connection::CF)
.def_property_readonly( "Kh", &Connection::Kh)
.def_property_readonly( "well_pi", &Connection::wellPi );
}