OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-28 20:13:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
8,346 Commits 24 Branches 101 Tags 75 MiB
9edd49ec3a
Commit Graph

5775 Commits

Author SHA1 Message Date
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
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
Arne Morten Kvarving
fb7bdffbc7 fixed: signed/unsigned warnings 2018-11-16 08:48:53 +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
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
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
Atgeirr Flø Rasmussen
49a7773b30
Merge pull request #1630 from akva2/split_vfp 
Split VFP classes in ebos and legacy
 2018-11-14 11:04:05 +01:00
Arne Morten Kvarving
c5ae3adbbf changed: split VFP classes in base (ebos) and legacy 
to get rid of eigen usage in ebos based classes
 2018-11-14 09:54:33 +01:00
Atgeirr Flø Rasmussen
e1e39b4bd9
Merge pull request #1626 from GitPaean/fixing_different_number_of_wells_due_to_wtest 
fixing different well number between Wells and Well_containers
 2018-11-14 09:37:09 +01:00
Atgeirr Flø Rasmussen
54cc52dcaf
Merge pull request #1629 from akva2/remove_rogue_includes 
remove two rogue includes
 2018-11-14 09:06:13 +01:00
Arne Morten Kvarving
e8c2029166 remove two rogue includes 
motivation: getting rid of BlackoilPropsAdFromDeck in ebos code path
 2018-11-14 08:35:21 +01:00
Atgeirr Flø Rasmussen
8d2bc0e449 Add missing include for std::vector. 2018-11-13 20:26:44 +01:00
Kai Bao
8f56634b69 fixing different well number between Wells and Well_containers 
when the solveWellEq did not get converged.
 2018-11-13 20:01:38 +01:00
Atgeirr Flø Rasmussen
58642254e0
Merge pull request #1624 from akva2/split_mpi_func 
split mpi function from newtoniterationutilities
 2018-11-13 19:21:56 +01:00
Arne Morten Kvarving
e0a9e13a97 split mpi function from newtoniterationutilities 2018-11-13 15:26:44 +01:00
Kai Bao
2ed2c20f12
Merge pull request #1623 from atgeirr/use-convergencereport-gather 
Use gatherConvergenceReport() in BlackoilWellModel.
 2018-11-13 15:16:34 +01:00
Atgeirr Flø Rasmussen
d858f2901a
Merge pull request #1614 from totto82/well_ppp 
Output of well potential when asked for
 2018-11-13 14:29:58 +01:00
Atgeirr Flø Rasmussen
446dbdf86d Use gatherConvergenceReport(). 
This avoids multiple all-reduce blocks, simplifying the code and
enabling us to return the report from getWellConvergence().
 2018-11-13 14:02:55 +01:00
Atgeirr Flø Rasmussen
6e7cc756de Move implementation of gatherConvergenceReport() to cpp file. 
No templates involved, no reason to keep it in header. This also makes
building more robust by only invoking HAVE_MPI in the cpp file, after
including config.h.
 2018-11-13 14:01:01 +01:00
Atgeirr Flø Rasmussen
566f6813dd Created gatherConvergenceReport() function and test. 2018-11-13 10:30:32 +01:00
Atgeirr Flø Rasmussen
48b0024855 Refactor BlackoilModelEbos::getConvergence(). 
The loop over elements to extract data has been moved to a separate
function localConvergenceData().
 2018-11-13 10:19:15 +01:00
Atgeirr Flø Rasmussen
576852b299 Remove cell_index from ReservoirFailure struct. 2018-11-13 10:19:15 +01:00
Atgeirr Flø Rasmussen
58eedf0d65
Merge pull request #1615 from GitPaean/using_events_for_well_states_2 
detecting whether some well control events happens to a well
 2018-11-13 07:42:19 +01:00