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

Merge pull request #551 from akva2/janitoring

Browse Source 
Some small cleanups
This commit is contained in:
Joakim Hove 2018-11-07 10:59:34 +01:00 committed by GitHub
commit 819ad1bf9e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Schedule/OilVaporizationProperties.hpp
View File

@ -35,7 +35,7 @@ namespace Opm
*/
class OilVaporizationProperties {
public:
OilVaporizationProperties(const size_t numPvtReginIdx);
explicit OilVaporizationProperties(const size_t numPvtReginIdx);
static void updateDRSDT(Opm::OilVaporizationProperties& ovp, const std::vector<double>& maxDRSDT, const std::vector<std::string>& option);
static void updateDRVDT(Opm::OilVaporizationProperties& ovp, const std::vector<double>& maxDRVDT);
static void updateVAPPARS(Opm::OilVaporizationProperties& ovp, const std::vector<double>& vap1, const std::vector<double>& vap2);

2
src/opm/output/eclipse/libECLRestart.cpp
View File

@ -2290,7 +2290,7 @@ void size_t_vector_free_container(::Opm::RestartIO::size_t_vector_type * vector)
void size_t_vector_free(::Opm::RestartIO::size_t_vector_type * vector) {
if (vector->data_owner)
::Opm::RestartIO::util_safe_free( vector->data );
::Opm::RestartIO::size_t_vector_free_container( vector );
::Opm::RestartIO::size_t_vector_free_container( vector );
}
void inv_map_free( ::Opm::RestartIO::inv_map_type * map ) {

1
tests/parser/ScheduleTests.cpp
View File

@ -1232,7 +1232,6 @@ BOOST_AUTO_TEST_CASE(createDeckWithDRSDTR) {
BOOST_CHECK_EQUAL(schedule.hasOilVaporizationProperties(), true);
const auto& ovap = schedule.getOilVaporizationProperties(currentStep);
auto unitSystem = UnitSystem::newMETRIC();
double conversion_factor = 1.0 / (60*60*24);
for (int i = 0; i < 3; ++i) {
double value = unitSystem.to_si( UnitSystem::measure::gas_surface_rate, i );
BOOST_CHECK_EQUAL(value, ovap.getMaxDRSDT(i));