From 87c8d0dc283ef6d50b48b3edd06a26f482584b14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Thu, 14 Mar 2013 21:43:21 +0100 Subject: [PATCH] Modified for added files and changed class names. --- examples/compute_tof_from_files.cpp | 10 +++++----- .../reorder/ReorderSolverInterface.cpp | 4 ++-- .../transport/reorder/TofDiscGalReorder.cpp | 14 ++++++------- opm/core/transport/reorder/TofReorder.cpp | 20 +++++++++---------- 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/examples/compute_tof_from_files.cpp b/examples/compute_tof_from_files.cpp index 4bf56d38a..589531781 100644 --- a/examples/compute_tof_from_files.cpp +++ b/examples/compute_tof_from_files.cpp @@ -42,8 +42,8 @@ #include #include #include -#include -#include +#include +#include #include #include @@ -124,9 +124,9 @@ main(int argc, char** argv) bool use_dg = param.getDefault("use_dg", false); bool use_multidim_upwind = false; // Need to initialize dg solver here, since it uses parameters now. - boost::scoped_ptr dg_solver; + boost::scoped_ptr dg_solver; if (use_dg) { - dg_solver.reset(new Opm::TransportModelTracerTofDiscGal(grid, param)); + dg_solver.reset(new Opm::TofDiscGalReorder(grid, param)); } else { use_multidim_upwind = param.getDefault("use_multidim_upwind", false); } @@ -163,7 +163,7 @@ main(int argc, char** argv) if (use_dg) { dg_solver->solveTof(&flux[0], &porevol[0], &src[0], tof); } else { - Opm::TransportModelTracerTof tofsolver(grid, use_multidim_upwind); + Opm::TofReorder tofsolver(grid, use_multidim_upwind); if (compute_tracer) { tofsolver.solveTofTracer(&flux[0], &porevol[0], &src[0], tof, tracer); } else { diff --git a/opm/core/transport/reorder/ReorderSolverInterface.cpp b/opm/core/transport/reorder/ReorderSolverInterface.cpp index 79969aaa4..eaa841493 100644 --- a/opm/core/transport/reorder/ReorderSolverInterface.cpp +++ b/opm/core/transport/reorder/ReorderSolverInterface.cpp @@ -63,13 +63,13 @@ void Opm::ReorderSolverInterface::reorderAndTransport(const UnstructuredGrid& gr } -const std::vector& Opm::TransportModelInterface::sequence() const +const std::vector& Opm::ReorderSolverInterface::sequence() const { return sequence_; } -const std::vector& Opm::TransportModelInterface::components() const +const std::vector& Opm::ReorderSolverInterface::components() const { return components_; } diff --git a/opm/core/transport/reorder/TofDiscGalReorder.cpp b/opm/core/transport/reorder/TofDiscGalReorder.cpp index 2ef010a41..10af155b5 100644 --- a/opm/core/transport/reorder/TofDiscGalReorder.cpp +++ b/opm/core/transport/reorder/TofDiscGalReorder.cpp @@ -403,7 +403,7 @@ namespace Opm - void TransportModelTracerTofDiscGal::applyLimiter(const int cell, double* tof) + void TofDiscGalReorder::applyLimiter(const int cell, double* tof) { switch (limiter_method_) { case MinUpwindFace: @@ -420,7 +420,7 @@ namespace Opm - void TransportModelTracerTofDiscGal::applyMinUpwindLimiter(const int cell, const bool face_min, double* tof) + void TofDiscGalReorder::applyMinUpwindLimiter(const int cell, const bool face_min, double* tof) { if (basis_func_->degree() != 1) { THROW("This limiter only makes sense for our DG1 implementation."); @@ -509,12 +509,12 @@ namespace Opm - void TransportModelTracerTofDiscGal::applyLimiterAsPostProcess() + void TofDiscGalReorder::applyLimiterAsPostProcess() { // Apply the limiter sequentially to all cells. // This means that a cell's limiting behaviour may be affected by // any limiting applied to its upstream cells. - const std::vector& seq = TransportModelInterface::sequence(); + const std::vector& seq = ReorderSolverInterface::sequence(); const int nc = seq.size(); ASSERT(nc == grid_.number_of_cells); for (int i = 0; i < nc; ++i) { @@ -526,7 +526,7 @@ namespace Opm - void TransportModelTracerTofDiscGal::applyLimiterAsSimultaneousPostProcess() + void TofDiscGalReorder::applyLimiterAsSimultaneousPostProcess() { // Apply the limiter simultaneously to all cells. // This means that each cell is limited independently from all other cells, @@ -543,7 +543,7 @@ namespace Opm - double TransportModelTracerTofDiscGal::totalFlux(const int cell) const + double TofDiscGalReorder::totalFlux(const int cell) const { // Find total upstream/downstream fluxes. double upstream_flux = 0.0; @@ -571,7 +571,7 @@ namespace Opm - double TransportModelTracerTofDiscGal::minCornerVal(const int cell, const int face) const + double TofDiscGalReorder::minCornerVal(const int cell, const int face) const { // Evaluate the solution in all corners. const int dim = grid_.dimensions; diff --git a/opm/core/transport/reorder/TofReorder.cpp b/opm/core/transport/reorder/TofReorder.cpp index ca5183e07..8002adc49 100644 --- a/opm/core/transport/reorder/TofReorder.cpp +++ b/opm/core/transport/reorder/TofReorder.cpp @@ -93,11 +93,11 @@ namespace Opm /// \param[out] tof Array of time-of-flight values (1 per cell). /// \param[out] tracer Array of tracer values (N per cell, where N is /// the number of cells c for which source[c] > 0.0). - void TransportModelTracerTof::solveTofTracer(const double* darcyflux, - const double* porevolume, - const double* source, - std::vector& tof, - std::vector& tracer) + void TofReorder::solveTofTracer(const double* darcyflux, + const double* porevolume, + const double* source, + std::vector& tof, + std::vector& tracer) { darcyflux_ = darcyflux; porevolume_ = porevolume; @@ -194,7 +194,7 @@ namespace Opm - void TransportModelTracerTof::solveSingleCellMultidimUpwind(const int cell) + void TofReorder::solveSingleCellMultidimUpwind(const int cell) { // Compute flux terms. // Sources have zero tof, and therefore do not contribute @@ -260,10 +260,10 @@ namespace Opm // tof(face) = face_term + cell_term_factor*tof(upwind_cell). // It is not computed here, since these factors are needed to // compute the tof(upwind_cell) itself. - void TransportModelTracerTof::multidimUpwindTerms(const int face, - const int upwind_cell, - double& face_term, - double& cell_term_factor) const + void TofReorder::multidimUpwindTerms(const int face, + const int upwind_cell, + double& face_term, + double& cell_term_factor) const { // Implements multidim upwind according to // "Multidimensional upstream weighting for multiphase transport on general grids"