OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-27 11:40:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

use opm property system, improvments to the parameter system

Browse Source
This commit is contained in:
Andreas Lauser 2013-09-23 20:25:58 +02:00
parent 5e0638e68b
commit e11f18719c
1 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
ewoms/vtk/vcfvvtkblackoilmodule.hh
View File

@ -25,14 +25,14 @@
#include "vcfvvtkoutputmodule.hh" #include "vcfvvtkoutputmodule.hh"
#include <ewoms/common/propertysystem.hh> #include <opm/core/utility/PropertySystem.hpp>
#include <ewoms/common/parametersystem.hh> #include <ewoms/common/parametersystem.hh>
#include <dune/common/fvector.hh> #include <dune/common/fvector.hh>
#include <cstdio> #include <cstdio>
namespace Ewoms { namespace Opm {
namespace Properties { namespace Properties {
// create new type tag for the VTK multi-phase output // create new type tag for the VTK multi-phase output
NEW_TYPE_TAG(VtkBlackOil); NEW_TYPE_TAG(VtkBlackOil);
@ -49,7 +49,9 @@ SET_BOOL_PROP(VtkBlackOil, VtkWriteGasFormationVolumeFactor, false);
SET_BOOL_PROP(VtkBlackOil, VtkWriteOilFormationVolumeFactor, false); SET_BOOL_PROP(VtkBlackOil, VtkWriteOilFormationVolumeFactor, false);
SET_BOOL_PROP(VtkBlackOil, VtkWriteOilSaturationPressure, false); SET_BOOL_PROP(VtkBlackOil, VtkWriteOilSaturationPressure, false);
} }
}
namespace Ewoms {
/*! /*!
* \ingroup VcfvVtk * \ingroup VcfvVtk
* *
@ -84,10 +86,10 @@ public:
*/ */
static void registerParameters() static void registerParameters()
{ {
REGISTER_PARAM(TypeTag, bool, VtkWriteGasFormationFactor, "Include the gas formation factor in the VTK output files"); EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteGasFormationFactor, "Include the gas formation factor in the VTK output files");
REGISTER_PARAM(TypeTag, bool, VtkWriteGasFormationVolumeFactor, "Include the gas formation volume factor in the VTK output files"); EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteGasFormationVolumeFactor, "Include the gas formation volume factor in the VTK output files");
REGISTER_PARAM(TypeTag, bool, VtkWriteOilFormationVolumeFactor, "Include the oil formation volume factor in the VTK output files"); EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteOilFormationVolumeFactor, "Include the oil formation volume factor in the VTK output files");
REGISTER_PARAM(TypeTag, bool, VtkWriteOilSaturationPressure, "Include the saturation pressure of oil in the VTK output files"); EWOMS_REGISTER_PARAM(TypeTag, bool, VtkWriteOilSaturationPressure, "Include the saturation pressure of oil in the VTK output files");
} }
/*! /*!
@ -134,23 +136,22 @@ public:
private: private:
static bool gasFormationFactorOutput_() static bool gasFormationFactorOutput_()
{ return GET_PARAM(TypeTag, bool, VtkWriteGasFormationFactor); } { return EWOMS_GET_PARAM(TypeTag, bool, VtkWriteGasFormationFactor); }
static bool gasFormationVolumeFactorOutput_() static bool gasFormationVolumeFactorOutput_()
{ return GET_PARAM(TypeTag, bool, VtkWriteGasFormationVolumeFactor); } { return EWOMS_GET_PARAM(TypeTag, bool, VtkWriteGasFormationVolumeFactor); }
static bool oilFormationVolumeFactorOutput_() static bool oilFormationVolumeFactorOutput_()
{ return GET_PARAM(TypeTag, bool, VtkWriteOilFormationVolumeFactor); } { return EWOMS_GET_PARAM(TypeTag, bool, VtkWriteOilFormationVolumeFactor); }
static bool oilSaturationPressureOutput_() static bool oilSaturationPressureOutput_()
{ return GET_PARAM(TypeTag, bool, VtkWriteOilSaturationPressure); } { return EWOMS_GET_PARAM(TypeTag, bool, VtkWriteOilSaturationPressure); }
ScalarBuffer gasFormationFactor_; ScalarBuffer gasFormationFactor_;
ScalarBuffer gasFormationVolumeFactor_; ScalarBuffer gasFormationVolumeFactor_;
ScalarBuffer oilFormationVolumeFactor_; ScalarBuffer oilFormationVolumeFactor_;
ScalarBuffer oilSaturationPressure_; ScalarBuffer oilSaturationPressure_;
}; };
} }
#endif #endif