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

Merge pull request #1993 from akva2/namespace_change

Browse Source 
changed: namespace Ewoms -> namespace Opm
This commit is contained in:
Atgeirr Flø Rasmussen 2019-09-09 09:05:19 +02:00 committed by GitHub
commit b8b3599ac5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
71 changed files with 334 additions and 334 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ebos/alucartesianindexmapper.hh
View File

@ -23,7 +23,7 @@
/*!
* \file
*
* \copydoc Ewoms::AluCartesianIndexMapper
* \copydoc Opm::AluCartesianIndexMapper
*/
#ifndef EWOMS_ALU_CARTESIAN_INDEX_MAPPER_HH
#define EWOMS_ALU_CARTESIAN_INDEX_MAPPER_HH
@ -37,7 +37,7 @@
#include <vector>
#include <cassert>
namespace Ewoms {
namespace Opm {
/*!
* \brief Interface class to access the logical Cartesian grid as used in industry
@ -248,6 +248,6 @@ protected:
const int cartesianSize_ ;
};
} // end namespace Ewoms
} // end namespace Opm
#endif

4
ebos/collecttoiorank.hh
View File

@ -41,7 +41,7 @@
#include <stdexcept>
namespace Ewoms {
namespace Opm {
template <class Vanguard>
class CollectDataToIORank
@ -588,6 +588,6 @@ protected:
Opm::data::Wells globalWellData_;
};
} // end namespace Ewoms
} // end namespace Opm
#endif

6
ebos/ebos.hh
View File

@ -36,7 +36,7 @@
#include <ewoms/common/start.hh>
namespace Ewoms {
namespace Opm {
template <class TypeTag>
class EbosProblem;
}
@ -46,7 +46,7 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(EbosTypeTag, INHERITS_FROM(BlackOilModel, EclBaseProblem, FlowModelParameters));
// Set the problem class
SET_TYPE_PROP(EbosTypeTag, Problem, Ewoms::EbosProblem<TypeTag>);
SET_TYPE_PROP(EbosTypeTag, Problem, Opm::EbosProblem<TypeTag>);
// Enable experimental features for ebos: ebos is the research simulator of the OPM
// project. If you're looking for a more stable "production quality" simulator, consider
@ -111,7 +111,7 @@ SET_BOOL_PROP(EbosTypeTag, ContinueOnConvergenceError, true);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
template <class TypeTag>
class EbosProblem : public EclProblem<TypeTag>
{

6
ebos/ebos_altidx.cc
View File

@ -33,7 +33,7 @@
#include "ebos.hh"
namespace Ewoms {
namespace Opm {
class EclAlternativeBlackOilIndexTraits
{
typedef Opm::BlackOilDefaultIndexTraits DIT;
@ -59,7 +59,7 @@ SET_PROP(EbosAltIdxTypeTag, FluidSystem)
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
public:
typedef Opm::BlackOilFluidSystem<Scalar, Ewoms::EclAlternativeBlackOilIndexTraits> type;
typedef Opm::BlackOilFluidSystem<Scalar, Opm::EclAlternativeBlackOilIndexTraits> type;
};
END_PROPERTIES
@ -67,5 +67,5 @@ END_PROPERTIES
int main(int argc, char **argv)
{
typedef TTAG(EbosAltIdxTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
return Opm::start<ProblemTypeTag>(argc, argv);
}

34
ebos/ebos_blackoil.cc
View File

@ -29,7 +29,7 @@
#include "ebos.hh"
namespace Ewoms {
namespace Opm {
bool ebosBlackOilDeckFileNameIsSet(int argc, char** argv)
{
@ -38,11 +38,11 @@ bool ebosBlackOilDeckFileNameIsSet(int argc, char** argv)
// use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
// the work
EWOMS_RESET_PARAMS_(ProblemTypeTag);
Ewoms::setupParameters_<ProblemTypeTag>(argc,
const_cast<const char**>(argv),
/*doRegistration=*/true,
/*allowUnused=*/true,
/*handleHelp=*/false);
Opm::setupParameters_<ProblemTypeTag>(argc,
const_cast<const char**>(argv),
/*doRegistration=*/true,
/*allowUnused=*/true,
/*handleHelp=*/false);
bool result = EWOMS_PARAM_IS_SET(ProblemTypeTag, std::string, EclDeckFileName);
EWOMS_RESET_PARAMS_(ProblemTypeTag);
@ -57,11 +57,11 @@ std::string ebosBlackOilGetDeckFileName(int argc, char** argv)
// use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
// the work
EWOMS_RESET_PARAMS_(ProblemTypeTag);
Ewoms::setupParameters_<ProblemTypeTag>(argc,
const_cast<const char**>(argv),
/*doRegistration=*/true,
/*allowUnused=*/true,
/*handleHelp=*/false);
Opm::setupParameters_<ProblemTypeTag>(argc,
const_cast<const char**>(argv),
/*doRegistration=*/true,
/*allowUnused=*/true,
/*handleHelp=*/false);
std::string rawDeckFileName = EWOMS_GET_PARAM(ProblemTypeTag, std::string, EclDeckFileName);
std::string result = Vanguard::canonicalDeckPath(rawDeckFileName).string();
EWOMS_RESET_PARAMS_(ProblemTypeTag);
@ -77,11 +77,11 @@ std::unique_ptr<Opm::ParseContext> ebosBlackOilCreateParseContext(int argc, char
// use the ewoms parameter machinery and the blackoil vanguard to handle the grunt of
// the work
EWOMS_RESET_PARAMS_(ProblemTypeTag);
Ewoms::setupParameters_<ProblemTypeTag>(argc,
const_cast<const char**>(argv),
/*doRegistration=*/true,
/*allowUnused=*/true,
/*handleHelp=*/false);
Opm::setupParameters_<ProblemTypeTag>(argc,
const_cast<const char**>(argv),
/*doRegistration=*/true,
/*allowUnused=*/true,
/*handleHelp=*/false);
std::unique_ptr<Opm::ParseContext> result = Vanguard::createParseContext();
EWOMS_RESET_PARAMS_(ProblemTypeTag);
@ -105,7 +105,7 @@ void ebosBlackOilSetDeck(Opm::Deck* deck,
int ebosBlackOilMain(int argc, char **argv)
{
typedef TTAG(EbosTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
return Opm::start<ProblemTypeTag>(argc, argv);
}
}

2
ebos/ebos_blackoil.hh
View File

@ -35,7 +35,7 @@
#include <memory>
#include <string>
namespace Ewoms {
namespace Opm {
bool ebosBlackOilDeckFileNameIsSet(int argc, char** argv);
std::string ebosBlackOilGetDeckFileName(int argc, char** argv);
std::unique_ptr<Opm::ParseContext> ebosBlackOilCreateParseContext(int argc, char** argv);

10
ebos/ebos_foam.cc
View File

@ -38,12 +38,12 @@ SET_BOOL_PROP(EbosFoamTypeTag, EnableFoam, true);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
void ebosFoamSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime)
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime)
{
typedef TTAG(EbosFoamTypeTag) ProblemTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
@ -57,7 +57,7 @@ void ebosFoamSetDeck(Opm::Deck* deck,
int ebosFoamMain(int argc, char **argv)
{
typedef TTAG(EbosFoamTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
return Opm::start<ProblemTypeTag>(argc, argv);
}
}

8
ebos/ebos_foam.hh
View File

@ -32,11 +32,11 @@
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
namespace Ewoms {
namespace Opm {
void ebosFoamSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
int ebosFoamMain(int argc, char** argv);
}

2
ebos/ebos_foam_main.cc
View File

@ -33,5 +33,5 @@
int main(int argc, char** argv)
{
return Ewoms::ebosFoamMain(argc, argv);
return Opm::ebosFoamMain(argc, argv);
}

16
ebos/ebos_gasoil.cc
View File

@ -43,17 +43,17 @@ private:
typedef typename GET_PROP_TYPE(TTAG(EbosTypeTag), 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;
};
END_PROPERTIES
namespace Ewoms {
namespace Opm {
void ebosGasOilSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
@ -72,7 +72,7 @@ void ebosGasOilSetDeck(Opm::Deck* deck,
int ebosGasOilMain(int argc, char **argv)
{
typedef TTAG(EbosGasOilTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
return Opm::start<ProblemTypeTag>(argc, argv);
}
}

8
ebos/ebos_gasoil.hh
View File

@ -32,11 +32,11 @@
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
namespace Ewoms {
namespace Opm {
void ebosGasOilSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
int ebosGasOilMain(int argc, char** argv);
}

2
ebos/ebos_gasoil_main.cc
View File

@ -33,5 +33,5 @@
int main(int argc, char** argv)
{
return Ewoms::ebosGasOilMain(argc, argv);
return Opm::ebosGasOilMain(argc, argv);
}

2
ebos/ebos_main.cc
View File

@ -33,5 +33,5 @@
int main(int argc, char** argv)
{
return Ewoms::ebosBlackOilMain(argc, argv);
return Opm::ebosBlackOilMain(argc, argv);
}

16
ebos/ebos_oilwater.cc
View File

@ -43,17 +43,17 @@ private:
typedef typename GET_PROP_TYPE(TTAG(EbosTypeTag), 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;
};
END_PROPERTIES
namespace Ewoms {
namespace Opm {
void ebosOilWaterSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
@ -72,7 +72,7 @@ void ebosOilWaterSetDeck(Opm::Deck* deck,
int ebosOilWaterMain(int argc, char **argv)
{
typedef TTAG(EbosOilWaterTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
return Opm::start<ProblemTypeTag>(argc, argv);
}
}

2
ebos/ebos_oilwater.hh
View File

@ -32,7 +32,7 @@
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
namespace Ewoms {
namespace Opm {
void ebosOilWaterSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,

2
ebos/ebos_oilwater_main.cc
View File

@ -33,5 +33,5 @@
int main(int argc, char** argv)
{
return Ewoms::ebosOilWaterMain(argc, argv);
return Opm::ebosOilWaterMain(argc, argv);
}

2
ebos/ebos_plain.cc
View File

@ -40,5 +40,5 @@ END_PROPERTIES
int main(int argc, char **argv)
{
typedef TTAG(EbosPlainTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
return Opm::start<ProblemTypeTag>(argc, argv);
}

10
ebos/ebos_polymer.cc
View File

@ -38,12 +38,12 @@ SET_BOOL_PROP(EbosPolymerTypeTag, EnablePolymer, true);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
void ebosPolymerSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime)
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime)
{
typedef TTAG(EbosPolymerTypeTag) ProblemTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
@ -57,7 +57,7 @@ void ebosPolymerSetDeck(Opm::Deck* deck,
int ebosPolymerMain(int argc, char **argv)
{
typedef TTAG(EbosPolymerTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
return Opm::start<ProblemTypeTag>(argc, argv);
}
}

8
ebos/ebos_polymer.hh
View File

@ -32,11 +32,11 @@
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
namespace Ewoms {
namespace Opm {
void ebosPolymerSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
int ebosPolymerMain(int argc, char** argv);
}

2
ebos/ebos_polymer_main.cc
View File

@ -33,5 +33,5 @@
int main(int argc, char** argv)
{
return Ewoms::ebosPolymerMain(argc, argv);
return Opm::ebosPolymerMain(argc, argv);
}

10
ebos/ebos_solvent.cc
View File

@ -38,12 +38,12 @@ SET_BOOL_PROP(EbosSolventTypeTag, EnableSolvent, true);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
void ebosSolventSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime)
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime)
{
typedef TTAG(EbosSolventTypeTag) ProblemTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
@ -57,7 +57,7 @@ void ebosSolventSetDeck(Opm::Deck* deck,
int ebosSolventMain(int argc, char **argv)
{
typedef TTAG(EbosSolventTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
return Opm::start<ProblemTypeTag>(argc, argv);
}
}

8
ebos/ebos_solvent.hh
View File

@ -32,11 +32,11 @@
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
namespace Ewoms {
namespace Opm {
void ebosSolventSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
int ebosSolventMain(int argc, char** argv);
}

2
ebos/ebos_solvent_main.cc
View File

@ -33,5 +33,5 @@
int main(int argc, char** argv)
{
return Ewoms::ebosSolventMain(argc, argv);
return Opm::ebosSolventMain(argc, argv);
}

10
ebos/ebos_thermal.cc
View File

@ -38,12 +38,12 @@ SET_BOOL_PROP(EbosThermalTypeTag, EnableEnergy, true);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
void ebosThermalSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime)
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime)
{
typedef TTAG(EbosThermalTypeTag) ProblemTypeTag;
typedef GET_PROP_TYPE(ProblemTypeTag, Vanguard) Vanguard;
@ -57,7 +57,7 @@ void ebosThermalSetDeck(Opm::Deck* deck,
int ebosThermalMain(int argc, char **argv)
{
typedef TTAG(EbosThermalTypeTag) ProblemTypeTag;
return Ewoms::start<ProblemTypeTag>(argc, argv);
return Opm::start<ProblemTypeTag>(argc, argv);
}
}

8
ebos/ebos_thermal.hh
View File

@ -32,11 +32,11 @@
#include <opm/parser/eclipse/Parser/ParseContext.hpp>
#include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
namespace Ewoms {
namespace Opm {
void ebosThermalSetDeck(Opm::Deck* deck,
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
Opm::ParseContext* parseContext,
Opm::ErrorGuard* errorGuard,
double externalSetupTime);
int ebosThermalMain(int argc, char** argv);
}

2
ebos/ebos_thermal_main.cc
View File

@ -33,5 +33,5 @@
int main(int argc, char** argv)
{
return Ewoms::ebosThermalMain(argc, argv);
return Opm::ebosThermalMain(argc, argv);
}

14
ebos/eclalugridvanguard.hh
View File

@ -22,7 +22,7 @@
*/
/*!
* \file
* \copydoc Ewoms::EclAluGridVanguard
* \copydoc Opm::EclAluGridVanguard
*/
#ifndef EWOMS_ECL_ALU_GRID_VANGUARD_HH
#define EWOMS_ECL_ALU_GRID_VANGUARD_HH
@ -34,24 +34,24 @@
#include <dune/alugrid/common/fromtogridfactory.hh>
#include <opm/grid/CpGrid.hpp>
namespace Ewoms {
namespace Opm {
template <class TypeTag>
class EclAluGridVanguard;
} // namespace Ewoms
} // namespace Opm
BEGIN_PROPERTIES
NEW_TYPE_TAG(EclAluGridVanguard, INHERITS_FROM(EclBaseVanguard));
// declare the properties
SET_TYPE_PROP(EclAluGridVanguard, Vanguard, Ewoms::EclAluGridVanguard<TypeTag>);
SET_TYPE_PROP(EclAluGridVanguard, Vanguard, Opm::EclAluGridVanguard<TypeTag>);
SET_TYPE_PROP(EclAluGridVanguard, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
SET_TYPE_PROP(EclAluGridVanguard, EquilGrid, Dune::CpGrid);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
@ -75,7 +75,7 @@ public:
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
private:
typedef Ewoms::AluCartesianIndexMapper<Grid> CartesianIndexMapper;
typedef Opm::AluCartesianIndexMapper<Grid> CartesianIndexMapper;
typedef Dune::CartesianIndexMapper<EquilGrid> EquilCartesianIndexMapper;
static const int dimension = Grid::dimension;
@ -215,6 +215,6 @@ protected:
EquilCartesianIndexMapper* equilCartesianIndexMapper_;
};
} // namespace Ewoms
} // namespace Opm
#endif

6
ebos/eclbaseaquifermodel.hh
View File

@ -22,7 +22,7 @@
*/
/*!
* \file
* \copydoc Ewoms::EclBaseAquiferModel
* \copydoc Opm::EclBaseAquiferModel
*/
#ifndef EWOMS_ECL_BASE_AQUIFER_MODEL_HH
#define EWOMS_ECL_BASE_AQUIFER_MODEL_HH
@ -36,7 +36,7 @@ NEW_PROP_TAG(RateVector);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBaseAquiferModel
@ -137,6 +137,6 @@ protected:
Simulator& simulator_;
};
} // namespace Ewoms
} // namespace Opm
#endif

8
ebos/eclbasevanguard.hh
View File

@ -22,7 +22,7 @@
*/
/*!
* \file
* \copydoc Ewoms::EclBaseVanguard
* \copydoc Opm::EclBaseVanguard
*/
#ifndef EWOMS_ECL_BASE_VANGUARD_HH
#define EWOMS_ECL_BASE_VANGUARD_HH
@ -55,7 +55,7 @@
#include <unordered_set>
#include <array>
namespace Ewoms {
namespace Opm {
template <class TypeTag>
class EclBaseVanguard;
}
@ -86,7 +86,7 @@ SET_INT_PROP(EclBaseVanguard, EdgeWeightsMethod, 1);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
@ -624,6 +624,6 @@ Opm::Schedule* EclBaseVanguard<TypeTag>::externalEclSchedule_ = nullptr;
template <class TypeTag>
Opm::SummaryConfig* EclBaseVanguard<TypeTag>::externalEclSummaryConfig_ = nullptr;
} // namespace Ewoms
} // namespace Opm
#endif

10
ebos/eclcpgridvanguard.hh
View File

@ -22,7 +22,7 @@
*/
/*!
* \file
* \copydoc Ewoms::EclCpGridVanguard
* \copydoc Opm::EclCpGridVanguard
*/
#ifndef EWOMS_ECL_CP_GRID_VANGUARD_HH
#define EWOMS_ECL_CP_GRID_VANGUARD_HH
@ -38,7 +38,7 @@
#include <dune/common/version.hh>
namespace Ewoms {
namespace Opm {
template <class TypeTag>
class EclCpGridVanguard;
}
@ -48,13 +48,13 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(EclCpGridVanguard, INHERITS_FROM(EclBaseVanguard));
// declare the properties
SET_TYPE_PROP(EclCpGridVanguard, Vanguard, Ewoms::EclCpGridVanguard<TypeTag>);
SET_TYPE_PROP(EclCpGridVanguard, Vanguard, Opm::EclCpGridVanguard<TypeTag>);
SET_TYPE_PROP(EclCpGridVanguard, Grid, Dune::CpGrid);
SET_TYPE_PROP(EclCpGridVanguard, EquilGrid, typename GET_PROP_TYPE(TypeTag, Grid));
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
@ -289,6 +289,6 @@ protected:
std::unordered_set<std::string> defunctWellNames_;
};
} // namespace Ewoms
} // namespace Opm
#endif

6
ebos/ecldummygradientcalculator.hh
View File

@ -23,7 +23,7 @@
/*!
* \file
*
* \copydoc Ewoms::EclDummyGradientCalculator
* \copydoc Opm::EclDummyGradientCalculator
*/
#ifndef EWOMS_ECL_DUMMY_GRADIENT_CALCULATOR_HH
#define EWOMS_ECL_DUMMY_GRADIENT_CALCULATOR_HH
@ -34,7 +34,7 @@
#include <dune/common/fvector.hh>
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
*
@ -99,6 +99,6 @@ public:
throw std::logic_error("Generic boundary gradients are not supported by the ECL black-oil simulator");
}
};
} // namespace Ewoms
} // namespace Opm
#endif

6
ebos/eclequilinitializer.hh
View File

@ -23,7 +23,7 @@
/**
* \file
*
* \copydoc Ewoms::EclEquilInitializer
* \copydoc Opm::EclEquilInitializer
*/
#ifndef EWOMS_ECL_EQUIL_INITIALIZER_HH
#define EWOMS_ECL_EQUIL_INITIALIZER_HH
@ -50,7 +50,7 @@ NEW_PROP_TAG(EnableEnergy);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
@ -182,6 +182,6 @@ protected:
std::vector<ScalarFluidState> initialFluidStates_;
};
} // namespace Ewoms
} // namespace Opm
#endif

4
ebos/eclfluxmodule.hh
View File

@ -47,7 +47,7 @@ NEW_PROP_TAG(MaterialLaw);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
template <class TypeTag>
class EclTransIntensiveQuantities;
@ -500,6 +500,6 @@ private:
unsigned short dnIdx_[numPhases];
};
} // namespace Ewoms
} // namespace Opm
#endif

