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

Merge dev into pre-proto

Browse Source
This commit is contained in:
Jacob Støren
2017-06-14 23:25:55 +02:00
parent bca96d31ad 81d44ca69b
commit 1911092cb7
46 changed files with 1123 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,5 +44,8 @@ public:
static double inchToFeet (double inch) { return (inch / 12.0); }
static double darcysConstant(UnitSystem unitSystem);
static double convertConductivtyValue(double Kw, UnitSystem fromUnit, UnitSystem toUnit);
};