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

Whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2019-03-25 07:38:33 +01:00
parent 58d369d32b
commit 5c316cecdd
2 changed files with 32 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ReservoirDataModel/RigGridManager.cpp
View File

@ -17,10 +17,10 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RigGridManager.h" #include "RigGridManager.h"
#include "RigEclipseCaseData.h" #include "RigEclipseCaseData.h"
#include "RigMainGrid.h" #include "RigMainGrid.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -61,7 +61,6 @@ RigMainGrid* RigGridManager::findEqualGrid(RigMainGrid* candidateGrid)
return nullptr; return nullptr;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -97,7 +96,8 @@ void RigGridManager::clear()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RigGridManager::isGridDimensionsEqual(const std::vector< std::vector<int> >& mainCaseGridDimensions, const std::vector< std::vector<int> >& caseGridDimensions) bool RigGridManager::isGridDimensionsEqual(const std::vector<std::vector<int>>& mainCaseGridDimensions,
const std::vector<std::vector<int>>& caseGridDimensions)
{ {
if (mainCaseGridDimensions.size() != caseGridDimensions.size()) if (mainCaseGridDimensions.size() != caseGridDimensions.size())
{ {
@ -112,7 +112,6 @@ bool RigGridManager::isGridDimensionsEqual(const std::vector< std::vector<int> >
if (mainCaseGridDimensions[j][0] != caseGridDimensions[j][0]) return false; // nx if (mainCaseGridDimensions[j][0] != caseGridDimensions[j][0]) return false; // nx
if (mainCaseGridDimensions[j][1] != caseGridDimensions[j][1]) return false; // ny if (mainCaseGridDimensions[j][1] != caseGridDimensions[j][1]) return false; // ny
if (mainCaseGridDimensions[j][2] != caseGridDimensions[j][2]) return false; // nz if (mainCaseGridDimensions[j][2] != caseGridDimensions[j][2]) return false; // nz
} }
return true; return true;
@ -137,8 +136,8 @@ bool RigGridManager::isMainGridDimensionsEqual(RigMainGrid* gridA, RigMainGrid*
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigGridManager::CaseToGridMap::CaseToGridMap(RigEclipseCaseData* eclipseCase, RigMainGrid* mainGrid) : RigGridManager::CaseToGridMap::CaseToGridMap(RigEclipseCaseData* eclipseCase, RigMainGrid* mainGrid)
m_eclipseCase(eclipseCase), : m_eclipseCase(eclipseCase)
m_mainGrid(mainGrid) , m_mainGrid(mainGrid)
{ {
} }

6
ApplicationCode/ReservoirDataModel/RigGridManager.h
View File

@ -19,8 +19,8 @@
#pragma once #pragma once
#include "cvfBase.h" #include "cvfBase.h"
#include "cvfObject.h"
#include "cvfCollection.h" #include "cvfCollection.h"
#include "cvfObject.h"
#include <vector> #include <vector>
@ -39,8 +39,9 @@ public:
void clear(); void clear();
static bool isEqual(RigMainGrid* gridA, RigMainGrid* gridB); static bool isEqual(RigMainGrid* gridA, RigMainGrid* gridB);
static bool isGridDimensionsEqual(const std::vector< std::vector<int> >& mainCaseGridDimensions, const std::vector< std::vector<int> >& caseGridDimensions);
static bool isMainGridDimensionsEqual(RigMainGrid* gridA, RigMainGrid* gridB); static bool isMainGridDimensionsEqual(RigMainGrid* gridA, RigMainGrid* gridB);
static bool isGridDimensionsEqual(const std::vector<std::vector<int>>& mainCaseGridDimensions,
const std::vector<std::vector<int>>& caseGridDimensions);
private: private:
class CaseToGridMap : public cvf::Object class CaseToGridMap : public cvf::Object
@ -52,7 +53,6 @@ private:
RigMainGrid* m_mainGrid; RigMainGrid* m_mainGrid;
}; };
private: private:
cvf::Collection<CaseToGridMap> m_caseToGrid; cvf::Collection<CaseToGridMap> m_caseToGrid;
}; };