OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
10,237 Commits 24 Branches 102 Tags 90 MiB
6aafdba80d
Commit Graph

718 Commits

Author SHA1 Message Date
Joakim Hove
fce5d2f369 Rename Well2 -> Well and Group2 -> Group 2019-11-13 23:18:01 +01:00
Steinar Foss
099df1d566 MissingFeatures: updated list, corrected spelling errors. 2019-11-13 12:17:39 +01:00
Joakim Hove
b03078452f Make sure the perforation pressures is initialized also for STOP wells 2019-11-12 15:41:22 +01:00
Tor Harald Sandve
95f013bd96 fixup review comments. including bug in updateGroupTargetReduction 2019-11-08 14:07:12 +01:00
Tor Harald Sandve
8218f81183 set reservoir rate to zero for shut wells 2019-11-08 11:30:37 +01:00
Tor Harald Sandve
a95459e6ff copy wellReservoirRates 2019-11-08 10:26:34 +01:00
Cintia Goncalves Machado
ac30f97c43
Delete few thermal keywords from list 
@slawekszklarz and I were checking the keywords mentioned in warnings as unhandled when running thermal models. The keywords RTEMP, RTEMPVD and THCONR seem to be working fine.  The WATVISCT table breaks the simulation when extrapolation is needed.
 2019-11-07 15:04:57 +01:00
Tor Harald Sandve
8cece8641e fix mpi 2019-11-07 14:57:59 +01:00
Tor Harald Sandve
159f36ff85 add openCrossFlowAvoidSingularity functionality for MSW 2019-11-07 14:01:21 +01:00
Tor Harald Sandve
1ab99d07c7 Support VREP with combined gas and water injectors 2019-11-07 11:31:47 +01:00
Tor Harald Sandve
c3423c770c fix vrep and rein 2019-11-06 13:27:47 +01:00
Tor Harald Sandve
04701580d8 keep current injection and production control 2019-11-06 13:27:47 +01:00
Tor Harald Sandve
008eb17693 Support nupcol 
Only update groupTargetReduction, group REIN rates and group VREP rates when iteration < nupcol
 2019-11-06 10:23:30 +01:00
Atgeirr Flø Rasmussen
b9b8905db5
Merge pull request #2142 from atgeirr/prediction-fixes 
Prediction improvements
 2019-11-05 19:15:01 +01:00
Atgeirr Flø Rasmussen
20f767555e
Merge pull request #2141 from totto82/fixGroupFraction 
fix group fraction bug
 2019-11-05 16:18:01 +01:00
Atgeirr Flø Rasmussen
672835710b
Merge pull request #2140 from totto82/fixGroupProd 
Fix for hierarchy of production groups.
 2019-11-05 16:15:29 +01:00
Atgeirr Flø Rasmussen
4b7e37df1b Increase hardcoded producer bhp search range to 600 bar. 2019-11-05 16:07:22 +01:00
Atgeirr Flø Rasmussen
5ce4e84acd Do not add 0 to flo_samples vector. 2019-11-05 16:06:09 +01:00
Atgeirr Flø Rasmussen
5e8b577cd0 Use the RegulaFalsiBisection method instead of RegulaFalsi. 2019-11-05 16:05:42 +01:00
Atgeirr Flø Rasmussen
b034ea2b04
Merge pull request #2139 from totto82/thpInj 
add computeBhpAtThpLimitInj
 2019-11-05 15:15:12 +01:00
Tor Harald Sandve
3c89e4ba75 fix group fraction bug 2019-11-05 15:13:47 +01:00
Tor Harald Sandve
485bbfe010 fix group prod 2019-11-05 15:04:26 +01:00
Tor Harald Sandve
9dc536bc82 add computeBhpAtThpLimitInj 2019-11-05 14:18:30 +01:00
Tor Harald Sandve
fb815e78e6 compute resv rates for MSW 2019-11-05 13:11:03 +01:00
Atgeirr Flø Rasmussen
bc71341462
Merge pull request #2125 from totto82/mswThp 
add support for thp control in MSW
 2019-11-04 11:25:20 +01:00
Atgeirr Flø Rasmussen
7922c51adb
Merge pull request #2132 from totto82/gconinje 
Support custom vrep and rein group
 2019-11-04 10:23:33 +01:00
Atgeirr Flø Rasmussen
95aeca322f
Merge pull request #2130 from totto82/reorderThp 
Check THP in the end
 2019-11-04 09:14:24 +01:00