6
ebos/eclnewtonmethod.hh
View File

@ -23,7 +23,7 @@
/*!
* \file
*
* \copydoc Ewoms::EclNewtonMethod
* \copydoc Opm::EclNewtonMethod
*/
#ifndef EWOMS_ECL_NEWTON_METHOD_HH
#define EWOMS_ECL_NEWTON_METHOD_HH
@ -43,7 +43,7 @@ NEW_PROP_TAG(EclNewtonRelaxedTolerance);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \brief A newton solver which is ebos specific.
@ -238,6 +238,6 @@ private:
int numStrictIterations_;
};
} // namespace Ewoms
} // namespace Opm
#endif

12
ebos/ecloutputblackoilmodule.hh
View File

@ -22,7 +22,7 @@
*/
/*!
* \file
* \copydoc Ewoms::EclOutputBlackOilModule
* \copydoc Opm::EclOutputBlackOilModule
*/
#ifndef EWOMS_ECL_OUTPUT_BLACK_OIL_MODULE_HH
#define EWOMS_ECL_OUTPUT_BLACK_OIL_MODULE_HH
@ -57,7 +57,7 @@ SET_BOOL_PROP(EclOutputBlackOil, ForceDisableFluidInPlaceOutput, false);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
// forward declaration
template <class TypeTag>
@ -149,7 +149,7 @@ public:
*/
void allocBuffers(unsigned bufferSize, unsigned reportStepNum, const bool substep, const bool log)
{
if (!std::is_same<Discretization, Ewoms::EcfvDiscretization<TypeTag> >::value)
if (!std::is_same<Discretization, Opm::EcfvDiscretization<TypeTag> >::value)
return;
// Summary output is for all steps
@ -376,7 +376,7 @@ public:
*/
void processElement(const ElementContext& elemCtx)
{
if (!std::is_same<Discretization, Ewoms::EcfvDiscretization<TypeTag> >::value)
if (!std::is_same<Discretization, Opm::EcfvDiscretization<TypeTag> >::value)
return;
const auto& problem = elemCtx.simulator().problem();
@ -787,7 +787,7 @@ public:
*/
void assignToSolution(Opm::data::Solution& sol)
{
if (!std::is_same<Discretization, Ewoms::EcfvDiscretization<TypeTag>>::value)
if (!std::is_same<Discretization, Opm::EcfvDiscretization<TypeTag>>::value)
return;
if (oilPressure_.size() > 0) {
@ -1508,6 +1508,6 @@ private:
std::map<size_t, Scalar> gasConnectionSaturations_;
std::vector<ScalarBuffer> tracerConcentrations_;
};
} // namespace Ewoms
} // namespace Opm
#endif

16
ebos/eclpeacemanwell.hh
View File

@ -23,7 +23,7 @@
/**
* \file
*
* \copydoc Ewoms::EclPeacemanWell
* \copydoc Opm::EclPeacemanWell
*/
#ifndef EWOMS_ECL_PEACEMAN_WELL_HH
#define EWOMS_ECL_PEACEMAN_WELL_HH
@ -45,7 +45,7 @@
#include <map>
namespace Ewoms {
namespace Opm {
template <class TypeTag>
class EcfvDiscretization;
@ -289,13 +289,13 @@ public:
}
/*!
* \copydoc Ewoms::BaseAuxiliaryModule::numDofs()
* \copydoc Opm::BaseAuxiliaryModule::numDofs()
*/
virtual unsigned numDofs() const
{ return 1; }
/*!
* \copydoc Ewoms::BaseAuxiliaryModule::addNeighbors()
* \copydoc Opm::BaseAuxiliaryModule::addNeighbors()
*/
virtual void addNeighbors(std::vector<NeighborSet>& neighbors) const
{
@ -315,7 +315,7 @@ public:
}
/*!
* \copydoc Ewoms::BaseAuxiliaryModule::addNeighbors()
* \copydoc Opm::BaseAuxiliaryModule::addNeighbors()
*/
virtual void applyInitial()
{
@ -337,7 +337,7 @@ public:
}
/*!
* \copydoc Ewoms::BaseAuxiliaryModule::linearize()
* \copydoc Opm::BaseAuxiliaryModule::linearize()
*/
virtual void linearize(SparseMatrixAdapter& matrix, GlobalEqVector& residual)
{
@ -1641,7 +1641,7 @@ protected:
std::string name_;
std::vector<DofVariables, Ewoms::aligned_allocator<DofVariables, alignof(DofVariables)> > dofVarsStore_;
std::vector<DofVariables, Opm::aligned_allocator<DofVariables, alignof(DofVariables)> > dofVarsStore_;
std::map<int, DofVariables*> dofVariables_;
// the number of times beginIteration*() was called for the current time step
@ -1717,6 +1717,6 @@ protected:
unsigned injectedPhaseIdx_;
};
} // namespace Ewoms
} // namespace Opm
#endif

