OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-01-03 21:16:54 -06:00
Code Issues Packages Projects Releases Wiki Activity
14,617 Commits 24 Branches 102 Tags 84 MiB
301c33410a
Commit Graph

1419 Commits

Author SHA1 Message Date
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
Tor Harald Sandve
abbff074b4 add support for thp control in MSW 2019-11-01 10:04:44 +01: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
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
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
Atgeirr Flø Rasmussen
40f91b0e32
Merge pull request #2034 from totto82/sync_restart 
sync restart
 2019-10-14 13:26:57 +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
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
Robert Kloefkorn
f708286111 [cleanup][Wells] Consequently use SparseMatrixAdapter in addWellContributions. 2019-10-09 10:27:38 +02:00
Tor Harald Sandve
f83e99c6aa sync restart 2019-10-01 14:30:11 +02:00
Arne Morten Kvarving
1aba020ea3 changed: ewoms/disc -> opm/models/discretization 2019-09-19 11:16:26 +02:00
Arne Morten Kvarving
7048589ec1 changed: ewoms/models/blackoil -> opm/models/blackoil 2019-09-19 11:12:45 +02:00
Arne Morten Kvarving
5599bb6d8c changed: namespace Ewoms -> namespace Opm 2019-09-05 17:14:38 +02:00
Joakim Hove
3d36565db7 Adapt to enum changes 2019-09-03 22:18:34 +02:00
Atgeirr Flø Rasmussen
fdcfa8f0ff
Merge pull request #1955 from GitPaean/well_potential_improvements 
using self-copying when calculating well potentials
 2019-08-21 15:31:09 +02:00
Kai Bao
f40c1cc12f throw when calling addWellContributions() for MSW 2019-08-15 11:29:30 +02:00
Atgeirr Flø Rasmussen
63364dc983 Bugfix: use proper method to access injected phase. 2019-08-13 11:57:06 +02:00
Atgeirr Flø Rasmussen
b32290d65a Remove unused variable. 
Also move variable to scope where used.
 2019-08-13 10:51:16 +02:00
Atgeirr Flø Rasmussen
f5070c6ba9 Avoid getting distr when current control index is -1. 2019-08-13 10:14:37 +02:00
Atgeirr Flø Rasmussen
8438e84db1 Handle two possible cases where current control is -1. 2019-08-12 14:49:52 +02:00
Kai Bao
fec9d1feee recovering the interface of function createWellContainer 
in BlackoilWellModel, which makes its usage easier.
 2019-08-09 10:02:28 +02:00
Kai Bao
4d8afb8539 using self-copying when calculating well potentials 
in order to re-use the existing well model in stead of re-creating new
ones. The latter way really complicates the function createWellContainer
in BlackWellModel.
 2019-08-09 10:02:28 +02:00
Atgeirr Flø Rasmussen
b9e7881878 Finalize integration of foam module. 2019-08-07 10:39:16 +02:00
Franz G. Fuchs
7fb90bff47 Use foam module. 2019-08-07 10:39:16 +02:00
Atgeirr Flø Rasmussen
0e309fc254
Merge pull request #1954 from GitPaean/wrong_thp_result 
Not extrapolating towards negative in VFP tables
 2019-08-06 10:40:17 +02:00
Joakim Hove
9f655d13bd Calculate well potentials: check if restart file output is requestd 2019-08-05 13:48:15 +02:00
Kai Bao
a772d1ef03 not extrapolating towards negative in VFP tables 2019-07-31 09:16:44 +02:00
Arne Morten Kvarving
4d893c35e8 changed: remove unused method BlackoilWellModel::extractLegacyPressure_ 2019-07-08 11:23:55 +02:00
Kai Bao
450f87551e adding GOR checking for WECON 2019-07-05 14:57:16 +02:00
Atgeirr Flø Rasmussen
70683b662b
Merge pull request #1933 from GitPaean/refactoring_wtest_further 
refactoring the ration economic limit checking
 2019-07-05 14:44:52 +02:00
Kai Bao
30e5a20f86 WELOPEN and WCON* interacting with WTEST and WECON 
WELOPEN and WCON* can open well closed due to various reasons, physical
            or economic.

If a well is shut with WELOPEN and WCON*, we do not try to re-open it
through WTEST
 2019-07-05 08:50:58 +02:00
