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

#4683 clang-format on all files in ApplicationCode

Browse Source
This commit is contained in:
Magne Sjaastad
2019-09-06 10:40:57 +02:00
parent 3a317504bb
commit fe9e567825
2092 changed files with 117952 additions and 111846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
ApplicationCode/ReservoirDataModel/RigFormationNames.cpp
View File

@@ -1,17 +1,17 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) Statoil ASA
//
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
@@ -19,47 +19,41 @@
#include "RigFormationNames.h"
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
RigFormationNames::RigFormationNames()
RigFormationNames::RigFormationNames() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFormationNames::~RigFormationNames() {}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigFormationNames::formationNameFromKLayerIdx( size_t Kidx )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RigFormationNames::~RigFormationNames()
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RigFormationNames::formationNameFromKLayerIdx(size_t Kidx)
{
int idx = formationIndexFromKLayerIdx(Kidx);
if(idx >= static_cast<int>(m_formationNames.size())) return "";
if(idx == -1) return "";
int idx = formationIndexFromKLayerIdx( Kidx );
if ( idx >= static_cast<int>( m_formationNames.size() ) ) return "";
if ( idx == -1 ) return "";
return m_formationNames[idx];
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RigFormationNames::appendFormationRange(const QString& name, int kStartIdx, int kEndIdx)
void RigFormationNames::appendFormationRange( const QString& name, int kStartIdx, int kEndIdx )
{
CVF_ASSERT(kStartIdx <= kEndIdx);
int nameIdx = static_cast<int>(m_formationNames.size());
m_formationNames.push_back(name);
CVF_ASSERT( kStartIdx <= kEndIdx );
if ( kEndIdx >= static_cast<int>(m_nameIndexPrKLayer.size()) )
int nameIdx = static_cast<int>( m_formationNames.size() );
m_formationNames.push_back( name );
if ( kEndIdx >= static_cast<int>( m_nameIndexPrKLayer.size() ) )
{
m_nameIndexPrKLayer.resize(kEndIdx + 1, -1);
m_nameIndexPrKLayer.resize( kEndIdx + 1, -1 );
}
for ( int kIdx = kStartIdx; kIdx <= kEndIdx; ++kIdx )
@@ -68,21 +62,20 @@ void RigFormationNames::appendFormationRange(const QString& name, int kStartIdx,
}
}
//--------------------------------------------------------------------------------------------------
///
///
//--------------------------------------------------------------------------------------------------
void RigFormationNames::appendFormationRangeHeight(const QString& name, int kLayerCount)
void RigFormationNames::appendFormationRangeHeight( const QString& name, int kLayerCount )
{
if (kLayerCount < 1) return;
if ( kLayerCount < 1 ) return;
int nameIdx = static_cast<int>(m_formationNames.size());
int nameIdx = static_cast<int>( m_formationNames.size() );
m_formationNames.push_back(name);
m_formationNames.push_back( name );
int kStartIdx = static_cast<int>(m_nameIndexPrKLayer.size());
m_nameIndexPrKLayer.resize(kStartIdx + kLayerCount, -1);
int kStartIdx = static_cast<int>( m_nameIndexPrKLayer.size() );
m_nameIndexPrKLayer.resize( kStartIdx + kLayerCount, -1 );
for ( int kIdx = kStartIdx; kIdx < kStartIdx + kLayerCount; ++kIdx )
{