10
ebos/eclpolyhedralgridvanguard.hh
View File

@ -22,7 +22,7 @@
*/
/*!
* \file
* \copydoc Ewoms::EclPolyhedralGridVanguard
* \copydoc Opm::EclPolyhedralGridVanguard
*/
#ifndef EWOMS_ECL_POLYHEDRAL_GRID_VANGUARD_HH
#define EWOMS_ECL_POLYHEDRAL_GRID_VANGUARD_HH
@ -31,7 +31,7 @@
#include <opm/grid/polyhedralgrid.hh>
namespace Ewoms {
namespace Opm {
template <class TypeTag>
class EclPolyhedralGridVanguard;
}
@ -41,13 +41,13 @@ BEGIN_PROPERTIES
NEW_TYPE_TAG(EclPolyhedralGridVanguard, INHERITS_FROM(EclBaseVanguard));
// declare the properties
SET_TYPE_PROP(EclPolyhedralGridVanguard, Vanguard, Ewoms::EclPolyhedralGridVanguard<TypeTag>);
SET_TYPE_PROP(EclPolyhedralGridVanguard, Vanguard, Opm::EclPolyhedralGridVanguard<TypeTag>);
SET_TYPE_PROP(EclPolyhedralGridVanguard, Grid, Dune::PolyhedralGrid<3, 3>);
SET_TYPE_PROP(EclPolyhedralGridVanguard, EquilGrid, typename GET_PROP_TYPE(TypeTag, Grid));
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
@ -165,6 +165,6 @@ protected:
CartesianIndexMapperPointer cartesianIndexMapper_;
};
} // namespace Ewoms
} // namespace Opm
#endif