Joakim Hove
24fd019037
Merge pull request #2128 from joakim-hove/P 
Add missing keywords on P
 2019-11-01 17:36:42 +01:00
Markus Blatt
a5506956fb renamed numWells to numLocalWells in BlackoilWellmodel 
as this better reflects that it is not the number of wells in
the whole domain but just the one in the part of the domain
stored in the local process.
 2019-11-01 15:11:21 +01:00
Markus Blatt
905403e2ed Fix BlackoilWellModel::numComponents for parallel runs. 
In the case with active solvent (BlackoilWellModel::has_solvent_ is
true, e.g. case 2D_OILWATER_POLYMER.DATA) and one process have no
wells while another has some this lead to numComponents returning
different values. Later this lead to truncated message in MPI_Allgather.

The underlying problem was the usage of numWells() which returns just
the number of local wells. We resort to using wellsActive which
returns whether there any well active regardless which process knows it.
 2019-11-01 15:07:00 +01:00
Tor Harald Sandve
f23b375c87 Check THP in the end 2019-11-01 14:58:40 +01:00
Tor Harald Sandve
375d936ecd Support custom vrep and rein group 2019-11-01 14:57:50 +01:00
Joakim Hove
7c471688f1 Add missing keywords on P 2019-11-01 14:39:38 +01:00
Tor Harald Sandve
abbff074b4 add support for thp control in MSW 2019-11-01 10:04:44 +01:00
Joakim Hove
29a514754a
Merge pull request #2121 from stefoss23/add_keywords_NOP 
added keywords beginning w/ N, O and P.
 2019-10-31 16:50:08 +01:00
Alf Birger Rustad
8922113869
Merge pull request #2100 from totto82/fixMSW 
BUGFIX. Scale MSW injector
 2019-10-31 15:39:49 +01:00
Steinar Foss
7d84a244d9 added even more keywords beginning w/ P. 2019-10-31 13:16:54 +01:00
Steinar Foss
aff6ce6f77 added keywords beginning w/ N, O and P. 2019-10-30 16:00:16 +01:00
Markus Blatt
10db57f66b Only print usage information on one processes. 
No matter whether requested via --help or printed due to a wrong
command line parameter.

Closes #2012.
 2019-10-29 17:00:24 +01:00
Steinar Foss
01b57da9e1 added keywords beg with N. 2019-10-26 12:54:59 +02:00
Joakim Hove
b58d14bfb0 Add Q keywords as missing features 2019-10-24 17:08:47 +02:00
Steinar Foss
c285b93c2b added more keywords beginning with M. 2019-10-24 11:56:09 +02:00
Tor Harald Sandve
9a3ce14885 scale the gas equation, not the control 2019-10-24 10:54:50 +02:00
Tor Harald Sandve
e1f09d89cd Scale MSW injector 2019-10-24 10:18:16 +02:00
Atgeirr Flø Rasmussen
5d1e125ab9
Merge pull request #2096 from totto82/avoid_nan_density 
avoid nan in the density calculation
 2019-10-22 14:27:45 +02:00
Tor Harald Sandve
775573e3b2 avoid nan in the density calculation 2019-10-22 13:04:29 +02:00
Tor Harald Sandve
5c60a487f9 Add well operability param 2019-10-22 12:57:32 +02:00
Atgeirr Flø Rasmussen
5267f3cf17
Merge pull request #1965 from totto82/killDistr 
Reimplementation of the well control code
 2019-10-22 10:25:32 +02:00
Markus Blatt
9751984021
Merge pull request #2033 from blattms/avoid_equil_grid-rebased 
Avoid using global grid (equilGrid) on non-IO processes.
 2019-10-21 11:47:17 +02:00
Joakim Hove
481c09170a
Merge pull request #2068 from stefoss23/add_keywords_M 
added keywords beginnign w/ M.
 2019-10-20 12:22:24 +02:00
Joakim Hove
5524852a31
Merge pull request #2075 from joakim-hove/use-location 
Use Location class for keyword location
 2019-10-19 23:30:51 +02:00
Joakim Hove
7211cb4486 Use Location class for keyword location 2019-10-19 21:59:10 +02:00
Kai Bao
c4a9bd346c converting the aquifer files to be unix format 
to avoid ^M in git diff and when editing.
 2019-10-19 20:53:35 +02:00