Kai Bao
cbbd75164e refactoring the ration economic limit checking 2019-07-02 12:44:56 +02:00
Kai Bao
327cf30c31 improving the WTEST results by initializing the explicit quantities 2019-07-01 12:39:09 +02:00
Kai Bao
dfe22cb1a4
Merge pull request #1901 from totto82/fixMSWThrow 
Make sure rvmax and rsmax is non-negtive in the getSurfaceVolume for MSW
 2019-06-27 15:41:45 +02:00
Kai Bao
9a2fcdbfd5 fixing warnings in other folder under opm-simulators 2019-06-26 10:48:41 +02:00
Kai Bao
53b15527c2 fixing warnings under simulator/wells 2019-06-26 09:52:38 +02:00
Kai Bao
1d5d883e99 adapting to the upstream change 2019-06-25 22:13:34 +02:00
Kai Bao
e15a8f62e8 considering not OPEN connection when updateCompletions 
in WellInterface.
 2019-06-24 21:20:37 +02:00
Kai Bao
e0bd33db43 using template instead of pointer to function 
for functions checkMaxRatioLimitWell and checkMaxRatioLimitCompletions
 2019-06-24 14:03:20 +02:00
Kai Bao
b27a646b98 adding function checkMaxRatioLimitCompletions in WellInterface 
and use it in checkMaxWaterCutLimit()
 2019-06-21 14:11:12 +02:00
Kai Bao
7bb06e1c3c adding function checkMaxRatioLimitWell to WellInterface 
and use it in function checkMaxWaterCutLimit
 2019-06-21 14:11:12 +02:00
Kai Bao
01c9935b02 fixing the function checkMaxWaterCutLimit 
when looking for the worst offending completion
 2019-06-21 14:11:12 +02:00
Kai Bao
8be28e8448 adding function initCompletions() to WellInterface 2019-06-21 14:11:12 +02:00
Atgeirr Flø Rasmussen
a598734e71
Merge pull request #1890 from akva2/janitoring 
remove unused variables
 2019-06-21 08:33:03 +02:00
Tor Harald Sandve
337ad8a046 Make sure rvmax and rsmax is non-negtive in the getSurfaceVoluem for MSW 
Negative values can happen if the pressure is outside the table range
 2019-06-21 08:15:30 +02:00
Atgeirr Flø Rasmussen
5749a7150c Move files out of opm/core/simulator. 2019-06-20 11:00:52 +02:00
Atgeirr Flø Rasmussen
fa016a6008 Moved all remaining files out of opm/autodiff. 2019-06-20 11:00:51 +02:00
Atgeirr Flø Rasmussen
a33cfbf0bc Moved Flow-related classes and files to opm/simulators/flow. 2019-06-20 11:00:51 +02:00
Kai Bao
1593d431ce
Merge pull request #1897 from alfbr/well-logging 
Moved well test messages from debug to log and prt
 2019-06-20 10:47:04 +02:00
Alf Birger Rustad
671b2d9a47 Moved well test messages from debug to log and prt 2019-06-20 09:57:24 +02:00
Kai Bao
f4efd464f4
Merge pull request #1883 from totto82/fix_inj 
Upwinding for MSW
 2019-06-19 12:50:16 +02:00
Arne Morten Kvarving
34bcccef9c remove unused variables 
quells warnings
 2019-06-19 11:59:43 +02:00
Tor Harald Sandve
a7f718a368 Some clean-up adressing PR comments 2019-06-19 09:13:38 +02:00
Tor Harald Sandve
5c7cfd8c21 fix scaling of gas injector 2019-06-17 08:40:44 +02:00
Tor Harald Sandve
22af6e563c fix upwinding for injector 2019-06-17 08:40:44 +02:00
Tor Harald Sandve
c39cec55fe fix control eq inj 2019-06-17 08:40:44 +02:00
Joakim Hove
7f1970af3c Use the shared SummaryState instance when initializing well rates 2019-06-17 07:49:55 +02:00
Kai Bao
ab839896b6 using createConstantZero instead of createBlank 
the content for createBlank is not initialized, which causes undefined
behavoir.
 2019-06-13 15:05:12 +02:00
