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

Use reference pointers for fast field access.

Browse Source 
This is necessary in the short term to replace SimulatorState with this
class without performance loss.
This commit is contained in:
Atgeirr Flø Rasmussen
2016-03-29 09:44:50 +02:00
parent 0d3d46e199
commit 52ce54bc47
2 changed files with 133 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
opm/common/data/SimulationDataContainer.cpp
+47 -42
View File
@@ -24,13 +24,43 @@
namespace Opm {
SimulationDataContainer::SimulationDataContainer(size_t num_cells, size_t num_faces , size_t num_phases) :
m_num_cells( num_cells),
m_num_faces( num_faces),
m_num_cells( num_cells ),
m_num_faces( num_faces ),
m_num_phases( num_phases )
{
addDefaultFields( );
}
SimulationDataContainer::SimulationDataContainer(const SimulationDataContainer& other)
: m_num_cells(other.m_num_cells),
m_num_faces(other.m_num_faces),
m_num_phases(other.m_num_phases),
m_cell_data(other.m_cell_data),
m_face_data(other.m_face_data)
{
setReferencePointers();
}
SimulationDataContainer& SimulationDataContainer::operator=(const SimulationDataContainer& other)
{
SimulationDataContainer copy(other);
copy.swap(*this);
return *this;
}
void SimulationDataContainer::swap(SimulationDataContainer& other)
{
using std::swap;
swap(m_num_cells, other.m_num_cells);
swap(m_num_faces, other.m_num_faces);
swap(m_num_phases, other.m_num_phases);
swap(m_cell_data, other.m_cell_data);
swap(m_face_data, other.m_face_data);
setReferencePointers();
other.setReferencePointers();
}
size_t SimulationDataContainer::numPhases() const {
return m_num_phases;
@@ -188,8 +218,7 @@ namespace Opm {
return m_cell_data;
}
/* This is very deprecated. */
// This is very deprecated.
void SimulationDataContainer::addDefaultFields() {
registerCellData("PRESSURE" , 1 , 0.0);
registerCellData("SATURATION" , m_num_phases , 0.0);
@@ -197,46 +226,22 @@ namespace Opm {
registerFaceData("FACEPRESSURE" , 1 , 0.0 );
registerFaceData("FACEFLUX" , 1 , 0.0 );
setReferencePointers();
}
std::vector<double>& SimulationDataContainer::pressure( ) {
return getCellData("PRESSURE");
void SimulationDataContainer::setReferencePointers()
{
// This sets the reference pointers for the fast
// accessors, the fields must be created first
// by copying or a call to addDefaultFields().
pressure_ref_ = &getCellData("PRESSURE");
temperature_ref_ = &getCellData("TEMPERATURE");
saturation_ref_ = &getCellData("SATURATION");
facepressure_ref_ = &getFaceData("FACEPRESSURE");
faceflux_ref_ = &getFaceData("FACEFLUX");
}
std::vector<double>& SimulationDataContainer::temperature() {
return getCellData("TEMPERATURE");
}
std::vector<double>& SimulationDataContainer::saturation() {
return getCellData("SATURATION");
}
std::vector<double>& SimulationDataContainer::facepressure() {
return getFaceData("FACEPRESSURE");
}
std::vector<double>& SimulationDataContainer::faceflux() {
return getFaceData("FACEFLUX");
}
const std::vector<double>& SimulationDataContainer::pressure( ) const {
return getCellData("PRESSURE");
}
const std::vector<double>& SimulationDataContainer::temperature() const {
return getCellData("TEMPERATURE");
}
const std::vector<double>& SimulationDataContainer::saturation() const {
return getCellData("SATURATION");
}
const std::vector<double>& SimulationDataContainer::facepressure() const {
return getFaceData("FACEPRESSURE");
}
const std::vector<double>& SimulationDataContainer::faceflux() const {
return getFaceData("FACEFLUX");
}
}
} // namespace Opm
opm/common/data/SimulationDataContainer.hpp
+86 -6
View File
@@ -40,11 +40,32 @@ namespace Opm {
/// mutable references are returned with the getCellData() and
/// getFaceData() methods, and the content will typically be
/// modified by external scope.
class SimulationDataContainer {
class SimulationDataContainer
{
public:
SimulationDataContainer(size_t num_cells, size_t num_faces , size_t num_phases);
/// Main constructor setting the sizes for the contained data
/// types.
/// \param num_cells number of elements in cell data vectors
/// \param num_faces number of elements in face data vectors
/// \param num_phases number of phases, the number of components
/// in any data vector must equal 1 or this
/// number (this behaviour and argument is deprecated).
SimulationDataContainer(size_t num_cells, size_t num_faces, size_t num_phases);
/// Copy constructor.
/// Must be defined explicitly because class contains non-value objects
/// (the reference pointers pressure_ref_ etc.) that should not simply
/// be copied.
SimulationDataContainer(const SimulationDataContainer&);
/// Copy assignment operator.
/// Must be defined explicitly because class contains non-value objects
/// (the reference pointers pressure_ref_ etc.) that should not simply
/// be copied.
SimulationDataContainer& operator=(const SimulationDataContainer&);
/// Efficient O(1) swap.
void swap(SimulationDataContainer& other);
size_t numPhases() const;
size_t numFaces() const;
@@ -79,7 +100,10 @@ namespace Opm {
/// values in @values.
void setCellDataComponent( const std::string& key , size_t component , const std::vector<int>& cells , const std::vector<double>& values);
/* Old deprecated */
// Direct explicit field access for certain default fields.
// These methods are all deprecated, and will eventually be moved to
// concrete subclasses.
std::vector<double>& pressure ();
std::vector<double>& temperature ();
std::vector<double>& saturation ();
@@ -96,8 +120,10 @@ namespace Opm {
const std::unordered_map<std::string, std::vector<double>>& cellData() const;
std::unordered_map<std::string, std::vector<double>>& cellData();
private:
void addDefaultFields();
void addDefaultFields();
void setReferencePointers();
size_t m_num_cells;
size_t m_num_faces;
@@ -105,7 +131,61 @@ namespace Opm {
std::unordered_map< std::string , std::vector<double> > m_cell_data;
std::unordered_map< std::string , std::vector<double> > m_face_data;
std::vector<double>* pressure_ref_;
std::vector<double>* temperature_ref_;
std::vector<double>* saturation_ref_;
std::vector<double>* facepressure_ref_;
std::vector<double>* faceflux_ref_;
};
// Inline implementations of the direct accessors required to guarantee
// performance.
inline std::vector<double>& SimulationDataContainer::pressure( ) {
return *pressure_ref_;
}
inline std::vector<double>& SimulationDataContainer::temperature() {
return *temperature_ref_;
}
inline std::vector<double>& SimulationDataContainer::saturation() {
return *saturation_ref_;
}
inline std::vector<double>& SimulationDataContainer::facepressure() {
return *facepressure_ref_;
}
inline std::vector<double>& SimulationDataContainer::faceflux() {
return *faceflux_ref_;
}
inline const std::vector<double>& SimulationDataContainer::pressure( ) const {
return *pressure_ref_;
}
inline const std::vector<double>& SimulationDataContainer::temperature() const {
return *temperature_ref_;
}
inline const std::vector<double>& SimulationDataContainer::saturation() const {
return *saturation_ref_;
}
inline const std::vector<double>& SimulationDataContainer::facepressure() const {
return *facepressure_ref_;
}
inline const std::vector<double>& SimulationDataContainer::faceflux() const {
return *faceflux_ref_;
}
}
#endif