mirror of
https://github.com/OPM/opm-simulators.git
synced 2025-02-25 18:55:30 -06:00
Conflicts: opm/autodiff/FullyImplicitBlackoilSolver.cpp To resolve conflicts, WellState was changed to WellStateFullyImplicitBlackoil in multiple places, and perfRate() changed to perfPhaseRate() in WellDensitySegmented.