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

Add Include Guards to Protect From Multiple Inclusion

Browse Source 
While here, also use a more efficient way of forming a
vector<double> from a vector<float> source.
This commit is contained in:
Bård Skaflestad 2021-08-12 11:51:05 +02:00
parent 92b1c6cb45
commit 210e09f981
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
opm/parser/eclipse/Deck/ImportContainer.hpp
View File

@ -17,8 +17,11 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef IMPORT_CONTAINER_HPP
#define IMPORT_CONTAINER_HPP #define IMPORT_CONTAINER_HPP
#include <cstddef>
#include <string>
#include <vector> #include <vector>
#include <opm/parser/eclipse/Deck/DeckKeyword.hpp> #include <opm/parser/eclipse/Deck/DeckKeyword.hpp>
@ -27,6 +30,7 @@
namespace Opm { namespace Opm {
class Parser; class Parser;
class UnitSystem;
class ImportContainer { class ImportContainer {
public: public:
@ -40,3 +44,5 @@ private:
} }
#endif // IMPORT_CONTAINER_HPP

8
src/opm/parser/eclipse/Deck/ImportContainer.cpp
View File

@ -15,6 +15,10 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>. along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <opm/parser/eclipse/Deck/ImportContainer.hpp>
#include <stdexcept>
#include <unordered_set> #include <unordered_set>
#include <fmt/format.h> #include <fmt/format.h>
@ -22,7 +26,6 @@
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/OpmLog/LogUtil.hpp> #include <opm/common/OpmLog/LogUtil.hpp>
#include <opm/io/eclipse/EclFile.hpp> #include <opm/io/eclipse/EclFile.hpp>
#include <opm/parser/eclipse/Deck/ImportContainer.hpp>
#include <opm/parser/eclipse/Parser/Parser.hpp> #include <opm/parser/eclipse/Parser/Parser.hpp>
namespace Opm { namespace Opm {
@ -48,8 +51,7 @@ ImportContainer::ImportContainer(const Parser& parser, const UnitSystem& unit_sy
if (parser_item.dataType() == type_tag::fdouble) { if (parser_item.dataType() == type_tag::fdouble) {
if (data_type == EclIO::REAL) { if (data_type == EclIO::REAL) {
auto& float_data = ecl_file.get<float>(kw_index); auto& float_data = ecl_file.get<float>(kw_index);
std::vector<double> double_data; std::vector<double> double_data{ float_data.begin(), float_data.end() };
std::copy(float_data.begin(), float_data.end(), std::back_inserter(double_data));
this->keywords.emplace_back(parser_kw, double_data, unit_system, unit_system); this->keywords.emplace_back(parser_kw, double_data, unit_system, unit_system);
} else if (data_type == EclIO::DOUB) { } else if (data_type == EclIO::DOUB) {
auto& double_data = ecl_file.get<double>(kw_index); auto& double_data = ecl_file.get<double>(kw_index);