Since the Deck* family of classes have changed their interfaces to no longer use shared_ptr, a lot of code broke. This patch fixes all problems in tests, other signatures and accesses to now use the new Deck interfaces.
101 lines
3.2 KiB
C++
101 lines
3.2 KiB
C++
/*
|
|
Copyright 2013 Statoil ASA.
|
|
|
|
This file is part of the Open Porous Media project (OPM).
|
|
|
|
OPM is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
OPM is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with OPM. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include <opm/parser/eclipse/Units/Dimension.hpp>
|
|
|
|
#include <string>
|
|
#include <stdexcept>
|
|
#include <cmath>
|
|
|
|
namespace Opm {
|
|
|
|
Dimension::Dimension() {
|
|
|
|
}
|
|
|
|
Dimension::Dimension(const std::string& name, double SIfactor, double SIoffset)
|
|
{
|
|
for (auto iter = name.begin(); iter != name.end(); ++iter) {
|
|
if (!isalpha(*iter) && (*iter) != '1')
|
|
throw std::invalid_argument("Invalid dimension name");
|
|
}
|
|
m_name = name;
|
|
m_SIfactor = SIfactor;
|
|
m_SIoffset = SIoffset;
|
|
}
|
|
|
|
double Dimension::getSIScaling() const {
|
|
if (!std::isfinite(m_SIfactor))
|
|
throw std::logic_error("The DeckItem contains a field with a context dependent unit. "
|
|
"Use getData< double >() and convert the returned value manually!");
|
|
return m_SIfactor;
|
|
}
|
|
|
|
double Dimension::getSIOffset() const {
|
|
return m_SIoffset;
|
|
}
|
|
|
|
double Dimension::convertRawToSi(double rawValue) const {
|
|
if (!std::isfinite(m_SIfactor))
|
|
throw std::logic_error("The DeckItem contains a field with a context dependent unit. "
|
|
"Use getData< double >() and convert the returned value manually!");
|
|
|
|
return rawValue*m_SIfactor + m_SIoffset;
|
|
}
|
|
|
|
double Dimension::convertSiToRaw(double siValue) const {
|
|
if (!std::isfinite(m_SIfactor))
|
|
throw std::logic_error("The DeckItem contains a field with a context dependent unit. "
|
|
"Use getData< double >() and convert the returned value manually!");
|
|
|
|
return (siValue - m_SIoffset)/m_SIfactor;
|
|
}
|
|
|
|
const std::string& Dimension::getName() const {
|
|
return m_name;
|
|
}
|
|
|
|
// only dimensions with zero offset are compositable...
|
|
bool Dimension::isCompositable() const
|
|
{ return m_SIoffset == 0.0; }
|
|
|
|
Dimension * Dimension::newComposite(const std::string& dim , double SIfactor, double SIoffset) {
|
|
Dimension * dimension = new Dimension();
|
|
dimension->m_name = dim;
|
|
dimension->m_SIfactor = SIfactor;
|
|
dimension->m_SIoffset = SIoffset;
|
|
|
|
return dimension;
|
|
}
|
|
|
|
|
|
bool Dimension::equal(const Dimension& other) const {
|
|
if (m_name != other.m_name)
|
|
return false;
|
|
if (m_SIfactor == other.m_SIfactor && m_SIoffset == other.m_SIoffset)
|
|
return true;
|
|
if (std::isnan(m_SIfactor) && std::isnan(other.m_SIfactor))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
}
|
|
|
|
|