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

Moved initialization of FaultCollection.

Browse Source
This commit is contained in:
Joakim Hove
2015-06-11 23:11:29 +02:00
parent f8bc617894
commit c38b892876
3 changed files with 45 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
opm/parser/eclipse/EclipseState/Grid/FaultCollection.cpp
View File

@@ -19,6 +19,8 @@
#include <stdexcept>
#include <opm/parser/eclipse/Parser/ParserKeywords.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
namespace Opm {
@@ -28,6 +30,41 @@ namespace Opm {
}
FaultCollection::FaultCollection( std::shared_ptr<const Deck> deck, std::shared_ptr<const EclipseGrid> grid) {
std::vector<std::shared_ptr<const DeckKeyword> > faultKeywords = deck->getKeywordList<ParserKeywords::FAULTS>();
for (auto keyword_iter = faultKeywords.begin(); keyword_iter != faultKeywords.end(); ++keyword_iter) {
std::shared_ptr<const DeckKeyword> faultsKeyword = *keyword_iter;
for (auto iter = faultsKeyword->begin(); iter != faultsKeyword->end(); ++iter) {
DeckRecordConstPtr faultRecord = *iter;
const std::string& faultName = faultRecord->getItem(0)->getString(0);
int I1 = faultRecord->getItem(1)->getInt(0) - 1;
int I2 = faultRecord->getItem(2)->getInt(0) - 1;
int J1 = faultRecord->getItem(3)->getInt(0) - 1;
int J2 = faultRecord->getItem(4)->getInt(0) - 1;
int K1 = faultRecord->getItem(5)->getInt(0) - 1;
int K2 = faultRecord->getItem(6)->getInt(0) - 1;
FaceDir::DirEnum faceDir = FaceDir::FromString( faultRecord->getItem(7)->getString(0) );
std::shared_ptr<const FaultFace> face = std::make_shared<const FaultFace>(grid->getNX() , grid->getNY() , grid->getNZ(),
static_cast<size_t>(I1) , static_cast<size_t>(I2) ,
static_cast<size_t>(J1) , static_cast<size_t>(J2) ,
static_cast<size_t>(K1) , static_cast<size_t>(K2) ,
faceDir);
if (!hasFault(faultName)) {
std::shared_ptr<Fault> fault = std::make_shared<Fault>( faultName );
addFault( fault );
}
{
std::shared_ptr<Fault> fault = getFault( faultName );
fault->addFace( face );
}
}
}
}
size_t FaultCollection::size() const {
return m_faults.size();
}