Markus Blatt
3dad4f21e8 Fixed unused parameter warning wehn compiling without MPI. 2019-10-18 16:23:22 +02:00
Markus Blatt
42247105bf Addressed reviewer's comments. 2019-10-18 16:23:22 +02:00
Tor Harald Sandve
cd0bf8045d change control eq tol for standard wells 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
9bd44dc79a quell some more warnings 2019-10-18 16:08:07 +02:00
Arne Morten Kvarving
af2e150118 fixed: missing break 2019-10-18 16:08:07 +02:00
Arne Morten Kvarving
17a6861f09 quell unused parameter warning 2019-10-18 16:08:07 +02:00
Arne Morten Kvarving
33dee9f7f8 quell shadowing warnings 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
47dc94f21e the usual rebase fixup commit 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
5e1ec249cd don't count wells not under group controll when computing guiderates 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
614025b28b clean up the logging message 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
5dcfd1c8f1 check bhp and thp constrains first 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
4fea282934 fixup-rebase 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
32b31a2606 Address review comments. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
f618073492 Some small logic fixes. 
- Make sure to reopen revived wells.
 - Do not use thp limit for potential calculations when well is bhp controlled.
 - Stopped wells do not check controls.
 - Set thp to control when appropriate in updateWellStateWithTarget().
 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
6b011c1bfb Use new method to determine operability under THP control. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
a536b90891 Improve stopped wells logic and log messages. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
2b9f5fb4fb Use robustSolveBhpAtThpLimitProd() for potentials and initialization. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
7581275b03 Add robustSolveBhpAtThpLimitProd() method. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
d5d890ff23 Make checkConstraints() stop after first broken constraint. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
e8daf663ab Solve the bhp = bhpfunc(thp, rate(bhp)) equation better. 2019-10-18 16:08:07 +02:00
Atgeirr Flø Rasmussen
f55c9647b7 Allow up to factor 3 extrapolation in VFP. 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
c21428419a support REIN for solvent 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
0b96b31d8c add some safaguards for trivial guiderates 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
88d8e2a68e don't set the control from the schedule, unfix the restart issue 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
f71d6c8623 implement proper guiderate support 
Tested on simple problems including GUIDERAT
 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
53896ffca8 Use well and group controls from opm-common. 
This PR remove the usage of well_control_ from opm-core
and instead uses the control classes for wells and groups
from opm-common.
This PR also removes the usage of the group classes from
opm-core.
 2019-10-18 16:08:07 +02:00
Tor Harald Sandve
b053558b3f Remove supported keywords from the missing feature list 2019-10-18 12:56:12 +02:00
Joakim Hove
3ef94af74e
Merge pull request #2067 from joakim-hove/missingR 
Missing features on R
 2019-10-17 14:54:38 +02:00
dr-robertk
18c31bda0b
Merge pull request #2047 from totto82/enableRockcompFlow 
enable rockcomp in flow
 2019-10-17 14:12:35 +02:00
Steinar Foss
973c039853 added keywords beginnign w/ M. 2019-10-17 13:05:15 +02:00
Tor Harald Sandve
8c7d7e3d2e enables rockcomp in flow 2019-10-17 12:44:49 +02:00
Joakim Hove
a6c890e274 Missing features on R 2019-10-17 11:29:33 +02:00
Steinar Foss
6ad1471e9f added keywords beginning w/ L. 
...

...
 2019-10-16 13:46:22 +02:00
Joakim Hove
337f36bac1
Merge pull request #2057 from stefoss23/add_keywords_IJKL 
Added keywords beginning w/ I, J, K and L.
 2019-10-15 18:26:53 +02:00
dr-robertk
abf793726d
Merge pull request #2046 from totto82/sync_logging 
Add logging in ebos
 2019-10-15 14:19:34 +02:00
Markus Blatt
9735bdadfc Load restart with global grid only available on one processor. 
For this the master (IO) rank loads the RestartValue and then
broadcasts it to the other ranks.
 2019-10-15 14:03:24 +02:00
Atgeirr Flø Rasmussen
11aeb82e8e
Merge pull request #2058 from blattms/fix-unused-variable-wells 
Fixes unused variable warning in standard wells.
 2019-10-15 10:07:18 +02:00
Joakim Hove
ab779b4213
Merge pull request #2056 from goncalvesmachadoc/goncalvesmachadoc-missingFeaturesList 
Add few missing unsupported keywords to the list
 2019-10-15 09:47:05 +02:00
Markus Blatt
7e5c810125 Fixes unused variable warning in standard wells. 
Only occurs when compiling with -DNDEBUG since the body of the
for-loop is an assert using the loop variable. Loop is now deactivated.
 2019-10-15 09:16:36 +02:00
