mirror of
https://github.com/OPM/opm-simulators.git
synced 2026-08-03 12:33:04 -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.