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

Release adjustments

Browse Source 
* Add CON*RAT track for tubing branch
* Set long summary vector name as default, and allow both in curve name
* Use line shift if multiple quantities are present on axis title
Insert line shift if multiple quantities are present, otherwise insert space between individual vector names and the unit text.
* Move Groups between Field and Wells
* Bump version
This commit is contained in:
Magne Sjaastad 2023-03-13 19:01:31 +01:00 committed by GitHub
parent eb5a0cf936
commit 9b4a3f663e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 25 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/Commands/WellLogCommands/RicNewMultiPhaseRftSegmentPlotFeature.cpp
View File

@ -75,15 +75,17 @@ void RicNewMultiPhaseRftSegmentPlotFeature::onActionTriggered( bool isChecked )
auto wellNames = rftReader->wellNames(); auto wellNames = rftReader->wellNames();
if ( !wellNames.empty() ) wellName = *wellNames.begin(); if ( !wellNames.empty() ) wellName = *wellNames.begin();
// Reservoir rates can be available on both annulus and device const auto allBranchTypes = { RiaDefines::RftBranchType::RFT_ANNULUS,
for ( auto branchType : { RiaDefines::RftBranchType::RFT_ANNULUS, RiaDefines::RftBranchType::RFT_DEVICE } ) RiaDefines::RftBranchType::RFT_DEVICE,
RiaDefines::RftBranchType::RFT_TUBING };
for ( auto branchType : allBranchTypes )
{ {
QString trackName = "Reservoir Rates - " + caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType ); QString trackName = "Reservoir Rates - " + caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType );
appendTrackAndCurveForBranchType( plot, trackName, { "CONGRAT", "CONORAT", "CONWRAT" }, wellName, branchType, summaryCase ); appendTrackAndCurveForBranchType( plot, trackName, { "CONGRAT", "CONORAT", "CONWRAT" }, wellName, branchType, summaryCase );
} }
for ( auto branchType : for ( auto branchType : allBranchTypes )
{ RiaDefines::RftBranchType::RFT_ANNULUS, RiaDefines::RftBranchType::RFT_DEVICE, RiaDefines::RftBranchType::RFT_TUBING } )
{ {
QString trackName = caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType ); QString trackName = caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType );
trackName += " Rates"; trackName += " Rates";

10
ApplicationLibCode/Commands/WellLogCommands/RicNewRftSegmentWellLogPlotFeature.cpp
View File