Steinar Foss
0510173408 MissingFeatures.cpp: added keywords beginning w/ I, J, K and L. 2019-10-14 15:48:21 +02:00
Atgeirr Flø Rasmussen
40f91b0e32
Merge pull request #2034 from totto82/sync_restart 
sync restart
 2019-10-14 13:26:57 +02:00
Cintia Goncalves Machado
d5f5fd8b8b
Add few missing unsupported keywords to the list 
Added the unsupported keywords WBP, WBP4, WBP5, WBP9, NLINEARS to the list in MissingFeatures.cpp.
 2019-10-14 12:47:17 +02:00
Tor Harald Sandve
86ef30950d Add logging in ebos 
With this .PRT and .DBG files are created also for ebos
 2019-10-14 10:39:10 +02:00
Atgeirr Flø Rasmussen
4ddb8e8d56
Merge pull request #2051 from atgeirr/enable-onephase-revised-rebased 
Enable onephase
 2019-10-11 21:02:46 +02:00
Atgeirr Flø Rasmussen
b0de207940
Merge pull request #2040 from alfbr/prt-banner 
Make PRT header self-explanatory
 2019-10-11 20:48:43 +02:00
Atgeirr Flø Rasmussen
8ef1958c18 Silence warnings. 2019-10-11 20:18:53 +02:00
Atgeirr Flø Rasmussen
5211217c94 Whitespace fixes (tabs->spaces, reformatted new files). 2019-10-11 15:57:51 +02:00
Atgeirr Flø Rasmussen
0b9b20695c Change back relative change computation to old order. 
Changing this caused tiny timestepping differences.
 2019-10-11 15:29:49 +02:00
Joakim Hove
5ba9107bea Missing features on S 2019-10-11 14:49:33 +02:00
Joakim Hove
f75934c5cb
Merge pull request #2038 from joakim-hove/W 
Add missing features for W keywords
 2019-10-11 10:24:05 +02:00
Joakim Hove
15a004114f
Merge pull request #2050 from stefoss23/add_keywords_H 
added keywords beginnign w/ H and I.
 2019-10-11 08:41:01 +02:00
Joakim Hove
8e5d21438e
Merge pull request #2049 from joakim-hove/T 
Add missing features on T
 2019-10-11 08:40:48 +02:00
Atgeirr Flø Rasmussen
3ddcdf2349 Only run relperm diagnostics for > 1 phase cases. 2019-10-11 08:19:18 +02:00
Atgeirr Flø Rasmussen
2d9f41b1aa Rename getPerfPressure() -> getPerfCellPressure(). 2019-10-11 08:19:18 +02:00
Halvor M. Nilsen
d873ae165d Enable single-phase runs. 2019-10-11 08:19:18 +02:00
Steinar Foss
9f8b5341ce added keywords beginnign w/ H and I. 2019-10-09 15:50:11 +02:00
Markus Blatt
e4e8425bad
Merge pull request #1858 from dr-robertk/PR/cleanup-sparsematrixadapter 
Cleanup SparseMatrixAdapter.
 2019-10-09 12:44:52 +02:00
Joakim Hove
4f79a281b6 Add missing features on T 2019-10-09 12:03:23 +02:00
Robert Kloefkorn
f708286111 [cleanup][Wells] Consequently use SparseMatrixAdapter in addWellContributions. 2019-10-09 10:27:38 +02:00
Alf Birger Rustad
ab1bf5f710 Make PRT header self-explanatory 2019-10-03 15:31:17 +02:00
Atgeirr Flø Rasmussen
189dc150fb
Merge pull request #2039 from totto82/moveBanner 
move PRT header to the top
 2019-10-03 14:28:06 +02:00
Tor Harald Sandve
aeb29a5412 move PRT header to the top 2019-10-03 12:13:13 +02:00
Joakim Hove
e1c2e70f09 Add missing features for W keywords 2019-10-02 19:28:37 +02:00
Steinar Foss
bab522d433 added keywords beginning w/ G and H. 2019-10-02 15:50:17 +02:00
Tor Harald Sandve
f83e99c6aa sync restart 2019-10-01 14:30:11 +02:00
Joakim Hove
1544f84fb4
Merge pull request #2031 from joakim-hove/missing-features-W 
Add keywords WSEGDFIN - WSEGTABL as not supported
 2019-10-01 07:48:06 +02:00
Joakim Hove
07c5430ac3 Add keywords WSEGDFIN - WSEGTABL as not supported 2019-09-30 18:47:25 +02:00
Bård Skaflestad
c06881b04e
Merge pull request #2027 from joakim-hove/missing-keywords-V 
Add missing features on U, V and T
 2019-09-30 14:44:16 +02:00
