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

Moved UnitSystem from RiaEclipseUnitTools to RiaDefines. (#7225)

Browse Source 
* Moved UnitSystem from RiaEclipseUnitTools to RiaDefines.
- Renamed UnitSystem to EclipseUnitSystem
- Replaced header includes and removed obsolete includes of RiaEclipseUnitTools.h
* Moved  result name functions into separate file.
* Minor cleanup

Co-authored-by: rubenthoms <rubenthoms@users.noreply.github.com>
Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Co-authored-by: magnesj <magnesj@users.noreply.github.com>
This commit is contained in:
rubenthomsrubenthomsMagne Sjaastadmagnesj
 authored and GitHub committed 2021-01-21 12:58:46 +01:00
1 parent c4c6eb75f2
commit bc81437435
176 files changed
+1470 -1365
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultCalculatorInitialPorosity.cpp
-2
View File
@@ -18,8 +18,6 @@
#include "RigFemPartResultCalculatorInitialPorosity.h"
#include "RiaEclipseUnitTools.h"
#include "RigFemPart.h"
#include "RigFemPartCollection.h"
#include "RigFemPartResultsCollection.h"
ApplicationLibCode/GeoMech/GeoMechDataModel/RigFemPartResultsCollection.cpp
+3 -2
View File
@@ -20,6 +20,7 @@
#include "RigFemPartResultsCollection.h"
#include "RiaLogging.h"
#include "RiaResultNames.h"
#include "RifElementPropertyReader.h"
#include "RifGeoMechReaderInterface.h"
@@ -796,12 +797,12 @@ std::map<std::string, std::vector<std::string>>
}
else if ( resPos == RIG_WELLPATH_DERIVED )
{
std::vector<QString> angles = RiaDefines::wbsAngleResultNames();
std::vector<QString> angles = RiaResultNames::wbsAngleResultNames();
for ( QString angle : angles )
{
fieldCompNames[angle.toStdString()];
}
std::vector<QString> derivedResults = RiaDefines::wbsDerivedResultNames();
std::vector<QString> derivedResults = RiaResultNames::wbsDerivedResultNames();
for ( QString result : derivedResults )
{
fieldCompNames[result.toStdString()];