28
ebos/eclproblem.hh
View File

@ -23,7 +23,7 @@
/*!
* \file
*
* \copydoc Ewoms::EclProblem
* \copydoc Opm::EclProblem
*/
#ifndef EWOMS_ECL_PROBLEM_HH
#define EWOMS_ECL_PROBLEM_HH
@ -109,7 +109,7 @@
#include <string>
#include <algorithm>
namespace Ewoms {
namespace Opm {
template <class TypeTag>
class EclProblem;
}
@ -162,7 +162,7 @@ NEW_PROP_TAG(EclRestartShrinkFactor);
NEW_PROP_TAG(EclEnableTuning);
// Set the problem property
SET_TYPE_PROP(EclBaseProblem, Problem, Ewoms::EclProblem<TypeTag>);
SET_TYPE_PROP(EclBaseProblem, Problem, Opm::EclProblem<TypeTag>);
// Select the element centered finite volume method as spatial discretization
SET_TAG_PROP(EclBaseProblem, SpatialDiscretizationSplice, EcfvDiscretization);
@ -223,14 +223,14 @@ private:
typedef typename GET_PROP_TYPE(TypeTag, GridView) GridView;
public:
typedef Ewoms::EcfvStencil<Scalar,
GridView,
/*needIntegrationPos=*/false,
/*needNormal=*/false> type;
typedef Opm::EcfvStencil<Scalar,
GridView,
/*needIntegrationPos=*/false,
/*needNormal=*/false> type;
};
// by default use the dummy aquifer "model"
SET_TYPE_PROP(EclBaseProblem, EclAquiferModel, Ewoms::EclBaseAquiferModel<TypeTag>);
SET_TYPE_PROP(EclBaseProblem, EclAquiferModel, Opm::EclBaseAquiferModel<TypeTag>);
// use the built-in proof of concept well model by default
SET_TYPE_PROP(EclBaseProblem, EclWellModel, EclWellManager<TypeTag>);
@ -323,14 +323,14 @@ SET_BOOL_PROP(EclBaseProblem, EnableIntensiveQuantityCache, true);
SET_BOOL_PROP(EclBaseProblem, EnableStorageCache, true);
// Use the "velocity module" which uses the Eclipse "NEWTRAN" transmissibilities
SET_TYPE_PROP(EclBaseProblem, FluxModule, Ewoms::EclTransFluxModule<TypeTag>);
SET_TYPE_PROP(EclBaseProblem, FluxModule, Opm::EclTransFluxModule<TypeTag>);
// Use the dummy gradient calculator in order not to do unnecessary work.
SET_TYPE_PROP(EclBaseProblem, GradientCalculator, Ewoms::EclDummyGradientCalculator<TypeTag>);
SET_TYPE_PROP(EclBaseProblem, GradientCalculator, Opm::EclDummyGradientCalculator<TypeTag>);
// Use a custom Newton-Raphson method class for ebos in order to attain more
// sophisticated update and error computation mechanisms
SET_TYPE_PROP(EclBaseProblem, NewtonMethod, Ewoms::EclNewtonMethod<TypeTag>);
SET_TYPE_PROP(EclBaseProblem, NewtonMethod, Opm::EclNewtonMethod<TypeTag>);
// The frequency of writing restart (*.ers) files. This is the number of time steps
// between writing restart files
@ -371,7 +371,7 @@ SET_BOOL_PROP(EclBaseProblem, EclEnableTuning, false);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
@ -2437,7 +2437,7 @@ private:
const auto& simulator = this->simulator();
// initial condition corresponds to hydrostatic conditions.
typedef Ewoms::EclEquilInitializer<TypeTag> EquilInitializer;
typedef Opm::EclEquilInitializer<TypeTag> EquilInitializer;
EquilInitializer equilInitializer(simulator, *materialLawManager_);
size_t numElems = this->model().numGridDof();
@ -3184,6 +3184,6 @@ private:
template <class TypeTag>
std::string EclProblem<TypeTag>::briefDescription_;
} // namespace Ewoms
} // namespace Opm
#endif

6
ebos/eclthresholdpressure.hh
View File

@ -23,7 +23,7 @@
/*!
* \file
*
* \copydoc Ewoms::EclThresholdPressure
* \copydoc Opm::EclThresholdPressure
*/
#ifndef EWOMS_ECL_THRESHOLD_PRESSURE_HH
#define EWOMS_ECL_THRESHOLD_PRESSURE_HH
@ -60,7 +60,7 @@ NEW_PROP_TAG(EnableExperiments);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
@ -399,6 +399,6 @@ private:
bool enableThresholdPressure_;
};
} // namespace Ewoms
} // namespace Opm
#endif

