OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-07-07 04:53:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5153 from akva2/actionhandler_drop_ecl

Browse Source 
EclActionHandler: rename to ActionHandler
This commit is contained in:
Bård Skaflestad 2024-02-06 13:01:04 +01:00 committed by GitHub
commit 644ba538d8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists_files.cmake
View File

@ -40,9 +40,9 @@ list (APPEND MAIN_SOURCE_FILES
opm/core/props/phaseUsageFromDeck.cpp
opm/core/props/satfunc/RelpermDiagnostics.cpp
opm/simulators/timestepping/SimulatorReport.cpp
opm/simulators/flow/ActionHandler.cpp
opm/simulators/flow/Banners.cpp
opm/simulators/flow/ConvergenceOutputConfiguration.cpp
opm/simulators/flow/EclActionHandler.cpp
opm/simulators/flow/ExtraConvergenceOutputThread.cpp
opm/simulators/flow/FlowMainEbos.cpp
opm/simulators/flow/InterRegFlows.cpp
@ -439,6 +439,7 @@ list (APPEND PUBLIC_HEADER_FILES
ebos/eclwriter.hh
ebos/femcpgridcompat.hh
ebos/vtkecltracermodule.hh
opm/simulators/flow/ActionHandler.hpp
opm/simulators/flow/countGlobalCells.hpp
opm/simulators/flow/priVarsPacking.hpp
opm/simulators/flow/BlackoilModel.hpp
@ -446,7 +447,6 @@ list (APPEND PUBLIC_HEADER_FILES
opm/simulators/flow/BlackoilModelParameters.hpp
opm/simulators/flow/Banners.hpp
opm/simulators/flow/ConvergenceOutputConfiguration.hpp
opm/simulators/flow/EclActionHandler.hpp
opm/simulators/flow/ExtraConvergenceOutputThread.hpp
opm/simulators/flow/FlowMainEbos.hpp
opm/simulators/flow/InterRegFlows.hpp

4
ebos/eclproblem.hh
View File

@ -82,7 +82,7 @@
#include <opm/output/eclipse/EclipseIO.hpp>
#include <opm/simulators/flow/EclActionHandler.hpp>
#include <opm/simulators/flow/ActionHandler.hpp>
#include <opm/simulators/timestepping/AdaptiveTimeStepping.hpp>
#include <opm/simulators/timestepping/SimulatorReport.hpp>
#include <opm/simulators/utils/DeferredLoggingErrorHelpers.hpp>
@ -2807,7 +2807,7 @@ private:
PffGridVector<GridView, Stencil, PffDofData_, DofMapper> pffDofData_;
TracerModel tracerModel_;
EclActionHandler actionHandler_;
ActionHandler actionHandler_;
template<class T>
struct BCData

38
opm/simulators/flow/EclActionHandler.cpp → opm/simulators/flow/ActionHandler.cpp
View File

@ -22,7 +22,7 @@
*/
#include <config.h>
#include <opm/simulators/flow/EclActionHandler.hpp>
#include <opm/simulators/flow/ActionHandler.hpp>
#include <opm/common/OpmLog/OpmLog.hpp>
#include <opm/common/utility/TimeService.hpp>
@ -112,12 +112,12 @@ namespace {
namespace Opm {
EclActionHandler::EclActionHandler(EclipseState& ecl_state,
Schedule& schedule,
Action::State& actionState,
SummaryState& summaryState,
BlackoilWellModelGeneric& wellModel,
Parallel::Communication comm)
ActionHandler::ActionHandler(EclipseState& ecl_state,
Schedule& schedule,
Action::State& actionState,
SummaryState& summaryState,
BlackoilWellModelGeneric& wellModel,
Parallel::Communication comm)
: ecl_state_(ecl_state)
, schedule_(schedule)
, actionState_(actionState)
@ -126,9 +126,9 @@ EclActionHandler::EclActionHandler(EclipseState& ecl_state,
, comm_(comm)
{}
void EclActionHandler::applyActions(const int reportStep,
const double sim_time,
const TransFunc& transUp)
void ActionHandler::applyActions(const int reportStep,
const double sim_time,
const TransFunc& transUp)
{
OPM_TIMEBLOCK(applyActions);
const auto& actions = schedule_[reportStep].actions();
@ -184,10 +184,10 @@ void EclActionHandler::applyActions(const int reportStep,
}
}
void EclActionHandler::applySimulatorUpdate(const int report_step,
const SimulatorUpdate& sim_update,
bool& commit_wellstate,
const TransFunc& updateTrans)
void ActionHandler::applySimulatorUpdate(const int report_step,
const SimulatorUpdate& sim_update,
bool& commit_wellstate,
const TransFunc& updateTrans)
{
OPM_TIMEBLOCK(applySimulatorUpdate);
@ -208,9 +208,9 @@ void EclActionHandler::applySimulatorUpdate(const int report_step,
}
std::unordered_map<std::string, double>
EclActionHandler::fetchWellPI(const int reportStep,
const Action::ActionX& action,
const std::vector<std::string>& matching_wells) const
ActionHandler::fetchWellPI(const int reportStep,
const Action::ActionX& action,
const std::vector<std::string>& matching_wells) const
{
auto wellpi_wells = action.wellpi_wells(WellMatcher(schedule_[reportStep].well_order(),
@ -253,8 +253,8 @@ EclActionHandler::fetchWellPI(const int reportStep,
return wellpi;
}
void EclActionHandler::evalUDQAssignments(const unsigned episodeIdx,
UDQState& udq_state)
void ActionHandler::evalUDQAssignments(const unsigned episodeIdx,
UDQState& udq_state)
{
const auto& udq = schedule_[episodeIdx].udq();

20
opm/simulators/flow/EclActionHandler.hpp → opm/simulators/flow/ActionHandler.hpp
View File

@ -21,8 +21,8 @@
copyright holders.
*/
#ifndef ECL_ACTION_HANDLER_HPP
#define ECL_ACTION_HANDLER_HPP
#ifndef OPM_ACTION_HANDLER_HPP
#define OPM_ACTION_HANDLER_HPP
#include <opm/simulators/utils/ParallelCommunication.hpp>
@ -46,18 +46,18 @@ class SummaryState;
class UDQState;
//! \brief Class handling Action support in simulator
class EclActionHandler
class ActionHandler
{
public:
//! \brief Function handle to update transmissiblities.
using TransFunc = std::function<void(bool)>;
EclActionHandler(EclipseState& ecl_state,
Schedule& schedule,
Action::State& actionState,
SummaryState& summaryState,
BlackoilWellModelGeneric& wellModel,
Parallel::Communication comm);
ActionHandler(EclipseState& ecl_state,
Schedule& schedule,
Action::State& actionState,
SummaryState& summaryState,
BlackoilWellModelGeneric& wellModel,
Parallel::Communication comm);
void applyActions(int reportStep,
double sim_time,
@ -94,4 +94,4 @@ public:
} // namespace Opm
#endif // ECL_ACTION_HANDLER_HPP
#endif // OPM_ACTION_HANDLER_HPP