OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

merge

Browse Source
This commit is contained in:
Xavier Raynaud
2012-06-11 14:40:55 +02:00
parent 74b499f7be 6a9dc03085
commit 9eb9ba372d
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/polymer_reorder.cpp
View File

@@ -28,7 +28,7 @@
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <opm/core/GridManager.hpp> #include <opm/core/GridManager.hpp>
#include <opm/core/newwells.h> #include <opm/core/newwells.h>
#include <opm/core/WellsManager.hpp> #include <opm/core/wells/WellsManager.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/initState.hpp> #include <opm/core/utility/initState.hpp>
#include <opm/core/utility/SimulatorTimer.hpp> #include <opm/core/utility/SimulatorTimer.hpp>
@@ -53,7 +53,7 @@
#include <opm/core/transport/CSRMatrixBlockAssembler.hpp> #include <opm/core/transport/CSRMatrixBlockAssembler.hpp>
#include <opm/core/transport/SinglePointUpwindTwoPhase.hpp> #include <opm/core/transport/SinglePointUpwindTwoPhase.hpp>
#include <opm/core/ColumnExtract.hpp> #include <opm/core/utility/ColumnExtract.hpp>
#include <opm/polymer/PolymerState.hpp> #include <opm/polymer/PolymerState.hpp>
#include <opm/polymer/SinglePointUpwindTwoPhasePolymer.hpp> #include <opm/polymer/SinglePointUpwindTwoPhasePolymer.hpp>

2
opm/polymer/PolymerState.hpp
View File

@@ -21,7 +21,7 @@
#define OPM_POLYMERSTATE_HEADER_INCLUDED #define OPM_POLYMERSTATE_HEADER_INCLUDED
#include <opm/core/TwophaseState.hpp> #include <opm/core/simulator/TwophaseState.hpp>
#include <opm/core/grid.h> #include <opm/core/grid.h>
#include <vector> #include <vector>

4
opm/polymer/TransportModelPolymer.cpp
View File

@@ -151,7 +151,7 @@ namespace
double operator()(const double t) const; double operator()(const double t) const;
CurveInSCPlane curve; CurveInSCPlane curve;
private: private:
Opm::TransportModelPolymer::ResidualEquation res_eq_; const Opm::TransportModelPolymer::ResidualEquation& res_eq_;
}; };
// Compute the "c" residual along the curve "curve" for a given residual equation "res_eq". // Compute the "c" residual along the curve "curve" for a given residual equation "res_eq".
@@ -163,7 +163,7 @@ namespace
double operator()(const double t) const; double operator()(const double t) const;
CurveInSCPlane curve; CurveInSCPlane curve;
private: private:
Opm::TransportModelPolymer::ResidualEquation res_eq_; const Opm::TransportModelPolymer::ResidualEquation& res_eq_;
}; };
} }