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

changed: store reference to FieldPropsManager as a pointer

Browse Source 
default initialization required for serialization
is not possible with a const ref member
This commit is contained in:
Arne Morten Kvarving
2020-01-14 14:16:58 +01:00
parent 83b3b5bab6
commit 48bca722f5
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp
View File

@@ -77,7 +77,7 @@ namespace Opm {
public:
MULTREGTScanner(const GridDims& grid,
const FieldPropsManager& fp_arg,
const FieldPropsManager* fp_arg,
const std::vector< const DeckKeyword* >& keywords);
double getRegionMultiplier(size_t globalCellIdx1, size_t globalCellIdx2, FaceDir::DirEnum faceDir) const;
@@ -85,7 +85,7 @@ namespace Opm {
void addKeyword( const DeckKeyword& deckKeyword, const std::string& defaultRegion);
void assertKeywordSupported(const DeckKeyword& deckKeyword);
std::size_t nx,ny,nz;
const FieldPropsManager& fp;
const FieldPropsManager* fp = nullptr;
std::vector< MULTREGTRecord > m_records;
std::map<std::string , MULTREGTSearchMap> m_searchMap;
std::map<std::string, std::vector<int>> regions;