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

make Aquifer constructors explicit

Browse Source 
and adjust test code
This commit is contained in:
Arne Morten Kvarving 2021-08-16 08:30:53 +02:00
parent 1463266ba6
commit 155c8fbcdb
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
opm/parser/eclipse/EclipseState/Aquifer/Aquancon.hpp
View File

@ -85,7 +85,7 @@ namespace Opm {
Aquancon() = default;
Aquancon(const EclipseGrid& grid, const Deck& deck);
Aquancon(const std::unordered_map<int, std::vector<Aquancon::AquancCell>>& data);
explicit Aquancon(const std::unordered_map<int, std::vector<Aquancon::AquancCell>>& data);
static Aquancon serializeObject();

2
opm/parser/eclipse/EclipseState/Aquifer/Aquifetp.hpp
View File

@ -96,7 +96,7 @@ class Aquifetp {
Aquifetp() = default;
Aquifetp(const TableManager& tables, const Deck& deck);
Aquifetp(const std::vector<Aquifetp::AQUFETP_data>& data);
explicit Aquifetp(const std::vector<Aquifetp::AQUFETP_data>& data);
static Aquifetp serializeObject();

6
tests/test_AggregateAquiferData.cpp
View File

@ -269,7 +269,7 @@ AQUTAB
ct.finishInitialisation(waterProperties());
}
return { properties };
return Opm::AquiferCT(properties);
}
void connectFetkovic(AquiferConnections& aquancon)
@ -329,7 +329,7 @@ AQUTAB
fetp.finishInitialisation(waterProperties());
}
return { properties };
return Opm::Aquifetp(properties);
}
Opm::AquiferConfig createAquiferConfig()
@ -339,7 +339,7 @@ AQUTAB
connectFetkovic(aquancon);
return {
createFetkovich(), createCarterTracy(), aquancon.getAllConnections()
createFetkovich(), createCarterTracy(), Opm::Aquancon(aquancon.getAllConnections())
};
}