mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-10-13 09:22:05 -05:00
cosmetics: do not indent for namespace
also avoid an unnecessary close/open for namespace Opm
This commit is contained in:
1 parent
2bd5b30cda
commit
dc136746df
1 file changed
+21
-25
@@ -88,50 +88,46 @@ struct FlowEarlyBird {
|
|||||||
} // namespace Opm::Properties
|
} // namespace Opm::Properties
|
||||||
|
|
||||||
namespace Opm {
|
namespace Opm {
|
||||||
template <class TypeTag>
|
|
||||||
void flowEbosSetDeck(std::shared_ptr<Deck> deck,
|
template <class TypeTag>
|
||||||
|
void flowEbosSetDeck(std::shared_ptr<Deck> deck,
|
||||||
std::shared_ptr<EclipseState> eclState,
|
std::shared_ptr<EclipseState> eclState,
|
||||||
std::shared_ptr<Schedule> schedule,
|
std::shared_ptr<Schedule> schedule,
|
||||||
std::shared_ptr<SummaryConfig> summaryConfig)
|
std::shared_ptr<SummaryConfig> summaryConfig)
|
||||||
{
|
{
|
||||||
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
|
using Vanguard = GetPropType<TypeTag, Properties::Vanguard>;
|
||||||
|
|
||||||
Vanguard::setExternalDeck(deck);
|
Vanguard::setExternalDeck(deck);
|
||||||
Vanguard::setExternalEclState(eclState);
|
Vanguard::setExternalEclState(eclState);
|
||||||
Vanguard::setExternalSchedule(schedule);
|
Vanguard::setExternalSchedule(schedule);
|
||||||
Vanguard::setExternalSummaryConfig(summaryConfig);
|
Vanguard::setExternalSummaryConfig(summaryConfig);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------- Main program -----------------
|
// ----------------- Main program -----------------
|
||||||
template <class TypeTag>
|
template <class TypeTag>
|
||||||
int flowEbosMain(int argc, char** argv, bool outputCout, bool outputFiles)
|
int flowEbosMain(int argc, char** argv, bool outputCout, bool outputFiles)
|
||||||
{
|
{
|
||||||
// we always want to use the default locale, and thus spare us the trouble
|
// we always want to use the default locale, and thus spare us the trouble
|
||||||
// with incorrect locale settings.
|
// with incorrect locale settings.
|
||||||
resetLocale();
|
resetLocale();
|
||||||
|
|
||||||
FlowMainEbos<TypeTag> mainfunc(argc, argv, outputCout, outputFiles);
|
FlowMainEbos<TypeTag> mainfunc(argc, argv, outputCout, outputFiles);
|
||||||
return mainfunc.execute();
|
return mainfunc.execute();
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ----------------- Main class -----------------
|
||||||
namespace Opm
|
// For now, we will either be instantiated from main() in flow.cpp,
|
||||||
|
// or from a Python pybind11 module..
|
||||||
|
// NOTE (March 2020): When used from a pybind11 module, we do not neccessarily
|
||||||
|
// want to run the whole simulation by calling run(), it is also
|
||||||
|
// useful to just run one report step at a time. According to these different
|
||||||
|
// usage scenarios, we refactored the original run() in flow.cpp into this class.
|
||||||
|
class Main
|
||||||
{
|
{
|
||||||
|
private:
|
||||||
// ----------------- Main class -----------------
|
|
||||||
// For now, we will either be instantiated from main() in flow.cpp,
|
|
||||||
// or from a Python pybind11 module..
|
|
||||||
// NOTE (March 2020): When used from a pybind11 module, we do not neccessarily
|
|
||||||
// want to run the whole simulation by calling run(), it is also
|
|
||||||
// useful to just run one report step at a time. According to these different
|
|
||||||
// usage scenarios, we refactored the original run() in flow.cpp into this class.
|
|
||||||
class Main
|
|
||||||
{
|
|
||||||
private:
|
|
||||||
using FlowMainEbosType = FlowMainEbos<Properties::TTag::EclFlowProblem>;
|
using FlowMainEbosType = FlowMainEbos<Properties::TTag::EclFlowProblem>;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
Main(int argc, char** argv) : argc_(argc), argv_(argv) { initMPI(); }
|
Main(int argc, char** argv) : argc_(argc), argv_(argv) { initMPI(); }
|
||||||
|
|
||||||
// This constructor can be called from Python
|
// This constructor can be called from Python
|
||||||
@@ -275,7 +271,7 @@ namespace Opm
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
int dispatchDynamic_()
|
int dispatchDynamic_()
|
||||||
{
|
{
|
||||||
const auto& rspec = this->eclipseState_->runspec();
|
const auto& rspec = this->eclipseState_->runspec();
|
||||||
@@ -712,7 +708,7 @@ namespace Opm
|
|||||||
|
|
||||||
// To demonstrate run with non_world_comm
|
// To demonstrate run with non_world_comm
|
||||||
bool isSimulationRank_ = true;
|
bool isSimulationRank_ = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
} // namespace Opm
|
} // namespace Opm
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user