6
ebos/ecltracermodel.hh
View File

@ -23,7 +23,7 @@
/**
* \file
*
* \copydoc Ewoms::EclTracerModel
* \copydoc Opm::EclTracerModel
*/
#ifndef EWOMS_ECL_TRACER_MODEL_HH
#define EWOMS_ECL_TRACER_MODEL_HH
@ -48,7 +48,7 @@ NEW_PROP_TAG(EnableTracerModel);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
@ -521,6 +521,6 @@ protected:
std::vector<Dune::BlockVector<Dune::FieldVector<Scalar, 1>>> storageOfTimeIndex1_;
};
} // namespace Ewoms
} // namespace Opm
#endif

6
ebos/ecltransmissibility.hh
View File

@ -23,7 +23,7 @@
/*!
* \file
*
* \copydoc Ewoms::EclTransmissibility
* \copydoc Opm::EclTransmissibility
*/
#ifndef EWOMS_ECL_TRANSMISSIBILITY_HH
#define EWOMS_ECL_TRANSMISSIBILITY_HH
@ -65,7 +65,7 @@ NEW_PROP_TAG(EnableEnergy);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
@ -910,6 +910,6 @@ private:
std::unordered_map<std::uint64_t, Scalar> > thermalHalfTrans_;
};
} // namespace Ewoms
} // namespace Opm
#endif

8
ebos/eclwellmanager.hh
View File

@ -23,7 +23,7 @@
/**
* \file
*
* \copydoc Ewoms::EclWellManager
* \copydoc Opm::EclWellManager
*/
#ifndef EWOMS_ECL_WELL_MANAGER_HH
#define EWOMS_ECL_WELL_MANAGER_HH
@ -57,7 +57,7 @@ NEW_PROP_TAG(Grid);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup EclBlackOilSimulator
@ -85,7 +85,7 @@ class EclWellManager
typedef typename GridView::template Codim<0>::Entity Element;
typedef Ewoms::EclPeacemanWell<TypeTag> Well;
typedef Opm::EclPeacemanWell<TypeTag> Well;
typedef std::map<int, std::pair<const Opm::Connection*, std::shared_ptr<Well> > > WellConnectionsMap;
@ -806,6 +806,6 @@ protected:
std::map<std::string, std::array<Scalar, numPhases> > wellTotalInjectedVolume_;
std::map<std::string, std::array<Scalar, numPhases> > wellTotalProducedVolume_;
};
} // namespace Ewoms
} // namespace Opm
#endif

6
ebos/eclwriter.hh
View File

@ -23,7 +23,7 @@
/*!
* \file
*
* \copydoc Ewoms::EclWriter
* \copydoc Opm::EclWriter
*/
#ifndef EWOMS_ECL_WRITER_HH
#define EWOMS_ECL_WRITER_HH
@ -66,7 +66,7 @@ NEW_PROP_TAG(EclOutputDoublePrecision);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
template <class TypeTag>
class EclWriter;
@ -711,6 +711,6 @@ private:
};
} // namespace Ewoms
} // namespace Opm
#endif

4
ebos/equil/equilibrationhelpers.hh
View File