@ -75,8 +75,11 @@ void RicNewRftSegmentWellLogPlotFeature::onActionTriggered( bool isChecked )
auto wellNames = rftReader->wellNames(); auto wellNames = rftReader->wellNames();
if ( !wellNames.empty() ) wellName = *wellNames.begin(); if ( !wellNames.empty() ) wellName = *wellNames.begin();
// Reservoir rates can be available on both annulus and device const auto allBranchTypes = { RiaDefines::RftBranchType::RFT_ANNULUS,
for ( auto branchType : { RiaDefines::RftBranchType::RFT_ANNULUS, RiaDefines::RftBranchType::RFT_DEVICE } ) RiaDefines::RftBranchType::RFT_DEVICE,
RiaDefines::RftBranchType::RFT_TUBING };
for ( auto branchType : allBranchTypes )
{ {
QString trackName = "Reservoir Rates - " + caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType ); QString trackName = "Reservoir Rates - " + caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType );
@ -89,8 +92,7 @@ void RicNewRftSegmentWellLogPlotFeature::onActionTriggered( bool isChecked )
curve->setFillStyle( Qt::SolidPattern ); curve->setFillStyle( Qt::SolidPattern );
} }
for ( auto branchType : for ( auto branchType : allBranchTypes )
{ RiaDefines::RftBranchType::RFT_ANNULUS, RiaDefines::RftBranchType::RFT_DEVICE, RiaDefines::RftBranchType::RFT_TUBING } )
{ {
QString resultName = "SEGGRAT"; QString resultName = "SEGGRAT";
QString trackName = caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType ); QString trackName = caf::AppEnum<RiaDefines::RftBranchType>::uiText( branchType );

2
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryAddressCollection.cpp
View File

@ -165,13 +165,13 @@ void RimSummaryAddressCollection::updateFolderStructure( const std::set<RifEclip
if ( addresses.empty() ) return; if ( addresses.empty() ) return;
auto* fields = getOrCreateSubfolder( CollectionContentType::FIELD ); auto* fields = getOrCreateSubfolder( CollectionContentType::FIELD );
auto* groups = getOrCreateSubfolder( CollectionContentType::GROUP_FOLDER );
auto* wells = getOrCreateSubfolder( CollectionContentType::WELL_FOLDER ); auto* wells = getOrCreateSubfolder( CollectionContentType::WELL_FOLDER );
auto* aquifer = getOrCreateSubfolder( CollectionContentType::AQUIFER ); auto* aquifer = getOrCreateSubfolder( CollectionContentType::AQUIFER );
auto* network = getOrCreateSubfolder( CollectionContentType::NETWORK ); auto* network = getOrCreateSubfolder( CollectionContentType::NETWORK );
auto* misc = getOrCreateSubfolder( CollectionContentType::MISC ); auto* misc = getOrCreateSubfolder( CollectionContentType::MISC );
auto* regions = getOrCreateSubfolder( CollectionContentType::REGION_FOLDER ); auto* regions = getOrCreateSubfolder( CollectionContentType::REGION_FOLDER );
auto* region2region = getOrCreateSubfolder( CollectionContentType::REGION_2_REGION ); auto* region2region = getOrCreateSubfolder( CollectionContentType::REGION_2_REGION );
auto* groups = getOrCreateSubfolder( CollectionContentType::GROUP_FOLDER );
auto* completion = getOrCreateSubfolder( CollectionContentType::WELL_COMPLETION ); auto* completion = getOrCreateSubfolder( CollectionContentType::WELL_COMPLETION );
auto* segment = getOrCreateSubfolder( CollectionContentType::WELL_SEGMENT ); auto* segment = getOrCreateSubfolder( CollectionContentType::WELL_SEGMENT );
auto* blocks = getOrCreateSubfolder( CollectionContentType::BLOCK ); auto* blocks = getOrCreateSubfolder( CollectionContentType::BLOCK );

8
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryCurveAutoName.cpp
View File

@ -45,8 +45,8 @@ RimSummaryCurveAutoName::RimSummaryCurveAutoName()
// clang-format off // clang-format off
CAF_PDM_InitObject("RimSummaryCurveAutoName"); CAF_PDM_InitObject("RimSummaryCurveAutoName");
CAF_PDM_InitField( &m_longVectorName, "LongVectorName", false, "Long Vector Name"); CAF_PDM_InitField( &m_longVectorName, "LongVectorName", true, "Long Vector Name");
CAF_PDM_InitField( &m_vectorName, "VectorName", true, "Vector Name"); CAF_PDM_InitField( &m_vectorName, "VectorName", false, "Vector Name");
CAF_PDM_InitField( &m_unit, "Unit", false, "Unit"); CAF_PDM_InitField( &m_unit, "Unit", false, "Unit");
CAF_PDM_InitField( &m_regionNumber, "RegionNumber", true, "Region Number"); CAF_PDM_InitField( &m_regionNumber, "RegionNumber", true, "Region Number");
CAF_PDM_InitField( &m_groupName, "WellGroupName", true, "Group Name"); CAF_PDM_InitField( &m_groupName, "WellGroupName", true, "Group Name");
@ -191,7 +191,7 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress&
{ {
std::string text; // Using std::string locally to avoid a lot of conversion when building the curve name std::string text; // Using std::string locally to avoid a lot of conversion when building the curve name
if ( m_vectorName ) if ( m_vectorName || m_longVectorName )
{ {
bool skipSubString = currentNameHelper && currentNameHelper->vectorNames().size() == 1; bool skipSubString = currentNameHelper && currentNameHelper->vectorNames().size() == 1;
if ( !skipSubString ) if ( !skipSubString )
@ -202,6 +202,8 @@ QString RimSummaryCurveAutoName::buildCurveName( const RifEclipseSummaryAddress&
if ( summaryAddress.isHistoryVector() ) quantityName = quantityName.substr( 0, quantityName.size() - 1 ); if ( summaryAddress.isHistoryVector() ) quantityName = quantityName.substr( 0, quantityName.size() - 1 );
text = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( quantityName ); text = RiuSummaryQuantityNameInfoProvider::instance()->longNameFromVectorName( quantityName );
if ( m_vectorName ) text += " (" + summaryAddress.vectorName() + ")";
} }
else else
{ {

7
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotAxisFormatter.cpp
View File

@ -301,9 +301,14 @@ QString RimSummaryPlotAxisFormatter::autoAxisTitle() const
for ( const auto& unitIt : unitToQuantityNameMap ) for ( const auto& unitIt : unitToQuantityNameMap )
{ {
// Insert line shift if multiple quantities are present, otherwise insert space
bool insertLineShift = unitIt.second.size() > 1;
for ( const auto& quantIt : unitIt.second ) for ( const auto& quantIt : unitIt.second )
{ {
assembledYAxisText += QString::fromStdString( quantIt ) + " "; assembledYAxisText += QString::fromStdString( quantIt );
insertLineShift ? ( assembledYAxisText += "\n" ) : ( assembledYAxisText += " " );
} }
if ( m_axisProperties->showUnitText() ) if ( m_axisProperties->showUnitText() )

2
ResInsightVersion.cmake
View File

@ -5,7 +5,7 @@ set(RESINSIGHT_PATCH_VERSION 0)
# Opional text with no restrictions # Opional text with no restrictions
#set(RESINSIGHT_VERSION_TEXT "-dev") #set(RESINSIGHT_VERSION_TEXT "-dev")
set(RESINSIGHT_VERSION_TEXT "-RC_01") set(RESINSIGHT_VERSION_TEXT "-RC_02")
# Optional text # Optional text
# Must be unique and increasing within one combination of major/minor/patch version # Must be unique and increasing within one combination of major/minor/patch version