OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

blackoilpolymerparams.hh: rename to blackoilpolymerparams.hpp

Browse Source
This commit is contained in:
Arne Morten Kvarving 2024-09-03 14:38:53 +02:00
parent 5a567de3e2
commit 85cc5ffa5f
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists_files.cmake
View File

@ -541,7 +541,7 @@ list (APPEND PUBLIC_HEADER_FILES
opm/models/blackoil/blackoilnewtonmethodparameters.hh opm/models/blackoil/blackoilnewtonmethodparameters.hh
opm/models/blackoil/blackoilonephaseindices.hh opm/models/blackoil/blackoilonephaseindices.hh
opm/models/blackoil/blackoilpolymermodules.hh opm/models/blackoil/blackoilpolymermodules.hh
opm/models/blackoil/blackoilpolymerparams.hh opm/models/blackoil/blackoilpolymerparams.hpp
opm/models/blackoil/blackoilprimaryvariables.hh opm/models/blackoil/blackoilprimaryvariables.hh
opm/models/blackoil/blackoilproblem.hh opm/models/blackoil/blackoilproblem.hh
opm/models/blackoil/blackoilproperties.hh opm/models/blackoil/blackoilproperties.hh

15
opm/models/blackoil/blackoilpolymermodules.hh
View File

@ -28,13 +28,17 @@
#ifndef EWOMS_BLACK_OIL_POLYMER_MODULE_HH #ifndef EWOMS_BLACK_OIL_POLYMER_MODULE_HH
#define EWOMS_BLACK_OIL_POLYMER_MODULE_HH #define EWOMS_BLACK_OIL_POLYMER_MODULE_HH
#include "blackoilproperties.hh" #include <dune/common/fvector.hh>
#include <opm/models/blackoil/blackoilpolymerparams.hh>
#include <opm/models/io/vtkblackoilpolymermodule.hh>
#include <opm/common/OpmLog/OpmLog.hpp> #include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/models/blackoil/blackoilpolymerparams.hpp>
#include <opm/models/blackoil/blackoilproperties.hh>
#include <opm/models/io/vtkblackoilpolymermodule.hh>
#include <opm/models/utils/propertysystem.hh>
#if HAVE_ECL_INPUT #if HAVE_ECL_INPUT
#include <opm/input/eclipse/EclipseState/EclipseState.hpp> #include <opm/input/eclipse/EclipseState/EclipseState.hpp>
#include <opm/input/eclipse/EclipseState/Tables/PlyadsTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/PlyadsTable.hpp>
@ -44,8 +48,6 @@
#include <opm/input/eclipse/EclipseState/Tables/PlyviscTable.hpp> #include <opm/input/eclipse/EclipseState/Tables/PlyviscTable.hpp>
#endif #endif
#include <dune/common/fvector.hh>
#include <cmath> #include <cmath>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
@ -1133,7 +1135,6 @@ public:
{ throw std::runtime_error("waterShearFactor() called but polymers are disabled"); } { throw std::runtime_error("waterShearFactor() called but polymers are disabled"); }
}; };
} // namespace Opm } // namespace Opm
#endif #endif

6
opm/models/blackoil/blackoilpolymerparams.hh → opm/models/blackoil/blackoilpolymerparams.hpp
View File

@ -25,8 +25,8 @@
* *
* \brief Contains the parameters required to extend the black-oil model by polymer. * \brief Contains the parameters required to extend the black-oil model by polymer.
*/ */
#ifndef EWOMS_BLACK_OIL_POLYMER_PARAMS_HH #ifndef OPM_BLACK_OIL_POLYMER_PARAMS_HPP
#define EWOMS_BLACK_OIL_POLYMER_PARAMS_HH #define OPM_BLACK_OIL_POLYMER_PARAMS_HPP
#include <opm/material/common/Tabulated1DFunction.hpp> #include <opm/material/common/Tabulated1DFunction.hpp>
#include <opm/material/common/IntervalTabulated2DFunction.hpp> #include <opm/material/common/IntervalTabulated2DFunction.hpp>
@ -132,4 +132,4 @@ struct BlackOilPolymerParams {
} // namespace Opm } // namespace Opm
#endif #endif // OPM_BLACK_OIL_POLYMER_PARAMS_HPP