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

#1755 Use namespace instead of class to encapsulate structures

Browse Source
This commit is contained in:
Magne Sjaastad 2017-08-11 14:24:34 +02:00
parent 89684c243f
commit 839e3e1d00
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationCode/Application/RiaDefines.cpp
View File

@ -19,6 +19,7 @@
/////////////////////////////////////////////////////////////////////////////////
#include "RiaDefines.h"
#include "cafAppEnum.h"
@ -306,5 +307,5 @@ double RiaDefines::minimumDefaultValuePlot()
//--------------------------------------------------------------------------------------------------
double RiaDefines::maximumDefaultValuePlot()
{
return 100.0;
return 100.0;
}

13
ApplicationCode/Application/RiaPorosityModel.cpp
View File

@ -21,11 +21,14 @@
#include "cafAppEnum.h"
template<>
void caf::AppEnum< RiaDefines::PorosityModelType >::setUp()
namespace caf
{
addItem(RiaDefines::MATRIX_MODEL, "MATRIX_MODEL", "Matrix");
addItem(RiaDefines::FRACTURE_MODEL, "FRACTURE_MODEL", "Fracture");
template<>
void caf::AppEnum< RiaDefines::PorosityModelType >::setUp()
{
addItem(RiaDefines::MATRIX_MODEL, "MATRIX_MODEL", "Matrix");
addItem(RiaDefines::FRACTURE_MODEL, "FRACTURE_MODEL", "Fracture");
setDefault(RiaDefines::MATRIX_MODEL);
setDefault(RiaDefines::MATRIX_MODEL);
}
}

3
ApplicationCode/Application/RiaPorosityModel.h
View File

@ -21,7 +21,8 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
namespace RiaDefines {
namespace RiaDefines
{
enum PorosityModelType
{
MATRIX_MODEL,