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

the big rename

Browse Source 
make all file names confirm to the OPM conventions. (hopefully)
This commit is contained in:
Andreas Lauser 2013-09-10 14:55:59 +02:00
parent a985ec3ef5
commit 2e34aecf67
111 changed files with 276 additions and 270 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
opm/material/constants.hh → opm/material/Constants.hpp
View File

2
opm/material/dynamictabulated2dfunction.hh → opm/material/DynamicTabulated2dFunction.hpp
View File

@ -26,7 +26,7 @@
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/material/tabulated2dfunction.hh> #include <opm/material/Tabulated2dFunction.hpp>
#include <vector> #include <vector>

2
opm/material/idealgas.hh → opm/material/IdealGas.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_IDEAL_GAS_HH #ifndef OPM_IDEAL_GAS_HH
#define OPM_IDEAL_GAS_HH #define OPM_IDEAL_GAS_HH
#include <opm/material/constants.hh> #include <opm/material/Constants.hpp>
namespace Opm namespace Opm
{ {

2
opm/material/statictabulated2dfunction.hh → opm/material/StaticTabulated2dFunction.hpp
View File

@ -26,7 +26,7 @@
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/material/tabulated2dfunction.hh> #include <opm/material/Tabulated2dFunction.hpp>
#include <assert.h> #include <assert.h>

0
opm/material/tabulated2dfunction.hh → opm/material/Tabulated2dFunction.hpp
View File

0
opm/material/valgrind.hh → opm/material/Valgrind.hpp
View File

4
opm/material/binarycoefficients/air_mesitylene.hh → opm/material/binarycoefficients/Air_Mesitylene.hpp
View File

@ -24,8 +24,8 @@
#ifndef OPM_BINARY_COEFF_AIR_MESITYLENE_HH #ifndef OPM_BINARY_COEFF_AIR_MESITYLENE_HH
#define OPM_BINARY_COEFF_AIR_MESITYLENE_HH #define OPM_BINARY_COEFF_AIR_MESITYLENE_HH
#include <opm/material/components/air.hh> #include <opm/material/components/Air.hpp>
#include <opm/material/components/mesitylene.hh> #include <opm/material/components/Mesitylene.hpp>
namespace Opm namespace Opm
{ {

4
opm/material/binarycoefficients/air_xylene.hh → opm/material/binarycoefficients/Air_Xylene.hpp
View File

@ -24,8 +24,8 @@
#ifndef OPM_BINARY_COEFF_AIR_XYLENE_HH #ifndef OPM_BINARY_COEFF_AIR_XYLENE_HH
#define OPM_BINARY_COEFF_AIR_XYLENE_HH #define OPM_BINARY_COEFF_AIR_XYLENE_HH
#include <opm/material/components/air.hh> #include <opm/material/components/Air.hpp>
#include <opm/material/components/xylene.hh> #include <opm/material/components/Xylene.hpp>
namespace Opm namespace Opm
{ {

8
opm/material/binarycoefficients/brine_co2.hh → opm/material/binarycoefficients/Brine_CO2.hpp
View File

@ -24,10 +24,10 @@
#ifndef OPM_BINARY_COEFF_BRINE_CO2_HH #ifndef OPM_BINARY_COEFF_BRINE_CO2_HH
#define OPM_BINARY_COEFF_BRINE_CO2_HH #define OPM_BINARY_COEFF_BRINE_CO2_HH
#include <opm/material/components/brine.hh> #include <opm/material/components/Brine.hpp>
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
#include <opm/material/components/co2.hh> #include <opm/material/components/CO2.hpp>
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
namespace Opm { namespace Opm {
namespace BinaryCoeff { namespace BinaryCoeff {

0
opm/material/binarycoefficients/fullermethod.hh → opm/material/binarycoefficients/FullerMethod.hpp
View File

0
opm/material/binarycoefficients/h2o_air.hh → opm/material/binarycoefficients/H2O_Air.hpp
View File

8
opm/material/binarycoefficients/h2o_co2.hh → opm/material/binarycoefficients/H2O_CO2.hpp
View File

@ -24,11 +24,11 @@
#ifndef OPM_BINARY_COEFF_H2O_CO2_HH #ifndef OPM_BINARY_COEFF_H2O_CO2_HH
#define OPM_BINARY_COEFF_H2O_CO2_HH #define OPM_BINARY_COEFF_H2O_CO2_HH
#include <opm/material/binarycoefficients/henryiapws.hh> #include <opm/material/binarycoefficients/HenryIapws.hpp>
#include <opm/material/binarycoefficients/fullermethod.hh> #include <opm/material/binarycoefficients/FullerMethod.hpp>
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
#include <opm/material/components/simpleco2.hh> #include <opm/material/components/SimpleCO2.hpp>
namespace Opm { namespace Opm {
namespace BinaryCoeff { namespace BinaryCoeff {

4
opm/material/binarycoefficients/h2o_mesitylene.hh → opm/material/binarycoefficients/H2O_Mesitylene.hpp
View File

@ -24,8 +24,8 @@
#ifndef OPM_BINARY_COEFF_H2O_MESITYLENE_HH #ifndef OPM_BINARY_COEFF_H2O_MESITYLENE_HH
#define OPM_BINARY_COEFF_H2O_MESITYLENE_HH #define OPM_BINARY_COEFF_H2O_MESITYLENE_HH
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
#include <opm/material/components/mesitylene.hh> #include <opm/material/components/Mesitylene.hpp>
namespace Opm namespace Opm
{ {

8
opm/material/binarycoefficients/h2o_n2.hh → opm/material/binarycoefficients/H2O_N2.hpp
View File

@ -24,11 +24,11 @@
#ifndef OPM_BINARY_COEFF_H2O_N2_HH #ifndef OPM_BINARY_COEFF_H2O_N2_HH
#define OPM_BINARY_COEFF_H2O_N2_HH #define OPM_BINARY_COEFF_H2O_N2_HH
#include "henryiapws.hh" #include "HenryIapws.hpp"
#include "fullermethod.hh" #include "FullerMethod.hpp"
#include <opm/material/components/n2.hh> #include <opm/material/components/N2.hpp>
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
namespace Opm { namespace Opm {
namespace BinaryCoeff { namespace BinaryCoeff {

4
opm/material/binarycoefficients/h2o_xylene.hh → opm/material/binarycoefficients/H2O_Xylene.hpp
View File

@ -24,8 +24,8 @@
#ifndef OPM_BINARY_COEFF_H2O_XYLENE_HH #ifndef OPM_BINARY_COEFF_H2O_XYLENE_HH
#define OPM_BINARY_COEFF_H2O_XYLENE_HH #define OPM_BINARY_COEFF_H2O_XYLENE_HH
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
#include <opm/material/components/xylene.hh> #include <opm/material/components/Xylene.hpp>
namespace Opm namespace Opm
{ {

2
opm/material/binarycoefficients/henryiapws.hh → opm/material/binarycoefficients/HenryIapws.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_HENRY_IAPWS_HH #ifndef OPM_HENRY_IAPWS_HH
#define OPM_HENRY_IAPWS_HH #define OPM_HENRY_IAPWS_HH
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
namespace Opm namespace Opm
{ {

4
opm/material/components/air.hh → opm/material/components/Air.hpp
View File

@ -24,8 +24,8 @@
#ifndef OPM_AIR_HH #ifndef OPM_AIR_HH
#define OPM_AIR_HH #define OPM_AIR_HH
#include <opm/material/components/component.hh> #include <opm/material/components/Component.hpp>
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>

2
opm/material/components/brine.hh → opm/material/components/Brine.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_BRINE_HH #ifndef OPM_BRINE_HH
#define OPM_BRINE_HH #define OPM_BRINE_HH
#include <opm/material/components/component.hh> #include <opm/material/components/Component.hpp>
#include <cmath> #include <cmath>

5
opm/material/components/co2.hh → opm/material/components/CO2.hpp
View File

@ -26,9 +26,8 @@
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/material/components/component.hh> #include <opm/material/Constants.hpp>
#include <opm/material/constants.hh> #include <opm/material/IdealGas.hpp>
#include <opm/material/idealgas.hh>
#include <cmath> #include <cmath>
#include <iostream> #include <iostream>

0
opm/material/components/component.hh → opm/material/components/Component.hpp
View File

4
opm/material/components/dnapl.hh → opm/material/components/Dnapl.hpp
View File

@ -25,8 +25,8 @@
#ifndef OPM_DNAPL_HH #ifndef OPM_DNAPL_HH
#define OPM_DNAPL_HH #define OPM_DNAPL_HH
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include "component.hh" #include "Component.hpp"
namespace Opm { namespace Opm {
/*! /*!

14
opm/material/components/h2o.hh → opm/material/components/H2O.hpp
View File

@ -27,17 +27,17 @@
#include <cmath> #include <cmath>
#include <cassert> #include <cassert>
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include "component.hh" #include "Component.hpp"
#include "iapws/common.hh" #include "iapws/Common.hpp"
#include "iapws/region1.hh" #include "iapws/Region1.hpp"
#include "iapws/region2.hh" #include "iapws/Region2.hpp"
#include "iapws/region4.hh" #include "iapws/Region4.hpp"
namespace Opm { namespace Opm {

2
opm/material/components/lnapl.hh → opm/material/components/Lnapl.hpp
View File

@ -25,7 +25,7 @@
#ifndef OPM_LNAPL_HH #ifndef OPM_LNAPL_HH
#define OPM_LNAPL_HH #define OPM_LNAPL_HH
#include "component.hh" #include "Component.hpp"
namespace Opm { namespace Opm {
/*! /*!

6
opm/material/components/mesitylene.hh → opm/material/components/Mesitylene.hpp
View File

@ -25,9 +25,9 @@
#ifndef OPM_MESITYLENE_HH #ifndef OPM_MESITYLENE_HH
#define OPM_MESITYLENE_HH #define OPM_MESITYLENE_HH
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include <opm/material/components/component.hh> #include <opm/material/components/Component.hpp>
#include <opm/material/constants.hh> #include <opm/material/Constants.hpp>
namespace Opm namespace Opm
{ {

4
opm/material/components/n2.hh → opm/material/components/N2.hpp
View File

@ -25,9 +25,9 @@
#ifndef OPM_N2_HH #ifndef OPM_N2_HH
#define OPM_N2_HH #define OPM_N2_HH
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include "component.hh" #include "Component.hpp"
#include <cmath> #include <cmath>

2
opm/material/components/nullcomponent.hh → opm/material/components/NullComponent.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_NULL_COMPONENT_HH #ifndef OPM_NULL_COMPONENT_HH
#define OPM_NULL_COMPONENT_HH #define OPM_NULL_COMPONENT_HH
#include "component.hh" #include "Component.hpp"
namespace Opm namespace Opm
{ {

4
opm/material/components/simpleco2.hh → opm/material/components/SimpleCO2.hpp
View File

@ -26,8 +26,8 @@
#ifndef OPM_SIMPLE_CO2_HH #ifndef OPM_SIMPLE_CO2_HH
#define OPM_SIMPLE_CO2_HH #define OPM_SIMPLE_CO2_HH
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include <opm/material/components/component.hh> #include <opm/material/components/Component.hpp>
#include <cmath> #include <cmath>

4
opm/material/components/simpleh2o.hh → opm/material/components/SimpleH2O.hpp
View File

@ -24,9 +24,9 @@
#ifndef OPM_SIMPLE_H2O_HH #ifndef OPM_SIMPLE_H2O_HH
#define OPM_SIMPLE_H2O_HH #define OPM_SIMPLE_H2O_HH
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include "component.hh" #include "Component.hpp"
#include <cmath> #include <cmath>

0
opm/material/components/tabulatedcomponent.hh → opm/material/components/TabulatedComponent.hpp
View File

2
opm/material/components/unit.hh → opm/material/components/Unit.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_UNIT_HH #ifndef OPM_UNIT_HH
#define OPM_UNIT_HH #define OPM_UNIT_HH
#include "component.hh" #include "Component.hpp"
namespace Opm namespace Opm
{ {

6
opm/material/components/xylene.hh → opm/material/components/Xylene.hpp
View File

@ -26,9 +26,9 @@
#define OPM_XYLENE_HH #define OPM_XYLENE_HH
#include <cmath> #include <cmath>
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include <opm/material/components/component.hh> #include <opm/material/components/Component.hpp>
#include <opm/material/constants.hh> #include <opm/material/Constants.hpp>
namespace Opm namespace Opm

4
opm/material/components/co2tables.inc
View File

@ -20451,7 +20451,7 @@ const double TabulatedDensityTraits::vals[200][500] =
} }
}; };
typedef StaticTabulated2DFunction< TabulatedDensityTraits > TabulatedDensity; typedef Opm::StaticTabulated2DFunction< TabulatedDensityTraits > TabulatedDensity;
struct TabulatedEnthalpyTraits { struct TabulatedEnthalpyTraits {
typedef double Scalar; typedef double Scalar;
@ -40877,7 +40877,7 @@ const double TabulatedEnthalpyTraits::vals[200][500] =
} }
}; };
typedef StaticTabulated2DFunction< TabulatedEnthalpyTraits > TabulatedEnthalpy; typedef Opm::StaticTabulated2DFunction< TabulatedEnthalpyTraits > TabulatedEnthalpy;
// this class collects all the tabulated quantities in one convenient place // this class collects all the tabulated quantities in one convenient place

2
opm/material/components/iapws/common.hh → opm/material/components/iapws/Common.hpp
View File

@ -25,7 +25,7 @@
#ifndef OPM_IAPWS_COMMON_HH #ifndef OPM_IAPWS_COMMON_HH
#define OPM_IAPWS_COMMON_HH #define OPM_IAPWS_COMMON_HH
#include <opm/material/constants.hh> #include <opm/material/Constants.hpp>
#include <cmath> #include <cmath>

0
opm/material/components/iapws/region1.hh → opm/material/components/iapws/Region1.hpp
View File

0
opm/material/components/iapws/region2.hh → opm/material/components/iapws/Region2.hpp
View File

0
opm/material/components/iapws/region4.hh → opm/material/components/iapws/Region4.hpp
View File

2
opm/material/constraintsolvers/compositionfromfugacities.hh → opm/material/constraintsolvers/CompositionFromFugacities.hpp
View File

@ -28,7 +28,7 @@
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <limits> #include <limits>

4
opm/material/constraintsolvers/computefromreferencephase.hh → opm/material/constraintsolvers/ComputeFromReferencePhase.hpp
View File

@ -23,11 +23,11 @@
#ifndef OPM_COMPUTE_FROM_REFERENCE_PHASE_HH #ifndef OPM_COMPUTE_FROM_REFERENCE_PHASE_HH
#define OPM_COMPUTE_FROM_REFERENCE_PHASE_HH #define OPM_COMPUTE_FROM_REFERENCE_PHASE_HH
#include <opm/material/constraintsolvers/compositionfromfugacities.hh> #include <opm/material/constraintsolvers/CompositionFromFugacities.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>

2
opm/material/constraintsolvers/immiscibleflash.hh → opm/material/constraintsolvers/ImmiscibleFlash.hpp
View File

@ -25,7 +25,7 @@
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh> #include <dune/common/fmatrix.hh>

2
opm/material/constraintsolvers/misciblemultiphasecomposition.hh → opm/material/constraintsolvers/MiscibleMultiPhaseComposition.hpp
View File

@ -28,7 +28,7 @@
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
namespace Opm { namespace Opm {

2
opm/material/constraintsolvers/ncpflash.hh → opm/material/constraintsolvers/NcpFlash.hpp
View File

@ -29,7 +29,7 @@
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/Average.hpp> #include <opm/core/utility/Average.hpp>
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <limits> #include <limits>
#include <iostream> #include <iostream>

6
opm/material/eos/pengrobinson.hh → opm/material/eos/PengRobinson.hpp
View File

@ -24,9 +24,9 @@
#ifndef OPM_PENG_ROBINSON_HH #ifndef OPM_PENG_ROBINSON_HH
#define OPM_PENG_ROBINSON_HH #define OPM_PENG_ROBINSON_HH
#include <opm/material/fluidstates/temperatureoverlayfluidstate.hh> #include <opm/material/fluidstates/TemperatureOverlayFluidState.hpp>
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include <opm/material/dynamictabulated2dfunction.hh> #include <opm/material/DynamicTabulated2dFunction.hpp>
#include <opm/core/utility/Unused.hpp> #include <opm/core/utility/Unused.hpp>
#include <opm/core/utility/PolynomialUtils.hpp> #include <opm/core/utility/PolynomialUtils.hpp>

4
opm/material/eos/pengrobinsonmixture.hh → opm/material/eos/PengRobinsonMixture.hpp
View File

@ -24,9 +24,9 @@
#ifndef OPM_PENG_ROBINSON_MIXTURE_HH #ifndef OPM_PENG_ROBINSON_MIXTURE_HH
#define OPM_PENG_ROBINSON_MIXTURE_HH #define OPM_PENG_ROBINSON_MIXTURE_HH
#include "pengrobinson.hh" #include "PengRobinson.hpp"
#include <opm/material/constants.hh> #include <opm/material/Constants.hpp>
#include <iostream> #include <iostream>

2
opm/material/eos/pengrobinsonparams.hh → opm/material/eos/PengRobinsonParams.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_PENG_ROBINSON_PARAMS_HH #ifndef OPM_PENG_ROBINSON_PARAMS_HH
#define OPM_PENG_ROBINSON_PARAMS_HH #define OPM_PENG_ROBINSON_PARAMS_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
namespace Opm namespace Opm
{ {

4
opm/material/eos/pengrobinsonparamsmixture.hh → opm/material/eos/PengRobinsonparamsMixture.hpp
View File

@ -24,9 +24,9 @@
#define OPM_PENG_ROBINSON_PARAMS_MIXTURE_HH #define OPM_PENG_ROBINSON_PARAMS_MIXTURE_HH
#include <algorithm> #include <algorithm>
#include <opm/material/constants.hh> #include <opm/material/Constants.hpp>
#include "pengrobinsonparams.hh" #include "PengRobinsonParams.hpp"
namespace Opm namespace Opm
{ {

2
opm/material/fluidmatrixinteractions/2p/brookscorey.hh → opm/material/fluidmatrixinteractions/2p/BrooksCorey.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_BROOKS_COREY_HH #ifndef OPM_BROOKS_COREY_HH
#define OPM_BROOKS_COREY_HH #define OPM_BROOKS_COREY_HH
#include "brookscoreyparams.hh" #include "BrooksCoreyParams.hpp"
#include <algorithm> #include <algorithm>

2
opm/material/fluidmatrixinteractions/2p/brookscoreyparams.hh → opm/material/fluidmatrixinteractions/2p/BrooksCoreyParams.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_BROOKS_COREY_PARAMS_HH #ifndef OPM_BROOKS_COREY_PARAMS_HH
#define OPM_BROOKS_COREY_PARAMS_HH #define OPM_BROOKS_COREY_PARAMS_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
namespace Opm { namespace Opm {

2
opm/material/fluidmatrixinteractions/2p/efftoabslaw.hh → opm/material/fluidmatrixinteractions/2p/EffToAbsLaw.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_EFF_TO_ABS_LAW_HH #ifndef OPM_EFF_TO_ABS_LAW_HH
#define OPM_EFF_TO_ABS_LAW_HH #define OPM_EFF_TO_ABS_LAW_HH
#include "efftoabslawparams.hh" #include "EffToAbsLawParams.hpp"
namespace Opm { namespace Opm {
/*! /*!

0
opm/material/fluidmatrixinteractions/2p/efftoabslawparams.hh → opm/material/fluidmatrixinteractions/2p/EffToAbsLawParams.hpp
View File

2
opm/material/fluidmatrixinteractions/2p/linearmaterial.hh → opm/material/fluidmatrixinteractions/2p/LinearMaterial.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_LINEAR_MATERIAL_HH #ifndef OPM_LINEAR_MATERIAL_HH
#define OPM_LINEAR_MATERIAL_HH #define OPM_LINEAR_MATERIAL_HH
#include "linearmaterialparams.hh" #include "LinearMaterialParams.hpp"
#include <algorithm> #include <algorithm>

0
opm/material/fluidmatrixinteractions/2p/linearmaterialparams.hh → opm/material/fluidmatrixinteractions/2p/LinearMaterialParams.hpp
View File

4
opm/material/fluidmatrixinteractions/2p/parkerlenhard.hh → opm/material/fluidmatrixinteractions/2p/ParkerLenhard.hpp
View File

@ -23,9 +23,9 @@
#ifndef OPM_PARKER_LENHARD_HH #ifndef OPM_PARKER_LENHARD_HH
#define OPM_PARKER_LENHARD_HH #define OPM_PARKER_LENHARD_HH
#include "parkerlenhardparams.hh" #include "ParkerLenhardParams.hpp"
#include <opm/material/fluidmatrixinteractions/2p/vangenuchten.hh> #include <opm/material/fluidmatrixinteractions/2p/VanGenuchten.hpp>
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>

2
opm/material/fluidmatrixinteractions/2p/parkerlenhardparams.hh → opm/material/fluidmatrixinteractions/2p/ParkerLenhardParams.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_PARKER_LENHARD_PARAMS_HH #ifndef OPM_PARKER_LENHARD_PARAMS_HH
#define OPM_PARKER_LENHARD_PARAMS_HH #define OPM_PARKER_LENHARD_PARAMS_HH
#include <opm/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh> #include <opm/material/fluidmatrixinteractions/2p/RegularizedVanGenuchten.hpp>
namespace Opm namespace Opm
{ {

4
opm/material/fluidmatrixinteractions/2p/regularizedbrookscorey.hh → opm/material/fluidmatrixinteractions/2p/RegularizedBrooksCorey.hpp
View File

@ -24,8 +24,8 @@
#ifndef REGULARIZED_BROOKS_COREY_HH #ifndef REGULARIZED_BROOKS_COREY_HH
#define REGULARIZED_BROOKS_COREY_HH #define REGULARIZED_BROOKS_COREY_HH
#include "brookscorey.hh" #include "BrooksCorey.hpp"
#include "regularizedbrookscoreyparams.hh" #include "RegularizedBrooksCoreyParams.hpp"
#include <opm/core/utility/Spline.hpp> #include <opm/core/utility/Spline.hpp>

2
opm/material/fluidmatrixinteractions/2p/regularizedbrookscoreyparams.hh → opm/material/fluidmatrixinteractions/2p/RegularizedBrooksCoreyParams.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_REGULARIZED_BROOKS_COREY_PARAMS_HH #ifndef OPM_REGULARIZED_BROOKS_COREY_PARAMS_HH
#define OPM_REGULARIZED_BROOKS_COREY_PARAMS_HH #define OPM_REGULARIZED_BROOKS_COREY_PARAMS_HH
#include "brookscoreyparams.hh" #include "BrooksCoreyParams.hpp"
namespace Opm { namespace Opm {
/*! /*!

4
opm/material/fluidmatrixinteractions/2p/regularizedlinearmaterial.hh → opm/material/fluidmatrixinteractions/2p/RegularizedLinearMaterial.hpp
View File

@ -25,8 +25,8 @@
#ifndef OPM_REGULARIZED_LINEAR_MATERIAL_HH #ifndef OPM_REGULARIZED_LINEAR_MATERIAL_HH
#define OPM_REGULARIZED_LINEAR_MATERIAL_HH #define OPM_REGULARIZED_LINEAR_MATERIAL_HH
#include "linearmaterial.hh" #include "LinearMaterial.hpp"
#include "regularizedlinearmaterialparams.hh" #include "RegularizedLinearMaterialParams.hpp"
#include <opm/core/utility/Spline.hpp> #include <opm/core/utility/Spline.hpp>

2
opm/material/fluidmatrixinteractions/2p/regularizedlinearmaterialparams.hh → opm/material/fluidmatrixinteractions/2p/RegularizedLinearMaterialParams.hpp
View File

@ -23,7 +23,7 @@
#ifndef REGULARIZED_LINEAR_PARAMS_HH #ifndef REGULARIZED_LINEAR_PARAMS_HH
#define REGULARIZED_LINEAR_PARAMS_HH #define REGULARIZED_LINEAR_PARAMS_HH
#include "linearmaterialparams.hh" #include "LinearMaterialParams.hpp"
namespace Opm { namespace Opm {
/*! /*!

4
opm/material/fluidmatrixinteractions/2p/regularizedvangenuchten.hh → opm/material/fluidmatrixinteractions/2p/RegularizedVanGenuchten.hpp
View File

@ -25,8 +25,8 @@
#ifndef OPM_REGULARIZED_VAN_GENUCHTEN_HH #ifndef OPM_REGULARIZED_VAN_GENUCHTEN_HH
#define OPM_REGULARIZED_VAN_GENUCHTEN_HH #define OPM_REGULARIZED_VAN_GENUCHTEN_HH
#include "vangenuchten.hh" #include "VanGenuchten.hpp"
#include "regularizedvangenuchtenparams.hh" #include "RegularizedVanGenuchtenParams.hpp"
#include <opm/core/utility/Spline.hpp> #include <opm/core/utility/Spline.hpp>

2
opm/material/fluidmatrixinteractions/2p/regularizedvangenuchtenparams.hh → opm/material/fluidmatrixinteractions/2p/RegularizedVanGenuchtenParams.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_REGULARIZED_VAN_GENUCHTEN_PARAMS_HH #ifndef OPM_REGULARIZED_VAN_GENUCHTEN_PARAMS_HH
#define OPM_REGULARIZED_VAN_GENUCHTEN_PARAMS_HH #define OPM_REGULARIZED_VAN_GENUCHTEN_PARAMS_HH
#include "vangenuchtenparams.hh" #include "VanGenuchtenParams.hpp"
namespace Opm { namespace Opm {
/*! /*!

2
opm/material/fluidmatrixinteractions/2p/vangenuchten.hh → opm/material/fluidmatrixinteractions/2p/VanGenuchten.hpp
View File

@ -25,7 +25,7 @@
#ifndef OPM_VAN_GENUCHTEN_HH #ifndef OPM_VAN_GENUCHTEN_HH
#define OPM_VAN_GENUCHTEN_HH #define OPM_VAN_GENUCHTEN_HH
#include "vangenuchtenparams.hh" #include "VanGenuchtenParams.hpp"
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>

0
opm/material/fluidmatrixinteractions/2p/vangenuchtenparams.hh → opm/material/fluidmatrixinteractions/2p/VanGenuchtenParams.hpp
View File

2
opm/material/fluidmatrixinteractions/3p/3pparkervangenuchten.hh → opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchten.hpp
View File

@ -25,7 +25,7 @@
#ifndef OPM_3P_PARKER_VAN_GENUCHTEN_HH #ifndef OPM_3P_PARKER_VAN_GENUCHTEN_HH
#define OPM_3P_PARKER_VAN_GENUCHTEN_HH #define OPM_3P_PARKER_VAN_GENUCHTEN_HH
#include "3pparkervangenuchtenparams.hh" #include "3pParkerVanGenuchtenParams.hpp"
#include <algorithm> #include <algorithm>

2
opm/material/fluidmatrixinteractions/3p/3pparkervangenuchtenparams.hh → opm/material/fluidmatrixinteractions/3p/3pParkerVanGenuchtenParams.hpp
View File

@ -27,7 +27,7 @@
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
namespace Opm { namespace Opm {
/*! /*!

0
opm/material/fluidmatrixinteractions/mp/2padapter.hh → opm/material/fluidmatrixinteractions/mp/2pAdapter.hpp
View File

2
opm/material/fluidmatrixinteractions/mp/3padapter.hh → opm/material/fluidmatrixinteractions/mp/3pAdapter.hpp
View File

@ -25,7 +25,7 @@
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <algorithm> #include <algorithm>

4
opm/material/fluidmatrixinteractions/mp/mplinearmaterial.hh → opm/material/fluidmatrixinteractions/mp/MpLinearMaterial.hpp
View File

@ -23,9 +23,9 @@
#ifndef OPM_MP_LINEAR_MATERIAL_HH #ifndef OPM_MP_LINEAR_MATERIAL_HH
#define OPM_MP_LINEAR_MATERIAL_HH #define OPM_MP_LINEAR_MATERIAL_HH
#include "mplinearmaterialparams.hh" #include "MpLinearMaterialParams.hpp"
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>

0
opm/material/fluidmatrixinteractions/mp/mplinearmaterialparams.hh → opm/material/fluidmatrixinteractions/mp/MpLinearMaterialParams.hpp
View File

2
opm/material/fluidmatrixinteractions/mp/nullmateriallaw.hh → opm/material/fluidmatrixinteractions/mp/NullMaterialLaw.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_NULL_MATERIAL_LAW_HH #ifndef OPM_NULL_MATERIAL_LAW_HH
#define OPM_NULL_MATERIAL_LAW_HH #define OPM_NULL_MATERIAL_LAW_HH
#include "nullmateriallawparams.hh" #include "NullMaterialLawParams.hpp"
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>

0
opm/material/fluidmatrixinteractions/mp/nullmateriallawparams.hh → opm/material/fluidmatrixinteractions/mp/NullMaterialLawParams.hpp
View File

4
opm/material/fluidstates/compositionalfluidstate.hh → opm/material/fluidstates/CompositionalFluidState.hpp
View File

@ -26,9 +26,9 @@
#ifndef OPM_COMPOSITIONAL_FLUID_STATE_HH #ifndef OPM_COMPOSITIONAL_FLUID_STATE_HH
#define OPM_COMPOSITIONAL_FLUID_STATE_HH #define OPM_COMPOSITIONAL_FLUID_STATE_HH
#include "modularfluidstate.hh" #include "ModularFluidState.hpp"
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <algorithm> #include <algorithm>
namespace Opm { namespace Opm {

2
opm/material/fluidstates/fluidstatecompositionmodules.hh → opm/material/fluidstates/FluidStateCompositionModules.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_FLUID_STATE_COMPOSITION_MODULES_HH #ifndef OPM_FLUID_STATE_COMPOSITION_MODULES_HH
#define OPM_FLUID_STATE_COMPOSITION_MODULES_HH #define OPM_FLUID_STATE_COMPOSITION_MODULES_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>

2
opm/material/fluidstates/fluidstatedensitymodules.hh → opm/material/fluidstates/FluidStateDensityModules.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_FLUID_STATE_DENSITY_MODULES_HH #ifndef OPM_FLUID_STATE_DENSITY_MODULES_HH
#define OPM_FLUID_STATE_DENSITY_MODULES_HH #define OPM_FLUID_STATE_DENSITY_MODULES_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>

2
opm/material/fluidstates/fluidstateenthalpymodules.hh → opm/material/fluidstates/FluidStateEnthalpyModules.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_FLUID_STATE_ENTHALPY_MODULES_HH #ifndef OPM_FLUID_STATE_ENTHALPY_MODULES_HH
#define OPM_FLUID_STATE_ENTHALPY_MODULES_HH #define OPM_FLUID_STATE_ENTHALPY_MODULES_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>

2
opm/material/fluidstates/fluidstatefugacitymodules.hh → opm/material/fluidstates/FluidStateFugacityModules.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_FLUID_STATE_FUGACITY_MODULES_HH #ifndef OPM_FLUID_STATE_FUGACITY_MODULES_HH
#define OPM_FLUID_STATE_FUGACITY_MODULES_HH #define OPM_FLUID_STATE_FUGACITY_MODULES_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>

2
opm/material/fluidstates/fluidstatepressuremodules.hh → opm/material/fluidstates/FluidStatePressureModules.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_FLUID_STATE_PRESSURE_MODULES_HH #ifndef OPM_FLUID_STATE_PRESSURE_MODULES_HH
#define OPM_FLUID_STATE_PRESSURE_MODULES_HH #define OPM_FLUID_STATE_PRESSURE_MODULES_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>

2
opm/material/fluidstates/fluidstatesaturationmodules.hh → opm/material/fluidstates/FluidStateSaturationModules.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_FLUID_STATE_SATURATION_MODULES_HH #ifndef OPM_FLUID_STATE_SATURATION_MODULES_HH
#define OPM_FLUID_STATE_SATURATION_MODULES_HH #define OPM_FLUID_STATE_SATURATION_MODULES_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>

2
opm/material/fluidstates/fluidstatetemperaturemodules.hh → opm/material/fluidstates/FluidStateTemperatureModules.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_FLUID_STATE_TEMPERATURE_MODULES_HH #ifndef OPM_FLUID_STATE_TEMPERATURE_MODULES_HH
#define OPM_FLUID_STATE_TEMPERATURE_MODULES_HH #define OPM_FLUID_STATE_TEMPERATURE_MODULES_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>

2
opm/material/fluidstates/fluidstateviscositymodules.hh → opm/material/fluidstates/FluidStateViscosityModules.hpp
View File

@ -24,7 +24,7 @@
#ifndef OPM_FLUID_STATE_VISCOSITY_MODULES_HH #ifndef OPM_FLUID_STATE_VISCOSITY_MODULES_HH
#define OPM_FLUID_STATE_VISCOSITY_MODULES_HH #define OPM_FLUID_STATE_VISCOSITY_MODULES_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>

4
opm/material/fluidstates/immisciblefluidstate.hh → opm/material/fluidstates/ImmiscibleFluidState.hpp
View File

@ -26,9 +26,9 @@
#ifndef OPM_IMMISCIBLE_FLUID_STATE_HH #ifndef OPM_IMMISCIBLE_FLUID_STATE_HH
#define OPM_IMMISCIBLE_FLUID_STATE_HH #define OPM_IMMISCIBLE_FLUID_STATE_HH
#include "modularfluidstate.hh" #include "ModularFluidState.hpp"
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <algorithm> #include <algorithm>
namespace Opm { namespace Opm {

18
opm/material/fluidstates/modularfluidstate.hh → opm/material/fluidstates/ModularFluidState.hpp
View File

@ -23,16 +23,16 @@
#ifndef OPM_MODULAR_FLUID_STATE_HH #ifndef OPM_MODULAR_FLUID_STATE_HH
#define OPM_MODULAR_FLUID_STATE_HH #define OPM_MODULAR_FLUID_STATE_HH
#include "fluidstatepressuremodules.hh" #include "FluidStatePressureModules.hpp"
#include "fluidstatetemperaturemodules.hh" #include "FluidStateTemperatureModules.hpp"
#include "fluidstatecompositionmodules.hh" #include "FluidStateCompositionModules.hpp"
#include "fluidstatefugacitymodules.hh" #include "FluidStateFugacityModules.hpp"
#include "fluidstatesaturationmodules.hh" #include "FluidStateSaturationModules.hpp"
#include "fluidstatedensitymodules.hh" #include "FluidStateDensityModules.hpp"
#include "fluidstateviscositymodules.hh" #include "FluidStateViscosityModules.hpp"
#include "fluidstateenthalpymodules.hh" #include "FluidStateEnthalpyModules.hpp"
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <algorithm> #include <algorithm>
namespace Opm { namespace Opm {

4
opm/material/fluidstates/nonequilibriumfluidstate.hh → opm/material/fluidstates/NonEquilibriumFluidState.hpp
View File

@ -26,9 +26,9 @@
#ifndef OPM_NON_EQUILIBRIUM_FLUID_STATE_HH #ifndef OPM_NON_EQUILIBRIUM_FLUID_STATE_HH
#define OPM_NON_EQUILIBRIUM_FLUID_STATE_HH #define OPM_NON_EQUILIBRIUM_FLUID_STATE_HH
#include "modularfluidstate.hh" #include "ModularFluidState.hpp"
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <algorithm> #include <algorithm>
namespace Opm { namespace Opm {

2
opm/material/fluidstates/pressureoverlayfluidstate.hh → opm/material/fluidstates/PressureOverlayFluidState.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_PRESSURE_OVERLAY_FLUID_STATE_HH #ifndef OPM_PRESSURE_OVERLAY_FLUID_STATE_HH
#define OPM_PRESSURE_OVERLAY_FLUID_STATE_HH #define OPM_PRESSURE_OVERLAY_FLUID_STATE_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <array> #include <array>

2
opm/material/fluidstates/saturationoverlayfluidstate.hh → opm/material/fluidstates/SaturationOverlayFluidState.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_SATURATION_OVERLAY_FLUID_STATE_HH #ifndef OPM_SATURATION_OVERLAY_FLUID_STATE_HH
#define OPM_SATURATION_OVERLAY_FLUID_STATE_HH #define OPM_SATURATION_OVERLAY_FLUID_STATE_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
#include <array> #include <array>

2
opm/material/fluidstates/temperatureoverlayfluidstate.hh → opm/material/fluidstates/TemperatureOverlayFluidState.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_TEMPERATURE_OVERLAY_FLUID_STATE_HH #ifndef OPM_TEMPERATURE_OVERLAY_FLUID_STATE_HH
#define OPM_TEMPERATURE_OVERLAY_FLUID_STATE_HH #define OPM_TEMPERATURE_OVERLAY_FLUID_STATE_HH
#include <opm/material/valgrind.hh> #include <opm/material/Valgrind.hpp>
namespace Opm { namespace Opm {

16
opm/material/fluidsystems/1pfluidsystem.hh → opm/material/fluidsystems/1pFluidSystem.hpp
View File

@ -23,15 +23,15 @@
#ifndef OPM_1P_FLUIDSYSTEM_HH #ifndef OPM_1P_FLUIDSYSTEM_HH
#define OPM_1P_FLUIDSYSTEM_HH #define OPM_1P_FLUIDSYSTEM_HH
#include "basefluidsystem.hh" #include "BaseFluidSystem.hpp"
#include "nullparametercache.hh" #include "NullParameterCache.hpp"
#include <opm/material/fluidsystems/liquidphase.hh> #include <opm/material/fluidsystems/LiquidPhase.hpp>
#include <opm/material/fluidsystems/gasphase.hh> #include <opm/material/fluidsystems/GasPhase.hpp>
#include <opm/material/components/simpleh2o.hh> #include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
#include <opm/material/components/n2.hh> #include <opm/material/components/N2.hpp>
#include <opm/material/components/tabulatedcomponent.hh> #include <opm/material/components/TabulatedComponent.hpp>
#include <limits> #include <limits>
#include <cassert> #include <cassert>

10
opm/material/fluidsystems/2pimmisciblefluidsystem.hh → opm/material/fluidsystems/2pImmiscibleFluidSystem.hpp
View File

@ -27,12 +27,12 @@
#include <limits> #include <limits>
#include <cassert> #include <cassert>
#include <opm/material/fluidsystems/liquidphase.hh> #include <opm/material/fluidsystems/LiquidPhase.hpp>
#include <opm/material/fluidsystems/gasphase.hh> #include <opm/material/fluidsystems/GasPhase.hpp>
#include <opm/material/fluidstates/immisciblefluidstate.hh> #include <opm/material/fluidstates/ImmiscibleFluidState.hpp>
#include "basefluidsystem.hh" #include "BaseFluidSystem.hpp"
#include "nullparametercache.hh" #include "NullParameterCache.hpp"
namespace Opm { namespace Opm {
namespace FluidSystems { namespace FluidSystems {

2
opm/material/fluidsystems/basefluidsystem.hh → opm/material/fluidsystems/BaseFluidSystem.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_BASE_FLUID_SYSTEM_HH #ifndef OPM_BASE_FLUID_SYSTEM_HH
#define OPM_BASE_FLUID_SYSTEM_HH #define OPM_BASE_FLUID_SYSTEM_HH
#include "nullparametercache.hh" #include "NullParameterCache.hpp"
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>

10
opm/material/fluidsystems/blackoilfluidsystem.hh → opm/material/fluidsystems/BlackOilFluidSystem.hpp
View File

@ -27,11 +27,11 @@
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>
#include <opm/core/utility/Spline.hpp> #include <opm/core/utility/Spline.hpp>
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include <opm/material/constants.hh> #include <opm/material/Constants.hpp>
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
#include <opm/material/fluidsystems/basefluidsystem.hh> #include <opm/material/fluidsystems/BaseFluidSystem.hpp>
#include <opm/material/fluidsystems/nullparametercache.hh> #include <opm/material/fluidsystems/NullParameterCache.hpp>
#include <array> #include <array>
#include <vector> #include <vector>

22
opm/material/fluidsystems/brineco2fluidsystem.hh → opm/material/fluidsystems/BrineCO2FluidSystem.hpp
View File

@ -24,20 +24,20 @@
#ifndef OPM_BRINE_CO2_SYSTEM_HH #ifndef OPM_BRINE_CO2_SYSTEM_HH
#define OPM_BRINE_CO2_SYSTEM_HH #define OPM_BRINE_CO2_SYSTEM_HH
#include "basefluidsystem.hh" #include "BaseFluidSystem.hpp"
#include "nullparametercache.hh" #include "NullParameterCache.hpp"
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include <opm/material/components/brine.hh> #include <opm/material/components/Brine.hpp>
#include <opm/material/components/co2.hh> #include <opm/material/components/CO2.hpp>
#include <opm/material/components/simpleco2.hh> #include <opm/material/components/SimpleCO2.hpp>
#include <opm/material/components/simpleh2o.hh> #include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/tabulatedcomponent.hh> #include <opm/material/components/TabulatedComponent.hpp>
#include <opm/material/binarycoefficients/h2o_co2.hh> #include <opm/material/binarycoefficients/H2O_CO2.hpp>
#include <opm/material/binarycoefficients/brine_co2.hh> #include <opm/material/binarycoefficients/Brine_CO2.hpp>
#include <opm/material/binarycoefficients/h2o_n2.hh> #include <opm/material/binarycoefficients/H2O_N2.hpp>
#if HAVE_MPI #if HAVE_MPI
#include <mpi.h> #include <mpi.h>

0
opm/material/fluidsystems/gasphase.hh → opm/material/fluidsystems/GasPhase.hpp
View File

17
opm/material/fluidsystems/h2oairfluidsystem.hh → opm/material/fluidsystems/H2OAirFluidSystem.hpp
View File

@ -24,15 +24,16 @@
#ifndef OPM_H2O_AIR_SYSTEM_HH #ifndef OPM_H2O_AIR_SYSTEM_HH
#define OPM_H2O_AIR_SYSTEM_HH #define OPM_H2O_AIR_SYSTEM_HH
#include "basefluidsystem.hh" #include "BaseFluidSystem.hpp"
#include "nullparametercache.hh" #include "NullParameterCache.hpp"
#include <opm/material/IdealGas.hpp>
#include <opm/material/binarycoefficients/H2O_Air.hpp>
#include <opm/material/components/Air.hpp>
#include <opm/material/components/H2O.hpp>
#include <opm/material/components/TabulatedComponent.hpp>
#include <opm/material/Valgrind.hpp>
#include <opm/material/idealgas.hh>
#include <opm/material/binarycoefficients/h2o_air.hh>
#include <opm/material/components/air.hh>
#include <opm/material/components/h2o.hh>
#include <opm/material/components/tabulatedcomponent.hh>
#include <opm/material/valgrind.hh>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>

26
opm/material/fluidsystems/h2oairmesitylenefluidsystem.hh → opm/material/fluidsystems/H2OAirMesityleneFluidSystem.hpp
View File

@ -23,20 +23,20 @@
#ifndef OPM_H2O_AIR_MESITYLENE_FLUID_SYSTEM_HH #ifndef OPM_H2O_AIR_MESITYLENE_FLUID_SYSTEM_HH
#define OPM_H2O_AIR_MESITYLENE_FLUID_SYSTEM_HH #define OPM_H2O_AIR_MESITYLENE_FLUID_SYSTEM_HH
#include "basefluidsystem.hh" #include "BaseFluidSystem.hpp"
#include "nullparametercache.hh" #include "NullParameterCache.hpp"
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include <opm/material/components/n2.hh> #include <opm/material/components/N2.hpp>
#include <opm/material/components/air.hh> #include <opm/material/components/Air.hpp>
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
#include <opm/material/components/simpleh2o.hh> #include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/mesitylene.hh> #include <opm/material/components/Mesitylene.hpp>
#include <opm/material/components/tabulatedcomponent.hh> #include <opm/material/components/TabulatedComponent.hpp>
#include <opm/material/binarycoefficients/h2o_air.hh> #include <opm/material/binarycoefficients/H2O_Air.hpp>
#include <opm/material/binarycoefficients/h2o_n2.hh> #include <opm/material/binarycoefficients/H2O_N2.hpp>
#include <opm/material/binarycoefficients/h2o_mesitylene.hh> #include <opm/material/binarycoefficients/H2O_Mesitylene.hpp>
#include <opm/material/binarycoefficients/air_mesitylene.hh> #include <opm/material/binarycoefficients/Air_Mesitylene.hpp>
#include <iostream> #include <iostream>

20
opm/material/fluidsystems/h2oairxylenefluidsystem.hh → opm/material/fluidsystems/H2OAirXyleneFluidSystem.hpp
View File

@ -24,18 +24,18 @@
#ifndef OPM_H2O_AIR_XYLENE_FLUID_SYSTEM_HH #ifndef OPM_H2O_AIR_XYLENE_FLUID_SYSTEM_HH
#define OPM_H2O_AIR_XYLENE_FLUID_SYSTEM_HH #define OPM_H2O_AIR_XYLENE_FLUID_SYSTEM_HH
#include <opm/material/idealgas.hh> #include <opm/material/IdealGas.hpp>
#include <opm/material/components/air.hh> #include <opm/material/components/Air.hpp>
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
#include <opm/material/components/xylene.hh> #include <opm/material/components/Xylene.hpp>
#include <opm/material/components/tabulatedcomponent.hh> #include <opm/material/components/TabulatedComponent.hpp>
#include <opm/material/binarycoefficients/h2o_air.hh> #include <opm/material/binarycoefficients/H2O_Air.hpp>
#include <opm/material/binarycoefficients/h2o_xylene.hh> #include <opm/material/binarycoefficients/H2O_Xylene.hpp>
#include <opm/material/binarycoefficients/air_xylene.hh> #include <opm/material/binarycoefficients/Air_Xylene.hpp>
#include "basefluidsystem.hh" #include "BaseFluidSystem.hpp"
#include "nullparametercache.hh" #include "NullParameterCache.hpp"
namespace Opm { namespace Opm {
namespace FluidSystems { namespace FluidSystems {

19
opm/material/fluidsystems/h2on2fluidsystem.hh → opm/material/fluidsystems/H2ON2FluidSystem.hpp
View File

@ -23,16 +23,17 @@
#ifndef OPM_H2O_N2_FLUID_SYSTEM_HH #ifndef OPM_H2O_N2_FLUID_SYSTEM_HH
#define OPM_H2O_N2_FLUID_SYSTEM_HH #define OPM_H2O_N2_FLUID_SYSTEM_HH
#include "basefluidsystem.hh" #include "BaseFluidSystem.hpp"
#include "nullparametercache.hh" #include "NullParameterCache.hpp"
#include <opm/material/IdealGas.hpp>
#include <opm/material/components/N2.hpp>
#include <opm/material/components/H2O.hpp>
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/TabulatedComponent.hpp>
#include <opm/material/binarycoefficients/H2O_N2.hpp>
#include <opm/material/Valgrind.hpp>
#include <opm/material/idealgas.hh>
#include <opm/material/components/n2.hh>
#include <opm/material/components/h2o.hh>
#include <opm/material/components/simpleh2o.hh>
#include <opm/material/components/tabulatedcomponent.hh>
#include <opm/material/binarycoefficients/h2o_n2.hh>
#include <opm/material/valgrind.hh>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>

19
opm/material/fluidsystems/h2on2liquidphasefluidsystem.hh → opm/material/fluidsystems/H2ON2LiquidPhaseFluidSystem.hpp
View File

@ -24,16 +24,17 @@
#ifndef OPM_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HH #ifndef OPM_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HH
#define OPM_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HH #define OPM_H2O_N2_LIQUIDPHASE_FLUID_SYSTEM_HH
#include "basefluidsystem.hh" #include "BaseFluidSystem.hpp"
#include "nullparametercache.hh" #include "NullParameterCache.hpp"
#include <opm/material/IdealGas.hpp>
#include <opm/material/components/N2.hpp>
#include <opm/material/components/H2O.hpp>
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/TabulatedComponent.hpp>
#include <opm/material/binarycoefficients/H2O_N2.hpp>
#include <opm/material/Valgrind.hpp>
#include <opm/material/idealgas.hh>
#include <opm/material/components/n2.hh>
#include <opm/material/components/h2o.hh>
#include <opm/material/components/simpleh2o.hh>
#include <opm/material/components/tabulatedcomponent.hh>
#include <opm/material/binarycoefficients/h2o_n2.hh>
#include <opm/material/valgrind.hh>
#include <opm/core/utility/Exceptions.hpp> #include <opm/core/utility/Exceptions.hpp>
#include <opm/core/utility/ErrorMacros.hpp> #include <opm/core/utility/ErrorMacros.hpp>

0
opm/material/fluidsystems/liquidphase.hh → opm/material/fluidsystems/LiquidPhase.hpp
View File

2
opm/material/fluidsystems/nullparametercache.hh → opm/material/fluidsystems/NullParameterCache.hpp
View File

@ -23,7 +23,7 @@
#ifndef OPM_NULL_PARAMETER_CACHE_HH #ifndef OPM_NULL_PARAMETER_CACHE_HH
#define OPM_NULL_PARAMETER_CACHE_HH #define OPM_NULL_PARAMETER_CACHE_HH
#include "parametercachebase.hh" #include "ParameterCacheBase.hpp"
namespace Opm { namespace Opm {

0
opm/material/fluidsystems/parametercachebase.hh → opm/material/fluidsystems/ParameterCacheBase.hpp
View File

9
opm/material/fluidsystems/spe5fluidsystem.hh → opm/material/fluidsystems/Spe5FluidSystem.hpp
View File

@ -23,12 +23,13 @@
#ifndef OPM_SPE5_FLUID_SYSTEM_HH #ifndef OPM_SPE5_FLUID_SYSTEM_HH
#define OPM_SPE5_FLUID_SYSTEM_HH #define OPM_SPE5_FLUID_SYSTEM_HH
#include "basefluidsystem.hh" #include "BaseFluidSystem.hpp"
#include "spe5parametercache.hh" #include "Spe5ParameterCache.hpp"
#include <opm/material/Constants.hpp>
#include <opm/material/eos/PengRobinsonMixture.hpp>
#include <opm/core/utility/Spline.hpp> #include <opm/core/utility/Spline.hpp>
#include <opm/material/constants.hh>
#include <opm/material/eos/pengrobinsonmixture.hh>
namespace Opm { namespace Opm {
namespace FluidSystems { namespace FluidSystems {

8
opm/material/fluidsystems/spe5parametercache.hh → opm/material/fluidsystems/Spe5ParameterCache.hpp
View File

@ -25,11 +25,11 @@
#include <cassert> #include <cassert>
#include <opm/material/components/h2o.hh> #include <opm/material/components/H2O.hpp>
#include <opm/material/fluidsystems/parametercachebase.hh> #include <opm/material/fluidsystems/ParameterCacheBase.hpp>
#include <opm/material/eos/pengrobinson.hh> #include <opm/material/eos/PengRobinson.hpp>
#include <opm/material/eos/pengrobinsonparamsmixture.hh> #include <opm/material/eos/PengRobinsonparamsMixture.hpp>
namespace Opm { namespace Opm {

Some files were not shown because too many files have changed in this diff Show More