@ -80,7 +80,7 @@
---- end of synopsis of EquilibrationHelpers.hpp ----
*/
namespace Ewoms {
namespace Opm {
/**
* Types and routines that collectively implement a basic
* ECLIPSE-style equilibration-based initialisation scheme.
@ -994,6 +994,6 @@ bool isConstPc(const MaterialLawManager& materialLawManager,
}
} // namespace Equil
} // namespace Ewoms
} // namespace Opm
#endif // EWOMS_EQUILIBRATIONHELPERS_HH

2
ebos/equil/initstateequil.hh
View File

@ -67,7 +67,7 @@ NEW_PROP_TAG(FluidSystem);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/**
* Types and routines that collectively implement a basic

78
ebos/mebos_main.cc
View File

@ -58,16 +58,16 @@ int main(int argc, char **argv)
Dune::Timer externalSetupTimer;
externalSetupTimer.start();
if (!Ewoms::ebosBlackOilDeckFileNameIsSet(argc, argv))
if (!Opm::ebosBlackOilDeckFileNameIsSet(argc, argv))
// no deck was specified, e.g., --help. use the black oil variant to figure out
// what exactly should be done
return Ewoms::ebosBlackOilMain(argc, argv);
return Opm::ebosBlackOilMain(argc, argv);
std::string deckFileName =
Ewoms::ebosBlackOilGetDeckFileName(argc, argv);
Opm::ebosBlackOilGetDeckFileName(argc, argv);
std::unique_ptr<Opm::ParseContext> parseContext
= Ewoms::ebosBlackOilCreateParseContext(argc, argv);
= Opm::ebosBlackOilCreateParseContext(argc, argv);
std::unique_ptr<Opm::ErrorGuard> errorGuard(new Opm::ErrorGuard);
// deal with parallel runs
@ -143,21 +143,21 @@ int main(int argc, char **argv)
if (oilActive && waterActive) {
if (myRank == 0)
std::cout << "Using oil-water mode" << std::endl;
Ewoms::ebosOilWaterSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Ewoms::ebosOilWaterMain(argc, argv);
Opm::ebosOilWaterSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Opm::ebosOilWaterMain(argc, argv);
}
else if (oilActive && gasActive) {
// run ebos_gasoil
if (myRank == 0)
std::cout << "Using gas-oil mode" << std::endl;
Ewoms::ebosGasOilSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Ewoms::ebosGasOilMain(argc, argv);
Opm::ebosGasOilSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Opm::ebosGasOilMain(argc, argv);
}
else if (waterActive && gasActive) {
notSupportedErrorStream << "\n"
@ -191,11 +191,11 @@ int main(int argc, char **argv)
// run ebos_foam
if (myRank == 0)
std::cout << "Using foam mode" << std::endl;
Ewoms::ebosFoamSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Ewoms::ebosFoamMain(argc, argv);
Opm::ebosFoamSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Opm::ebosFoamMain(argc, argv);
}
else if (polymerActive) {
if (solventActive) {
@ -222,11 +222,11 @@ int main(int argc, char **argv)
// run ebos_polymer
if (myRank == 0)
std::cout << "Using polymer mode" << std::endl;
Ewoms::ebosPolymerSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Ewoms::ebosPolymerMain(argc, argv);
Opm::ebosPolymerSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Opm::ebosPolymerMain(argc, argv);
}
else if (solventActive) {
if (polymerActive) {
@ -253,11 +253,11 @@ int main(int argc, char **argv)
// run ebos_solvent
if (myRank == 0)
std::cout << "Using solvent mode" << std::endl;
Ewoms::ebosSolventSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Ewoms::ebosSolventMain(argc, argv);
Opm::ebosSolventSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Opm::ebosSolventMain(argc, argv);
}
else if (thermalActive) {
if (solventActive) {
@ -284,20 +284,20 @@ int main(int argc, char **argv)
// run ebos_thermal
if (myRank == 0)
std::cout << "Using thermal mode" << std::endl;
Ewoms::ebosThermalSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Ewoms::ebosThermalMain(argc, argv);
Opm::ebosThermalSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Opm::ebosThermalMain(argc, argv);
}
else {
if (myRank == 0)
std::cout << "Using blackoil mode" << std::endl;
Ewoms::ebosBlackOilSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Ewoms::ebosBlackOilMain(argc, argv);
Opm::ebosBlackOilSetDeck(deck.get(),
parseContext.get(),
errorGuard.get(),
externalSetupTimer.elapsed());
return Opm::ebosBlackOilMain(argc, argv);
}
if (myRank == 0)

4
ebos/nncsorter.cpp
View File

@ -28,7 +28,7 @@
#include <sstream>
#include <algorithm>
#include <iostream>
namespace Ewoms
namespace Opm
{
std::vector<Opm::NNCdata> sortNncAndApplyEditnnc(const std::vector<Opm::NNCdata>& nncDataIn, std::vector<Opm::NNCdata> editnncData,
bool log )
@ -92,4 +92,4 @@ std::vector<Opm::NNCdata> sortNncAndApplyEditnnc(const std::vector<Opm::NNCdata>
}
return nncData;
}
} // end namespace Ewoms
} // end namespace Opm

2
ebos/nncsorter.hpp
View File

@ -29,7 +29,7 @@
#include <vector>
namespace Ewoms
namespace Opm
{
/// \brief Scale NNC data wit informtion form EDITNNC and sort it.
/// \param nncData The NNC data as provided by the deck.

4
ebos/tracervdtable.hh
View File

@ -23,14 +23,14 @@
/*!
* \file
*
* \copydoc Ewoms::TracerVdTable
* \copydoc Opm::TracerVdTable
*/
#ifndef EWOMS_TRACER_VD_TABLE_HH
#define EWOMS_TRACER_VD_TABLE_HH
#include <opm/parser/eclipse/EclipseState/Tables/SimpleTable.hpp>
namespace Ewoms {
namespace Opm {
/*!
* \brief A class that contains tracer concentration vs depth table

8
ebos/vtkecltracermodule.hh
View File

@ -22,7 +22,7 @@
*/
/*!
* \file
* \copydoc Ewoms::VtkEclTracerModule
* \copydoc Opm::VtkEclTracerModule
*/
#ifndef EWOMS_VTK_ECL_TRACER_MODULE_HH
#define EWOMS_VTK_ECL_TRACER_MODULE_HH
@ -54,7 +54,7 @@ NEW_PROP_TAG(VtkWriteEclTracerConcentration);
SET_BOOL_PROP(VtkEclTracer, VtkWriteEclTracerConcentration, false);
END_PROPERTIES
namespace Ewoms {
namespace Opm {
/*!
* \ingroup Vtk
*
@ -74,7 +74,7 @@ namespace Ewoms {
typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
static const int vtkFormat = GET_PROP_VALUE(TypeTag, VtkOutputFormat);
typedef Ewoms::VtkMultiWriter<GridView, vtkFormat> VtkMultiWriter;
typedef Opm::VtkMultiWriter<GridView, vtkFormat> VtkMultiWriter;
typedef typename ParentType::ScalarBuffer ScalarBuffer;
@ -165,6 +165,6 @@ namespace Ewoms {
std::vector<ScalarBuffer> eclTracerConcentration_;
};
} // namespace Ewoms
} // namespace Opm
#endif

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;
}

14
opm/simulators/flow/FlowMainEbos.hpp
View File

@ -99,7 +99,7 @@ namespace Opm
Simulator::registerParameters();
// register the parameters inherited from ebos
Ewoms::registerAllParameters_<TypeTag>(/*finalizeRegistration=*/false);
Opm::registerAllParameters_<TypeTag>(/*finalizeRegistration=*/false);
// hide the parameters unused by flow. TODO: this is a pain to maintain
EWOMS_HIDE_PARAM(TypeTag, EnableGravity);
@ -148,7 +148,7 @@ namespace Opm
EWOMS_END_PARAM_REGISTRATION(TypeTag);
// read in the command line parameters
int status = Ewoms::setupParameters_<TypeTag>(argc, const_cast<const char**>(argv), /*doRegistration=*/false, /*allowUnused=*/true, /*handleHelp=*/true);
int status = Opm::setupParameters_<TypeTag>(argc, const_cast<const char**>(argv), /*doRegistration=*/false, /*allowUnused=*/true, /*handleHelp=*/true);
if (status == 0) {
// deal with --print-properties and --print-parameters
@ -161,13 +161,13 @@ namespace Opm
if (EWOMS_GET_PARAM(TypeTag, int, PrintProperties) == 1) {
doExit = true;
if (mpiRank == 0)
Ewoms::Properties::printValues<TypeTag>();
Opm::Properties::printValues<TypeTag>();
}
if (EWOMS_GET_PARAM(TypeTag, int, PrintParameters) == 1) {
doExit = true;
if (mpiRank == 0)
Ewoms::Parameters::printValues<TypeTag>();
Opm::Parameters::printValues<TypeTag>();
}
if (doExit)
@ -329,14 +329,14 @@ namespace Opm
ss << "Simulation started on " << tmstr << " hrs\n";
ss << "Parameters used by Flow:\n";
Ewoms::Parameters::printValues<TypeTag>(ss);
Opm::Parameters::printValues<TypeTag>(ss);
OpmLog::note(ss.str());
}
if ( mpi_rank_ == 0 )
{
return Ewoms::Parameters::printUnused<TypeTag>(std::cerr);
return Opm::Parameters::printUnused<TypeTag>(std::cerr);
}
else
{
@ -458,7 +458,7 @@ namespace Opm
// This allows a user to catch typos and misunderstandings in the
// use of simulator parameters.
if (Ewoms::Parameters::printUnused<TypeTag>(oss)) {
if (Opm::Parameters::printUnused<TypeTag>(oss)) {
std::cout << "----------------- Unrecognized parameters: -----------------\n";
std::cout << oss.str();
std::cout << "----------------------------------------------------------------" << std::endl;

2
opm/simulators/flow/SimulatorFullyImplicitBlackoilEbos.hpp
View File

@ -65,7 +65,7 @@ public:
typedef typename GET_PROP_TYPE(TypeTag, MaterialLawParams) MaterialLawParams;
typedef AdaptiveTimeSteppingEbos<TypeTag> TimeStepper;
typedef Ewoms::BlackOilPolymerModule<TypeTag> PolymerModule;
typedef Opm::BlackOilPolymerModule<TypeTag> PolymerModule;
typedef WellStateFullyImplicitBlackoil WellState;
typedef BlackoilModelEbos<TypeTag> Model;

4
opm/simulators/linalg/BlackoilAmg.hpp
View File

@ -187,9 +187,9 @@ struct ScalarType<Dune::MatrixBlock<FieldType, ROWS, COLS> >
};
template<typename FieldType, int ROWS, int COLS>
struct ScalarType<Ewoms::MatrixBlock<FieldType, ROWS, COLS> >
struct ScalarType<Opm::MatrixBlock<FieldType, ROWS, COLS> >
{
typedef Ewoms::MatrixBlock<FieldType, 1, 1> value;
typedef Opm::MatrixBlock<FieldType, 1, 1> value;
};
template<typename BlockType, typename Allocator>

4
opm/simulators/linalg/ISTLSolverEbos.hpp
View File

@ -63,10 +63,10 @@ SET_PROP(FlowIstlSolver, SparseMatrixAdapter)
private:
typedef typename GET_PROP_TYPE(TypeTag, Scalar) Scalar;
enum { numEq = GET_PROP_VALUE(TypeTag, NumEq) };
typedef Ewoms::MatrixBlock<Scalar, numEq, numEq> Block;
typedef Opm::MatrixBlock<Scalar, numEq, numEq> Block;
public:
typedef typename Ewoms::Linear::IstlSparseMatrixAdapter<Block> type;
typedef typename Opm::Linear::IstlSparseMatrixAdapter<Block> type;
};
END_PROPERTIES

6
opm/simulators/wells/BlackoilWellModel.hpp
View File

@ -66,7 +66,7 @@ namespace Opm {
/// Class for handling the blackoil well model.
template<typename TypeTag>
class BlackoilWellModel : public Ewoms::BaseAuxiliaryModule<TypeTag>
class BlackoilWellModel : public Opm::BaseAuxiliaryModule<TypeTag>
{
public:
// --------- Types ---------
@ -83,7 +83,7 @@ namespace Opm {
typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector;
typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter;
typedef typename Ewoms::BaseAuxiliaryModule<TypeTag>::NeighborSet NeighborSet;
typedef typename Opm::BaseAuxiliaryModule<TypeTag>::NeighborSet NeighborSet;
static const int numEq = Indices::numEq;
static const int solventSaturationIdx = Indices::solventSaturationIdx;
@ -102,7 +102,7 @@ namespace Opm {
#endif
typedef typename SparseMatrixAdapter::IstlMatrix Mat;
typedef Ewoms::BlackOilPolymerModule<TypeTag> PolymerModule;
typedef Opm::BlackOilPolymerModule<TypeTag> PolymerModule;
// For the conversion between the surface volume rate and resrevoir voidage rate
using RateConverterType = RateConverter::

4
opm/simulators/wells/StandardWell.hpp
View File

@ -66,8 +66,8 @@ namespace Opm
using Base::has_foam;
using Base::has_energy;
using PolymerModule = Ewoms::BlackOilPolymerModule<TypeTag>;
using FoamModule = Ewoms::BlackOilFoamModule<TypeTag>;
using PolymerModule = Opm::BlackOilPolymerModule<TypeTag>;
using FoamModule = Opm::BlackOilFoamModule<TypeTag>;
// polymer concentration and temperature are already known by the well, so
// polymer and energy conservation do not need to be considered explicitly

4
opm/simulators/wells/WellConnectionAuxiliaryModule.hpp
View File

@ -33,7 +33,7 @@ namespace Opm
{
template<class TypeTag>
class WellConnectionAuxiliaryModule
: public Ewoms::BaseAuxiliaryModule<TypeTag>
: public Opm::BaseAuxiliaryModule<TypeTag>
{
typedef typename GET_PROP_TYPE(TypeTag, GlobalEqVector) GlobalEqVector;
typedef typename GET_PROP_TYPE(TypeTag, SparseMatrixAdapter) SparseMatrixAdapter;
@ -41,7 +41,7 @@ class WellConnectionAuxiliaryModule
public:
using NeighborSet = typename
Ewoms::BaseAuxiliaryModule<TypeTag>::NeighborSet;
Opm::BaseAuxiliaryModule<TypeTag>::NeighborSet;
WellConnectionAuxiliaryModule(const Schedule& schedule,
const Dune::CpGrid& grid)

2
opm/simulators/wells/WellInterface_impl.hpp
View File

@ -1208,7 +1208,7 @@ namespace Opm
if (well_controls_get_current(wc) != -1 && well_controls_get_current_type(wc) == RESERVOIR_RATE) {
if (has_solvent && phaseIdx == contiSolventEqIdx ) {
typedef Ewoms::BlackOilSolventModule<TypeTag> SolventModule;
typedef Opm::BlackOilSolventModule<TypeTag> SolventModule;
double coeff = 0;
rateConverter_.template calcCoeffSolvent<SolventModule>(0, pvtRegionIdx_, coeff);
return coeff;

10
tests/test_ecl_output.cc
View File

@ -97,7 +97,7 @@ initSimulator(const char *filename)
filenameArg.c_str()
};
Ewoms::setupParameters_<TypeTag>(/*argc=*/sizeof(argv)/sizeof(argv[0]), argv, /*registerParams=*/false);
Opm::setupParameters_<TypeTag>(/*argc=*/sizeof(argv)/sizeof(argv[0]), argv, /*registerParams=*/false);
return std::unique_ptr<Simulator>(new Simulator);
}
@ -118,11 +118,11 @@ void test_summary()
auto simulator = initSimulator<TypeTag>(filename.data());
typedef typename GET_PROP_TYPE(TypeTag, Vanguard) Vanguard;
typedef Ewoms::CollectDataToIORank< Vanguard > CollectDataToIORankType;
typedef Opm::CollectDataToIORank< Vanguard > CollectDataToIORankType;
CollectDataToIORankType collectToIORank(simulator->vanguard());
Ewoms::EclOutputBlackOilModule<TypeTag> eclOutputModule(*simulator, collectToIORank);
Opm::EclOutputBlackOilModule<TypeTag> eclOutputModule(*simulator, collectToIORank);
typedef Ewoms::EclWriter<TypeTag> EclWriterType;
typedef Opm::EclWriter<TypeTag> EclWriterType;
// create the actual ECL writer
std::unique_ptr<EclWriterType> eclWriter = std::unique_ptr<EclWriterType>(new EclWriterType(*simulator));
@ -253,7 +253,7 @@ int main(int argc, char** argv)
#endif
typedef TTAG(TestEclOutputTypeTag) TypeTag;
Ewoms::registerAllParameters_<TypeTag>();
Opm::registerAllParameters_<TypeTag>();
test_summary();
test_readWriteWells();

92
tests/test_equil.cc
View File

@ -86,7 +86,7 @@ initSimulator(const char *filename)
filenameArg.c_str()
};
Ewoms::setupParameters_<TypeTag>(/*argc=*/sizeof(argv)/sizeof(argv[0]), argv, /*registerParams=*/false);
Opm::setupParameters_<TypeTag>(/*argc=*/sizeof(argv)/sizeof(argv[0]), argv, /*registerParams=*/false);
return std::unique_ptr<Simulator>(new Simulator);
}
@ -227,17 +227,17 @@ void test_PhasePressure()
auto simulator = initSimulator<TypeTag>("equil_base.DATA");
initDefaultFluidSystem<TypeTag>();
Ewoms::EQUIL::EquilReg
Opm::EQUIL::EquilReg
region(record,
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
0);
std::vector<int> cells(simulator->vanguard().grid().size(0));
std::iota(cells.begin(), cells.end(), 0);
const double grav = 10;
const PPress ppress = Ewoms::EQUIL::phasePressures<FluidSystem>(simulator->vanguard().grid(), region, cells, grav);
const PPress ppress = Opm::EQUIL::phasePressures<FluidSystem>(simulator->vanguard().grid(), region, cells, grav);
const int first = 0, last = simulator->vanguard().grid().size(0) - 1;
const double reltol = 1.0e-8;
@ -264,26 +264,26 @@ void test_CellSubset()
Opm::EquilRecord record[] = { mkEquilRecord( 0, 1e5, 2.5, -0.075e5, 0, 0 ),
mkEquilRecord( 5, 1.35e5, 7.5, -0.225e5, 5, 0 ) };
Ewoms::EQUIL::EquilReg region[] =
Opm::EQUIL::EquilReg region[] =
{
Ewoms::EQUIL::EquilReg(record[0],
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
Opm::EQUIL::EquilReg(record[0],
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
0)
,
Ewoms::EQUIL::EquilReg(record[0],
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
Opm::EQUIL::EquilReg(record[0],
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
0)
,
Ewoms::EQUIL::EquilReg(record[1],
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
Opm::EQUIL::EquilReg(record[1],
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
0)
,
Ewoms::EQUIL::EquilReg(record[1],
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
Opm::EQUIL::EquilReg(record[1],
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
0)
};
@ -315,7 +315,7 @@ void test_CellSubset()
const int rno = int(r - cells.begin());
const double grav = 10;
const PPress p =
Ewoms::EQUIL::phasePressures<FluidSystem>(simulator->vanguard().grid(), region[rno], *r, grav);
Opm::EQUIL::phasePressures<FluidSystem>(simulator->vanguard().grid(), region[rno], *r, grav);
PVal::size_type i = 0;
for (std::vector<int>::const_iterator
@ -351,26 +351,26 @@ void test_RegMapping()
auto simulator = initSimulator<TypeTag>("equil_base.DATA");
initDefaultFluidSystem<TypeTag>();
Ewoms::EQUIL::EquilReg region[] =
Opm::EQUIL::EquilReg region[] =
{
Ewoms::EQUIL::EquilReg(record[0],
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
Opm::EQUIL::EquilReg(record[0],
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
0)
,
Ewoms::EQUIL::EquilReg(record[0],
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
Opm::EQUIL::EquilReg(record[0],
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
0)
,
Ewoms::EQUIL::EquilReg(record[1],
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
Opm::EQUIL::EquilReg(record[1],
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
0)
,
Ewoms::EQUIL::EquilReg(record[1],
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Ewoms::EQUIL::Miscibility::NoMixing>(),
Opm::EQUIL::EquilReg(record[1],
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
std::make_shared<Opm::EQUIL::Miscibility::NoMixing>(),
0)
};
@ -404,7 +404,7 @@ void test_RegMapping()
const int rno = r;
const double grav = 10;
const PPress p =
Ewoms::EQUIL::phasePressures<FluidSystem>(simulator->vanguard().grid(), region[rno], rng, grav);
Opm::EQUIL::phasePressures<FluidSystem>(simulator->vanguard().grid(), region[rno], rng, grav);
PVal::size_type i = 0;
for (const auto& c : rng) {
@ -435,7 +435,7 @@ void test_DeckAllDead()
Opm::GridManager gm(eclipseState.getInputGrid());
const UnstructuredGrid& grid = *(gm.c_grid());
Ewoms::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 10.0);
Opm::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 10.0);
const auto& pressures = comp.press();
REQUIRE(pressures.size() == 3);
REQUIRE(int(pressures[0].size()) == grid.number_of_cells);
@ -471,7 +471,7 @@ void test_CapillaryInversion()
const std::vector<double> s = { 0.2, 0.2, 0.2, 0.466666666666, 0.733333333333, 1.0, 1.0, 1.0, 1.0 };
REQUIRE(pc.size() == s.size());
for (size_t i = 0; i < pc.size(); ++i) {
const double s_computed = Ewoms::EQUIL::satFromPc<FluidSystem, MaterialLaw, MaterialLawManager>(*simulator->problem().materialLawManager(), phase, cell, pc[i], increasing);
const double s_computed = Opm::EQUIL::satFromPc<FluidSystem, MaterialLaw, MaterialLawManager>(*simulator->problem().materialLawManager(), phase, cell, pc[i], increasing);
CHECK_CLOSE(s_computed, s[i], reltol);
}
}
@ -484,7 +484,7 @@ void test_CapillaryInversion()
const std::vector<double> s = { 0.8, 0.8, 0.8, 0.533333333333, 0.266666666666, 0.0, 0.0, 0.0, 0.0 };
REQUIRE(pc.size() == s.size());
for (size_t i = 0; i < pc.size(); ++i) {
const double s_computed = Ewoms::EQUIL::satFromPc<FluidSystem, MaterialLaw, MaterialLawManager>(*simulator->problem().materialLawManager(), phase, cell, pc[i], increasing);
const double s_computed = Opm::EQUIL::satFromPc<FluidSystem, MaterialLaw, MaterialLawManager>(*simulator->problem().materialLawManager(), phase, cell, pc[i], increasing);
CHECK_CLOSE(s_computed, s[i], reltol);
}
}
@ -497,7 +497,7 @@ void test_CapillaryInversion()
const std::vector<double> s = { 0.2, 0.333333333333, 0.6, 0.866666666666, 1.0 };
REQUIRE(pc.size() == s.size());
for (size_t i = 0; i < pc.size(); ++i) {
const double s_computed = Ewoms::EQUIL::satFromSumOfPcs<FluidSystem, MaterialLaw, MaterialLawManager>(*simulator->problem().materialLawManager(), water, gas, cell, pc[i]);
const double s_computed = Opm::EQUIL::satFromSumOfPcs<FluidSystem, MaterialLaw, MaterialLawManager>(*simulator->problem().materialLawManager(), water, gas, cell, pc[i]);
CHECK_CLOSE(s_computed, s[i], reltol);
}
}
@ -513,7 +513,7 @@ void test_DeckWithCapillary()
Opm::GridManager gm(eclipseState.getInputGrid());
const UnstructuredGrid& grid = *(gm.c_grid());
Ewoms::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 10.0);
Opm::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 10.0);
const auto& pressures = comp.press();
REQUIRE(pressures.size() == 3);
@ -552,7 +552,7 @@ void test_DeckWithCapillaryOverlap()
Opm::GridManager gm(eclipseState.getInputGrid());
const UnstructuredGrid& grid = *(gm.c_grid());
Ewoms::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.80665);
Opm::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.80665);
const auto& pressures = comp.press();
REQUIRE(pressures.size() == 3);
REQUIRE(int(pressures[0].size()) == grid.number_of_cells);
@ -612,7 +612,7 @@ void test_DeckWithLiveOil()
const UnstructuredGrid& grid = *(gm.c_grid());
// Initialize the fluid system
Ewoms::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.80665);
Opm::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.80665);
const auto& pressures = comp.press();
REQUIRE(pressures.size() == 3);
REQUIRE(int(pressures[0].size()) == grid.number_of_cells);
@ -688,7 +688,7 @@ void test_DeckWithLiveGas()
Opm::GridManager gm(eclipseState.getInputGrid());
const UnstructuredGrid& grid = *(gm.c_grid());
Ewoms::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.80665);
Opm::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.80665);
const auto& pressures = comp.press();
REQUIRE(pressures.size() == 3);
REQUIRE(int(pressures[0].size()) == grid.number_of_cells);
@ -767,7 +767,7 @@ void test_DeckWithRSVDAndRVVD()
Opm::GridManager gm(eclipseState.getInputGrid());
const UnstructuredGrid& grid = *(gm.c_grid());
Ewoms::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.80665);
Opm::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.80665);
const auto& pressures = comp.press();
REQUIRE(pressures.size() == 3);
REQUIRE(int(pressures[0].size()) == grid.number_of_cells);
@ -867,7 +867,7 @@ void test_DeckWithPBVDAndPDVD()
Opm::GridManager gm(eclipseState.getInputGrid());
const UnstructuredGrid& grid = *(gm.c_grid());
Ewoms::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.80665);
Opm::EQUIL::DeckDependent::InitialStateComputer<TypeTag> comp(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.80665);
const auto& pressures = comp.press();
REQUIRE(pressures.size() == 3);
REQUIRE(int(pressures[0].size()) == grid.number_of_cells);
@ -1038,9 +1038,9 @@ void test_DeckWithSwatinit()
// compute the initial state
// apply swatinit
Ewoms::EQUIL::DeckDependent::InitialStateComputer<TypeTag> compScaled(materialLawManagerScaled, eclipseState, simulator->vanguard().grid(), 9.81, true);
Opm::EQUIL::DeckDependent::InitialStateComputer<TypeTag> compScaled(materialLawManagerScaled, eclipseState, simulator->vanguard().grid(), 9.81, true);
// don't apply swatinit
Ewoms::EQUIL::DeckDependent::InitialStateComputer<TypeTag> compUnscaled(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.81, false);
Opm::EQUIL::DeckDependent::InitialStateComputer<TypeTag> compUnscaled(*simulator->problem().materialLawManager(), eclipseState, simulator->vanguard().grid(), 9.81, false);
// compute pc
std::vector<double> pc_scaled(numCells * FluidSystem::numPhases);
@ -1104,7 +1104,7 @@ int main(int argc, char** argv)
#endif
typedef TTAG(TestEquilTypeTag) TypeTag;
Ewoms::registerAllParameters_<TypeTag>();
Opm::registerAllParameters_<TypeTag>();
test_PhasePressure();
test_CellSubset();

2
tests/test_nncsorter.cpp
View File

@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE(Test1) {
std::vector<Opm::NNCdata> nncDataOut2 =
{ { 1, 2, 0.5 }, { 1, 2, 0.3 }, { 3, 4, 0.4 }, { 8, 9, 10.0 } };
auto nncDataProcessed = Ewoms::sortNncAndApplyEditnnc(nncDataIn, editnncData);
auto nncDataProcessed = Opm::sortNncAndApplyEditnnc(nncDataIn, editnncData);
BOOST_CHECK(nncDataProcessed.size() == nncDataOut1.size());
auto expectedNnc1 = nncDataOut1.begin();
auto expectedNnc2 = nncDataOut2.begin();