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

Corrected include statements after renaming files.

Browse Source
This commit is contained in:
Halvor Møll Nilsen 2012-11-16 16:24:54 +01:00
parent 0db443553b
commit b6301d37e0
18 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -41,8 +41,8 @@ target_link_libraries(opmcore
FILE(GLOB CPP_EXAMPLES "examples/*.cpp")
FILE(GLOB CPP_tests "tests/*.cpp")
add_executable(spu_2p examples/spu_2p.cpp ${EXTRA_FILES})
add_executable(sim_2p_incomp_reorder examples/sim_2p_incomp_reorder.cpp)
add_executable(spu_2p examples/spu_2p.cpp)
add_executable(sim_2p_incomp_reorder examples/sim_2p_incomp_reorder.cpp ${EXTRA_FILES})
add_executable(sim_wateroil examples/sim_wateroil.cpp)
add_executable(pvt_test tests/pvt_test.cpp)

4
examples/sim_wateroil.cpp
View File

@ -49,7 +49,7 @@
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/transport/GravityColumnSolver.hpp>
#include <opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp>
#include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>
#include <boost/filesystem/convenience.hpp>
#include <boost/scoped_ptr.hpp>
@ -278,7 +278,7 @@ main(int argc, char** argv)
// Reordering solver.
const double nl_tolerance = param.getDefault("nl_tolerance", 1e-9);
const int nl_maxiter = param.getDefault("nl_maxiter", 30);
Opm::TransportModelCompressibleTwophase reorder_model(*grid->c_grid(), *props, nl_tolerance, nl_maxiter);
Opm::TransportSolverCompressibleTwophaseReorder reorder_model(*grid->c_grid(), *props, nl_tolerance, nl_maxiter);
if (use_segregation_split) {
reorder_model.initGravity(grav);
}

4
examples/spu_2p.cpp
View File

@ -74,7 +74,7 @@
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/transport/GravityColumnSolver.hpp>
#include <opm/core/transport/reorder/TransportModelTwophase.hpp>
#include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
#include <boost/filesystem/convenience.hpp>
#include <boost/scoped_ptr.hpp>
@ -455,7 +455,7 @@ main(int argc, char** argv)
// Reordering solver.
const double nl_tolerance = param.getDefault("nl_tolerance", 1e-9);
const int nl_maxiter = param.getDefault("nl_maxiter", 30);
Opm::TransportModelTwophase reorder_model(*grid->c_grid(), *props, nl_tolerance, nl_maxiter);
Opm::TransportSolverTwophaseReorder reorder_model(*grid->c_grid(), *props, nl_tolerance, nl_maxiter);
if (use_gauss_seidel_gravity) {
reorder_model.initGravity(grav);
}

4
opm/core/simulator/SimulatorCompressibleTwophase.cpp
View File

@ -46,7 +46,7 @@
#include <opm/core/utility/ColumnExtract.hpp>
#include <opm/core/simulator/BlackoilState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp>
#include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>
#include <boost/filesystem.hpp>
#include <boost/scoped_ptr.hpp>
@ -101,7 +101,7 @@ namespace Opm
const double* gravity_;
// Solvers
CompressibleTpfa psolver_;
TransportModelCompressibleTwophase tsolver_;
TransportSolverCompressibleTwophaseReorder tsolver_;
// Needed by column-based gravity segregation solver.
std::vector< std::vector<int> > columns_;
// Misc. data

7
opm/core/simulator/SimulatorIncompTwophase.cpp
View File

@ -46,8 +46,8 @@
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/simulator/WellState.hpp>
//#include <opm/core/transport/reorder/TransportModelTwophase.hpp>
#include <opm/core/transport/reorder/TransportModelTwophase.hpp>
#include <opm/core/transport/ImpliciteTwoPhaseTransportSolver.hpp>
//#include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
#include <opm/core/transport/ImplicitTwoPhaseTransportSolver.hpp>
#include <boost/filesystem.hpp>
#include <boost/scoped_ptr.hpp>
#include <boost/lexical_cast.hpp>
@ -359,7 +359,8 @@ namespace Opm
//}
SinglePointUpwindTwoPhase<Opm::SimpleFluid2pWrappingProps>
model(fluid, grid, porevol, gravity, guess_old_solution);
tsolver_.reset(new Opm::ImpliciteTwoPhaseTransportSolver(
model.initGravityTrans(grid_, psolver_.getHalfTrans());
tsolver_.reset(new Opm::ImplicitTwoPhaseTransportSolver(
wells_manager,
*rock_comp_props,
ctrl,

4
opm/core/simulator/SimulatorIncompTwophaseReorder.cpp
View File

@ -45,7 +45,7 @@
#include <opm/core/utility/ColumnExtract.hpp>
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/simulator/WellState.hpp>
#include <opm/core/transport/reorder/TransportModelTwophase.hpp>
#include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
#include <boost/filesystem.hpp>
#include <boost/scoped_ptr.hpp>
@ -98,7 +98,7 @@ namespace Opm
const FlowBoundaryConditions* bcs_;
// Solvers
IncompTpfa psolver_;
TransportModelTwophase tsolver_;
TransportSolverTwophaseReorder tsolver_;
// Needed by column-based gravity segregation solver.
std::vector< std::vector<int> > columns_;
// Misc. data

2
opm/core/transport/ImplicitTwoPhaseTransportSolver.cpp
View File

@ -27,7 +27,7 @@
*/
#include <opm/core/transport/ImpliciteTwoPhaseTransportSolver.hpp>
#include <opm/core/transport/ImplicitTwoPhaseTransportSolver.hpp>
#include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/utility/miscUtilities.hpp>
namespace Opm{

8
opm/core/transport/ImplicitTwoPhaseTransportSolver.hpp
View File

@ -70,9 +70,9 @@ namespace Opm{
const Opm::IncompPropertiesInterface& props,
const parameter::ParameterGroup& param);
//ImpliciteTwoPhaseTransportSolver(){
// destroy_transport_source(tsrc_);
//}
~ImplicitTwoPhaseTransportSolver(){
destroy_transport_source(tsrc_);
}
/// Solve for saturation at next timestep.
/// \param[in] darcyflux Array of signed face fluxes.
@ -87,6 +87,8 @@ namespace Opm{
Opm::WellState& well_state);
private:
ImplicitTwoPhaseTransportSolver(const ImplicitTwoPhaseTransportSolver&);
ImplicitTwoPhaseTransportSolver& operator=(const ImplicitTwoPhaseTransportSolver&);
typedef Opm::SimpleFluid2pWrappingProps TwophaseFluid;
typedef Opm::SinglePointUpwindTwoPhase<TwophaseFluid> TransportModel;

12
opm/core/transport/SimpleFluid2pWrappingProps_impl.hpp
View File

@ -25,14 +25,15 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef SIMPLEFLUID2PWRAPPINGPROPS_IMPL_HPP
#define SIMPLEFLUID2PWRAPPINGPROPS_IMPL_HPP
#include <opm/core/transport/SimpleFluid2pWrappingProps.hpp>
#include <cassert>
#include <opm/core/utility/ErrorMacros.hpp>
namespace Opm{
SimpleFluid2pWrappingProps::SimpleFluid2pWrappingProps(const Opm::IncompPropertiesInterface& props)
inline SimpleFluid2pWrappingProps::SimpleFluid2pWrappingProps(const Opm::IncompPropertiesInterface& props)
: props_(props),
smin_(props.numCells()*props.numPhases()),
smax_(props.numCells()*props.numPhases())
@ -48,7 +49,7 @@ namespace Opm{
props.satRange(num_cells, &cells[0], &smin_[0], &smax_[0]);
}
double SimpleFluid2pWrappingProps::density(int phase) const
inline double SimpleFluid2pWrappingProps::density(int phase) const
{
return props_.density()[phase];
}
@ -89,14 +90,15 @@ namespace Opm{
ASSERT(dpcow[3] == 0.0);
}
double SimpleFluid2pWrappingProps::s_min(int c) const
inline double SimpleFluid2pWrappingProps::s_min(int c) const
{
return smin_[2*c + 0];
}
double SimpleFluid2pWrappingProps::s_max(int c) const
inline double SimpleFluid2pWrappingProps::s_max(int c) const
{
return smax_[2*c + 0];
}
}
#endif // SIMPLEFLUID2PWRAPPINGPROPS_IMPL_HPP

2
opm/core/transport/reorder/ReorderSolverInterface.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/transport/reorder/TransportModelInterface.hpp>
#include <opm/core/transport/reorder/ReorderSolverInterface.hpp>
#include <opm/core/transport/reorder/reordersequence.h>
#include <opm/core/grid.h>
#include <opm/core/utility/StopWatch.hpp>

2
opm/core/transport/reorder/TofDiscGalReorder.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/transport/reorder/TransportModelTracerTofDiscGal.hpp>
#include <opm/core/transport/reorder/TofDiscGalReorder.hpp>
#include <opm/core/grid.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/VelocityInterpolation.hpp>

2
opm/core/transport/reorder/TofDiscGalReorder.hpp
View File

@ -20,7 +20,7 @@
#ifndef OPM_TOFDISCGALREORDER_HEADER_INCLUDED
#define OPM_TOFDISCGALREORDER_HEADER_INCLUDED
#include <opm/core/transport/reorder/TransportModelInterface.hpp>
#include <opm/core/transport/reorder/ReorderSolverInterface.hpp>
#include <boost/shared_ptr.hpp>
#include <vector>
#include <map>

2
opm/core/transport/reorder/TTofReorder.cpp → opm/core/transport/reorder/TofReorder.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/transport/reorder/TransportModelTracerTof.hpp>
#include <opm/core/transport/reorder/TofReorder.hpp>
#include <opm/core/grid.h>
#include <opm/core/utility/ErrorMacros.hpp>
#include <algorithm>

2
opm/core/transport/reorder/TTofReorder.hpp → opm/core/transport/reorder/TofReorder.hpp
View File

@ -20,7 +20,7 @@
#ifndef OPM_TOFREORDER_HEADER_INCLUDED
#define OPM_TOFREORDER_HEADER_INCLUDED
#include <opm/core/transport/reorder/TransportModelInterface.hpp>
#include <opm/core/transport/reorder/ReorderSolverInterface.hpp>
#include <vector>
#include <map>
#include <ostream>

2
opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.cpp
View File

@ -18,7 +18,7 @@
*/
#include <opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp>
#include <opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp>
#include <opm/core/fluid/BlackoilPropertiesInterface.hpp>
#include <opm/core/grid.h>
#include <opm/core/transport/reorder/reordersequence.h>

2
opm/core/transport/reorder/TransportSolverCompressibleTwophaseReorder.hpp
View File

@ -20,7 +20,7 @@
#ifndef OPM_TRANSPORTSOLVERCOMPRESSIBLETWOPHASEREORDER_HEADER_INCLUDED
#define OPM_TRANSPORTSOLVERCOMPRESSIBLETWOPHASEREORDER_HEADER_INCLUDED
#include <opm/core/transport/reorder/TransportModelInterface.hpp>
#include <opm/core/transport/reorder/ReorderSolverInterface.hpp>
#include <vector>
struct UnstructuredGrid;

36
opm/core/transport/reorder/TransportSolverTwophaseReorder.cpp
View File

@ -17,7 +17,7 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/transport/reorder/TransportModelTwophase.hpp>
#include <opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp>
#include <opm/core/fluid/IncompPropertiesInterface.hpp>
#include <opm/core/grid.h>
#include <opm/core/transport/reorder/reordersequence.h>
@ -40,7 +40,7 @@ namespace Opm
typedef RegulaFalsi<WarnAndContinueOnError> RootFinder;
TransportModelTwophase::TransportModelTwophase(const UnstructuredGrid& grid,
TransportSolverTwophaseReorder::TransportSolverTwophaseReorder(const UnstructuredGrid& grid,
const Opm::IncompPropertiesInterface& props,
const double tol,
const int maxit)
@ -76,7 +76,7 @@ namespace Opm
props.satRange(props.numCells(), &cells[0], &smin_[0], &smax_[0]);
}
void TransportModelTwophase::solve(const double* darcyflux,
void TransportSolverTwophaseReorder::solve(const double* darcyflux,
const double* porevolume,
const double* source,
const double dt,
@ -108,7 +108,7 @@ namespace Opm
}
const std::vector<int>& TransportModelTwophase::getReorderIterations() const
const std::vector<int>& TransportSolverTwophaseReorder::getReorderIterations() const
{
return reorder_iterations_;
}
@ -120,7 +120,7 @@ namespace Opm
//
// where influx is water influx, outflux is total outflux.
// Influxes are negative, outfluxes positive.
struct TransportModelTwophase::Residual
struct TransportSolverTwophaseReorder::Residual
{
int cell;
double s0;
@ -128,8 +128,8 @@ namespace Opm
double outflux; // sum_j max(v_ij, 0) - q
double comp_term; // q - sum_j v_ij
double dtpv; // dt/pv(i)
const TransportModelTwophase& tm;
explicit Residual(const TransportModelTwophase& tmodel, int cell_index)
const TransportSolverTwophaseReorder& tm;
explicit Residual(const TransportSolverTwophaseReorder& tmodel, int cell_index)
: tm(tmodel)
{
cell = cell_index;
@ -171,7 +171,7 @@ namespace Opm
};
void TransportModelTwophase::solveSingleCell(const int cell)
void TransportSolverTwophaseReorder::solveSingleCell(const int cell)
{
Residual res(*this, cell);
// const double r0 = res(saturation_[cell]);
@ -225,7 +225,7 @@ namespace Opm
// } // anon namespace
void TransportModelTwophase::solveMultiCell(const int num_cells, const int* cells)
void TransportSolverTwophaseReorder::solveMultiCell(const int num_cells, const int* cells)
{
// std::ofstream os("dump");
// std::copy(cells, cells + num_cells, std::ostream_iterator<double>(os, "\n"));
@ -440,7 +440,7 @@ namespace Opm
#endif // EXPERIMENT_GAUSS_SEIDEL
}
double TransportModelTwophase::fracFlow(double s, int cell) const
double TransportSolverTwophaseReorder::fracFlow(double s, int cell) const
{
double sat[2] = { s, 1.0 - s };
double mob[2];
@ -458,15 +458,15 @@ namespace Opm
//
// r(s) = s - s0 + dt/pv*sum_{j adj i}( gravmod_ij * gf_ij ).
//
struct TransportModelTwophase::GravityResidual
struct TransportSolverTwophaseReorder::GravityResidual
{
int cell;
int nbcell[2];
double s0;
double dtpv; // dt/pv(i)
double gf[2];
const TransportModelTwophase& tm;
explicit GravityResidual(const TransportModelTwophase& tmodel,
const TransportSolverTwophaseReorder& tm;
explicit GravityResidual(const TransportSolverTwophaseReorder& tmodel,
const std::vector<int>& cells,
const int pos,
const double* gravflux) // Always oriented towards next in column. Size = colsize - 1.
@ -513,7 +513,7 @@ namespace Opm
}
};
void TransportModelTwophase::mobility(double s, int cell, double* mob) const
void TransportSolverTwophaseReorder::mobility(double s, int cell, double* mob) const
{
double sat[2] = { s, 1.0 - s };
props_.relperm(1, sat, &cell, mob, 0);
@ -523,7 +523,7 @@ namespace Opm
void TransportModelTwophase::initGravity(const double* grav)
void TransportSolverTwophaseReorder::initGravity(const double* grav)
{
// Set up gravflux_ = T_ij g (rho_w - rho_o) (z_i - z_j)
std::vector<double> htrans(grid_.cell_facepos[grid_.number_of_cells]);
@ -547,7 +547,7 @@ namespace Opm
void TransportModelTwophase::solveSingleCellGravity(const std::vector<int>& cells,
void TransportSolverTwophaseReorder::solveSingleCellGravity(const std::vector<int>& cells,
const int pos,
const double* gravflux)
{
@ -564,7 +564,7 @@ namespace Opm
int TransportModelTwophase::solveGravityColumn(const std::vector<int>& cells)
int TransportSolverTwophaseReorder::solveGravityColumn(const std::vector<int>& cells)
{
// Set up column gravflux.
const int nc = cells.size();
@ -617,7 +617,7 @@ namespace Opm
void TransportModelTwophase::solveGravity(const std::vector<std::vector<int> >& columns,
void TransportSolverTwophaseReorder::solveGravity(const std::vector<std::vector<int> >& columns,
const double* porevolume,
const double dt,
std::vector<double>& saturation)

2
opm/core/transport/reorder/TransportSolverTwophaseReorder.hpp
View File

@ -20,7 +20,7 @@
#ifndef OPM_TRANSPORTSOLVERTWOPHASEREORDER_HEADER_INCLUDED
#define OPM_TRANSPORTSOLVERTWOPHASEREORDER_HEADER_INCLUDED
#include <opm/core/transport/reorder/TransportModelInterface.hpp>
#include <opm/core/transport/reorder/ReorderSolverInterface.hpp>
#include <vector>
#include <map>
#include <ostream>