Skip to content
Snippets Groups Projects
Commit 19fd37af authored by Bernd Flemisch's avatar Bernd Flemisch
Browse files

insert a space between >> for nested template arguments

git-svn-id: svn://svn.iws.uni-stuttgart.de/DUMUX/dumux/trunk@9600 2fb0f335-1f38-0410-981e-8018bf24f1b0
parent a0ec5b45
No related branches found
No related tags found
No related merge requests found
...@@ -62,11 +62,11 @@ namespace FluidSystems{ ...@@ -62,11 +62,11 @@ namespace FluidSystems{
*/ */
template<class Scalar, template<class Scalar,
class CO2Table, class CO2Table,
class H2Otype = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar>>, class H2Otype = Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> >,
class BrineRawComponent = Dumux::Brine<Scalar, Dumux::H2O<Scalar>>, class BrineRawComponent = Dumux::Brine<Scalar, Dumux::H2O<Scalar> >,
class Brinetype = Dumux::TabulatedComponent<Scalar, BrineRawComponent> > class Brinetype = Dumux::TabulatedComponent<Scalar, BrineRawComponent> >
class BrineCO2 class BrineCO2
: public BaseFluidSystem<Scalar, BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype>> : public BaseFluidSystem<Scalar, BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype> >
{ {
typedef BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype> ThisType; typedef BrineCO2<Scalar, CO2Table, H2Otype, BrineRawComponent, Brinetype> ThisType;
typedef BaseFluidSystem <Scalar, ThisType> Base; typedef BaseFluidSystem <Scalar, ThisType> Base;
...@@ -749,7 +749,7 @@ SET_SCALAR_PROP(NumericModel, ProblemSalinity, 1e-3); ...@@ -749,7 +749,7 @@ SET_SCALAR_PROP(NumericModel, ProblemSalinity, 1e-3);
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar; typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
// Do not use the defaults that are the following // Do not use the defaults that are the following
// typedef Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > H2O; // typedef Dumux::TabulatedComponent<Scalar, Dumux::H2O<Scalar> > H2O;
// typedef Dumux::Brine<Scalar, Dumux::H2O<Scalar>> BrineRawComponent; // typedef Dumux::Brine<Scalar, Dumux::H2O<Scalar> > BrineRawComponent;
// typedef Dumux::TabulatedComponent<Scalar,BrineRawComponent > Brine; // typedef Dumux::TabulatedComponent<Scalar,BrineRawComponent > Brine;
// Apply the following component classes: // Apply the following component classes:
......
...@@ -68,7 +68,7 @@ public: ...@@ -68,7 +68,7 @@ public:
typedef Dumux::CH4<Scalar> CH4; typedef Dumux::CH4<Scalar> CH4;
typedef Dumux::SimpleCO2<Scalar> SimpleCO2; typedef Dumux::SimpleCO2<Scalar> SimpleCO2;
typedef Dumux::SimpleH2O<Scalar> SimpleH2O; typedef Dumux::SimpleH2O<Scalar> SimpleH2O;
typedef Dumux::Brine<Scalar, Dumux::H2O<Scalar>> BrineRawComponent; typedef Dumux::Brine<Scalar, Dumux::H2O<Scalar> > BrineRawComponent;
typedef Dumux::TabulatedComponent<Scalar, BrineRawComponent > Brine; typedef Dumux::TabulatedComponent<Scalar, BrineRawComponent > Brine;
static void init() static void init()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment