Commit Graph
8354 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen 83ce1eb919 Ensure all residuals are checked for convergence.
Looping over all components instead of phases, to handle polymer etc.
correctly. Also slight refactoring of how component names for output
are handled.
2018-11-19 14:46:31 +01:00
Atgeirr Flø Rasmussen b42165b560 Store convergence reports from all steps and iterations. 2018-11-19 11:48:07 +01:00
Atgeirr Flø Rasmussen fe79a9fc07 Refactor getConvergence() to use ConvergenceReport.
Note: the communication and reduction for computing reservoir
convergence is not done by gathering ConvergenceReports, but
as before, using the convergenceReduction() method.
2018-11-19 11:48:07 +01:00
Atgeirr Flø Rasmussen c006ea23f2 Merge pull request #1651 from totto82/speed_up_add_cell_rates
Speed up add cell rates
2018-11-19 10:49:19 +01:00
Arne Morten Kvarving 81b5c634a4 Merge pull request #1652 from akva2/fix_install_mpiutilities
fixed: install MPIUtilities.hpp
2018-11-19 10:26:59 +01:00
Tor Harald Sandve 9903738690 Avoid copying of SummaryConfig 2018-11-19 09:41:00 +01:00
Tor Harald Sandve 54e33a00d2 Only update intensiveQuantities for perforated cells 2018-11-19 09:41:00 +01:00
Tor Harald Sandve 3a38b9fe53 Move addCellRates to interface and add is_cell_penetrated 2018-11-19 09:41:00 +01:00
Arne Morten Kvarving 9edd49ec3a fixed: install MPIUtilities.hpp 2018-11-19 09:06:15 +01:00
Atgeirr Flø Rasmussen 339c7a5043 Merge pull request #1650 from akva2/fix_install_matrixblock
fixed: install MatrixBlock.hpp
2018-11-19 09:01:17 +01:00
Arne Morten Kvarving 2fa961bb3d fixed: install MatrixBlock.hpp 2018-11-19 08:44:23 +01:00
Atgeirr Flø Rasmussen b5cb7bb829 Merge pull request #1644 from GitPaean/fixing_control_initialization
using control in DECK to initialize the control in WellState
2018-11-16 15:38:22 +01:00
Atgeirr Flø Rasmussen 8b09803bc2 Merge pull request #1646 from akva2/split_legacy
Remove legacy simulators
2018-11-16 15:17:09 +01:00
Arne Morten Kvarving f771049f93 build system cleanup 2018-11-16 15:01:59 +01:00
Arne Morten Kvarving f027262ec4 remove files 2018-11-16 14:53:37 +01:00
Kai Bao 7ded0907fe using control in DECK to initialize the control in WellState
otherwise, it might not be initialized if the well does not exisit in
previous well state, which will result in undefined behavoir.

it causes failure in running some realizations.
2018-11-16 13:47:43 +01:00
Arne Morten Kvarving 78158bf44a Merge pull request #1643 from atgeirr/legacy-split-work
Avoid using legacy stuff for ebos linear solvers.
2018-11-16 13:29:24 +01:00
Atgeirr Flø Rasmussen 92a9b5fa9b Avoid using legacy stuff for ebos linear solvers. 2018-11-16 12:06:12 +01:00
Kai Bao 0e1ef4993b Merge pull request #1641 from akva2/fix_sign_unsigned
fixed: signed/unsigned warnings
2018-11-16 09:35:31 +01:00
Arne Morten Kvarving fb7bdffbc7 fixed: signed/unsigned warnings 2018-11-16 08:48:53 +01:00
Atgeirr Flø Rasmussen 7896c2f334 Merge pull request #1636 from GitPaean/update_IPR
update well state with THP target based on inflow performance relationship
2018-11-15 18:01:34 +01:00
Kai Bao b2be13ced4 changing std::cout to OpmLog with VFPProdProperties
for better output of information.
2018-11-15 11:46:22 +01:00
Kai Bao 76a3f2a1f5 adding function updateWellStateWithTHPTargetIPR()
this function can update the well state related based on the inflow
perfomance relationship and THP target.
2018-11-15 11:46:22 +01:00
Kai Bao eeae6aa4fc adding two THP control related fucntions to WellInterface
getTHPConstraint() and getTHPControlIndex();
2018-11-15 11:46:22 +01:00
Kai Bao 01efbc639c adding function underPredictionMode() to WellInterface
to indicate whether a well is under prediction mode.
2018-11-15 11:46:22 +01:00
Kai Bao 9bfa39224f re-organize the interface of function findIntersectionForBhp()
hopefully, make it easier to use.

