OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

FieldData and TranCalculator are now in Fieldprops namespace.

Browse Source
This commit is contained in:
Markus Blatt 2020-09-18 15:01:17 +02:00
parent abff765c1d
commit 99f74cad96
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
opm/simulators/utils/ParallelEclipseState.cpp
View File

@ -68,7 +68,7 @@ const std::vector<int>& ParallelFieldPropsManager::get_int(const std::string& ke
// Some of the keywords might be defaulted. // Some of the keywords might be defaulted.
// We will let rank 0 create them and distribute them using get_global_int // We will let rank 0 create them and distribute them using get_global_int
auto data = get_global_int(keyword); auto data = get_global_int(keyword);
auto& local_data = const_cast<std::map<std::string, FieldData<int>>&>(m_intProps)[keyword]; auto& local_data = const_cast<std::map<std::string, Fieldprops::FieldData<int>>&>(m_intProps)[keyword];
local_data.data.resize(m_activeSize()); local_data.data.resize(m_activeSize());
local_data.value_status.resize(m_activeSize()); local_data.value_status.resize(m_activeSize());
@ -122,7 +122,7 @@ const std::vector<double>& ParallelFieldPropsManager::get_double(const std::stri
// Some of the keywords might be defaulted. // Some of the keywords might be defaulted.
// We will let rank 0 create them and distribute them using get_global_int // We will let rank 0 create them and distribute them using get_global_int
auto data = get_global_double(keyword); auto data = get_global_double(keyword);
auto& local_data = const_cast<std::map<std::string, FieldData<double>>&>(m_doubleProps)[keyword]; auto& local_data = const_cast<std::map<std::string, Fieldprops::FieldData<double>>&>(m_doubleProps)[keyword];
local_data.data.resize(m_activeSize()); local_data.data.resize(m_activeSize());
local_data.value_status.resize(m_activeSize()); local_data.value_status.resize(m_activeSize());
for (int i = 0; i < m_activeSize(); ++i) for (int i = 0; i < m_activeSize(); ++i)

6
opm/simulators/utils/ParallelEclipseState.hpp
View File

@ -103,13 +103,13 @@ public:
void deserialize_tran(const std::vector<char>& buffer) override; void deserialize_tran(const std::vector<char>& buffer) override;
protected: protected:
std::map<std::string, Opm::FieldData<int>> m_intProps; //!< Map of integer properties in process-local compressed indices. std::map<std::string, Opm::Fieldprops::FieldData<int>> m_intProps; //!< Map of integer properties in process-local compressed indices.
std::map<std::string, Opm::FieldData<double>> m_doubleProps; //!< Map of double properties in process-local compressed indices. std::map<std::string, Opm::Fieldprops::FieldData<double>> m_doubleProps; //!< Map of double properties in process-local compressed indices.
FieldPropsManager& m_manager; //!< Underlying field property manager (only used on root process). FieldPropsManager& m_manager; //!< Underlying field property manager (only used on root process).
Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator> m_comm; //!< Collective communication handler. Dune::CollectiveCommunication<Dune::MPIHelper::MPICommunicator> m_comm; //!< Collective communication handler.
std::function<int(void)> m_activeSize; //!< active size function of the grid std::function<int(void)> m_activeSize; //!< active size function of the grid
std::function<int(const int)> m_local2Global; //!< mapping from local to global cartesian indices std::function<int(const int)> m_local2Global; //!< mapping from local to global cartesian indices
std::unordered_map<std::string, TranCalculator> m_tran; //!< calculators map std::unordered_map<std::string, Fieldprops::TranCalculator> m_tran; //!< calculators map
}; };