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

checkin after merge

Browse Source
This commit is contained in:
Halvor M. Nilsen 2011-10-17 10:55:20 +02:00
commit 1cd4352beb
4 changed files with 5 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/spu_2p.cpp
View File

@ -34,9 +34,10 @@
*/ */
#include <cassert> #include <cassert>
#include <cstddef>
#include <algorithm> #include <algorithm>
#include <cstddef> #include <array>
#include <functional> #include <functional>
#include <iostream> #include <iostream>
#include <iterator> #include <iterator>
@ -61,7 +62,7 @@
#include <SimpleFluid2p.hpp> #include <SimpleFluid2p.hpp>
#include <SinglePointUpwindTwoPhase.hpp> #include <SinglePointUpwindTwoPhase.hpp>
#include <array>
template <class Ostream, class Collection> template <class Ostream, class Collection>
Ostream& Ostream&
operator<<(Ostream& os, const Collection& c) operator<<(Ostream& os, const Collection& c)

3
src/CSRMatrixBlockAssembler.hpp
View File

@ -42,8 +42,7 @@
#include <algorithm> #include <algorithm>
#include <vector> #include <vector>
#include <dune/porsol/opmtransport/src/JacobianSystem.hpp> #include <sparse_sys.h>
#include <dune/porsol/opmpressure/src/sparse_sys.h>
namespace Opm { namespace Opm {
namespace ImplicitTransportDefault { namespace ImplicitTransportDefault {

2
src/CSRMatrixUmfpackSolver.hpp
View File

@ -36,7 +36,7 @@
#ifndef OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER #ifndef OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
#define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER #define OPM_CSRMATRIXUMFPACKSOLVER_HPP_HEADER
#include <dune/porsol/opmtransport/examples/call_umfpack.h> #include <call_umfpack.h>
namespace Opm { namespace Opm {
namespace ImplicitTransportLinAlgSupport { namespace ImplicitTransportLinAlgSupport {

17
src/SinglePointUpwindTwoPhase.hpp
View File

@ -152,23 +152,6 @@ namespace Opm {
std::copy(porevol.begin(), porevol.end(), store_.porevol()); std::copy(porevol.begin(), porevol.end(), store_.porevol());
} }
/*
template <class Grid>
void init(const TwophaseFluid& fluid ,
const Grid& g ,
const std::vector<double>& porevol ,
const double* grav = 0,
const double* trans = 0)
{
fluid_ = fluid;
gravity_ = grav;
f2hf_.resize(2 * g.number_of_faces, -1);
store_(g.number_of_cells,g.cell_facepos[ g.number_of_cells ]);
if (gravity_) {
store_.drho() = fluid_.density(0) - fluid_.density(1);
this->computeStaticGravity(g, grav, trans);
}
for (int c = 0, i = 0; c < g.number_of_cells; ++c) { for (int c = 0, i = 0; c < g.number_of_cells; ++c) {
for (; i < g.cell_facepos[c + 1]; ++i) { for (; i < g.cell_facepos[c + 1]; ++i) {