OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-11 19:45:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

fix test suite

Browse Source
This commit is contained in:
Bernd Flemisch 2020-03-24 17:47:11 +01:00
parent 54d665a532
commit 5e411a8665
16 changed files with 124 additions and 54 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 "lens_immiscible_ecfv_ad.hh"
#include <opm/models/utils/start.hh>
#include "lens_immiscible_ecfv_ad.hh"
int main(int argc, char **argv)
{
typedef TTAG(LensProblemEcfvAd) ProblemTypeTag;

6
examples/lens_immiscible_ecfv_ad_23.cpp
View File

@ -28,11 +28,13 @@
*/
#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 "lens_immiscible_ecfv_ad.hh"
#include <opm/models/utils/start.hh>
#include "lens_immiscible_ecfv_ad.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 "lens_immiscible_ecfv_ad.hh"
#include <opm/models/utils/start.hh>
#include "lens_immiscible_ecfv_ad.hh"
// fake forward declaration to prevent esoteric compiler warning
int mainCU2(int argc, char **argv);

4
examples/problems/co2injectionproblem.hh
View File

@ -73,7 +73,9 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(Co2InjectionBaseProblem);
// declare the CO2 injection problem specific property tags
NEW_PROP_TAG(MaxDepth);
NEW_PROP_TAG(Temperature);
NEW_PROP_TAG(SimulationName);
// Set the grid type
SET_TYPE_PROP(Co2InjectionBaseProblem, Grid, Dune::YaspGrid<2>);

1
examples/problems/fingerproblem.hh
View File

@ -77,6 +77,7 @@ SET_TYPE_PROP(FingerBaseProblem,
#endif
// declare the properties used by the finger problem
NEW_PROP_TAG(InitialWaterSaturation);
// Set the problem property
SET_TYPE_PROP(FingerBaseProblem, Problem, Opm::FingerProblem<TypeTag>);

8
examples/problems/groundwaterproblem.hh
View File

@ -55,6 +55,14 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(GroundWaterBaseProblem);
NEW_PROP_TAG(LensLowerLeftX);
NEW_PROP_TAG(LensLowerLeftY);
NEW_PROP_TAG(LensLowerLeftZ);
NEW_PROP_TAG(LensUpperRightX);
NEW_PROP_TAG(LensUpperRightY);
NEW_PROP_TAG(LensUpperRightZ);
NEW_PROP_TAG(Permeability);
NEW_PROP_TAG(PermeabilityLens);
SET_PROP(GroundWaterBaseProblem, Fluid)
{

7
examples/problems/lensproblem.hh
View File

@ -61,6 +61,13 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(LensBaseProblem, INHERITS_FROM(StructuredGridVanguard));
// declare the properties specific for the lens problem
NEW_PROP_TAG(LensLowerLeftX);
NEW_PROP_TAG(LensLowerLeftY);
NEW_PROP_TAG(LensLowerLeftZ);
NEW_PROP_TAG(LensUpperRightX);
NEW_PROP_TAG(LensUpperRightY);
NEW_PROP_TAG(LensUpperRightZ);
// Set the problem property
SET_TYPE_PROP(LensBaseProblem, Problem, Opm::LensProblem<TypeTag>);

5
examples/problems/reservoirproblem.hh
View File

@ -62,8 +62,13 @@ BEGIN_PROPERTIES
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);
// Set the grid type
SET_TYPE_PROP(ReservoirBaseProblem, Grid, Dune::YaspGrid<2>);

5
opm/models/blackoil/blackoilmodel.hh
View File

@ -153,12 +153,9 @@ private:
public:
typedef Scalar type;
static const Scalar value;
static constexpr Scalar value = 1.0/(30.0*4184.0*alpha);
};
PROP_STATIC_CONST_MEMBER_DEFINITION_PREFIX_(BlackOilModel, BlackOilEnergyScalingFactor)
::value = 1.0/(30*4184.0*alpha);
// by default, ebos formulates the conservation equations in terms of mass not surface
// volumes
SET_BOOL_PROP(BlackOilModel, BlackoilConserveSurfaceVolume, false);

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

@ -50,11 +50,6 @@ class MultiPhaseBaseModel;
BEGIN_PROPERTIES
namespace TTag {
struct ParallelBiCGStabLinearSolver;
struct FiniteDifferenceLocalLinearizer;
}
//! The generic type tag for problems using the immiscible multi-phase model
NEW_TYPE_TAG(MultiPhaseBaseModel, INHERITS_FROM(VtkMultiPhase, VtkTemperature));

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

@ -31,10 +31,10 @@
#define EWOMS_FV_BASE_PROPERTIES_HH
#include "fvbasenewtonmethod.hh"
#include "fvbaseproperties.hh"
#include "fvbasefdlocallinearizer.hh"
#include <opm/models/utils/basicproperties.hh>
#include <opm/models/io/dgfvanguard.hh>
#include <opm/models/io/vtkprimaryvarsmodule.hh>
#include <opm/simulators/linalg/parallelbicgstabbackend.hh>
@ -254,6 +254,8 @@ SET_TAG_PROP(FvBaseDiscretization, LocalLinearizerSplice, FiniteDifferenceLocalL
//! Specify if experimental features should be enabled or not.
SET_TYPE_PROP(NumericModel, Vanguard, Opm::DgfVanguard<TypeTag>);
END_PROPERTIES
#endif

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

@ -41,7 +41,6 @@
BEGIN_PROPERTIES
END_PROPERTIES
namespace Opm {
@ -67,13 +66,8 @@ public:
*/
static void registerParameters()
{
// #define EWOMS_REGISTER_PARAM(TypeTag, ParamType, ParamName, Description)
// ::Opm::Parameters::registerParam<TypeTag, ParamType, PTAG_(ParamName)>(
// #ParamName, #ParamName, Description)
// EWOMS_REGISTER_PARAM(TypeTag, std::string, GridFile,
// "The file name of the DGF file to load");
::Opm::Parameters::template registerParam<TypeTag, std::string, Properties::GridFile>
("GridFile", "GridFile", "The file name of the DGF file to load");
EWOMS_REGISTER_PARAM(TypeTag, std::string, GridFile,
"The file name of the DGF file to load");
EWOMS_REGISTER_PARAM(TypeTag, unsigned, GridGlobalRefinements,
"The number of global refinements of the grid "
"executed after it was loaded");
@ -197,10 +191,6 @@ private:
FractureMapper fractureMapper_;
};
namespace Properties {
SET_TYPE_PROP(NumericModel, Vanguard, Opm::DgfVanguard<TypeTag>);
}
} // namespace Opm
#endif

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

@ -54,6 +54,7 @@
#include <string>
BEGIN_PROPERTIES
///////////////////////////////////
@ -205,6 +206,75 @@ NEW_PROP_TAG(VtkWriteSolidInternalEnergy);
NEW_PROP_TAG(VtkWriteThermalConductivity);
NEW_PROP_TAG(VtkWriteInternalEnergies);
NEW_PROP_TAG(VtkWriteEnthalpies);
NEW_PROP_TAG(VtkWriteMassFractions);
NEW_PROP_TAG(VtkWriteMoleFractions);
NEW_PROP_TAG(VtkWriteTotalMassFractions);
NEW_PROP_TAG(VtkWriteTotalMoleFractions);
NEW_PROP_TAG(VtkWriteMolarities);
NEW_PROP_TAG(VtkWriteFugacities);
NEW_PROP_TAG(VtkWriteFugacityCoeffs);
NEW_PROP_TAG(VtkWriteEffectiveDiffusionCoefficients);
NEW_PROP_TAG(VtkWriteDiffusionCoefficients);
NEW_PROP_TAG(VtkWriteTortuosities);
NEW_PROP_TAG(VtkWritePhasePresence);
NEW_PROP_TAG(VtkWriteSolventSaturation);
NEW_PROP_TAG(VtkWriteSolventDensity);
NEW_PROP_TAG(VtkWriteSolventViscosity);
NEW_PROP_TAG(VtkWriteSolventMobility);
NEW_PROP_TAG(EnableSolvent);
NEW_PROP_TAG(BlackoilConserveSurfaceVolume);
NEW_PROP_TAG(VtkWritePolymerConcentration);
NEW_PROP_TAG(VtkWritePolymerDeadPoreVolume);
NEW_PROP_TAG(VtkWritePolymerViscosityCorrection);
NEW_PROP_TAG(VtkWriteWaterViscosityCorrection);
NEW_PROP_TAG(VtkWritePolymerRockDensity);
NEW_PROP_TAG(VtkWritePolymerAdsorption);
NEW_PROP_TAG(EnablePolymer);
NEW_PROP_TAG(EnablePolymerMW);
NEW_PROP_TAG(VtkWriteRockInternalEnergy);
NEW_PROP_TAG(VtkWriteTotalThermalConductivity);
NEW_PROP_TAG(VtkWriteFluidInternalEnergies);
NEW_PROP_TAG(VtkWriteFluidEnthalpies);
NEW_PROP_TAG(BlackOilEnergyScalingFactor);
NEW_PROP_TAG(EnableTemperature);
NEW_PROP_TAG(EnableFoam);
NEW_PROP_TAG(EnableBrine);
NEW_PROP_TAG(DpMaxRel);
NEW_PROP_TAG(DsMax);
NEW_PROP_TAG(PriVarOscilationThreshold);
NEW_PROP_TAG(VtkWriteGasDissolutionFactor);
NEW_PROP_TAG(VtkWriteOilVaporizationFactor);
NEW_PROP_TAG(VtkWriteOilFormationVolumeFactor);
NEW_PROP_TAG(VtkWriteGasFormationVolumeFactor);
NEW_PROP_TAG(VtkWriteWaterFormationVolumeFactor);
NEW_PROP_TAG(VtkWriteOilSaturationPressure);
NEW_PROP_TAG(VtkWriteGasSaturationPressure);
NEW_PROP_TAG(VtkWriteSaturationRatios);
NEW_PROP_TAG(VtkWriteSaturatedOilGasDissolutionFactor);
NEW_PROP_TAG(VtkWriteSaturatedGasOilVaporizationFactor);
NEW_PROP_TAG(VtkWritePrimaryVarsMeaning);
NEW_PROP_TAG(VtkWriteFractureSaturations);
NEW_PROP_TAG(VtkWriteFractureMobilities);
NEW_PROP_TAG(VtkWriteFractureRelativePermeabilities);
NEW_PROP_TAG(VtkWriteFracturePorosity);
NEW_PROP_TAG(VtkWriteFractureIntrinsicPermeabilities);
NEW_PROP_TAG(VtkWriteFractureFilterVelocities);
NEW_PROP_TAG(VtkWriteFractureVolumeFraction);
NEW_PROP_TAG(UseTwoPointGradients);
NEW_PROP_TAG(PvsVerbosity);
NEW_PROP_TAG(PvsPressureBaseWeight);
NEW_PROP_TAG(PvsSaturationsBaseWeight);
NEW_PROP_TAG(PvsMoleFractionsBaseWeight);
NEW_PROP_TAG(NcpPressureBaseWeight);
NEW_PROP_TAG(NcpSaturationsBaseWeight);
NEW_PROP_TAG(NcpFugacitiesBaseWeight);
NEW_PROP_TAG(FluidSystemPressureLow);
NEW_PROP_TAG(FluidSystemPressureHigh);
NEW_PROP_TAG(FluidSystemNumPressure);
NEW_PROP_TAG(FluidSystemTemperatureLow);
NEW_PROP_TAG(FluidSystemTemperatureHigh);
NEW_PROP_TAG(FluidSystemNumTemperature);
NEW_PROP_TAG(IntensiveQuantities);
NEW_PROP_TAG(BoundaryContext);
@ -223,6 +293,7 @@ NEW_PROP_TAG(DomainSizeY);
NEW_PROP_TAG(DomainSizeZ);
NEW_PROP_TAG(ElementMapper);
NEW_PROP_TAG(EnableAsyncVtkOutput);
NEW_PROP_TAG(EnableDiffusion);
NEW_PROP_TAG(EnableEnergy);
NEW_PROP_TAG(EnableGravity);
NEW_PROP_TAG(EnableGridAdaptation);
@ -253,6 +324,8 @@ NEW_PROP_TAG(UseVolumetricResidual);
NEW_PROP_TAG(VertexMapper);
NEW_PROP_TAG(SolidEnergyLawParams);
NEW_PROP_TAG(ThermalConductionLawParams);
NEW_PROP_TAG(FlashSolver);
NEW_PROP_TAG(FlashTolerance);
NEW_PROP_TAG(BaseProblem);
NEW_PROP_TAG(ConstraintsContext);
@ -275,11 +348,16 @@ NEW_PROP_TAG(Overlap);
NEW_PROP_TAG(OverlappingScalarProduct);
NEW_PROP_TAG(OverlappingLinearOperator);
NEW_PROP_TAG(LiquidPhaseIndex);
NEW_PROP_TAG(GasPhaseIndex);
NEW_PROP_TAG(LiquidComponentIndex);
NEW_PROP_TAG(GasComponentIndex);
NEW_PROP_TAG(WettingFluid);
NEW_PROP_TAG(NonWettingFluid);
//! the preconditioner used by the linear solver
NEW_PROP_TAG(PreconditionerWrapper);
//! The floating point type used internally by the linear solver
NEW_PROP_TAG(LinearSolverScalar);
@ -316,6 +394,9 @@ NEW_PROP_TAG(LinearSolverMaxIterations);
NEW_PROP_TAG(LinearSolverMaxError);
NEW_PROP_TAG(GMResRestart);
NEW_PROP_TAG(LinearSolverWrapper);
NEW_PROP_TAG(LinearSolverSplice);
NEW_PROP_TAG(LocalLinearizerSplice);
NEW_PROP_TAG(SpatialDiscretizationSplice);
@ -428,7 +509,6 @@ SET_SCALAR_PROP(NumericModel, RestartTime, -1e35);
//! By default, do not force any time steps
SET_STRING_PROP(NumericModel, PredeterminedTimeStepsFile, "");
END_PROPERTIES
#endif

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

@ -27,6 +27,7 @@
#ifndef EWOMS_START_HH
#define EWOMS_START_HH
#include <opm/models/utils/propertysystemmacros.hh>
#include <opm/models/utils/propertysystem.hh>
// the following header is not required here, but it must be included before
// dune/common/densematrix.hh because of some c++ ideosyncrasies

22
tests/models/test_propertysystem.cpp
View File

@ -32,6 +32,7 @@
#include "config.h"
#include <opm/models/utils/propertysystem.hh>
#include <opm/models/utils/propertysystemmacros.hh>
#include <iostream>
@ -120,10 +121,6 @@ SET_INT_PROP(Pickup, Payload, 5);
SET_INT_PROP(HummerH1, TopSpeed, GET_PROP_VALUE(TTAG(Pickup), TopSpeed));
///////////////////
// Unmount the canon from the Hummer
UNSET_PROP(HummerH1, CanonCaliber);
END_PROPERTIES
@ -176,23 +173,6 @@ int main()
std::cout << "(HummerH1, GasUsage) = " << GET_PROP_VALUE(TTAG(HummerH1), GasUsage) << "\n";
std::cout << "(HummerH1, Payload) = " << GET_PROP_VALUE(TTAG(HummerH1), Payload) << "\n";
std::cout << "(HummerH1, AutomaticTransmission) = " << GET_PROP_VALUE(TTAG(HummerH1), AutomaticTransmission) << "\n";
// CanonCaliber is explcitly unset for the Hummer -> this would not compile:
// std::cout << "(HummerH1, CanonCaliber) = " << GET_PROP_VALUE(TTAG(HummerH1), CanonCaliber) << "\n";
std::cout << "\n";
std::cout << "---------------------------------------\n";
std::cout << "-- Diagnostic messages\n";
std::cout << "---------------------------------------\n";
std::cout << "---- All properties for Sedan ---\n";
Opm::Properties::printValues<TTAG(Sedan)>();
std::cout << "---- Message for (HummerH1, CanonCaliber) ---\n"
<< PROP_DIAGNOSTIC(TTAG(HummerH1), CanonCaliber);
std::cout << "---- Message for (HummerH1, GasUsage) ---\n"
<< PROP_DIAGNOSTIC(TTAG(HummerH1), GasUsage);
std::cout << "---- Message for (HummerH1, AutomaticTransmission) ---\n"
<< PROP_DIAGNOSTIC(TTAG(HummerH1), AutomaticTransmission);
return 0;
}