Joakim Hove
97209c2b6e Add missing features on U, V and T 2019-09-27 20:55:12 +02:00
Steinar Foss
0734802996 MissingFeatures.cpp: added keywords beginning w/ G. 2019-09-25 15:49:44 +02:00
Joakim Hove
dccb9bfa10
Merge pull request #2017 from atgeirr/fix-abort-unknown-param 
Abort the run before reading the deck if there are unknown params.
 2019-09-23 22:10:17 +02:00
Atgeirr Flø Rasmussen
37854bcdcb
Merge pull request #2016 from akva2/ewoms_to_models 
Move ewoms/* into an opm/models/* structure
 2019-09-19 14:23:47 +02:00
Atgeirr Flø Rasmussen
c7200460ab Abort the run before reading the deck if there are unknown params. 2019-09-19 14:20:05 +02:00
Joakim Hove
7ab5bf8598
Merge pull request #2015 from stefoss23/add_keywords_F1 
WIP. added keywords beginning w/ F and G.
 2019-09-19 12:24:32 +02:00
Arne Morten Kvarving
1aba020ea3 changed: ewoms/disc -> opm/models/discretization 2019-09-19 11:16:26 +02:00
Arne Morten Kvarving
d3d9831fc3 changed: ewoms/common -> opm/models/utils 2019-09-19 11:14:36 +02:00
Arne Morten Kvarving
7048589ec1 changed: ewoms/models/blackoil -> opm/models/blackoil 2019-09-19 11:12:45 +02:00
Tor Harald Sandve
afdce991c2
Merge pull request #2004 from atgeirr/update-missingfeatures 
Remove some supported keywords from the missing features list.
 2019-09-19 09:43:55 +02:00
Steinar Foss
112225f338 added keywords beginning w/ F and G. 2019-09-18 16:20:37 +02:00
Atgeirr Flø Rasmussen
523e38e095 Remove some supported keywords from the missing features list. 2019-09-18 15:34:38 +02:00
Arne Morten Kvarving
ec007c1a86 quell shadowing warning 2019-09-18 13:03:13 +02:00
Joakim Hove
d24e935c73 Add missing features W 2019-09-16 19:46:40 +02:00
Joakim Hove
9fd4030269 Add missing features LCUNIT and LINCOM 2019-09-16 15:43:30 +02:00
Joakim Hove
4b8331bc0c Add missing keywords on W 2019-09-13 17:31:50 +02:00
Steinar Foss
997580668c added keywords beginning w/F. 2019-09-12 12:17:58 +02:00
Steinar Foss
2ac118c6e0 added keywords beginning with E. 2019-09-12 08:48:56 +02:00
Joakim Hove
63f9fde3ca
Merge pull request #1992 from stefoss23/add_keywords_D1 
added more kw starting w/ D.
 2019-09-11 23:22:18 +02:00
Bård Skaflestad
e9aec288e1 AmgCpr: Follow Relocation of "matrixblock.hh" 
Taken from commit d71f7045.
 2019-09-10 18:00:34 +02:00
Joakim Hove
6c2db2488d
Merge pull request #1999 from joakim-hove/keywordsW 
Update missing features with W keywords
 2019-09-10 09:59:17 +02:00
Joakim Hove
c14d8f69e7 Update missing features with W keywords 2019-09-10 07:42:58 +02:00
Arne Morten Kvarving
d71f704532 changed: ewoms/linear -> opm/simulators/linalg 2019-09-09 09:21:42 +02:00
Atgeirr Flø Rasmussen
b8b3599ac5
Merge pull request #1993 from akva2/namespace_change 
changed: namespace Ewoms -> namespace Opm
 2019-09-09 09:05:19 +02:00
Joakim Hove
96025d224e Unsupported W keywords 2019-09-06 11:22:25 +02:00
Arne Morten Kvarving
5599bb6d8c changed: namespace Ewoms -> namespace Opm 2019-09-05 17:14:38 +02:00
Steinar Foss
748f09c3e0 added more kw starting w/ D. 2019-09-05 14:55:06 +02:00
Joakim Hove
3d36565db7 Adapt to enum changes 2019-09-03 22:18:34 +02:00
Joakim Hove
c804e85bc7
Setup logging before the simulator is initialized (#1980) 
Setup logging before the simulator is initialized
 2019-08-27 22:41:48 +02:00