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

clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false

Browse Source
This commit is contained in:
Magne Sjaastad
2019-11-04 14:35:41 +01:00
parent 946f9e7f91
commit 7c8cf60dba
83 changed files with 495 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/FileInterface/RifEclipseSummaryAddress.cpp
View File

@@ -400,8 +400,11 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::wellAddress( const std::strin
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RifEclipseSummaryAddress::wellCompletionAddress(
const std::string& quantityName, const std::string& wellName, int i, int j, int k )
RifEclipseSummaryAddress RifEclipseSummaryAddress::wellCompletionAddress( const std::string& quantityName,
const std::string& wellName,
int i,
int j,
int k )
{
RifEclipseSummaryAddress addr;
addr.m_variableCategory = SUMMARY_WELL_COMPLETION;
@@ -431,8 +434,12 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::wellLgrAddress( const std::st
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RifEclipseSummaryAddress::wellCompletionLgrAddress(
const std::string& quantityName, const std::string& lgrName, const std::string& wellName, int i, int j, int k )
RifEclipseSummaryAddress RifEclipseSummaryAddress::wellCompletionLgrAddress( const std::string& quantityName,
const std::string& lgrName,
const std::string& wellName,
int i,
int j,
int k )
{
RifEclipseSummaryAddress addr;
addr.m_variableCategory = SUMMARY_WELL_COMPLETION_LGR;
@@ -477,8 +484,11 @@ RifEclipseSummaryAddress RifEclipseSummaryAddress::blockAddress( const std::stri
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RifEclipseSummaryAddress RifEclipseSummaryAddress::blockLgrAddress(
const std::string& quantityName, const std::string& lgrName, int i, int j, int k )
RifEclipseSummaryAddress RifEclipseSummaryAddress::blockLgrAddress( const std::string& quantityName,
const std::string& lgrName,
int i,
int j,
int k )
{
RifEclipseSummaryAddress addr;
addr.m_variableCategory = SUMMARY_BLOCK_LGR;

8
ApplicationCode/FileInterface/RifEclipseSummaryAddress.h
View File

@@ -136,8 +136,12 @@ public:
wellCompletionAddress( const std::string& quantityName, const std::string& wellName, int i, int j, int k );
static RifEclipseSummaryAddress
wellLgrAddress( const std::string& quantityName, const std::string& lgrName, const std::string& wellName );
static RifEclipseSummaryAddress wellCompletionLgrAddress(
const std::string& quantityName, const std::string& lgrName, const std::string& wellName, int i, int j, int k );
static RifEclipseSummaryAddress wellCompletionLgrAddress( const std::string& quantityName,
const std::string& lgrName,
const std::string& wellName,
int i,
int j,
int k );
static RifEclipseSummaryAddress
wellSegmentAddress( const std::string& quantityName, const std::string& wellName, int segmentNumber );
static RifEclipseSummaryAddress blockAddress( const std::string& quantityName, int i, int j, int k );

7
ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp
View File

@@ -159,8 +159,11 @@ void RifEclipseSummaryTools::dumpMetaData( RifSummaryReaderInterface* readerEcli
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RifEclipseSummaryTools::findSummaryHeaderFileInfo(
const QString& inputFile, QString* headerFile, QString* path, QString* base, bool* isFormatted )
void RifEclipseSummaryTools::findSummaryHeaderFileInfo( const QString& inputFile,
QString* headerFile,
QString* path,
QString* base,
bool* isFormatted )
{
char* myPath = nullptr;
char* myBase = nullptr;

7
ApplicationCode/FileInterface/RifEclipseSummaryTools.h
View File

@@ -42,6 +42,9 @@ public:
static void dumpMetaData( RifSummaryReaderInterface* readerEclipseSummary );
private:
static void findSummaryHeaderFileInfo(
const QString& inputFile, QString* headerFile, QString* path, QString* base, bool* isFormatted );
static void findSummaryHeaderFileInfo( const QString& inputFile,
QString* headerFile,
QString* path,
QString* base,
bool* isFormatted );
};

5
ApplicationCode/FileInterface/RifReaderEclipseRft.cpp
View File

@@ -285,8 +285,9 @@ std::set<QDateTime>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<QDateTime> RifReaderEclipseRft::availableTimeSteps(
const QString& wellName, const std::set<RifEclipseRftAddress::RftWellLogChannelType>& relevantChannels )
std::set<QDateTime>
RifReaderEclipseRft::availableTimeSteps( const QString& wellName,
const std::set<RifEclipseRftAddress::RftWellLogChannelType>& relevantChannels )
{
if ( !m_ecl_rft_file )
{

6
ApplicationCode/FileInterface/RifReaderEnsembleStatisticsRft.cpp
View File

@@ -114,7 +114,8 @@ std::set<QDateTime> RifReaderEnsembleStatisticsRft::availableTimeSteps( const QS
///
//--------------------------------------------------------------------------------------------------
std::set<QDateTime> RifReaderEnsembleStatisticsRft::availableTimeSteps(
const QString& wellName, const RifEclipseRftAddress::RftWellLogChannelType& wellLogChannelName )
const QString& wellName,
const RifEclipseRftAddress::RftWellLogChannelType& wellLogChannelName )
{
std::set<QDateTime> allTimeSteps;
for ( auto summaryCase : m_summaryCaseCollection->allSummaryCases() )
@@ -132,7 +133,8 @@ std::set<QDateTime> RifReaderEnsembleStatisticsRft::availableTimeSteps(
///
//--------------------------------------------------------------------------------------------------
std::set<QDateTime> RifReaderEnsembleStatisticsRft::availableTimeSteps(
const QString& wellName, const std::set<RifEclipseRftAddress::RftWellLogChannelType>& relevantChannels )
const QString& wellName,
const std::set<RifEclipseRftAddress::RftWellLogChannelType>& relevantChannels )
{
std::set<QDateTime> allTimeSteps;
for ( auto summaryCase : m_summaryCaseCollection->allSummaryCases() )

3
ApplicationCode/FileInterface/RifSummaryCaseRestartSelector.cpp
View File

@@ -162,7 +162,8 @@ void RifSummaryCaseRestartSelector::determineFilesToImport( const std::vector<Ri
///
//--------------------------------------------------------------------------------------------------
void RifSummaryCaseRestartSelector::determineFilesToImportByAskingUser(
const std::vector<RifSummaryCaseFileImportInfo>& initialFiles, bool enableApplyToAllField )
const std::vector<RifSummaryCaseFileImportInfo>& initialFiles,
bool enableApplyToAllField )
{
RicSummaryCaseRestartDialogResult lastResult;