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

Add regression curves to ensemble statistics curves

Browse Source 
* Add statistics enum
* Support ensemble statistics curve as data source for regression curves
* Allow creation of regression curves from statistics curves
* Make sure regression curves are updated after source curves
* Add state to use full or user defined range for regression source data
* Add isRegressionCurve
* Make sure source stepping works when regression curves are present
This commit is contained in:
Magne Sjaastad
2023-09-30 11:07:23 +02:00
committed by GitHub
parent 31596e0713
commit 263e39b97b
16 changed files with 564 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/FileInterface/CMakeLists_files.cmake
View File

@@ -88,6 +88,7 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RifInpExportTools.h
${CMAKE_CURRENT_LIST_DIR}/RifFaultReactivationModelExporter.h
${CMAKE_CURRENT_LIST_DIR}/RifThermalToStimPlanFractureXmlOutput.h
${CMAKE_CURRENT_LIST_DIR}/RifEclipseSummaryAddressDefines.h
)
set(SOURCE_GROUP_SOURCE_FILES
@@ -177,6 +178,7 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RifInpExportTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RifFaultReactivationModelExporter.cpp
${CMAKE_CURRENT_LIST_DIR}/RifThermalToStimPlanFractureXmlOutput.cpp
${CMAKE_CURRENT_LIST_DIR}/RifEclipseSummaryAddressDefines.cpp
)
list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})

75
ApplicationLibCode/FileInterface/RifEclipseSummaryAddressDefines.cpp Normal file
View File

@@ -0,0 +1,75 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2023- Equinor 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 "RifEclipseSummaryAddressDefines.h"
#include "cafAppEnum.h"
namespace caf
{
template <>
void caf::AppEnum<RifEclipseSummaryAddressDefines::StatisticsType>::setUp()
{
addItem( RifEclipseSummaryAddressDefines::StatisticsType::NONE, "NONE", "None" );
addItem( RifEclipseSummaryAddressDefines::StatisticsType::P10, "P10", "P10" );
addItem( RifEclipseSummaryAddressDefines::StatisticsType::P50, "P50", "P50" );
addItem( RifEclipseSummaryAddressDefines::StatisticsType::P90, "P90", "P90" );
addItem( RifEclipseSummaryAddressDefines::StatisticsType::MEAN, "MEAN", "Mean" );
setDefault( RifEclipseSummaryAddressDefines::StatisticsType::NONE );
}
} // namespace caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RifEclipseSummaryAddressDefines::statisticsNameP10()
{
return statisticsTypeToString( StatisticsType::P10 );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RifEclipseSummaryAddressDefines::statisticsNameP50()
{
return statisticsTypeToString( StatisticsType::P50 );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RifEclipseSummaryAddressDefines::statisticsNameP90()
{
return statisticsTypeToString( StatisticsType::P90 );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RifEclipseSummaryAddressDefines::statisticsNameMean()
{
return statisticsTypeToString( StatisticsType::MEAN );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::string RifEclipseSummaryAddressDefines::statisticsTypeToString( StatisticsType type )
{
caf::AppEnum<StatisticsType> enumType( type );
return enumType.uiText().toStdString();
}

24
ApplicationLibCode/FileInterface/RifEclipseSummaryAddressDefines.h
View File

@@ -1,6 +1,6 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) Statoil ASA
// Copyright (C) 2023- Equinor 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
@@ -15,12 +15,10 @@
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
#define ENSEMBLE_STAT_P10_QUANTITY_NAME "P10"
#define ENSEMBLE_STAT_P50_QUANTITY_NAME "P50"
#define ENSEMBLE_STAT_P90_QUANTITY_NAME "P90"
#define ENSEMBLE_STAT_MEAN_QUANTITY_NAME "MEAN"
#include <string>
//==================================================================================================
//
@@ -65,4 +63,20 @@ enum class SummaryIdentifierType
INPUT_VECTOR_NAME,
INPUT_ID
};
enum class StatisticsType
{
NONE,
P10,
P50,
P90,
MEAN
};
std::string statisticsNameP10();
std::string statisticsNameP50();
std::string statisticsNameP90();
std::string statisticsNameMean();
std::string statisticsTypeToString( StatisticsType type );
}; // namespace RifEclipseSummaryAddressDefines