Kai Bao
310741a54f fixing a small bug related to EvalWell 2019-06-13 14:49:04 +02:00
Kai Bao
4449f0c172 adding updateConnectionRatePolyMW to StandardWell 2019-06-13 14:49:04 +02:00
Kai Bao
2256395957 adding updateExtraPrimaryVariables to StandardWell 2019-06-13 14:49:04 +02:00
Kai Bao
94057a53f9 adding checkConvergenceExtraEqs to StandardWell 2019-06-13 14:49:04 +02:00
Kai Bao
4f7b899290 fixing the compilation problem due to rebasing 
and also some small cleaning up
 2019-06-13 14:49:04 +02:00
Kai Bao
3dcec6a436 removing StandardWellV 2019-06-13 14:49:04 +02:00
Kai Bao
33de77e595 incorporate the staticSize template parameter for DynamicEvaluation 2019-06-13 14:49:04 +02:00
Kai Bao
ad0e294e52 using StandardWellV as the default StandardWell model 2019-06-13 14:49:04 +02:00
Atgeirr Flø Rasmussen
d42c5426b2
Merge pull request #1872 from totto82/eval_friction2 
Make calculateFrictionFactor evalution  + critical bugfix in MSW friction model
 2019-06-05 11:19:28 +02:00
Joakim Hove
47f4e750d2
Merge pull request #1865 from joakim-hove/use-shared-summarystate 
Use shared summarystate
 2019-06-04 09:49:56 +02:00
Tor Harald Sandve
0d28dfff17 fix cutoff value bug in haalandFormula 2019-06-03 11:28:15 +02:00
Tor Harald Sandve
779dbd39dd make calculateFrictionFactor Evaluation 2019-06-03 11:24:56 +02:00
Kai Bao
8fd1a8b7da assert pressure derivative in getSegmentRateUpwinding is zero 2019-05-31 12:51:50 +02:00
Kai Bao
5aacda1880 adding some comments about getSegmentRateUpwinding() 2019-05-31 11:22:35 +02:00
Kai Bao
c5983eeec5 not trying to update RESV target for prediction producers 2019-05-30 11:58:23 +02:00
Atgeirr Flø Rasmussen
ff2965e346
Merge pull request #1862 from GitPaean/fixing_multisegment_wells_cleaning_up_restarting_test_1 
adding function updateUpwindingSegments() for MSW
 2019-05-29 10:09:08 +02:00
Joakim Hove
b129a10362 Use shared SummaryState in BlackoilWellModel 2019-05-29 07:52:17 +02:00
Joakim Hove
a0aa7fcc2b Use shared SummaryState when instantiating WellsManager 2019-05-29 07:44:23 +02:00
Joakim Hove
c6af5f11b6 Fixup: Use ProductionControls and InjectionControls 2019-05-29 07:12:15 +02:00
Joakim Hove
dc4f57f7eb
Merge pull request #1831 from joakim-hove/use-wells2-controls 
Use wells2 controls
 2019-05-29 06:46:58 +02:00
Kai Bao
236e4d7e33 adding function updateUpwindingSegments() for MSW 
to update the upwinding segment for each segment based on flow direction
 2019-05-28 12:35:59 +02:00
Tor Harald Sandve
613473082f Address PR comments 2019-05-24 16:45:27 +02:00
Joakim Hove
511645d12c Use InjectionControls and ProductionControls data classes 2019-05-23 16:27:17 +02:00
Tor Harald Sandve
821794b0ad Add well potential output to MSW 
The common part is moved to the well interface class
This commit also adds iterations to the standardWells
well potential calculations to improve the results
 2019-05-23 15:32:48 +02:00
Joakim Hove
b6840db604 Use new well implementation Well2 from opm-common 2019-05-22 21:47:45 +02:00
Kai Bao
080e840f2f using tolerance_wells_ for BHP control tolerance for MSW 2019-05-16 12:20:35 +02:00
Kai Bao
28f0274fb5 fixing bugs spotted in the review comments 2019-05-15 16:28:18 +02:00
Kai Bao
4593453d10 adding function checkConvergenceControlEq to refactor getWellConvergence 
only functional change is that rate control or BHP control has different
tolerance for MSW now.
 2019-05-15 16:28:18 +02:00
Kai Bao
8c96aeebbe updating well control during iterateWellEquations in MSW 2019-05-10 14:56:20 +02:00
Atgeirr Flø Rasmussen
c17adf788f Moved files to opm/simulators/ subdirs. 2019-05-08 12:58:19 +02:00