[Richards&Transport] Remove do_operator_setup flag

parent c87c4aa7
......@@ -103,8 +103,9 @@ RichardsSimulation<Traits>::RichardsSimulation (
adaptivity = adaptivity_fac.create();
}
do_operator_setup = true;
// --- Operator Setup ---
operator_setup();
this->_log->info("Setup complete");
}
......@@ -144,17 +145,11 @@ void RichardsSimulation<Traits>::operator_setup()
osm->setVerbosityLevel(0);
gfs->update();
do_operator_setup = false;
}
template<typename Traits>
void RichardsSimulation<Traits>::step()
{
// --- Operator Setup ---
if (do_operator_setup)
operator_setup();
// long time step log for level 'debug'
if (this->_log->should_log(spdlog::level::debug)) {
this->_log->info("Time Step {}:",
......@@ -262,7 +257,7 @@ void RichardsSimulation<Traits>::adapt_grid()
template<typename Traits>
void RichardsSimulation<Traits>::post_adapt_grid()
{
do_operator_setup = true;
operator_setup();
}
template<typename Traits>
......
......@@ -321,7 +321,6 @@ protected:
RF time_before;
RF dt_before;
bool do_operator_setup;
const bool enable_fluxrc;
public:
......
......@@ -93,7 +93,8 @@ TransportSimulation<Traits>::TransportSimulation(
"./");
}
do_operator_setup = true;
// --- Operator Setup ---
operator_setup();
this->_log->info("Setup complete");
}
......@@ -133,17 +134,11 @@ void TransportSimulation<Traits>::operator_setup()
osm->setVerbosityLevel(0);
gfs->update();
do_operator_setup = false;
}
template<typename Traits>
void TransportSimulation<Traits>::step()
{
// --- Operator Setup ---
if (do_operator_setup)
operator_setup();
// long time step log for level 'debug'
if (this->_log->should_log(spdlog::level::debug)) {
this->_log->info("Time Step {}:",time_steps);
......
......@@ -295,7 +295,6 @@ protected:
unsigned int time_steps;
bool do_operator_setup;
const bool enable_fluxrc;
public:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment