OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed: namespace Ewoms -> namespace Opm

Browse Source
This commit is contained in:
Arne Morten Kvarving
2019-09-05 17:04:39 +02:00
parent aff158566e
commit 5599bb6d8c
71 changed files with 334 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
flow/flow_blackoil_dunecpr.cpp
View File

@@ -30,7 +30,7 @@
BEGIN_PROPERTIES
NEW_TYPE_TAG(EclFlowProblemSimple, INHERITS_FROM(EclFlowProblem));
NEW_PROP_TAG(FluidState);
//SET_TYPE_PROP(EclBaseProblem, Problem, Ewoms::EclProblem<TypeTag>);
//SET_TYPE_PROP(EclBaseProblem, Problem, Opm::EclProblem<TypeTag>);
SET_PROP(EclFlowProblemSimple, FluidState)
{
private:
@@ -62,7 +62,7 @@ SET_INT_PROP(EclFlowProblemSimple, CprSolverVerbose, 0);
SET_STRING_PROP(EclFlowProblemSimple, SystemStrategy, "quasiimpes");
END_PROPERTIES
namespace Ewoms {
namespace Opm {
namespace Properties {
SET_PROP(EclFlowProblemSimple, FluidSystem)
@@ -76,11 +76,11 @@ namespace Ewoms {
typedef Opm::BlackOilFluidSystem<Scalar> type;
};
//NEW_TYPE_TAG(EclFlowProblem, INHERITS_FROM(BlackOilModel, EclBaseProblem));
SET_TYPE_PROP(EclFlowProblemSimple, IntensiveQuantities, Ewoms::BlackOilIntensiveQuantities<TypeTag>);
SET_TYPE_PROP(EclFlowProblemSimple, IntensiveQuantities, Opm::BlackOilIntensiveQuantities<TypeTag>);
//SET_TYPE_PROP(EclFlowProblemSimple, LinearSolverBackend, Opm::ISTLSolverEbos<TypeTag>);
//SET_TAG_PROP(EclFlowProblemSimple, LinearSolverSplice, ParallelBiCGStabLinearSolver);
//SET_TYPE_PROP(EclFlowProblemSimple, LinearSolverBackend, Ewoms::Linear::ParallelBiCGStabSolverBackend<TypeTag>);//not work
//SET_TYPE_PROP(EclFlowProblemSimple, LinearSolverBackend, Ewoms::Linear::SuperLUBackend<TypeTag>)//not work
//SET_TYPE_PROP(EclFlowProblemSimple, LinearSolverBackend, Opm::Linear::ParallelBiCGStabSolverBackend<TypeTag>);//not work
//SET_TYPE_PROP(EclFlowProblemSimple, LinearSolverBackend, Opm::Linear::SuperLUBackend<TypeTag>)//not work
//SET_TAG_PROP(EclFlowProblem, FluidState, Opm::BlackOilFluidState);
#if DUNE_VERSION_NEWER(DUNE_ISTL, 2, 6)
SET_TYPE_PROP(EclFlowProblemSimple, LinearSolverBackend, Opm::ISTLSolverEbosFlexible<TypeTag>);

2
flow/flow_ebos_energy.cpp
View File

@@ -29,7 +29,7 @@
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Ewoms {
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(EclFlowEnergyProblem, INHERITS_FROM(EclFlowProblem));
SET_BOOL_PROP(EclFlowEnergyProblem, EnableEnergy, true);

2
flow/flow_ebos_foam.cpp
View File

@@ -29,7 +29,7 @@
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Ewoms {
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(EclFlowFoamProblem, INHERITS_FROM(EclFlowProblem));
SET_BOOL_PROP(EclFlowFoamProblem, EnableFoam, true);

14
flow/flow_ebos_gasoil.cpp
View File

@@ -34,7 +34,7 @@
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Ewoms {
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(EclFlowGasOilProblem, INHERITS_FROM(EclFlowProblem));
@@ -49,12 +49,12 @@ private:
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
public:
typedef Ewoms::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam),
/*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::waterCompIdx> type;
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam),
/*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::waterCompIdx> type;
};
}}

14
flow/flow_ebos_oilwater.cpp
View File

@@ -34,7 +34,7 @@
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Ewoms {
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(EclFlowOilWaterProblem, INHERITS_FROM(EclFlowProblem));
@@ -49,12 +49,12 @@ private:
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
public:
typedef Ewoms::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam),
/*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::gasCompIdx> type;
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam),
/*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::gasCompIdx> type;
};
}}

14
flow/flow_ebos_oilwater_polymer.cpp
View File

@@ -34,7 +34,7 @@
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Ewoms {
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(EclFlowOilWaterPolymerProblem, INHERITS_FROM(EclFlowProblem));
SET_BOOL_PROP(EclFlowOilWaterPolymerProblem, EnablePolymer, true);
@@ -50,12 +50,12 @@ private:
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
public:
typedef Ewoms::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam),
/*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::gasCompIdx> type;
typedef Opm::BlackOilTwoPhaseIndices<GET_PROP_VALUE(TypeTag, EnableSolvent),
GET_PROP_VALUE(TypeTag, EnablePolymer),
GET_PROP_VALUE(TypeTag, EnableEnergy),
GET_PROP_VALUE(TypeTag, EnableFoam),
/*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::gasCompIdx> type;
};
}}

14
flow/flow_ebos_oilwater_polymer_injectivity.cpp
View File

@@ -34,7 +34,7 @@
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Ewoms {
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(EclFlowOilWaterPolymerInjectivityProblem, INHERITS_FROM(EclFlowProblem));
SET_BOOL_PROP(EclFlowOilWaterPolymerInjectivityProblem, EnablePolymer, true);
@@ -52,12 +52,12 @@ private:
typedef typename GET_PROP_TYPE(BaseTypeTag, FluidSystem) FluidSystem;
public:
typedef Ewoms::BlackOilTwoPhaseIndices<0,
2,
0,
GET_PROP_VALUE(TypeTag, EnableFoam),
/*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::gasCompIdx> type;
typedef Opm::BlackOilTwoPhaseIndices<0,
2,
0,
GET_PROP_VALUE(TypeTag, EnableFoam),
/*PVOffset=*/0,
/*disabledCompIdx=*/FluidSystem::gasCompIdx> type;
};
}}

2
flow/flow_ebos_polymer.cpp
View File

@@ -29,7 +29,7 @@
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Ewoms {
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(EclFlowPolymerProblem, INHERITS_FROM(EclFlowProblem));
SET_BOOL_PROP(EclFlowPolymerProblem, EnablePolymer, true);

2
flow/flow_ebos_solvent.cpp
View File

@@ -29,7 +29,7 @@
#include <dune/common/parallel/mpihelper.hh>
#endif
namespace Ewoms {
namespace Opm {
namespace Properties {
NEW_TYPE_TAG(EclFlowSolventProblem, INHERITS_FROM(EclFlowProblem));
SET_BOOL_PROP(EclFlowSolventProblem, EnableSolvent, true);

2
flow/flow_tag.hpp
View File

@@ -169,7 +169,7 @@ int mainFlow(int argc, char** argv, bool outputCout, bool outputFiles)
deckFilename = PreVanguard::canonicalDeckPath(deckFilename).string();
}
catch (const std::exception& e) {
Ewoms::Parameters::printUsage<PreTypeTag>(PreProblem::helpPreamble(argc, const_cast<const char**>(argv)),
Opm::Parameters::printUsage<PreTypeTag>(PreProblem::helpPreamble(argc, const_cast<const char**>(argv)),
e.what());
return 1;
}