Merge pull request #1890 from joakim-hove/extract-udq-eval

Remove call to udq::eval() from Summary::eval()

msim/src/msim.cpp

@@ -30,6 +30,7 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/SummaryState.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Action/ActionContext.hpp>
 #include <opm/parser/eclipse/EclipseState/Schedule/Action/State.hpp>
+#include <opm/parser/eclipse/EclipseState/Schedule/UDQ/UDQConfig.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseContext.hpp>
 #include <opm/parser/eclipse/Parser/ErrorGuard.hpp>
@@ -118,6 +119,8 @@ void msim::run_step(const Schedule& schedule, Action::State& action_state, Summa
                           group_data,
                           {});
 
+        schedule.getUDQConfig( report_step ).eval(st);
+
         this->output(action_state,
                      st,
                      report_step,

src/opm/output/eclipse/Summary.cpp

@@ -2657,8 +2657,6 @@ void Summary::eval(SummaryState&                  st,
                        well_solution, group_solution, single_values,
                        region_values, block_values, st);
 
-    const auto& udq = schedule.getUDQConfig(sim_step);
-    udq.eval(st);
     st.update_elapsed(duration);
 }