OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

variable named map renamed to int_data

Browse Source
This commit is contained in:
Steinar Foss 2017-11-20 09:39:25 +01:00
parent 045e355720
commit 73420104b5
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/output/eclipse/EclipseIO.hpp
View File

@ -107,7 +107,7 @@ public:
* are not yet written to disk. * are not yet written to disk.
*/ */
void writeInitial( data::Solution simProps = data::Solution(), std::map<std::string, std::vector<int> > map = {}, const NNC& nnc = NNC()); void writeInitial( data::Solution simProps = data::Solution(), std::map<std::string, std::vector<int> > int_data = {}, const NNC& nnc = NNC());
/** /**
* \brief Overwrite the initial OIP values. * \brief Overwrite the initial OIP values.

8
src/opm/output/eclipse/EclipseIO.cpp
View File

@ -192,7 +192,7 @@ inline std::string uppercase( std::string x ) {
class EclipseIO::Impl { class EclipseIO::Impl {
public: public:
Impl( const EclipseState&, EclipseGrid, const Schedule&, const SummaryConfig& ); Impl( const EclipseState&, EclipseGrid, const Schedule&, const SummaryConfig& );
void writeINITFile( const data::Solution& simProps, std::map<std::string, std::vector<int> > map, const NNC& nnc) const; void writeINITFile( const data::Solution& simProps, std::map<std::string, std::vector<int> > int_data, const NNC& nnc) const;
void writeEGRIDFile( const NNC& nnc ) const; void writeEGRIDFile( const NNC& nnc ) const;
const EclipseState& es; const EclipseState& es;
@ -221,7 +221,7 @@ EclipseIO::Impl::Impl( const EclipseState& eclipseState,
void EclipseIO::Impl::writeINITFile( const data::Solution& simProps, std::map<std::string, std::vector<int> > map, const NNC& nnc) const { void EclipseIO::Impl::writeINITFile( const data::Solution& simProps, std::map<std::string, std::vector<int> > int_data, const NNC& nnc) const {
const auto& units = this->es.getUnits(); const auto& units = this->es.getUnits();
const IOConfig& ioConfig = this->es.cfg().io(); const IOConfig& ioConfig = this->es.cfg().io();
@ -339,9 +339,9 @@ void EclipseIO::Impl::writeINITFile( const data::Solution& simProps, std::map<st
//Write Integer Vector Map //Write Integer Vector Map
{ {
std::map<std::string, std::vector<int> >::iterator it = map.begin(); std::map<std::string, std::vector<int> >::iterator it = int_data.begin();
while(it != map.end()) { while(it != int_data.end()) {
std::string key = it->first; std::string key = it->first;
if (key.size() > ECL_STRING8_LENGTH) if (key.size() > ECL_STRING8_LENGTH)
throw std::invalid_argument("Keyword is too long."); throw std::invalid_argument("Keyword is too long.");

12
tests/test_EclipseIO.cpp
View File

@ -317,19 +317,19 @@ BOOST_AUTO_TEST_CASE(EclipseIOIntegration) {
{ "TRANZ", { measure::transmissibility, tranz, TargetType::INIT } }, { "TRANZ", { measure::transmissibility, tranz, TargetType::INIT } },
}; };
std::map<std::string, std::vector<int> > map; std::map<std::string, std::vector<int> > int_data;
std::vector<int> u(27); u[2] = 67; u[5] = 89; std::vector<int> u(27); u[2] = 67; u[5] = 89;
map["STR_ULONGNAME"] = u; int_data["STR_ULONGNAME"] = u;
std::vector<int> v(27); v[2] = 67; v[26] = 89; std::vector<int> v(27); v[2] = 67; v[26] = 89;
map["STR_V"] = v; int_data["STR_V"] = v;
eclWriter.writeInitial( ); eclWriter.writeInitial( );
test_assert_throw( eclWriter.writeInitial( eGridProps , map) , std::invalid_argument); test_assert_throw( eclWriter.writeInitial( eGridProps , int_data) , std::invalid_argument);
map.erase("STR_ULONGNAME"); int_data.erase("STR_ULONGNAME");
eclWriter.writeInitial( eGridProps , map ); eclWriter.writeInitial( eGridProps , int_data );
data::Wells wells; data::Wells wells;