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

use OPM instead of dune infrastructure wherever possible

Browse Source 
basically the only Dune thing which is still used are the FieldVector
and FieldMatrix classes used by some constraint solvers. Until
something similar goes into opm-core, opm-material must depend on
dune-common...
This commit is contained in:
Andreas Lauser
2013-09-20 15:04:27 +02:00
parent f60682b472
commit a407f5c389
71 changed files with 326 additions and 2901 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
opm/material/components/air.hh
View File

@@ -24,10 +24,12 @@
#ifndef OPM_AIR_HH
#define OPM_AIR_HH
#include <dune/common/exceptions.hh>
#include <opm/material/components/component.hh>
#include <opm/material/idealgas.hh>
#include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
namespace Opm {
/*!
@@ -156,8 +158,8 @@ public:
Scalar r;
if(temperature < 273.15 || temperature > 660.)
{
DUNE_THROW(Dune::NotImplemented,
"ConstrelAir: Temperature out of range at ");
OPM_THROW(MaterialLawProblem,
"ConstrelAir: Temperature out of range at ");
}
r = 1.496*1.E-6*std::pow(temperature,1.5)/(temperature+120.);
return (r);

11
opm/material/components/co2.hh
View File

@@ -24,7 +24,8 @@
#ifndef OPM_CO2_HH
#define OPM_CO2_HH
#include <opm/common/exceptions.hh>
#include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/material/components/component.hh>
#include <opm/material/constants.hh>
#include <opm/material/idealgas.hh>
@@ -163,8 +164,8 @@ public:
#ifndef NDEBUG
if ((temperature < criticalTemperature() or pressure < criticalPressure()) and !warningPrinted)
{
Dune::dwarn << "The tables used for the CO2 exhibit subcritical as well as critical values: "
<< "Double-check your results if you cross the critical-subcritical line during the simulation!\n";
std::cout << "The tables used for the CO2 exhibit subcritical as well as critical values: "
<< "Double-check your results if you cross the critical-subcritical line during the simulation!\n";
warningPrinted=true;
}
#endif
@@ -192,8 +193,8 @@ public:
#ifndef NDEBUG
if ((temperature < criticalTemperature() or pressure < criticalPressure()) and !warningPrinted)
{
Dune::dwarn << "The tables used for the CO2 exhibit subcritical as well as critical values: "
<< "Double-check your results if you cross the critical-subcritical line during the simulation!\n";
std::cout << "The tables used for the CO2 exhibit subcritical as well as critical values: "
<< "Double-check your results if you cross the critical-subcritical line during the simulation!\n";
warningPrinted=true;
}
#endif

52
opm/material/components/component.hh
View File

@@ -25,10 +25,10 @@
#ifndef OPM_COMPONENT_HH
#define OPM_COMPONENT_HH
#include <dune/common/stdstreams.hh>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp>
namespace Opm
{
namespace Opm {
/*!
* \ingroup Components
@@ -57,61 +57,61 @@ public:
*/
static void init(Scalar tempMin, Scalar tempMax, unsigned nTemp,
Scalar pressMin, Scalar pressMax, unsigned nPress)
{ Dune::dwarn << "No init routine defined - make sure that this is not necessary!" << std::endl; }
{ }
/*!
* \brief Returns true iff the gas phase is assumed to be compressible
*/
static bool gasIsCompressible()
{ DUNE_THROW(Dune::NotImplemented, "Component::gasIsCompressible()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::gasIsCompressible()"); }
/*!
* \brief Returns true iff the gas phase is assumed to be ideal
*/
static bool gasIsIdeal()
{ DUNE_THROW(Dune::NotImplemented, "Component::gasIsIdeal()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::gasIsIdeal()"); }
/*!
* \brief Returns true iff the liquid phase is assumed to be compressible
*/
static bool liquidIsCompressible()
{ DUNE_THROW(Dune::NotImplemented, "Component::liquidIsCompressible()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::liquidIsCompressible()"); }
/*!
* \brief A human readable name for the component.
*/
static const char *name()
{ DUNE_THROW(Dune::NotImplemented, "Component::name()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::name()"); }
/*!
* \brief The molar mass in \f$\mathrm{[kg]}\f$ of the component.
*/
static Scalar molarMass()
{ DUNE_THROW(Dune::NotImplemented, "Component::molarMass()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::molarMass()"); }
/*!
* \brief Returns the critical temperature in \f$\mathrm{[K]}\f$ of the component.
*/
static Scalar criticalTemperature()
{ DUNE_THROW(Dune::NotImplemented, "Component::criticalTemperature()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::criticalTemperature()"); }
/*!
* \brief Returns the critical pressure in \f$\mathrm{[Pa]}\f$ of the component.
*/
static Scalar criticalPressure()
{ DUNE_THROW(Dune::NotImplemented, "Component::criticalPressure()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::criticalPressure()"); }
/*!
* \brief Returns the temperature in \f$\mathrm{[K]}\f$ at the component's triple point.
*/
static Scalar tripleTemperature()
{ DUNE_THROW(Dune::NotImplemented, "Component::tripleTemperature()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::tripleTemperature()"); }
/*!
* \brief Returns the pressure in \f$\mathrm{[Pa]}\f$ at the component's triple point.
*/
static Scalar triplePressure()
{ DUNE_THROW(Dune::NotImplemented, "Component::triplePressure()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::triplePressure()"); }
/*!
* \brief The vapor pressure in \f$\mathrm{[Pa]}\f$ of the component at a given
@@ -120,7 +120,7 @@ public:
* \param T temperature of the component in \f$\mathrm{[K]}\f$
*/
static Scalar vaporPressure(Scalar T)
{ DUNE_THROW(Dune::NotImplemented, "Component::vaporPressure()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::vaporPressure()"); }
/*!
* \brief The density in \f$\mathrm{[kg/m^3]}\f$ of the component at a given pressure in \f$\mathrm{[Pa]}\f$ and temperature in \f$\mathrm{[K]}\f$.
@@ -129,7 +129,7 @@ public:
* \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
*/
static Scalar gasDensity(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::gasDensity()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::gasDensity()"); }
/*!
* \brief The density \f$\mathrm{[kg/m^3]}\f$ of the liquid component at a given pressure in \f$\mathrm{[Pa]}\f$ and temperature in \f$\mathrm{[K]}\f$.
@@ -138,7 +138,7 @@ public:
* \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
*/
static Scalar liquidDensity(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::liquidDensity()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::liquidDensity()"); }
/*!
* \brief Specific enthalpy \f$\mathrm{[J/kg]}\f$ of the pure component in gas.
@@ -147,7 +147,7 @@ public:
* \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
*/
static const Scalar gasEnthalpy(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::gasEnthalpy()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::gasEnthalpy()"); }
/*!
* \brief Specific enthalpy \f$\mathrm{[J/kg]}\f$ of the pure component in liquid.
@@ -156,7 +156,7 @@ public:
* \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
*/
static const Scalar liquidEnthalpy(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::liquidEnthalpy()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::liquidEnthalpy()"); }
/*!
* \brief Specific internal energy \f$\mathrm{[J/kg]}\f$ of the pure component in gas.
@@ -165,7 +165,7 @@ public:
* \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
*/
static const Scalar gasInternalEnergy(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::gasInternalEnergy()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::gasInternalEnergy()"); }
/*!
* \brief Specific internal energy \f$\mathrm{[J/kg]}\f$ of pure the pure component in liquid.
@@ -174,7 +174,7 @@ public:
* \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
*/
static const Scalar liquidInternalEnergy(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::liquidInternalEnergy()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::liquidInternalEnergy()"); }
/*!
* \brief The dynamic viscosity \f$\mathrm{[Pa*s]}\f$ of the pure component at a given pressure in \f$\mathrm{[Pa]}\f$ and
@@ -184,7 +184,7 @@ public:
* \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
*/
static Scalar gasViscosity(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::gasViscosity()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::gasViscosity()"); }
/*!
* \brief The dynamic liquid viscosity \f$\mathrm{[Pa*s]}\f$ of the pure component.
@@ -193,31 +193,31 @@ public:
* \param pressure pressure of component in \f$\mathrm{[Pa]}\f$
*/
static Scalar liquidViscosity(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::liquidViscosity()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::liquidViscosity()"); }
/*!
* \brief Thermal conductivity of the component [W/(m^2 K/m)] as a gas.
*/
static Scalar gasThermalConductivity(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::gasThermalConductivity()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::gasThermalConductivity()"); }
/*!
* \brief Thermal conductivity of the component [W/(m^2 K/m)] as a liquid.
*/
static Scalar liquidThermalConductivity(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::liquidThermalConductivity()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::liquidThermalConductivity()"); }
/*!
* \brief Specific isobaric heat capacity of the component [J/kg] as a gas.
*/
static Scalar gasHeatCapacity(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::gasHeatCapacity()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::gasHeatCapacity()"); }
/*!
* \brief Specific isobaric heat capacity of the component [J/kg] as a liquid.
*/
static Scalar liquidHeatCapacity(Scalar temperature, Scalar pressure)
{ DUNE_THROW(Dune::NotImplemented, "Component::liquidHeatCapacity()"); }
{ OPM_THROW(std::runtime_error, "Not implemented: Component::liquidHeatCapacity()"); }
};
} // end namepace

33
opm/material/components/h2o.hh
View File

@@ -28,8 +28,9 @@
#include <cassert>
#include <opm/material/idealgas.hh>
#include <opm/common/exceptions.hh>
#include <opm/common/valgrind.hh>
#include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
#include <opm/material/valgrind.hh>
#include "component.hh"
@@ -172,7 +173,7 @@ public:
{
if (!Region2::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Enthalpy of steam is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -222,7 +223,7 @@ public:
{
if (!Region1::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Enthalpy of water is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -263,7 +264,7 @@ public:
{
if (!Region2::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Heat capacity of steam is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -299,7 +300,7 @@ public:
{
if (!Region1::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"heat Capacity of water is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -332,7 +333,7 @@ public:
{
if (!Region1::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Internal Energy of water is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -388,7 +389,7 @@ public:
{
if (!Region2::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Internal Energy of steam is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -462,7 +463,7 @@ public:
{
if (!Region1::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Heat capacity of water is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -495,7 +496,7 @@ public:
{
if (!Region2::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Heat capacity of steam is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -541,7 +542,7 @@ public:
{
if (!Region2::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Density of steam is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -662,7 +663,7 @@ public:
{
if (!Region1::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Density of water is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -761,7 +762,7 @@ public:
{
if (!Region2::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Viscosity of steam is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
}
@@ -785,7 +786,7 @@ public:
{
if (!Region1::isValid(temperature, pressure))
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Viscosity of water is only implemented for temperatures below 623.15K and "
"pressures below 100MPa. (T = " << temperature << ", p=" << pressure);
};
@@ -818,7 +819,7 @@ public:
|| (pressure <= 150e6 && ((523.15 < temperature) || (temperature > 673.15)) )
|| (pressure <= 100e6 && ((673.15 < temperature) || (temperature > 1073.15)) ) )
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Liquid thermal conductivity of H2O for "
<< "T="<<temperature<<" p="<<pressure
<< " is not implemented");
@@ -852,7 +853,7 @@ public:
|| (pressure <= 150e6 && ((523.15 < temperature) || (temperature > 673.15)) )
|| (pressure <= 100e6 && ((673.15 < temperature) || (temperature > 1073.15)) ) )
{
DUNE_THROW(NumericalProblem,
OPM_THROW(NumericalProblem,
"Gas thermal conductivity of H2O for "
" T="<<temperature<<" p="<<pressure
<< " is not implemented");

4
opm/material/components/mesitylene.hh
View File

@@ -77,13 +77,13 @@ public:
* \brief Returns the temperature \f$\mathrm{[K]}\f$ at mesitylene's triple point.
*/
static Scalar tripleTemperature()
{ DUNE_THROW(Dune::NotImplemented, "tripleTemperature for mesitylene"); }
{ OPM_THROW(std::runtime_error, "Not implemented: tripleTemperature for mesitylene"); }
/*!
* \brief Returns the pressure \f$\mathrm{[Pa]}\f$ at mesitylene's triple point.
*/
static Scalar triplePressure()
{ DUNE_THROW(Dune::NotImplemented, "triplePressure for mesitylene"); }
{ OPM_THROW(std::runtime_error, "Not implemented: triplePressure for mesitylene"); }
/*!
* \brief The saturation vapor pressure in \f$\mathrm{[Pa]}\f$ of

2
opm/material/components/simpleh2o.hh
View File

@@ -265,7 +265,7 @@ public:
*/
static Scalar liquidPressure(Scalar temperature, Scalar density)
{
DUNE_THROW(Dune::InvalidStateException,
OPM_THROW(std::logic_error,
"The liquid pressure is undefined for incompressible fluids");
}

37
opm/material/components/tabulatedcomponent.hh
View File

@@ -31,7 +31,8 @@
#include <cassert>
#include <iostream>
#include <opm/common/exceptions.hh>
#include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp>
namespace Opm
{
@@ -109,7 +110,7 @@ public:
Scalar temperature = iT * (tempMax_ - tempMin_)/(nTemp_ - 1) + tempMin_;
try { vaporPressure_[iT] = RawComponent::vaporPressure(temperature); }
catch (Dune::NotImplemented) { vaporPressure_[iT] = NaN; }
catch (std::exception) { vaporPressure_[iT] = NaN; }
catch (NumericalProblem e) { vaporPressure_[iT] = NaN; };
Scalar pgMax = maxGasPressure_(iT);
@@ -122,23 +123,23 @@ public:
unsigned i = iT + iP*nTemp_;
try { gasEnthalpy_[i] = RawComponent::gasEnthalpy(temperature, pressure); }
catch (Dune::NotImplemented) { gasEnthalpy_[i] = NaN; }
catch (std::exception) { gasEnthalpy_[i] = NaN; }
catch (NumericalProblem) { gasEnthalpy_[i] = NaN; };
try { gasHeatCapacity_[i] = RawComponent::gasHeatCapacity(temperature, pressure); }
catch (Dune::NotImplemented) { gasHeatCapacity_[i] = NaN; }
catch (std::exception) { gasHeatCapacity_[i] = NaN; }
catch (NumericalProblem) { gasHeatCapacity_[i] = NaN; };
try { gasDensity_[i] = RawComponent::gasDensity(temperature, pressure); }
catch (Dune::NotImplemented) { gasDensity_[i] = NaN; }
catch (std::exception) { gasDensity_[i] = NaN; }
catch (NumericalProblem) { gasDensity_[i] = NaN; };
try { gasViscosity_[i] = RawComponent::gasViscosity(temperature, pressure); }
catch (Dune::NotImplemented) { gasViscosity_[i] = NaN; }
catch (std::exception) { gasViscosity_[i] = NaN; }
catch (NumericalProblem) { gasViscosity_[i] = NaN; };
try { gasThermalConductivity_[i] = RawComponent::gasThermalConductivity(temperature, pressure); }
catch (Dune::NotImplemented) { gasThermalConductivity_[i] = NaN; }
catch (std::exception) { gasThermalConductivity_[i] = NaN; }
catch (NumericalProblem) { gasThermalConductivity_[i] = NaN; };
};
@@ -150,23 +151,23 @@ public:
unsigned i = iT + iP*nTemp_;
try { liquidEnthalpy_[i] = RawComponent::liquidEnthalpy(temperature, pressure); }
catch (Dune::NotImplemented) { liquidEnthalpy_[i] = NaN; }
catch (std::exception) { liquidEnthalpy_[i] = NaN; }
catch (NumericalProblem) { liquidEnthalpy_[i] = NaN; };
try { liquidHeatCapacity_[i] = RawComponent::liquidHeatCapacity(temperature, pressure); }
catch (Dune::NotImplemented) { liquidHeatCapacity_[i] = NaN; }
catch (std::exception) { liquidHeatCapacity_[i] = NaN; }
catch (NumericalProblem) { liquidHeatCapacity_[i] = NaN; };
try { liquidDensity_[i] = RawComponent::liquidDensity(temperature, pressure); }
catch (Dune::NotImplemented) { liquidDensity_[i] = NaN; }
catch (std::exception) { liquidDensity_[i] = NaN; }
catch (NumericalProblem) { liquidDensity_[i] = NaN; };
try { liquidViscosity_[i] = RawComponent::liquidViscosity(temperature, pressure); }
catch (Dune::NotImplemented) { liquidViscosity_[i] = NaN; }
catch (std::exception) { liquidViscosity_[i] = NaN; }
catch (NumericalProblem) { liquidViscosity_[i] = NaN; };
try { liquidThermalConductivity_[i] = RawComponent::liquidThermalConductivity(temperature, pressure); }
catch (Dune::NotImplemented) { liquidThermalConductivity_[i] = NaN; }
catch (std::exception) { liquidThermalConductivity_[i] = NaN; }
catch (NumericalProblem) { liquidThermalConductivity_[i] = NaN; };
}
}
@@ -595,13 +596,13 @@ private:
#if 0 && !defined NDEBUG
if(!(0 <= alphaT && alphaT <= 1.0))
DUNE_THROW(NumericalProblem, "Temperature out of range: "
OPM_THROW(NumericalProblem, "Temperature out of range: "
<< "T=" << T << " range: [" << tempMin_ << ", " << tempMax_ << "]");
if(!(0 <= alphaP1 && alphaP1 <= 1.0))
DUNE_THROW(NumericalProblem, "First liquid pressure out of range: "
OPM_THROW(NumericalProblem, "First liquid pressure out of range: "
<< "p=" << p << " range: [" << minLiquidPressure_(tempIdx_(T)) << ", " << maxLiquidPressure_(tempIdx_(T)) << "]");
if(!(0 <= alphaP2 && alphaP2 <= 1.0))
DUNE_THROW(NumericalProblem, "Second liquid pressure out of range: "
OPM_THROW(NumericalProblem, "Second liquid pressure out of range: "
<< "p=" << p << " range: [" << minLiquidPressure_(tempIdx_(T) + 1) << ", " << maxLiquidPressure_(tempIdx_(T) + 1) << "]");
#endif
@@ -633,13 +634,13 @@ private:
#if 0 && !defined NDEBUG
if(!(0 <= alphaT && alphaT <= 1.0))
DUNE_THROW(NumericalProblem, "Temperature out of range: "
OPM_THROW(NumericalProblem, "Temperature out of range: "
<< "T=" << T << " range: [" << tempMin_ << ", " << tempMax_ << "]");
if(!(0 <= alphaP1 && alphaP1 <= 1.0))
DUNE_THROW(NumericalProblem, "First gas pressure out of range: "
OPM_THROW(NumericalProblem, "First gas pressure out of range: "
<< "p=" << p << " range: [" << minGasPressure_(tempIdx_(T)) << ", " << maxGasPressure_(tempIdx_(T)) << "]");
if(!(0 <= alphaP2 && alphaP2 <= 1.0))
DUNE_THROW(NumericalProblem, "Second gas pressure out of range: "
OPM_THROW(NumericalProblem, "Second gas pressure out of range: "
<< "p=" << p << " range: [" << minGasPressure_(tempIdx_(T) + 1) << ", " << maxGasPressure_(tempIdx_(T) + 1) << "]");
#endif

8
opm/material/components/xylene.hh
View File

@@ -73,17 +73,13 @@ public:
* \brief Returns the temperature \f$\mathrm{[K]}\f$ at xylene's triple point.
*/
static const Scalar tripleTemperature()
{
DUNE_THROW(Dune::NotImplemented, "tripleTemperature for xylene");
}
{ OPM_THROW(std::runtime_error, "Not implemented: tripleTemperature for xylene"); }
/*!
* \brief Returns the pressure \f$\mathrm{[Pa]}\f$ at xylene's triple point.
*/
static const Scalar triplePressure()
{
DUNE_THROW(Dune::NotImplemented, "triplePressure for xylene");
}
{ OPM_THROW(std::runtime_error, "Not implemented: triplePressure for xylene"); }
/*!
* \brief The saturation vapor pressure in \f$\mathrm{[Pa]}\f$ of pure xylene