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

Copy changes from dev-branch into main

Browse Source 
History of main branch was difficult to merge. Take a copy of dev-branch, and merge both ways between dev and main after the release.
This commit is contained in:
Magne Sjaastad
2023-10-23 08:12:19 +02:00
parent 5688838899
commit 06f9c6126d
1778 changed files with 35036 additions and 12457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationLibCode/ProjectDataModel/WellPath/RimWellIASettings.cpp
View File

@@ -21,6 +21,7 @@
#include "RiaApplication.h"
#include "RiaPreferencesGeoMech.h"
#include "RigFemAddressDefines.h"
#include "RigWellPath.h"
#include "RigWellPathGeometryTools.h"
@@ -94,7 +95,7 @@ RimWellIASettings::RimWellIASettings()
CAF_PDM_InitField( &m_boxValid, "boxValid", false, "Model box is valid" );
m_boxValid.uiCapability()->setUiHidden( true );
this->setDeletable( true );
setDeletable( true );
}
//--------------------------------------------------------------------------------------------------
@@ -145,7 +146,7 @@ void RimWellIASettings::fieldChangedByUi( const caf::PdmFieldHandle* changedFiel
updateVisualization();
}
this->updateConnectedEditors();
updateConnectedEditors();
}
//--------------------------------------------------------------------------------------------------
@@ -476,7 +477,12 @@ bool RimWellIASettings::updateResInsightParameters()
}
}
double ppValue = dataAccess.interpolatedResultValue( "POR-Bar", "", RigFemResultPosEnum::RIG_NODAL, position, 0, 0 );
double ppValue = dataAccess.interpolatedResultValue( QString::fromStdString( RigFemAddressDefines::porBar() ),
"",
RigFemResultPosEnum::RIG_NODAL,
position,
0,
0 );
if ( std::isfinite( ppValue ) )
{
initialStress->addParameter( "PP", ppValue * 100000.0 );