mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
Use updated opm-common
* Update opm-common submodule and use branch development https://github.com/CeetronSolutions/opm-common/tree/development * Add cmake-format of ThirdParty/custom-opm-common/CMakeLists.txt * Add boost-test * Update generated files and simplify CMake configuration Add -D_USE_MATH_DEFINES to CMake to avoid multiple local defines Introduce flag CREATE_OPM_COMMON_KEYWORDS used to generate C++ files JSON files. This enables use also in MSVC. Remove obsolete direct include of source files. * Update generated ESMRY test file There was a invalid extra : postfix for some keywords like NEWTON and other N* keywords. When creating ESRMY using updated opm-common fix this issue. * Update URL for custom-opm-common
This commit is contained in:
@@ -405,6 +405,7 @@ set(UNITY_EXCLUDE_FILES
|
||||
FileInterface/RifOsduWellLogReader.cpp
|
||||
FileInterface/RifByteArrayArrowRandomAccessFile.cpp
|
||||
FileInterface/RifArrowTools.cpp
|
||||
FileInterface/RifReaderOpmRft.cpp
|
||||
)
|
||||
|
||||
message("Files excluded from UNITY_BUILD : ${UNITY_EXCLUDE_FILES}")
|
||||
|
||||
@@ -212,7 +212,8 @@ void RifOpmRadialGridTools::lockToHostPillars( cvf::Vec3d& riNode,
|
||||
std::array<double, 8> cellRadius{};
|
||||
std::array<double, 8> cellTheta{};
|
||||
std::array<double, 8> cellZ{};
|
||||
opmGrid.getRadialCellCorners( ijkCell, cellRadius, cellTheta, cellZ );
|
||||
bool convertToRadialCoords = false;
|
||||
opmGrid.getCellCorners( ijkCell, cellRadius, cellTheta, cellZ, convertToRadialCoords );
|
||||
|
||||
double maxRadius = *std::max_element( cellRadius.begin(), cellRadius.end() );
|
||||
|
||||
|
||||
@@ -48,6 +48,8 @@
|
||||
|
||||
#include <QStringList>
|
||||
|
||||
#include <iostream>
|
||||
|
||||
using namespace Opm;
|
||||
|
||||
//--------------------------------------------------------------------------------------------------
|
||||
|
||||
@@ -27,6 +27,7 @@
|
||||
|
||||
#include "opm/common/utility/OpmInputError.hpp"
|
||||
#include "opm/input/eclipse/Deck/Deck.hpp"
|
||||
#include "opm/input/eclipse/Parser/InputErrorAction.hpp"
|
||||
#include "opm/input/eclipse/Parser/ParseContext.hpp"
|
||||
#include "opm/input/eclipse/Parser/Parser.hpp"
|
||||
#include "opm/input/eclipse/Parser/ParserKeywords/G.hpp"
|
||||
@@ -115,7 +116,7 @@ std::pair<std::vector<Opm::VFPProdTable>, std::vector<Opm::VFPInjTable>> extract
|
||||
parser.addParserKeyword( kw );
|
||||
}
|
||||
|
||||
Opm::ParseContext parseContext( Opm::InputError::Action::WARN );
|
||||
Opm::ParseContext parseContext( Opm::InputErrorAction::WARN );
|
||||
auto deck = parser.parseFile( dataDeckFilename, parseContext );
|
||||
|
||||
{
|
||||
@@ -174,7 +175,7 @@ std::map<std::string, std::vector<std::pair<int, int>>> extractWseglink( const s
|
||||
parser.addParserKeyword( kw3 );
|
||||
|
||||
std::stringstream ss;
|
||||
Opm::ParseContext parseContext( Opm::InputError::Action::WARN );
|
||||
Opm::ParseContext parseContext( Opm::InputErrorAction::WARN );
|
||||
auto deck = parser.parseFile( filename, parseContext );
|
||||
|
||||
std::string keyword = "WSEGLINK";
|
||||
@@ -246,7 +247,7 @@ std::vector<RiaOpmParserTools::AicdTemplateValues> extractWsegAicd( const std::s
|
||||
parser.addParserKeyword( kw3 );
|
||||
|
||||
std::stringstream ss;
|
||||
Opm::ParseContext parseContext( Opm::InputError::Action::WARN );
|
||||
Opm::ParseContext parseContext( Opm::InputErrorAction::WARN );
|
||||
auto deck = parser.parseFile( filename, parseContext );
|
||||
|
||||
const std::string keyword = "WSEGAICD";
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user