and also, there is no mistake introduced.
2018-11-15 11:46:22 +01:00
Kai Bao 8445c802c0 adding function calculateBhpWithTHPTarget to VFPProdProperties
it calculate bhp value based on THP target/limit, VFP curves and
inflow-performance relationship
2018-11-15 11:46:22 +01:00
Kai Bao 9b5e25ae0f function to calculate bhp from thp through intersection
of VFP curves and IPR relationship.

Some small adjustment of the interface will be done later.
2018-11-15 11:46:22 +01:00
Kai Bao 32b8e79eae adding function updateIPR() to StandardWell 2018-11-15 11:46:22 +01:00
Atgeirr Flø Rasmussen 0761850e7a Merge pull request #1637 from OPM/fix-gather-convergemcereport-for-openmpi
Make MPI calls in gatherConvergenceReport with void*.
2018-11-15 11:04:35 +01:00
Markus Blatt 8cafb0e92a Make MPI calls in gatherConvergenceReport with void* instead of const void*
Fixes compilation of PR #1612 with open-mpi 1.6.5.
Compiler complained about not being able to transform const void* to void*
as needed by MPI.
2018-11-15 09:30:51 +00:00
Atgeirr Flø Rasmussen 8b376f9b14 Merge pull request #1634 from atgeirr/fix-missing-includes-matrixblock
Add missing includes
2018-11-14 21:11:45 +01:00
Atgeirr Flø Rasmussen 5e51d6982b Add missing includes. 2018-11-14 21:09:40 +01:00
Atgeirr Flø Rasmussen 258c019989 Merge pull request #1617 from andlaus/sparse_matrix_abstraction
Sparse matrix abstraction
2018-11-14 16:14:00 +01:00
Andreas Lauser e110fac52a Merge pull request #1633 from akva2/rogue_and_unwanted
Remove some rogue includes and unwanted opm/autodiff/GridHelpers.hpp usage
2018-11-14 16:00:30 +01:00
Atgeirr Flø Rasmussen db8c00db00 Merge pull request #1632 from akva2/use_istl_ebos
Use ebos ISTL class
2018-11-14 15:44:26 +01:00
Arne Morten Kvarving fe8adb51d8 remove rogue includes 2018-11-14 15:37:44 +01:00
Arne Morten Kvarving 023924d057 changed: use UgGridHelpers directly
GridHelpers.hpp will be moved
2018-11-14 15:37:44 +01:00
Atgeirr Flø Rasmussen 44dc9b22bc Merge pull request #1622 from GitPaean/updating_thp_when_VFPActive
Updating thp when valid VFP table is specified
2018-11-14 15:00:14 +01:00
Andreas Lauser f58f5d3c7a MPIUtilities.hpp: include required header file 2018-11-14 14:36:11 +01:00
Andreas Lauser d5089076d9 ISTLSolver: add now-necessary include 2018-11-14 14:35:52 +01:00
Andreas Lauser f9104ca3d7 adapt to the eWoms interface for abstracting sparse matrices 2018-11-14 14:35:52 +01:00
Andreas Lauser 46641d5ace move the MatrixBlock class and assorted code to its own header
this avoids recompiles if something changes in ewoms because
ISTLSolver.hpp included ISTLSolverEbos.hpp . also, it is better style.
2018-11-14 14:35:52 +01:00
Kai Bao bf967e50a7 adding hasTable() method to the VFP properties
and give a clear message about non-accessible table ID in the function
isVFPActive() in WellInterface.
2018-11-14 14:29:28 +01:00
Kai Bao cf2eb1c336 remove a useless #if HAVE_OPENMP in BlackoilWellModel 2018-11-14 12:47:49 +01:00
Kai Bao 5a5c1bfcd3 addressing review comments from PR 1622 2018-11-14 12:45:41 +01:00
Arne Morten Kvarving 911a89fc4c fixed: use the ebos ISTL class
to avoid legacy code in tests that will sit in this repo
2018-11-14 12:27:39 +01:00
Kai Bao afcdbcf202 detecting the NAN and INF values during VFP calculation
and give warning messages when they happen, since they can be the
culprits of the termination of simulation later.

For ADB related, I did not find a good way to do the detection, so there
is no warning message given.
2018-11-14 11:35:44 +01:00
Kai Bao 32b00b61f8 updating the thp value if VFP table is valid
through function isVFPActive().
2018-11-14 11:27:00 +01:00
Kai Bao 0d1a4b2d13 adding function isVFPActive() for WellInterface
Even the well does not have a THP target/constraint, but if it is
specified with a valid VFP table, we are supposed to update the thp
value for output purposes.
2018-11-14 11:27:00 +01:00