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

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:
rubenthoms
2021-01-21 12:58:46 +01:00
committed by GitHub
parent c4c6eb75f2
commit bc81437435
176 changed files with 1470 additions and 1365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationLibCode/UserInterface/RiuRelativePermeabilityPlotPanel.h
View File

@@ -18,7 +18,7 @@
#pragma once
#include "RiaEclipseUnitTools.h"
#include "RiaDefines.h"
#include "RigFlowDiagSolverInterface.h"
#include <QPointer>
@@ -49,7 +49,7 @@ public:
RiuRelativePermeabilityPlotPanel( QDockWidget* parent );
~RiuRelativePermeabilityPlotPanel() override;
void setPlotData( RiaEclipseUnitTools::UnitSystem unitSystem,
void setPlotData( RiaDefines::EclipseUnitSystem unitSystem,
const std::vector<RigFlowDiagSolverInterface::RelPermCurve>& relPermCurves,
double swat,
double sgas,
@@ -79,7 +79,7 @@ private:
void plotUiSelectedCurves();
static void setPlotDefaults( QwtPlot* plot );
static void plotCurvesInQwt( RiaEclipseUnitTools::UnitSystem unitSystem,
static void plotCurvesInQwt( RiaDefines::EclipseUnitSystem unitSystem,
const std::vector<RigFlowDiagSolverInterface::RelPermCurve>& curveArr,
double swat,
double sgas,
@@ -127,7 +127,7 @@ private slots:
void slotShowCurveSelectionWidgets( int state );
private:
RiaEclipseUnitTools::UnitSystem m_unitSystem;
RiaDefines::EclipseUnitSystem m_unitSystem;
std::vector<RigFlowDiagSolverInterface::RelPermCurve> m_allCurvesArr;
double m_swat;
double m_sgas;