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

CppCheck : Remove unused function and added whitespace

Browse Source
This commit is contained in:
Magne Sjaastad 2017-09-07 22:26:27 +02:00
parent fb1b6cc628
commit 9815cbe1ff
2 changed files with 4 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/Application/Tools/RiaEclipseUnitTools.cpp
View File

@ -60,25 +60,3 @@ double RiaEclipseUnitTools::darcysConstant(UnitSystem unitSystem)
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
double RiaEclipseUnitTools::convertConductivtyValue(double Kw, UnitSystem fromUnit, UnitSystem toUnit)
{
if (fromUnit == toUnit) return Kw;
else if (fromUnit == UNITS_METRIC && toUnit == UNITS_FIELD)
{
return meterToFeet(Kw);
}
else if (fromUnit == UNITS_METRIC && toUnit == UNITS_FIELD)
{
return feetToMeter(Kw);
}
CVF_ASSERT(false);
return HUGE_VAL;
}

11
ApplicationCode/Application/Tools/RiaEclipseUnitTools.h
View File

@ -37,15 +37,12 @@ public:
static double feetPerMeter() { return 3.2808399; }
static double meterPerFeet() { return 0.3048000; }
static double meterToFeet(double meter) { return meter*feetPerMeter(); }
static double feetToMeter(double feet) { return feet*meterPerFeet();}
static double meterToInch(double meter) { return meter*feetPerMeter()*12; }
static double inchToMeter(double inch) { return (inch / 12)*meterPerFeet(); }
static double meterToFeet(double meter) { return meter * feetPerMeter(); }
static double feetToMeter(double feet) { return feet * meterPerFeet();}
static double meterToInch(double meter) { return meter * feetPerMeter()*12.0; }
static double inchToMeter(double inch) { return (inch / 12.0) * meterPerFeet(); }
static double inchToFeet (double inch) { return (inch / 12.0); }
static double darcysConstant(UnitSystem unitSystem);
static double convertConductivtyValue(double Kw, UnitSystem fromUnit, UnitSystem toUnit);
};