mirror of
https://github.com/OPM/ResInsight.git
synced 2026-10-24 22:27:55 -05:00
Magne Sjaastad
56e98ba1c4
Migrate all assert macros in ApplicationLibCode to CAF_ASSERT and remove every use of cvfAssert.h. CVF_ASSERT is replaced one to one. CVF_TIGHT_ASSERT is also replaced by CAF_ASSERT, which is semantically exact: CVF_ENABLE_TIGHT_ASSERTS is 1 only under _DEBUG, and that is what CAF_ASSERT now does. The two CVF_FAIL_MSG sites become CAF_ASSERT( false && "message" ), preserving the message with the idiom already used elsewhere in the code base. Counts before and after: CVF_ASSERT 1044 to 0, CVF_TIGHT_ASSERT 66 to 0, CVF_FAIL_MSG 2 to 0, cvfAssert.h references 154 to 0. Include handling: files that included cvfAssert.h directly now include cafAssert.h instead, includes left dead by the migration are removed, and files that were relying on cvfAssert.h transitively get an explicit cafAssert.h. Files that reach cafAssert.h through another caf header are left unchanged; a missing include here is a compile error, not a silently disabled assert. ResultStatisticsCache links only LibCore and therefore had no path to cafAssert.h. Add the cafPdmCore directory as a private include path rather than linking the library, since cafAssert.h is header only. Note that this stops these asserts from firing in Release and RelWithDebInfo, where CVF_ASSERT was previously active.
207 lines
8.0 KiB
C++
207 lines
8.0 KiB
C++
/////////////////////////////////////////////////////////////////////////////////
|
|
//
|
|
// Copyright (C) 2017 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>
|
|
// for more details.
|
|
//
|
|
/////////////////////////////////////////////////////////////////////////////////
|
|
|
|
#include "RigEclipseResultInfo.h"
|
|
|
|
#include "cafAssert.h"
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
RigEclipseTimeStepInfo::RigEclipseTimeStepInfo( const QDateTime& date, int reportNumber, double daysSinceSimulationStart )
|
|
: m_date( date )
|
|
, m_reportNumber( reportNumber )
|
|
, m_daysSinceSimulationStart( daysSinceSimulationStart )
|
|
{
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::vector<RigEclipseTimeStepInfo> RigEclipseTimeStepInfo::createTimeStepInfos( std::vector<QDateTime> dates,
|
|
std::vector<int> reportNumbers,
|
|
std::vector<double> daysSinceSimulationStarts )
|
|
{
|
|
CAF_ASSERT( dates.size() == reportNumbers.size() );
|
|
CAF_ASSERT( dates.size() == daysSinceSimulationStarts.size() );
|
|
|
|
std::vector<RigEclipseTimeStepInfo> timeStepInfos;
|
|
|
|
for ( size_t i = 0; i < dates.size(); i++ )
|
|
{
|
|
timeStepInfos.push_back( RigEclipseTimeStepInfo( dates[i], reportNumbers[i], daysSinceSimulationStarts[i] ) );
|
|
}
|
|
|
|
return timeStepInfos;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
RigEclipseResultInfo::RigEclipseResultInfo( const RigEclipseResultAddress& resultAddress,
|
|
bool needsToBeStored,
|
|
bool mustBeCalculated,
|
|
size_t gridScalarResultIndex )
|
|
: m_resultAddress( resultAddress )
|
|
, m_needsToBeStored( needsToBeStored )
|
|
, m_mustBeCalculated( mustBeCalculated )
|
|
, m_gridScalarResultIndex( gridScalarResultIndex )
|
|
{
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
RiaDefines::ResultCatType RigEclipseResultInfo::resultType() const
|
|
{
|
|
return m_resultAddress.resultCatType();
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigEclipseResultInfo::setResultType( RiaDefines::ResultCatType newType )
|
|
{
|
|
m_resultAddress.setResultCatType( newType );
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
const QString& RigEclipseResultInfo::resultName() const
|
|
{
|
|
return m_resultAddress.resultName();
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigEclipseResultInfo::setResultName( const QString& name )
|
|
{
|
|
m_resultAddress.setResultName( name );
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
bool RigEclipseResultInfo::needsToBeStored() const
|
|
{
|
|
return m_needsToBeStored;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
bool RigEclipseResultInfo::mustBeCalculated() const
|
|
{
|
|
return m_mustBeCalculated;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigEclipseResultInfo::setMustBeCalculated( bool mustCalculate )
|
|
{
|
|
m_mustBeCalculated = mustCalculate;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
size_t RigEclipseResultInfo::gridScalarResultIndex() const
|
|
{
|
|
return m_gridScalarResultIndex;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
const RigEclipseResultAddress& RigEclipseResultInfo::eclipseResultAddress() const
|
|
{
|
|
return m_resultAddress;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
const std::vector<RigEclipseTimeStepInfo>& RigEclipseResultInfo::timeStepInfos() const
|
|
{
|
|
return m_timeStepInfos;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
void RigEclipseResultInfo::setTimeStepInfos( const std::vector<RigEclipseTimeStepInfo>& timeSteps )
|
|
{
|
|
m_timeStepInfos = timeSteps;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::vector<QDateTime> RigEclipseResultInfo::dates() const
|
|
{
|
|
std::vector<QDateTime> values;
|
|
|
|
for ( auto v : m_timeStepInfos )
|
|
{
|
|
values.push_back( v.m_date );
|
|
}
|
|
|
|
return values;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::vector<double> RigEclipseResultInfo::daysSinceSimulationStarts() const
|
|
{
|
|
std::vector<double> values;
|
|
|
|
for ( auto v : m_timeStepInfos )
|
|
{
|
|
values.push_back( v.m_daysSinceSimulationStart );
|
|
}
|
|
|
|
return values;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
///
|
|
//--------------------------------------------------------------------------------------------------
|
|
std::vector<int> RigEclipseResultInfo::reportNumbers() const
|
|
{
|
|
std::vector<int> values;
|
|
|
|
for ( auto v : m_timeStepInfos )
|
|
{
|
|
values.push_back( v.m_reportNumber );
|
|
}
|
|
|
|
return values;
|
|
}
|
|
|
|
//--------------------------------------------------------------------------------------------------
|
|
/// Ordering operator for set storage. Just the type and name are used to find unique addresses.
|
|
//--------------------------------------------------------------------------------------------------
|
|
bool RigEclipseResultInfo::operator<( const RigEclipseResultInfo& rhs ) const
|
|
{
|
|
return m_resultAddress < rhs.m_resultAddress;
|
|
}
|