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

Merge pull request #747 from blattms/copyable-properties

Browse Source 
Makes BlackoilPropertiesFromDeck copyable.
This commit is contained in:
Atgeirr Flø Rasmussen 2015-02-06 13:38:34 +01:00
commit e7ac697e17
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/core/props/BlackoilPropertiesFromDeck.hpp
View File

@ -259,7 +259,7 @@ namespace Opm
RockFromDeck rock_;
std::vector<int> cellPvtRegionIdx_;
BlackoilPvtProperties pvt_;
std::unique_ptr<SaturationPropsInterface> satprops_;
std::shared_ptr<SaturationPropsInterface> satprops_;
mutable std::vector<double> B_;
mutable std::vector<double> dB_;
mutable std::vector<double> R_;

7
opm/core/simulator/BlackoilState.hpp
View File

@ -56,11 +56,10 @@ namespace Opm
const std::vector<double>& rv () const {return rv_ ; }
private:
std::vector<double> surfvol_;
std::vector<double> gor_ ;
std::vector<double> rv_ ;
std::vector<double> surfvol_; // no entries = no cells * no phases
std::vector<double> gor_ ; // no entries = no cells
std::vector<double> rv_ ; // no entries = no cells
};
} // namespace Opm

7
opm/core/simulator/SimulatorState.hpp
View File

@ -17,7 +17,7 @@ namespace Opm
virtual void init(const UnstructuredGrid& g, int num_phases);
virtual void init(int number_of_cells, int number_of_phases, int num_phases);
virtual void init(int number_of_cells, int number_of_faces, int num_phases);
enum ExtremalSat { MinSat, MaxSat };
@ -57,10 +57,15 @@ namespace Opm
double epsilon = 1e-8) const;
private:
int num_phases_;
/// \brief pressure per cell.
std::vector<double> press_ ;
/// \brief temperature per cell.
std::vector<double> temp_ ;
/// \brief pressure per face.
std::vector<double> fpress_;
/// \brief The fluxes at the faces.
std::vector<double> flux_ ;
/// \brief The saturation of each phase per cell.
std::vector<double> sat_ ;
protected: