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

Capitalize nested namespace names.

Browse Source 
equil -> Equil
miscibility -> Miscibility
This commit is contained in:
Atgeirr Flø Rasmussen 2014-02-24 15:55:14 +01:00 committed by Andreas Lauser
parent f02270fbdc
commit e2913a178c
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
opm/core/simulator/initStateEquil.hpp
View File

@ -49,7 +49,7 @@ namespace Opm
* This namespace is intentionally nested to avoid name clashes
* with other parts of OPM.
*/
namespace equil {
namespace Equil {
template <class Props>
class DensityCalculator;
@ -116,7 +116,7 @@ namespace Opm
* Types and routines relating to phase mixing in
* equilibration calculations.
*/
namespace miscibility {
namespace Miscibility {
/**
* Type that implements "no phase mixing" policy.
*/
@ -258,7 +258,7 @@ namespace Opm
return A_[np*opos + gpos] / A_[np*opos + opos];
}
};
} // namespace miscibility
} // namespace Miscibility
@ -336,8 +336,8 @@ namespace Opm
* depth and (gas) pressure @c press.
*/
template <class DensCalc,
class RS = miscibility::NoMixing,
class RV = miscibility::NoMixing>
class RS = Miscibility::NoMixing,
class RV = Miscibility::NoMixing>
class EquilReg {
public:
/**
@ -825,7 +825,7 @@ namespace Opm
const UnstructuredGrid& G ,
const double grav)
{
typedef miscibility::NoMixing NoMix;
typedef Miscibility::NoMixing NoMix;
for (typename RMap::RegionId
r = 0, nr = reg.numRegions();
@ -863,7 +863,7 @@ namespace Opm
const UnstructuredGrid& G ,
const double grav)
{
typedef miscibility::NoMixing NoMix;
typedef Miscibility::NoMixing NoMix;
for (typename RMap::RegionId
r = 0, nr = reg.numRegions();
@ -908,7 +908,7 @@ namespace Opm
};
} // namespace DeckDependent
} // namespace equil
} // namespace Equil
} // namespace Opm
#include <opm/core/simulator/initStateEquil_impl.hpp>

4
opm/core/simulator/initStateEquil_impl.hpp
View File

@ -485,7 +485,7 @@ namespace Opm
}
} // namespace Details
namespace equil {
namespace Equil {
template <class Region,
class CellRange>
std::vector< std::vector<double> >
@ -568,7 +568,7 @@ namespace Opm
return press;
}
} // namespace equil
} // namespace Equil
} // namespace Opm
#endif // OPM_INITSTATEEQUIL_IMPL_HEADER_INCLUDED