From f9ea03fe67f09d92c94419dd47f8feaa14604e16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Fri, 24 Jan 2014 15:54:01 +0100 Subject: [PATCH] Renamed SegmentedWellModel->WellDensitySegmented. --- CMakeLists_files.cmake | 6 +++--- ...WellModel.cpp => WellDensitySegmented.cpp} | 20 +++++++++---------- ...WellModel.hpp => WellDensitySegmented.hpp} | 8 ++++---- ...odel.cpp => test_welldensitysegmented.cpp} | 6 +++--- 4 files changed, 20 insertions(+), 20 deletions(-) rename opm/autodiff/{SegmentedWellModel.cpp => WellDensitySegmented.cpp} (93%) rename opm/autodiff/{SegmentedWellModel.hpp => WellDensitySegmented.hpp} (94%) rename tests/{test_segmentedwellmodel.cpp => test_welldensitysegmented.cpp} (93%) diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake index 28dd5565a..cba690427 100644 --- a/CMakeLists_files.cmake +++ b/CMakeLists_files.cmake @@ -30,12 +30,12 @@ list (APPEND MAIN_SOURCE_FILES opm/autodiff/BlackoilPropsAdInterface.cpp opm/autodiff/FullyImplicitBlackoilSolver.cpp opm/autodiff/ImpesTPFAAD.cpp - opm/autodiff/SegmentedWellModel.cpp opm/autodiff/SimulatorCompressibleAd.cpp opm/autodiff/SimulatorFullyImplicitBlackoil.cpp opm/autodiff/SimulatorIncompTwophaseAd.cpp opm/autodiff/TransportSolverTwophaseAd.cpp opm/autodiff/BlackoilPropsAdFromDeck.cpp + opm/autodiff/WellDensitySegmented.cpp ) # originally generated with the command: @@ -46,7 +46,7 @@ list (APPEND TEST_SOURCE_FILES tests/test_span.cpp tests/test_syntax.cpp tests/test_scalar_mult.cpp - tests/test_segmentedwellmodel.cpp + tests/test_welldensitysegmented.cpp ) list (APPEND TEST_DATA_FILES @@ -84,9 +84,9 @@ list (APPEND PUBLIC_HEADER_FILES opm/autodiff/GeoProps.hpp opm/autodiff/ImpesTPFAAD.hpp opm/autodiff/FullyImplicitBlackoilSolver.hpp - opm/autodiff/SegmentedWellModel.hpp opm/autodiff/SimulatorCompressibleAd.hpp opm/autodiff/SimulatorFullyImplicitBlackoil.hpp opm/autodiff/SimulatorIncompTwophaseAd.hpp opm/autodiff/TransportSolverTwophaseAd.hpp + opm/autodiff/WellDensitySegmented.hpp ) diff --git a/opm/autodiff/SegmentedWellModel.cpp b/opm/autodiff/WellDensitySegmented.cpp similarity index 93% rename from opm/autodiff/SegmentedWellModel.cpp rename to opm/autodiff/WellDensitySegmented.cpp index 4432ab99a..f033cd1b8 100644 --- a/opm/autodiff/SegmentedWellModel.cpp +++ b/opm/autodiff/WellDensitySegmented.cpp @@ -17,7 +17,7 @@ along with OPM. If not, see . */ -#include +#include #include #include #include @@ -26,15 +26,15 @@ #include -std::vector Opm::SegmentedWellModel::computeConnectionPressureDelta(const Wells& wells, - const WellState& wstate, - const PhaseUsage& phase_usage, - const std::vector& b_perf, - const std::vector& rsmax_perf, - const std::vector& rvmax_perf, - const std::vector& z_perf, - const std::vector& surf_dens, - const double gravity) +std::vector Opm::WellDensitySegmented::computeConnectionPressureDelta(const Wells& wells, + const WellState& wstate, + const PhaseUsage& phase_usage, + const std::vector& b_perf, + const std::vector& rsmax_perf, + const std::vector& rvmax_perf, + const std::vector& z_perf, + const std::vector& surf_dens, + const double gravity) { // Verify that we have consistent input. const int np = wells.number_of_phases; diff --git a/opm/autodiff/SegmentedWellModel.hpp b/opm/autodiff/WellDensitySegmented.hpp similarity index 94% rename from opm/autodiff/SegmentedWellModel.hpp rename to opm/autodiff/WellDensitySegmented.hpp index 06aefabc8..228262311 100644 --- a/opm/autodiff/SegmentedWellModel.hpp +++ b/opm/autodiff/WellDensitySegmented.hpp @@ -17,8 +17,8 @@ along with OPM. If not, see . */ -#ifndef OPM_SEGMENTEDWELLMODEL_HEADER_INCLUDED -#define OPM_SEGMENTEDWELLMODEL_HEADER_INCLUDED +#ifndef OPM_WELLDENSITYSEGMENTED_HEADER_INCLUDED +#define OPM_WELLDENSITYSEGMENTED_HEADER_INCLUDED #include @@ -36,7 +36,7 @@ namespace Opm /// pressure. This class contains an explicit model, that uses a /// different density for each well segment, that is between each /// pair of perforations. - class SegmentedWellModel + class WellDensitySegmented { public: /// Compute pressure deltas. @@ -63,4 +63,4 @@ namespace Opm } // namespace Opm -#endif // OPM_SEGMENTEDWELLMODEL_HEADER_INCLUDED +#endif // OPM_WELLDENSITYSEGMENTED_HEADER_INCLUDED diff --git a/tests/test_segmentedwellmodel.cpp b/tests/test_welldensitysegmented.cpp similarity index 93% rename from tests/test_segmentedwellmodel.cpp rename to tests/test_welldensitysegmented.cpp index 1edc92629..158d7f74a 100644 --- a/tests/test_segmentedwellmodel.cpp +++ b/tests/test_welldensitysegmented.cpp @@ -24,9 +24,9 @@ #define BOOST_TEST_DYN_LINK #endif -#define BOOST_TEST_MODULE SegmentedWellModelTest +#define BOOST_TEST_MODULE WellDensitySegmentedTest -#include +#include #include #include #include @@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE(TestPressureDeltas) const std::vector z_perf = { 10, 30, 50, 70, 90, 10, 30, 50, 70, 90 }; const std::vector surf_dens = { 1000.0, 800.0, 10.0 }; const double gravity = Opm::unit::gravity; - const std::vector dp = SegmentedWellModel::computeConnectionPressureDelta(*wells, wellstate, pu, b_perf, rsmax_perf, rvmax_perf, z_perf, surf_dens, gravity); + const std::vector dp = WellDensitySegmented::computeConnectionPressureDelta(*wells, wellstate, pu, b_perf, rsmax_perf, rvmax_perf, z_perf, surf_dens, gravity); const std::vector answer = { 20e3*gravity, 62e3*gravity, 106e3*gravity, 152e3*gravity, 200e3*gravity, 20e3*gravity, 62e3*gravity, 106e3*gravity, 152e3*gravity, 200e3*gravity }; BOOST_REQUIRE_EQUAL(dp.size(), answer.size());