OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-27 21:26:25 -06:00
Code Issues Packages Projects Releases Wiki Activity

[properties] clean up

Browse Source
This commit is contained in:
Bernd Flemisch 2020-05-13 17:16:31 +02:00
parent de2ca522ff
commit 58182fe379
35 changed files with 30 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/lens_immiscible_ecfv_ad.cpp
View File

@ -28,10 +28,10 @@
*/
#include "config.h"
#include <opm/models/utils/start.hh>
#include "lens_immiscible_ecfv_ad.hh"
#include <opm/models/utils/start.hh>
int main(int argc, char **argv)
{
typedef TTAG(LensProblemEcfvAd) ProblemTypeTag;

6
examples/lens_immiscible_ecfv_ad_23.cpp
View File

@ -28,13 +28,11 @@
*/
#include "config.h"
#include "lens_immiscible_ecfv_ad.hh"
#include <dune/grid/geometrygrid.hh>
#include <dune/grid/io/file/dgfparser/dgfgeogrid.hh>
#include <opm/models/utils/start.hh>
#include "lens_immiscible_ecfv_ad.hh"
BEGIN_PROPERTIES
// Use Dune-grid's GeometryGrid< YaspGrid >

4
examples/lens_immiscible_ecfv_ad_cu1.cpp
View File

@ -34,10 +34,10 @@
*/
#include "config.h"
#include <opm/models/utils/start.hh>
#include "lens_immiscible_ecfv_ad.hh"
#include <opm/models/utils/start.hh>
// fake forward declaration to prevent esoteric compiler warning
int mainCU1(int argc, char **argv);

4
examples/lens_immiscible_ecfv_ad_cu2.cpp
View File

@ -34,10 +34,10 @@
*/
#include "config.h"
#include <opm/models/utils/start.hh>
#include "lens_immiscible_ecfv_ad.hh"
#include <opm/models/utils/start.hh>
// fake forward declaration to prevent esoteric compiler warning
int mainCU2(int argc, char **argv);

1
examples/problems/lensproblem.hh
View File

@ -68,7 +68,6 @@ NEW_PROP_TAG(LensUpperRightX);
NEW_PROP_TAG(LensUpperRightY);
NEW_PROP_TAG(LensUpperRightZ);
// Set the problem property
SET_TYPE_PROP(LensBaseProblem, Problem, Opm::LensProblem<TypeTag>);

2
examples/problems/reservoirproblem.hh
View File

@ -63,10 +63,8 @@ NEW_TYPE_TAG(ReservoirBaseProblem);
// Maximum depth of the reservoir
NEW_PROP_TAG(MaxDepth);
// The temperature inside the reservoir
NEW_PROP_TAG(Temperature);
// The width of producer/injector wells as a fraction of the width of the spatial domain
NEW_PROP_TAG(WellWidth);

1
examples/tutorial1.cpp
View File

@ -27,7 +27,6 @@
* immisciblility.
*/
#include "config.h" /*@\label{tutorial1:include-begin}@*/
#include <opm/models/utils/propertysystemmacros.hh>
#include <opm/models/utils/start.hh> /*@\label{tutorial1:include-end}@*/
#include "tutorial1problem.hh" /*@\label{tutorial1:include-problem-header}@*/

2
examples/tutorial1problem.hh
View File

@ -34,8 +34,6 @@
// The spatial discretization (VCFV == Vertex-Centered Finite Volumes)
#include <opm/models/discretization/vcfv/vcfvdiscretization.hh> /*@\label{tutorial1:include-discretization}@*/
#include <opm/simulators/linalg/parallelamgbackend.hh>
// The chemical species that are used
#include <opm/material/components/SimpleH2O.hpp>
#include <opm/material/components/Lnapl.hpp>

5
opm/models/common/darcyfluxmodule.hh
View File

@ -42,11 +42,6 @@
#include <cmath>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
template <class TypeTag>

5
opm/models/common/diffusionmodule.hh
View File

@ -37,11 +37,6 @@
#include <dune/common/fvector.hh>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
/*!

5
opm/models/common/energymodule.hh
View File

@ -40,11 +40,6 @@
#include <string>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
/*!
* \ingroup Energy

5
opm/models/common/forchheimerfluxmodule.hh
View File

@ -43,11 +43,6 @@
#include <cmath>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
template <class TypeTag>
class ForchheimerIntensiveQuantities;

5
opm/models/common/multiphasebaseproblem.hh
View File

@ -41,11 +41,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
/*!

5
opm/models/discretefracture/discretefractureproblem.hh
View File

@ -39,11 +39,6 @@
#include <dune/common/fvector.hh>
#include <dune/common/fmatrix.hh>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
/*!

2
opm/models/discretization/common/baseauxiliarymodule.hh
View File

@ -38,8 +38,6 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(AuxModule);
// declare the properties required by the for the ecl grid manager
END_PROPERTIES
namespace Opm {

1
opm/models/discretization/common/fvbaseadlocallinearizer.hh
View File

@ -52,7 +52,6 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(AutoDiffLocalLinearizer);
// set the properties to be spliced in
SET_TYPE_PROP(AutoDiffLocalLinearizer, LocalLinearizer,
Opm::FvBaseAdLocalLinearizer<TypeTag>);

5
opm/models/discretization/common/fvbaseconstraints.hh
View File

@ -31,11 +31,6 @@
#include <opm/models/utils/propertysystem.hh>
#include <opm/material/common/Valgrind.hpp>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
/*!

3
opm/models/discretization/common/fvbasenewtonconvergencewriter.hh
View File

@ -33,8 +33,10 @@
#include <iostream>
//! \cond SKIP_THIS
BEGIN_PROPERTIES
// forward declaration of the required property tags
template<class TypeTag, class MyTypeTag>
struct SolutionVector;
template<class TypeTag, class MyTypeTag>
@ -45,6 +47,7 @@ template<class TypeTag, class MyTypeTag>
struct VtkOutputFormat;
END_PROPERTIES
//! \endcond
namespace Opm {
/*!

1
opm/models/discretization/common/fvbaseproperties.hh
View File

@ -60,7 +60,6 @@ SET_TAG_PROP(FvBaseDiscretization, LinearSolverSplice, ParallelBiCGStabLinearSol
//! by default, use finite differences to linearize the system of PDEs
SET_TAG_PROP(FvBaseDiscretization, LocalLinearizerSplice, FiniteDifferenceLocalLinearizer);
/*!
* \brief Representation of a function evaluation and all necessary derivatives with
* regard to the intensive quantities of the primary variables.

8
opm/models/io/baseoutputmodule.hh
View File

@ -47,14 +47,14 @@
#include <cstdio>
namespace Opm {
namespace Properties {
BEGIN_PROPERTIES
template <class TypeTag, class MyTypeTag>
struct FluidSystem;
} // namespace Properties
END_PROPERTIES
namespace Opm {
#if __GNUC__ || __clang__
#pragma GCC diagnostic push

8
opm/models/io/cubegridvanguard.hh
View File

@ -38,14 +38,6 @@
#include <memory>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
/*!

4
opm/models/io/dgfvanguard.hh
View File

@ -39,10 +39,6 @@
#include <type_traits>
#include <string>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
/*!

8
opm/models/io/simplexvanguard.hh
View File

@ -36,14 +36,6 @@
#include <memory>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
/*!
* \brief Provides a simulator vanguard which a creates regular grid made of simplices.

5
opm/models/io/structuredgridvanguard.hh
View File

@ -56,11 +56,6 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(StructuredGridVanguard);
// declare the properties required by the for the structured grid simulator vanguard
// GRIDDIM is only set by the finger problem
#ifndef GRIDDIM
static const int dim = 2;

1
opm/models/ncp/ncpnewtonmethod.hh
View File

@ -34,6 +34,7 @@
#include <opm/material/common/Unused.hpp>
#include <opm/material/common/Exceptions.hpp>
#include <algorithm>
BEGIN_PROPERTIES

5
opm/models/parallel/threadmanager.hh
View File

@ -38,11 +38,6 @@
#include <dune/common/version.hh>
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
/*!

10
opm/models/utils/basicproperties.hh
View File

@ -35,12 +35,12 @@
#ifndef OPM_PROPERTY_SYSTEM_HH
#include <opm/models/utils/propertysystem.hh>
// remove this after release 3.1 to disable macros per default
// remove this after release 2020.10 to disable macros per default
#ifndef OPM_ENABLE_OLD_PROPERTY_MACROS
#define OPM_ENABLE_OLD_PROPERTY_MACROS 1
#endif
// remove this after release 3.2 to remove macros completely
// remove this after release 2021.04 to remove macros completely
#if OPM_ENABLE_OLD_PROPERTY_MACROS
#include <opm/models/utils/propertysystemmacros.hh>
#endif // OPM_ENABLE_OLD_PROPERTY_MACROS
@ -54,13 +54,8 @@
#include <string>
BEGIN_PROPERTIES
// type tag which is supposed to spliced in or inherited from if the
// parameter system is to be used
NEW_TYPE_TAG(ParameterSystem);
///////////////////////////////////
// Type tag definitions:
//
@ -237,6 +232,7 @@ SET_SCALAR_PROP(NumericModel, RestartTime, -1e35);
//! By default, do not force any time steps
SET_STRING_PROP(NumericModel, PredeterminedTimeStepsFile, "");
END_PROPERTIES
#endif

7
opm/models/utils/parametersystem.hh
View File

@ -32,7 +32,7 @@
#ifndef EWOMS_PARAMETER_SYSTEM_HH
#define EWOMS_PARAMETER_SYSTEM_HH
#include <opm/models/utils/basicproperties.hh>
#include <opm/models/utils/propertysystem.hh>
#include <opm/material/common/Exceptions.hpp>
#include <opm/material/common/Unused.hpp>
@ -222,8 +222,13 @@ private:
BEGIN_PROPERTIES
// type tag which is supposed to spliced in or inherited from if the
// parameter system is to be used
NEW_TYPE_TAG(ParameterSystem);
NEW_PROP_TAG(ParameterMetaData);
//! Set the ParameterMetaData property
SET_PROP(ParameterSystem, ParameterMetaData)
{

8
opm/models/utils/propertysystemmacros.hh
View File

@ -38,11 +38,11 @@
*/
#ifndef OPM_PROPERTY_SYSTEM_MACROS_HH
#define OPM_PROPERTY_SYSTEM_MACROS_HH
#warning "Property macros are deprecated and will be removed after release 3.2. \
#warning "Property macros are deprecated and will be removed after release 2021.04. \
If you are not using property macros you can disable this warning by \
setting OPM_ENABLE_OLD_PROPERTY_MACROS to 0 (false) when configuring DuMux. \
OPM_ENABLE_OLD_PROPERTY_MACROS defaults to 1 (true) until release 3.1. \
After release 3.1 it will default to 0 (false) so you will have to manually \
setting OPM_ENABLE_OLD_PROPERTY_MACROS to 0 (false) when configuring OPM. \
OPM_ENABLE_OLD_PROPERTY_MACROS defaults to 1 (true) until release 2020.10. \
After release 2020.10 it will default to 0 (false) so you will have to manually \
enable property macros in order to use them."
#include <opm/models/utils/propertysystem.hh>

5
opm/models/utils/simulator.hh
View File

@ -47,11 +47,6 @@
#include <string>
#include <memory>
BEGIN_PROPERTIES
END_PROPERTIES
#define EWOMS_CATCH_PARALLEL_EXCEPTIONS_FATAL(code) \
{ \
const auto& comm = Dune::MPIHelper::getCollectiveCommunication(); \

6
opm/models/utils/start.hh
View File

@ -69,12 +69,6 @@
#include <mpi.h>
#endif
BEGIN_PROPERTIES
// forward declaration of property tags
END_PROPERTIES
//! \cond SKIP_THIS
namespace Opm {

1
opm/simulators/linalg/linalgproperties.hh
View File

@ -97,7 +97,6 @@ NEW_PROP_TAG(OverlappingLinearOperator);
NEW_PROP_TAG(OverlappingMatrix);
NEW_PROP_TAG(OverlappingScalarProduct);
NEW_PROP_TAG(OverlappingVector);
NEW_TYPE_TAG(ParallelBaseLinearSolver);
END_PROPERTIES

1
opm/simulators/linalg/parallelbasebackend.hh
View File

@ -52,6 +52,7 @@
#include <iostream>
BEGIN_PROPERTIES
NEW_TYPE_TAG(ParallelBaseLinearSolver);
//! Set the type of a global jacobian matrix for linear solvers that are based on
//! dune-istl.

1
opm/simulators/linalg/parallelbicgstabbackend.hh
View File

@ -45,7 +45,6 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(ParallelBiCGStabLinearSolver, INHERITS_FROM(ParallelBaseLinearSolver));
SET_TYPE_PROP(ParallelBiCGStabLinearSolver,
LinearSolverBackend,
Opm::Linear::ParallelBiCGStabSolverBackend<TypeTag>);

1
opm/simulators/linalg/superlubackend.hh
View File

@ -41,7 +41,6 @@
BEGIN_PROPERTIES
// forward declaration of the required property tags
NEW_TYPE_TAG(SuperLULinearSolver);
END_PROPERTIES