OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-26 07:00:17 -05:00
Code Issues Packages Projects Releases Wiki Activity

clang-format : Set AllowAllParametersOfDeclarationOnNextLine to false

Browse Source
This commit is contained in:
Magne Sjaastad committed 2019-11-04 14:35:41 +01:00
1 parent 946f9e7f91
commit 7c8cf60dba
83 files changed
+495 -210
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/Application/Tools/RiaProjectFileVersionTools.cpp
+5 -2
View File
@@ -61,8 +61,11 @@ bool RiaProjectFileVersionTools::isCandidateVersionNewerThanOther( const QString
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaProjectFileVersionTools::decodeVersionString(
const QString& projectFileVersion, int* majorVersion, int* minorVersion, int* patch, int* developmentId )
void RiaProjectFileVersionTools::decodeVersionString( const QString& projectFileVersion,
int* majorVersion,
int* minorVersion,
int* patch,
int* developmentId )
{
if ( projectFileVersion.isEmpty() ) return;
ApplicationCode/Application/Tools/RiaProjectFileVersionTools.h
+5 -2
View File
@@ -30,8 +30,11 @@ public:
const QString& otherProjectFileVersion );
// Public to be able to unit test function, not intended to be used
static void decodeVersionString(
const QString& projectFileVersion, int* majorVersion, int* minorVersion, int* patch, int* developmentId );
static void decodeVersionString( const QString& projectFileVersion,
int* majorVersion,
int* minorVersion,
int* patch,
int* developmentId );
private:
static bool isCandidateNewerThanOther( int candidateMajorVersion,
ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.cpp
+24 -6
View File
@@ -28,8 +28,14 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSCurveCalculator::RiaSCurveCalculator(
cvf::Vec3d p1, double azi1, double inc1, double rad1, cvf::Vec3d p2, double azi2, double inc2, double rad2 )
RiaSCurveCalculator::RiaSCurveCalculator( cvf::Vec3d p1,
double azi1,
double inc1,
double rad1,
cvf::Vec3d p2,
double azi2,
double inc2,
double rad2 )
: m_isCalculationOK( false )
, m_p1( p1 )
, m_p2( p2 )
@@ -145,8 +151,14 @@ RiaSCurveCalculator::RiaSCurveCalculator( cvf::Vec3d p1, cvf::Vec3d q1, cvf::Vec
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSCurveCalculator RiaSCurveCalculator::fromTangentsAndLength(
cvf::Vec3d p1, double azi1, double inc1, double lengthToQ1, cvf::Vec3d p2, double azi2, double inc2, double lengthToQ2 )
RiaSCurveCalculator RiaSCurveCalculator::fromTangentsAndLength( cvf::Vec3d p1,
double azi1,
double inc1,
double lengthToQ1,
cvf::Vec3d p2,
double azi2,
double inc2,
double lengthToQ2 )
{
cvf::Vec3d t1( RiaOffshoreSphericalCoords::unitVectorFromAziInc( azi1, inc1 ) );
cvf::Vec3d t2( RiaOffshoreSphericalCoords::unitVectorFromAziInc( azi2, inc2 ) );
@@ -209,8 +221,14 @@ bool isZeroCrossing( double newError, double oldError, double maxError )
/// R1(q1, q2), R2(q1, q2)
///
//--------------------------------------------------------------------------------------------------
void RiaSCurveCalculator::initializeByFinding_q1q2(
cvf::Vec3d p1, double azi1, double inc1, double r1, cvf::Vec3d p2, double azi2, double inc2, double r2 )
void RiaSCurveCalculator::initializeByFinding_q1q2( cvf::Vec3d p1,
double azi1,
double inc1,
double r1,
cvf::Vec3d p2,
double azi2,
double inc2,
double r2 )
{
// Algorithm options
ApplicationCode/Application/Tools/WellPathTools/RiaSCurveCalculator.h
+9 -4
View File
@@ -23,8 +23,7 @@
class RiaSCurveCalculator
{
public:
RiaSCurveCalculator(
cvf::Vec3d p1, double azi1, double inc1, double r1, cvf::Vec3d p2, double azi2, double inc2, double r2 );
RiaSCurveCalculator( cvf::Vec3d p1, double azi1, double inc1, double r1, cvf::Vec3d p2, double azi2, double inc2, double r2 );
RiaSCurveCalculator( cvf::Vec3d p1, cvf::Vec3d q1, cvf::Vec3d p2, cvf::Vec3d q2 );
@@ -105,8 +104,14 @@ public:
double lengthToQ2 );
private:
void initializeByFinding_q1q2(
cvf::Vec3d p1, double azi1, double inc1, double r1, cvf::Vec3d p2, double azi2, double inc2, double r2 );
void initializeByFinding_q1q2( cvf::Vec3d p1,
double azi1,
double inc1,
double r1,
cvf::Vec3d p2,
double azi2,
double inc2,
double r2 );
bool m_isCalculationOK;