OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-21 05:53:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

Include all timesteps in preproc file, not just from/to

Browse Source 
Convert angle to radians.
This commit is contained in:
jonjenssen 2021-05-29 00:35:18 +02:00 committed by jonjenssen
parent e2e04db6eb
commit 326a1765ef
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationLibCode/ProjectDataModel/Faults/RimFaultRAPostprocSettings.cpp
View File

@ -22,6 +22,7 @@
#include "RimFaultRASettings.h" #include "RimFaultRASettings.h"
#include "RimParameterGroup.h" #include "RimParameterGroup.h"
#define _USE_MATH_DEFINES
#include <cmath> #include <cmath>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -66,7 +67,7 @@ void RimFaultRAPostprocSettings::initFromSettings( RimFaultRASettings* settings
dynamic_cast<RimDoubleParameter*>( settings->getInputParameter( "friction_angle" ) ); dynamic_cast<RimDoubleParameter*>( settings->getInputParameter( "friction_angle" ) );
if ( friction_angle != nullptr ) if ( friction_angle != nullptr )
{ {
m_postprocParameters->addParameter( "friction_coef", std::atan( friction_angle->value() ) ); m_postprocParameters->addParameter( "friction_coef", std::atan( friction_angle->value() / 180.0 * M_PI ) );
} }
RimDoubleParameter* rho_rock = dynamic_cast<RimDoubleParameter*>( settings->getInputParameter( "rho_rock" ) ); RimDoubleParameter* rho_rock = dynamic_cast<RimDoubleParameter*>( settings->getInputParameter( "rho_rock" ) );
@ -101,9 +102,11 @@ void RimFaultRAPostprocSettings::initFromSettings( RimFaultRASettings* settings
QStringList RimFaultRAPostprocSettings::stepsToLoad() QStringList RimFaultRAPostprocSettings::stepsToLoad()
{ {
QStringList timesteps; QStringList timesteps;
timesteps.push_back( QString::number( m_startTimestepEclipse() ) );
timesteps.push_back( QString::number( m_endTimestepEclipse() ) );
for ( int i = m_startTimestepEclipse(); i <= m_endTimestepEclipse(); i++ )
{
timesteps.push_back( QString::number( i ) );
}
return timesteps; return timesteps;
} }