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

Adjust Whitespace in Data::Solution Implementation

Browse Source 
In preparation of enabling in-place construction in insert().
This commit is contained in:
Bård Skaflestad 2023-03-15 16:27:19 +01:00
parent 5f55ffe21a
commit 7f1e56e436
2 changed files with 58 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
opm/output/data/Solution.hpp
View File

@ -15,22 +15,25 @@
You should have received a copy of the GNU General Public License
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
*/
#ifndef OPM_OUTPUT_DATA_SOLUTION_HPP
#define OPM_OUTPUT_DATA_SOLUTION_HPP
#include <string>
#include <map>
#include <opm/output/data/Cells.hpp>
#include <opm/input/eclipse/Units/UnitSystem.hpp>
namespace Opm {
namespace data {
#include <map>
#include <string>
#include <utility>
#include <vector>
class Solution : public std::map< std::string, data::CellData > {
using Base = std::map< std::string, data::CellData >;
namespace Opm { namespace data {
class Solution : public std::map<std::string, data::CellData>
{
using Base = std::map<std::string, data::CellData>;
public:
Solution() = default;
@ -75,7 +78,6 @@ class Solution : public std::map< std::string, data::CellData > {
bool si = true;
};
}
}
}} // namespace Opm::data
#endif
#endif // OPM_OUTPUT_DATA_SOLUTION_HPP

71
src/opm/output/data/Solution.cpp
View File

@ -17,27 +17,38 @@
along with OPM. If not, see <http://www.gnu.org/licenses/>.
*/
#include <algorithm>
#include <opm/output/data/Solution.hpp>
#include <opm/output/data/Cells.hpp>
#include <algorithm>
#include <map>
#include <string>
#include <tuple>
#include <utility>
#include <vector>
namespace Opm {
namespace data {
namespace Opm { namespace data {
Solution::Solution( bool init_si ) : si( init_si ) {}
Solution::Solution(const bool init_si)
: si(init_si)
{}
bool Solution::has(const std::string& keyword) const {
return this->count( keyword ) > 0;
bool Solution::has(const std::string& keyword) const
{
return this->find(keyword) != this->end();
}
std::vector<double>& Solution::data(const std::string& keyword) {
return this->at( keyword ).data;
std::vector<double>&
Solution::data(const std::string& keyword)
{
return this->at(keyword).data;
}
const std::vector<double>& Solution::data(const std::string& keyword) const {
return this->at( keyword ).data;
const std::vector<double>&
Solution::data(const std::string& keyword) const
{
return this->at(keyword).data;
}
std::pair< Solution::iterator, bool > Solution::insert( std::string name,
@ -48,30 +59,38 @@ std::pair< Solution::iterator, bool > Solution::insert( std::string name,
return this->emplace( name, CellData{ m, std::move( xs ), type } );
}
void data::Solution::convertToSI( const UnitSystem& units ) {
if (this->si) return;
void data::Solution::convertToSI(const UnitSystem& units)
{
if (this->si) {
return;
}
for( auto& elm : *this ) {
UnitSystem::measure dim = elm.second.dim;
if (dim != UnitSystem::measure::identity)
units.to_si( dim , elm.second.data );
for (auto& elm : *this) {
const auto dim = elm.second.dim;
if (dim != UnitSystem::measure::identity) {
units.to_si(dim, elm.second.data);
}
}
this->si = true;
}
void data::Solution::convertFromSI( const UnitSystem& units ) {
if (!this->si) return;
void data::Solution::convertFromSI(const UnitSystem& units)
{
if (!this->si) {
return;
}
for (auto& elm : *this ) {
UnitSystem::measure dim = elm.second.dim;
if (dim != UnitSystem::measure::identity)
units.from_si( dim , elm.second.data );
for (auto& elm : *this) {
const auto dim = elm.second.dim;
if (dim != UnitSystem::measure::identity) {
units.from_si(dim, elm.second.data);
}
}
this->si = false;
}
}
}
}} // namespace Opm::data