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

System : Reorder initialization order to match declaration

Browse Source
This commit is contained in:
Magne Sjaastad
2018-02-23 22:38:08 +01:00
parent 34c6e3d906
commit 0006c786cf
11 changed files with 50 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ReservoirDataModel/RigActiveCellsResultAccessor.cpp
View File

@@ -26,9 +26,9 @@
RigActiveCellsResultAccessor::RigActiveCellsResultAccessor(const RigGridBase* grid, const std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo) RigActiveCellsResultAccessor::RigActiveCellsResultAccessor(const RigGridBase* grid, const std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo)
: m_grid(grid), : m_activeCellInfo(activeCellInfo),
m_reservoirResultValues(reservoirResultValues), m_grid(grid),
m_activeCellInfo(activeCellInfo) m_reservoirResultValues(reservoirResultValues)
{ {
} }

10
ApplicationCode/ReservoirDataModel/RigCell.cpp
View File

@@ -38,13 +38,13 @@ static size_t undefinedCornersArray[8] = {cvf::UNDEFINED_SIZE_T,
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigCell::RigCell() : RigCell::RigCell() :
m_gridLocalCellIndex(cvf::UNDEFINED_SIZE_T),
m_hostGrid(nullptr),
m_subGrid(nullptr),
m_parentCellIndex(cvf::UNDEFINED_SIZE_T), m_parentCellIndex(cvf::UNDEFINED_SIZE_T),
m_mainGridCellIndex(cvf::UNDEFINED_SIZE_T), m_mainGridCellIndex(cvf::UNDEFINED_SIZE_T),
m_subGrid(nullptr), m_coarseningBoxIndex(cvf::UNDEFINED_SIZE_T),
m_hostGrid(nullptr), m_isInvalid(false)
m_isInvalid(false),
m_gridLocalCellIndex(cvf::UNDEFINED_SIZE_T),
m_coarseningBoxIndex(cvf::UNDEFINED_SIZE_T)
{ {
memcpy(m_cornerIndices.data(), undefinedCornersArray, 8*sizeof(size_t)); memcpy(m_cornerIndices.data(), undefinedCornersArray, 8*sizeof(size_t));

8
ApplicationCode/ReservoirDataModel/RigEclipseWellLogExtractor.cpp
View File

@@ -35,13 +35,15 @@
/// ///
//================================================================================================== //==================================================================================================
RigEclipseWellLogExtractor::RigEclipseWellLogExtractor(const RigEclipseCaseData* aCase, const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName) RigEclipseWellLogExtractor::RigEclipseWellLogExtractor(const RigEclipseCaseData* aCase,
: m_caseData(aCase), RigWellLogExtractor(wellpath, wellCaseErrorMsgName) const RigWellPath* wellpath,
const std::string& wellCaseErrorMsgName)
: RigWellLogExtractor(wellpath, wellCaseErrorMsgName)
, m_caseData(aCase)
{ {
calculateIntersection(); calculateIntersection();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

5
ApplicationCode/ReservoirDataModel/RigFlowDiagResultAddress.h
View File

@@ -52,8 +52,9 @@ public:
RigFlowDiagResultAddress(const std::string& aVariableName, PhaseSelection phaseSelection, const std::set<std::string>& someSelectedTracerNames) RigFlowDiagResultAddress(const std::string& aVariableName, PhaseSelection phaseSelection, const std::set<std::string>& someSelectedTracerNames)
: variableName(aVariableName), : variableName(aVariableName),
phaseSelection(phaseSelection), selectedTracerNames(someSelectedTracerNames),
selectedTracerNames(someSelectedTracerNames) {} phaseSelection(phaseSelection)
{}
RigFlowDiagResultAddress(const std::string& aVariableName, PhaseSelection phaseSelection, const std::string& tracerName) RigFlowDiagResultAddress(const std::string& aVariableName, PhaseSelection phaseSelection, const std::string& tracerName)
: variableName(aVariableName), : variableName(aVariableName),

10
ApplicationCode/ReservoirDataModel/RigGeoMechWellLogExtractor.cpp
View File

@@ -30,11 +30,15 @@
#include "RigWellPath.h" #include "RigWellPath.h"
#include "cvfGeometryTools.h" #include "cvfGeometryTools.h"
#include "RigWellPathIntersectionTools.h" #include "RigWellPathIntersectionTools.h"
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RigGeoMechWellLogExtractor::RigGeoMechWellLogExtractor(RigGeoMechCaseData* aCase, const RigWellPath* wellpath, const std::string& wellCaseErrorMsgName) RigGeoMechWellLogExtractor::RigGeoMechWellLogExtractor(RigGeoMechCaseData* aCase,
:m_caseData(aCase), RigWellLogExtractor(wellpath, wellCaseErrorMsgName) const RigWellPath* wellpath,
const std::string& wellCaseErrorMsgName)
: RigWellLogExtractor(wellpath, wellCaseErrorMsgName)
, m_caseData(aCase)
{ {
calculateIntersection(); calculateIntersection();
} }

4
ApplicationCode/ReservoirDataModel/RigGridBase.cpp
View File

@@ -29,8 +29,8 @@
RigGridBase::RigGridBase(RigMainGrid* mainGrid): RigGridBase::RigGridBase(RigMainGrid* mainGrid):
m_gridPointDimensions(0,0,0), m_gridPointDimensions(0,0,0),
m_mainGrid(mainGrid), m_indexToStartOfCells(0),
m_indexToStartOfCells(0) m_mainGrid(mainGrid)
{ {
if (mainGrid == nullptr) if (mainGrid == nullptr)
{ {

6
ApplicationCode/ReservoirDataModel/RigLasFileExporter.cpp
View File

@@ -92,9 +92,9 @@ class SingleLasFileMetaData
{ {
public: public:
SingleLasFileMetaData() SingleLasFileMetaData()
: m_minimumCurveValue(HUGE_VAL), : m_rkbDiff(HUGE_VAL)
m_rkbDiff(HUGE_VAL), , m_exportTvdrkb(false)
m_exportTvdrkb(false) , m_minimumCurveValue(HUGE_VAL)
{ {
} }

12
ApplicationCode/ReservoirDataModel/RigResultModifier.h
View File

@@ -66,10 +66,12 @@ private:
class RigActiveCellsResultModifier : public RigResultModifier class RigActiveCellsResultModifier : public RigResultModifier
{ {
public: public:
RigActiveCellsResultModifier(const RigGridBase* grid, std::vector<double>* reservoirResultValues, const RigActiveCellInfo* activeCellInfo) RigActiveCellsResultModifier(const RigGridBase* grid,
: m_grid(grid), const RigActiveCellInfo* activeCellInfo,
m_reservoirResultValues(reservoirResultValues), std::vector<double>* reservoirResultValues)
m_activeCellInfo(activeCellInfo) : m_grid(grid)
, m_activeCellInfo(activeCellInfo)
, m_reservoirResultValues(reservoirResultValues)
{ {
} }
@@ -85,8 +87,8 @@ public:
private: private:
const RigActiveCellInfo* m_activeCellInfo;
const RigGridBase* m_grid; const RigGridBase* m_grid;
const RigActiveCellInfo* m_activeCellInfo;
std::vector<double>* m_reservoirResultValues; std::vector<double>* m_reservoirResultValues;
}; };

2
ApplicationCode/ReservoirDataModel/RigResultModifierFactory.cpp
View File

@@ -90,7 +90,7 @@ cvf::ref<RigResultModifier> RigResultModifierFactory::createResultModifier(RigEc
bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(scalarResultIndex); bool useGlobalActiveIndex = eclipseCase->results(porosityModel)->isUsingGlobalActiveIndex(scalarResultIndex);
if (useGlobalActiveIndex) if (useGlobalActiveIndex)
{ {
cvf::ref<RigResultModifier> object = new RigActiveCellsResultModifier(grid, resultValues, eclipseCase->activeCellInfo(porosityModel)); cvf::ref<RigResultModifier> object = new RigActiveCellsResultModifier(grid, eclipseCase->activeCellInfo(porosityModel), resultValues);
return object; return object;
} }
else else

4
ApplicationCode/ReservoirDataModel/RigSimWellData.h
View File

@@ -160,8 +160,8 @@ public:
public: public:
RigWellResultFrame() : RigWellResultFrame() :
m_isOpen(false), m_productionType(UNDEFINED_PRODUCTION_TYPE),
m_productionType(UNDEFINED_PRODUCTION_TYPE) m_isOpen(false)
{ } { }
const RigWellResultPoint* findResultCell(size_t gridIndex, size_t gridCellIndex) const; const RigWellResultPoint* findResultCell(size_t gridIndex, size_t gridCellIndex) const;

14
ApplicationCode/ReservoirDataModel/RigWellLogExtractionTools.h
View File

@@ -45,7 +45,12 @@ struct RigWellLogExtractionTools
struct RigMDCellIdxEnterLeaveKey struct RigMDCellIdxEnterLeaveKey
{ {
RigMDCellIdxEnterLeaveKey(double md, size_t cellIdx, bool entering): measuredDepth(md), hexIndex(cellIdx), isEnteringCell(entering){} RigMDCellIdxEnterLeaveKey(double md, size_t cellIdx, bool entering)
: measuredDepth(md)
, hexIndex(cellIdx)
, isEnteringCell(entering)
{
}
double measuredDepth; double measuredDepth;
size_t hexIndex; size_t hexIndex;
@@ -85,7 +90,12 @@ struct RigMDCellIdxEnterLeaveKey
struct RigMDEnterLeaveCellIdxKey struct RigMDEnterLeaveCellIdxKey
{ {
RigMDEnterLeaveCellIdxKey(double md, bool entering, size_t cellIdx ): measuredDepth(md), hexIndex(cellIdx), isEnteringCell(entering){} RigMDEnterLeaveCellIdxKey(double md, bool entering, size_t cellIdx)
: measuredDepth(md)
, isEnteringCell(entering)
, hexIndex(cellIdx)
{
}
double measuredDepth; double measuredDepth;
bool isEnteringCell; // As opposed to leaving. bool isEnteringCell; // As opposed to leaving.