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

Now fluid cpp files compile successfully.

Browse Source
This commit is contained in:
Atgeirr Flø Rasmussen 2011-12-21 13:29:15 +01:00
parent 3914dcb8e9
commit a55b664eb9
7 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
opm/core/fluid/blackoil/BlackoilPVT.cpp
View File

@ -18,15 +18,15 @@
*/
#include "BlackoilPVT.hpp"
#include <dune/common/EclipseGridParser.hpp>
#include <dune/common/Units.hpp>
#include "MiscibilityDead.hpp"
#include "MiscibilityLiveOil.hpp"
#include "MiscibilityLiveGas.hpp"
#include "MiscibilityWater.hpp"
#include <dune/common/ErrorMacros.hpp>
#include <dune/common/linInt.hpp>
#include <opm/core/fluid/blackoil/BlackoilPVT.hpp>
#include <opm/core/fluid/blackoil/MiscibilityDead.hpp>
#include <opm/core/fluid/blackoil/MiscibilityLiveOil.hpp>
#include <opm/core/fluid/blackoil/MiscibilityLiveGas.hpp>
#include <opm/core/fluid/blackoil/MiscibilityWater.hpp>
#include <opm/core/eclipse/EclipseGridParser.hpp>
#include <opm/core/utility/Units.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linInt.hpp>
using namespace Dune;

6
opm/core/fluid/blackoil/MiscibilityLiveGas.cpp
View File

@ -29,10 +29,10 @@
*/
#include <opm/core/fluid/blackoil/MiscibilityLiveGas.hpp>
#include <algorithm>
#include "MiscibilityLiveGas.hpp"
#include <dune/common/ErrorMacros.hpp>
#include <dune/common/linInt.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linInt.hpp>
using namespace std;
using namespace Dune;

8
opm/core/fluid/blackoil/MiscibilityLiveOil.cpp
View File

@ -28,10 +28,10 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <opm/core/fluid/blackoil/MiscibilityLiveOil.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linInt.hpp>
#include <algorithm>
#include "MiscibilityLiveOil.hpp"
#include <dune/common/ErrorMacros.hpp>
#include <dune/common/linInt.hpp>
using namespace std;
using namespace Dune;
@ -85,7 +85,7 @@ namespace Opm
while (undersat_oil_tables_[iNext][0].size() < 2) {
++iNext;
}
assert(iNext < sz);
ASSERT(iNext < sz);
for (int i=0; i<sz; ++i) {
if (undersat_oil_tables_[i][0].size() > 1) {
iPrev = i;

4
opm/core/fluid/blackoil/MiscibilityWater.hpp
View File

@ -34,8 +34,8 @@
#ifndef OPENRS_MISCIBILITYWATER_HEADER
#define OPENRS_MISCIBILITYWATER_HEADER
#include "MiscibilityProps.hpp"
#include <dune/common/ErrorMacros.hpp>
#include <opm/core/fluid/blackoil/MiscibilityProps.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
// Forward declaration.
class PVTW;

4
dune/porsol/common/UniformTableLinear.hpp → opm/core/utility/UniformTableLinear.hpp
View File

@ -26,8 +26,8 @@
#include <utility>
#include <iostream>
#include <dune/common/ErrorMacros.hpp>
#include <dune/porsol/common/linearInterpolation.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/linearInterpolation.hpp>
namespace Dune {
namespace utils {

4
dune/porsol/common/buildUniformMonotoneTable.hpp → opm/core/utility/buildUniformMonotoneTable.hpp
View File

@ -20,8 +20,8 @@
#ifndef OPM_BUILDUNIFORMMONOTONETABLE_HEADER_INCLUDED
#define OPM_BUILDUNIFORMMONOTONETABLE_HEADER_INCLUDED
#include <dune/common/MonotCubicInterpolator.hpp>
#include <dune/porsol/common/UniformTableLinear.hpp>
#include <opm/core/utility/MonotCubicInterpolator.hpp>
#include <opm/core/utility/UniformTableLinear.hpp>
namespace Dune {
namespace utils {

0
dune/porsol/common/linearInterpolation.hpp → opm/core/utility/linearInterpolation.hpp
View File