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

#859 Added time from start of simulation option

Browse Source
This commit is contained in:
Jacob Støren
2016-11-22 11:13:34 +01:00
parent 3a0e7d098f
commit 5d04ac198b
13 changed files with 445 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/FileInterface/RifReaderEclipseSummary.cpp
View File

@@ -71,6 +71,14 @@ bool RifReaderEclipseSummary::open(const std::string& headerFileName, const std:
eclSmSpec = ecl_sum_get_smspec(ecl_sum);
assert(eclSmSpec != NULL);
assert(ecl_sum != NULL);
for ( int time_index = 0; time_index < timeStepCount(); time_index++ )
{
time_t sim_time = ecl_sum_iget_sim_time(ecl_sum, time_index);
m_timeSteps.push_back(sim_time);
}
return true;
}
@@ -241,13 +249,15 @@ const std::vector<RifEclipseSummaryAddress>& RifReaderEclipseSummary::allResultA
bool RifReaderEclipseSummary::values(const RifEclipseSummaryAddress& resultAddress, std::vector<double>* values)
{
assert(ecl_sum != NULL);
int variableIndex = indexFromAddress(resultAddress);
if ( variableIndex < 0 ) return false;
values->clear();
int tsCount = timeStepCount();
values->reserve(timeStepCount());
int variableIndex = indexFromAddress(resultAddress);
if(variableIndex < 0) return false;
const smspec_node_type * ertSumVarNode = ecl_smspec_iget_node(eclSmSpec, variableIndex);
int paramsIndex = smspec_node_get_params_index(ertSumVarNode);
@@ -274,18 +284,11 @@ int RifReaderEclipseSummary::timeStepCount() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<time_t> RifReaderEclipseSummary::timeSteps() const
const std::vector<time_t>& RifReaderEclipseSummary::timeSteps() const
{
assert(ecl_sum != NULL);
std::vector<time_t> steps;
for (int time_index = 0; time_index < timeStepCount(); time_index++)
{
time_t sim_time = ecl_sum_iget_sim_time(ecl_sum , time_index);
steps.push_back(sim_time);
}
return steps;
return m_timeSteps;
}
//--------------------------------------------------------------------------------------------------