mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
FlowBaseVanguard: move parameter registration to FlowGenericVanguard
This commit is contained in:
Arne Morten Kvarving
parent
9a9d4e0974
commit
19c77bdaa1
@ -70,42 +70,6 @@ struct EquilGrid { using type = UndefinedProperty; };
|
||||
|
||||
} // namespace Opm::Properties
|
||||
|
||||
namespace Opm::Parameters {
|
||||
|
||||
struct AllowDistributedWells { static constexpr bool value = false; };
|
||||
struct EclOutputInterval { static constexpr int value = -1; };
|
||||
struct EdgeWeightsMethod { static constexpr int value = 1; };
|
||||
struct EnableDryRun { static constexpr auto value = "auto"; };
|
||||
struct EnableOpmRstFile { static constexpr bool value = false; };
|
||||
struct ExternalPartition { static constexpr auto* value = ""; };
|
||||
|
||||
template<class Scalar>
|
||||
struct ImbalanceTol { static constexpr Scalar value = 1.1; };
|
||||
|
||||
struct IgnoreKeywords { static constexpr auto value = ""; };
|
||||
struct InputSkipMode { static constexpr auto value = "100"; };
|
||||
struct MetisParams { static constexpr auto value = "default"; };
|
||||
|
||||
#if HAVE_OPENCL || HAVE_ROCSPARSE || HAVE_CUDA
|
||||
struct NumJacobiBlocks { static constexpr int value = 0; };
|
||||
#endif
|
||||
|
||||
struct OwnerCellsFirst { static constexpr bool value = true; };
|
||||
struct ParsingStrictness { static constexpr auto value = "normal"; };
|
||||
|
||||
// 0: simple, 1: Zoltan, 2: METIS, see GridEnums.hpp
|
||||
struct PartitionMethod { static constexpr int value = 1; };
|
||||
|
||||
struct SchedRestart{ static constexpr bool value = false; };
|
||||
struct SerialPartitioning{ static constexpr bool value = false; };
|
||||
|
||||
template<class Scalar>
|
||||
struct ZoltanImbalanceTol { static constexpr Scalar value = 1.1; };
|
||||
|
||||
struct ZoltanParams { static constexpr auto value = "graph"; };
|
||||
|
||||
} // namespace Opm::Parameters
|
||||
|
||||
namespace Opm {
|
||||
|
||||
/*!
|
||||
@ -141,77 +105,7 @@ public:
|
||||
*/
|
||||
static void registerParameters()
|
||||
{
|
||||
Parameters::Register<Parameters::EclDeckFileName>
|
||||
("The name of the file which contains the ECL deck to be simulated");
|
||||
Parameters::Register<Parameters::EclOutputInterval>
|
||||
("The number of report steps that ought to be skipped between two writes of ECL results");
|
||||
Parameters::Register<Parameters::EnableDryRun>
|
||||
("Specify if the simulation ought to be actually run, or just pretended to be");
|
||||
Parameters::Register<Parameters::EnableOpmRstFile>
|
||||
("Include OPM-specific keywords in the ECL restart file to "
|
||||
"enable restart of OPM simulators from these files");
|
||||
Parameters::Register<Parameters::IgnoreKeywords>
|
||||
("List of Eclipse keywords which should be ignored. As a ':' separated string.");
|
||||
Parameters::Register<Parameters::ParsingStrictness>
|
||||
("Set strictness of parsing process. Available options are "
|
||||
"normal (stop for critical errors), "
|
||||
"high (stop for all errors) and "
|
||||
"low (as normal, except do not stop due to unsupported "
|
||||
"keywords even if marked critical");
|
||||
Parameters::Register<Parameters::InputSkipMode>
|
||||
("Set compatibility mode for the SKIP100/SKIP300 keywords. Options are "
|
||||
"100 (skip SKIP100..ENDSKIP, keep SKIP300..ENDSKIP) [default], "
|
||||
"300 (skip SKIP300..ENDSKIP, keep SKIP100..ENDSKIP) and "
|
||||
"all (skip both SKIP100..ENDSKIP and SKIP300..ENDSKIP) ");
|
||||
Parameters::Register<Parameters::SchedRestart>
|
||||
("When restarting: should we try to initialize wells and "
|
||||
"groups from historical SCHEDULE section.");
|
||||
Parameters::Register<Parameters::EdgeWeightsMethod>
|
||||
("Choose edge-weighing strategy: 0=uniform, 1=trans, 2=log(trans).");
|
||||
|
||||
#if HAVE_OPENCL || HAVE_ROCSPARSE || HAVE_CUDA
|
||||
Parameters::Register<Parameters::NumJacobiBlocks>
|
||||
("Number of blocks to be created for the Block-Jacobi preconditioner.");
|
||||
#endif
|
||||
|
||||
Parameters::Register<Parameters::OwnerCellsFirst>
|
||||
("Order cells owned by rank before ghost/overlap cells.");
|
||||
#if HAVE_MPI
|
||||
Parameters::Register<Parameters::PartitionMethod>
|
||||
("Choose partitioning strategy: 0=simple, 1=Zoltan, 2=METIS.");
|
||||
Parameters::Register<Parameters::SerialPartitioning>
|
||||
("Perform partitioning for parallel runs on a single process.");
|
||||
Parameters::Register<Parameters::ZoltanImbalanceTol<Scalar>>
|
||||
("Tolerable imbalance of the loadbalancing provided by Zoltan. DEPRECATED: Use --imbalance-tol instead");
|
||||
Parameters::Hide<Parameters::ZoltanImbalanceTol<Scalar>>();
|
||||
Parameters::Register<Parameters::ZoltanParams>
|
||||
("Configuration of Zoltan partitioner. "
|
||||
"Valid options are: graph, hypergraph or scotch. "
|
||||
"Alternatively, you can request a configuration to be read "
|
||||
"from a JSON file by giving the filename here, ending with '.json.' "
|
||||
"See https://sandialabs.github.io/Zoltan/ug_html/ug.html "
|
||||
"for available Zoltan options.");
|
||||
Parameters::Hide<Parameters::ZoltanParams>();
|
||||
Parameters::Register<Parameters::ImbalanceTol<Scalar>>
|
||||
("Tolerable imbalance of the loadbalancing (default: 1.1).");
|
||||
Parameters::Register<Parameters::MetisParams>
|
||||
("Configuration of Metis partitioner. "
|
||||
"You can request a configuration to be read "
|
||||
"from a JSON file by giving the filename here, ending with '.json.' "
|
||||
"See http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/manual.pdf"
|
||||
"for available METIS options.");
|
||||
Parameters::Register<Parameters::ExternalPartition>
|
||||
("Name of file from which to load an externally generated "
|
||||
"partitioning of the model's active cells for MPI "
|
||||
"distribution purposes. If empty, the built-in partitioning "
|
||||
"method will be employed.");
|
||||
Parameters::Hide<Parameters::ExternalPartition>();
|
||||
#endif
|
||||
Parameters::Register<Parameters::AllowDistributedWells>
|
||||
("Allow the perforations of a well to be distributed to interior of multiple processes");
|
||||
// register here for the use in the tests without BlackoilModelParameters
|
||||
Parameters::Register<Parameters::UseMultisegmentWell>
|
||||
("Use the well model for multi-segment wells instead of the one for single-segment wells");
|
||||
FlowGenericVanguard::registerParameters_<Scalar>();
|
||||
}
|
||||
|
||||
/*!
|
||||
|
||||
@ -24,6 +24,10 @@
|
||||
#include <config.h>
|
||||
#include <opm/simulators/flow/FlowGenericVanguard.hpp>
|
||||
|
||||
#include <dune/common/version.hh>
|
||||
#include <dune/common/parallel/mpihelper.hh>
|
||||
#include <dune/common/timer.hh>
|
||||
|
||||
#include <opm/common/utility/MemPacker.hpp>
|
||||
#include <opm/common/utility/Serializer.hpp>
|
||||
|
||||
@ -77,11 +81,10 @@
|
||||
|
||||
#include <opm/input/eclipse/Parser/InputErrorAction.hpp>
|
||||
|
||||
#include <opm/simulators/utils/readDeck.hpp>
|
||||
#include <opm/models/utils/parametersystem.hh>
|
||||
|
||||
#include <dune/common/version.hh>
|
||||
#include <dune/common/parallel/mpihelper.hh>
|
||||
#include <dune/common/timer.hh>
|
||||
#include <opm/simulators/flow/BlackoilModelParameters.hpp>
|
||||
#include <opm/simulators/utils/readDeck.hpp>
|
||||
|
||||
#if HAVE_MPI
|
||||
#include <mpi.h>
|
||||
@ -378,4 +381,83 @@ bool FlowGenericVanguard::operator==(const FlowGenericVanguard& rhs) const
|
||||
cmp_ptr(this->eclSchedule_, rhs.eclSchedule_);
|
||||
}
|
||||
|
||||
template<class Scalar>
|
||||
void FlowGenericVanguard::registerParameters_()
|
||||
{
|
||||
Parameters::Register<Parameters::EclDeckFileName>
|
||||
("The name of the file which contains the ECL deck to be simulated");
|
||||
Parameters::Register<Parameters::EclOutputInterval>
|
||||
("The number of report steps that ought to be skipped between two writes of ECL results");
|
||||
Parameters::Register<Parameters::EnableDryRun>
|
||||
("Specify if the simulation ought to be actually run, or just pretended to be");
|
||||
Parameters::Register<Parameters::EnableOpmRstFile>
|
||||
("Include OPM-specific keywords in the ECL restart file to "
|
||||
"enable restart of OPM simulators from these files");
|
||||
Parameters::Register<Parameters::IgnoreKeywords>
|
||||
("List of Eclipse keywords which should be ignored. As a ':' separated string.");
|
||||
Parameters::Register<Parameters::ParsingStrictness>
|
||||
("Set strictness of parsing process. Available options are "
|
||||
"normal (stop for critical errors), "
|
||||
"high (stop for all errors) and "
|
||||
"low (as normal, except do not stop due to unsupported "
|
||||
"keywords even if marked critical");
|
||||
Parameters::Register<Parameters::InputSkipMode>
|
||||
("Set compatibility mode for the SKIP100/SKIP300 keywords. Options are "
|
||||
"100 (skip SKIP100..ENDSKIP, keep SKIP300..ENDSKIP) [default], "
|
||||
"300 (skip SKIP300..ENDSKIP, keep SKIP100..ENDSKIP) and "
|
||||
"all (skip both SKIP100..ENDSKIP and SKIP300..ENDSKIP) ");
|
||||
Parameters::Register<Parameters::SchedRestart>
|
||||
("When restarting: should we try to initialize wells and "
|
||||
"groups from historical SCHEDULE section.");
|
||||
Parameters::Register<Parameters::EdgeWeightsMethod>
|
||||
("Choose edge-weighing strategy: 0=uniform, 1=trans, 2=log(trans).");
|
||||
|
||||
#if HAVE_OPENCL || HAVE_ROCSPARSE || HAVE_CUDA
|
||||
Parameters::Register<Parameters::NumJacobiBlocks>
|
||||
("Number of blocks to be created for the Block-Jacobi preconditioner.");
|
||||
#endif
|
||||
|
||||
Parameters::Register<Parameters::OwnerCellsFirst>
|
||||
("Order cells owned by rank before ghost/overlap cells.");
|
||||
#if HAVE_MPI
|
||||
Parameters::Register<Parameters::PartitionMethod>
|
||||
("Choose partitioning strategy: 0=simple, 1=Zoltan, 2=METIS.");
|
||||
Parameters::Register<Parameters::SerialPartitioning>
|
||||
("Perform partitioning for parallel runs on a single process.");
|
||||
Parameters::Register<Parameters::ZoltanImbalanceTol<Scalar>>
|
||||
("Tolerable imbalance of the loadbalancing provided by Zoltan. DEPRECATED: Use --imbalance-tol instead");
|
||||
Parameters::Register<Parameters::ZoltanParams>
|
||||
("Configuration of Zoltan partitioner. "
|
||||
"Valid options are: graph, hypergraph or scotch. "
|
||||
"Alternatively, you can request a configuration to be read "
|
||||
"from a JSON file by giving the filename here, ending with '.json.' "
|
||||
"See https://sandialabs.github.io/Zoltan/ug_html/ug.html "
|
||||
"for available Zoltan options.");
|
||||
Parameters::Register<Parameters::ImbalanceTol<Scalar>>
|
||||
("Tolerable imbalance of the loadbalancing (default: 1.1).");
|
||||
Parameters::Register<Parameters::MetisParams>
|
||||
("Configuration of Metis partitioner. "
|
||||
"You can request a configuration to be read "
|
||||
"from a JSON file by giving the filename here, ending with '.json.' "
|
||||
"See http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/manual.pdf"
|
||||
"for available METIS options.");
|
||||
Parameters::Register<Parameters::ExternalPartition>
|
||||
("Name of file from which to load an externally generated "
|
||||
"partitioning of the model's active cells for MPI "
|
||||
"distribution purposes. If empty, the built-in partitioning "
|
||||
"method will be employed.");
|
||||
Parameters::Hide<Parameters::ExternalPartition>();
|
||||
#endif
|
||||
Parameters::Register<Parameters::AllowDistributedWells>
|
||||
("Allow the perforations of a well to be distributed to interior of multiple processes");
|
||||
// register here for the use in the tests without BlackoilModelParameters
|
||||
Parameters::Register<Parameters::UseMultisegmentWell>
|
||||
("Use the well model for multi-segment wells instead of the one for single-segment wells");
|
||||
|
||||
Parameters::Hide<Parameters::ZoltanImbalanceTol<Scalar>>();
|
||||
Parameters::Hide<Parameters::ZoltanParams>();
|
||||
}
|
||||
|
||||
template void FlowGenericVanguard::registerParameters_<double>();
|
||||
|
||||
} // namespace Opm
|
||||
|
||||
@ -45,6 +45,42 @@
|
||||
#include <utility>
|
||||
#include <vector>
|
||||
|
||||
namespace Opm::Parameters {
|
||||
|
||||
struct AllowDistributedWells { static constexpr bool value = false; };
|
||||
struct EclOutputInterval { static constexpr int value = -1; };
|
||||
struct EdgeWeightsMethod { static constexpr int value = 1; };
|
||||
struct EnableDryRun { static constexpr auto value = "auto"; };
|
||||
struct EnableOpmRstFile { static constexpr bool value = false; };
|
||||
struct ExternalPartition { static constexpr auto* value = ""; };
|
||||
|
||||
template<class Scalar>
|
||||
struct ImbalanceTol { static constexpr Scalar value = 1.1; };
|
||||
|
||||
struct IgnoreKeywords { static constexpr auto value = ""; };
|
||||
struct InputSkipMode { static constexpr auto value = "100"; };
|
||||
struct MetisParams { static constexpr auto value = "default"; };
|
||||
|
||||
#if HAVE_OPENCL || HAVE_ROCSPARSE || HAVE_CUDA
|
||||
struct NumJacobiBlocks { static constexpr int value = 0; };
|
||||
#endif
|
||||
|
||||
struct OwnerCellsFirst { static constexpr bool value = true; };
|
||||
struct ParsingStrictness { static constexpr auto value = "normal"; };
|
||||
|
||||
// 0: simple, 1: Zoltan, 2: METIS, see GridEnums.hpp
|
||||
struct PartitionMethod { static constexpr int value = 1; };
|
||||
|
||||
struct SchedRestart{ static constexpr bool value = false; };
|
||||
struct SerialPartitioning{ static constexpr bool value = false; };
|
||||
|
||||
template<class Scalar>
|
||||
struct ZoltanImbalanceTol { static constexpr Scalar value = 1.1; };
|
||||
|
||||
struct ZoltanParams { static constexpr auto value = "graph"; };
|
||||
|
||||
} // namespace Opm::Parameters
|
||||
|
||||
namespace Opm {
|
||||
|
||||
namespace Action { class State; }
|
||||
@ -292,6 +328,9 @@ protected:
|
||||
|
||||
void init();
|
||||
|
||||
template<class Scalar>
|
||||
static void registerParameters_();
|
||||
|
||||
double setupTime_;
|
||||
|
||||
// These variables may be owned by both Python and the simulator
|
||||
|
||||
Loading…
Reference in New Issue
Block a user