do explicit put properties into the the Ewoms::Properties namespace anymore

instead, do it implicitly by using the BEGIN_PROPERTIES and
END_PROPERTIES macros.
This commit is contained in:
Andreas Lauser
2018-06-14 16:06:05 +02:00
parent 1be1f15b47
commit acc93ff6e7
60 changed files with 253 additions and 194 deletions

View File

@@ -35,8 +35,7 @@
#include <iostream>
namespace Ewoms {
namespace Properties {
BEGIN_PROPERTIES
///////////////////
// Define some hierarchy of type tags:
@@ -125,8 +124,7 @@ SET_INT_PROP(HummerH1, TopSpeed, GET_PROP_VALUE(TTAG(Pickup), TopSpeed));
// Unmount the canon from the Hummer
UNSET_PROP(HummerH1, CanonCaliber);
} // namespace Properties
} // namespace Ewoms
END_PROPERTIES
int main()

View File

@@ -75,12 +75,13 @@
std::abort(); \
}
namespace Ewoms {
namespace Properties {
BEGIN_PROPERTIES
NEW_TYPE_TAG(TestEclOutputTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem));
SET_BOOL_PROP(TestEclOutputTypeTag, EnableGravity, false);
SET_BOOL_PROP(TestEclOutputTypeTag, EnableAsyncEclOutput, false);
}}
END_PROPERTIES
static const int day = 24 * 60 * 60;

View File

@@ -66,10 +66,11 @@
std::abort(); \
}
namespace Ewoms {
namespace Properties {
BEGIN_PROPERTIES
NEW_TYPE_TAG(TestEquilTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem));
}}
END_PROPERTIES
template <class TypeTag>
std::unique_ptr<typename GET_PROP_TYPE(TypeTag, Simulator)>