mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-10-25 15:10:09 -05:00
Conflicts: opm/autodiff/FullyImplicitBlackoilSolver.cpp To resolve conflicts, WellState was changed to WellStateFullyImplicitBlackoil in multiple places, and perfRate() changed to perfPhaseRate() in WellDensitySegmented.