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

Minor refactor. Changed shared_ptr to references in EclipseState, MULTREGTScanner and FaultCollection

Browse Source
This commit is contained in:
Pål Grønås Drange
2016-06-20 12:27:56 +02:00
parent 88c55dcd91
commit ff9ee958d7
13 changed files with 108 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
opm/parser/eclipse/EclipseState/Grid/TransMult.cpp
View File

@@ -16,16 +16,17 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <stdexcept>
#include <iostream>
#include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
#include <stdexcept>
#include <opm/parser/eclipse/EclipseState/Grid/Fault.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaultFace.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/GridProperty.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/TransMult.hpp>
#include <opm/parser/eclipse/EclipseState/Grid/MULTREGTScanner.hpp>
namespace Opm {
TransMult::TransMult(size_t nx , size_t ny , size_t nz) :
@@ -78,7 +79,9 @@ namespace Opm {
}
double TransMult::getRegionMultiplier(size_t globalCellIndex1, size_t globalCellIndex2, FaceDir::DirEnum faceDir) const {
return m_multregtScanner->getRegionMultiplier(globalCellIndex1, globalCellIndex2, faceDir);
if (m_multregtScanner == nullptr)
throw new std::logic_error("MULTREGTScanner has not been initialized.");
return m_multregtScanner->getRegionMultiplier(globalCellIndex1, globalCellIndex2, faceDir);
}
bool TransMult::hasDirectionProperty(FaceDir::DirEnum faceDir) const {
@@ -134,7 +137,8 @@ namespace Opm {
void TransMult::setMultregtScanner( std::shared_ptr<const MULTREGTScanner> multregtScanner) {
m_multregtScanner = multregtScanner;
void TransMult::createMultregtScanner(const Eclipse3DProperties& e3DProps,
std::vector< const DeckKeyword* > multregtKeywords) {
m_multregtScanner = new MULTREGTScanner(e3DProps, multregtKeywords);
}
}