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

#2610 Fix a few Linux build errors

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-04-06 13:35:47 +02:00
parent 7dc41bd981
commit 8491fd7f6c
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/Summary/RimEnsambleCurveSet.cpp
View File

@ -61,12 +61,15 @@ static QTextStream& operator >> (QTextStream& str, RifEclipseSummaryAddress& sob
return str; return str;
} }
template<> namespace caf
void caf::AppEnum< RimEnsambleCurveSet::ColorMode >::setUp()
{ {
addItem(RimEnsambleCurveSet::SINGLE_COLOR, "SINGLE_COLOR", "Single Color"); template<>
addItem(RimEnsambleCurveSet::BY_ENSAMBLE_PARAM, "BY_ENSAMBLE_PARAM", "By Ensamble Parameter"); void AppEnum< RimEnsambleCurveSet::ColorMode >::setUp()
setDefault(RimEnsambleCurveSet::SINGLE_COLOR); {
addItem(RimEnsambleCurveSet::SINGLE_COLOR, "SINGLE_COLOR", "Single Color");
addItem(RimEnsambleCurveSet::BY_ENSAMBLE_PARAM, "BY_ENSAMBLE_PARAM", "By Ensamble Parameter");
setDefault(RimEnsambleCurveSet::SINGLE_COLOR);
}
} }

2
ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.cpp
View File

@ -17,7 +17,7 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RigCaseRealizationParameters.h" #include "RigCaseRealizationParameters.h"
#include <cmath>
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///

1
ApplicationCode/ReservoirDataModel/RigCaseRealizationParameters.h
View File

@ -18,6 +18,7 @@
#pragma once #pragma once
#include "cvfBase.h"
#include "cvfObject.h" #include "cvfObject.h"
#include <QString> #include <QString>

6
ApplicationCode/UnitTests/RifCaseRealizationParametersReader-Test.cpp
View File

@ -45,9 +45,9 @@ TEST(RifCaseRealizationParametersReaderTest, SuccessfulParsing)
const cvf::ref<RigCaseRealizationParameters> parameters = reader.parameters(); const cvf::ref<RigCaseRealizationParameters> parameters = reader.parameters();
std::map<QString, double> params = parameters->parameters(); std::map<QString, double> params = parameters->parameters();
EXPECT_EQ(1, params.count("LETSWOF:L_1OW")); EXPECT_EQ(1U, params.count("LETSWOF:L_1OW"));
EXPECT_EQ(1, params.count("LETSGOF:KRG1")); EXPECT_EQ(1U, params.count("LETSGOF:KRG1"));
EXPECT_EQ(1, params.count("LOG10_MULTFLT:MULTFLT_F1")); EXPECT_EQ(1U, params.count("LOG10_MULTFLT:MULTFLT_F1"));
EXPECT_EQ(1.83555, params["LETSWOF:L_1OW"]); EXPECT_EQ(1.83555, params["LETSWOF:L_1OW"]);
EXPECT_EQ(0.97, params["LETSGOF:KRG1"]); EXPECT_EQ(0.97, params["LETSGOF:KRG1"]);