Atgeirr Flø Rasmussen
cab0724a26
Merge pull request #2119 from blattms/fix-multiple-usage-printing-parallel
...
Only print usage information on one processes.
2019-11-22 15:23:27 +01:00
Bård Skaflestad
26c8d78eac
Merge pull request #2155 from blattms/print-mpi-omp-size
...
Print number of MPI/OMP threads at start and end.
2019-11-21 16:06:37 +01:00
Joakim Hove
02bdf4c699
Merge pull request #2165 from joakim-hove/ecl-eps-grid-extract
...
Use EclEpsGridProperties constructor
2019-11-21 11:33:24 +01:00
Joakim Hove
2f7e1c2e10
Remove ENDACTIO from list of unsupported keywords
2019-11-20 15:48:53 +01:00
Joakim Hove
5d1dba4686
Remove FIPNUM from list of unsupported keywords
2019-11-20 15:47:26 +01:00
Joakim Hove
e79723b5c1
Remove ACTIONX from list of missing features
2019-11-20 15:35:59 +01:00
Steinar Foss
3d2892fbdb
added 'special' keywords to MissingFeatures.
2019-11-20 15:31:11 +01:00
Joakim Hove
1faa39cff1
Use EclEpsGridProperties to access SATNUM value
2019-11-20 13:59:47 +01:00
Joakim Hove
22bb38e5cc
Remove unused class RockFromDeck
2019-11-19 23:23:30 +01:00
Joakim Hove
c80d72e27c
Removed unused perm and ntg arguments to Well construction
2019-11-19 23:23:30 +01:00
Markus Blatt
5c34b843f1
Use process instead of processor for MPI.
2019-11-19 15:56:18 +01:00
Markus Blatt
b4ec2f0611
Use correct number of threads when printing banner.
...
At that stage flow did not set the number of thread in the case where
OMP_NUM_THREADS is not defined. That happens in setupParallelism which
is called when the simulator is run. Hence we have to manually compute
the number of threads similar to there.
2019-11-19 15:45:50 +01:00
Markus Blatt
afc76a8b27
Print number of MPI/OMP threads at start and end.
2019-11-19 15:45:50 +01:00
Joakim Hove
571c24d10c
Use EclEpsGridProperties constructor
2019-11-18 12:22:35 +01:00
Atgeirr Flø Rasmussen
4aa79bf39c
Merge pull request #2152 from GitPaean/wip_fixing_aquifer_2
...
fixing and improvement of the Aquifer models
2019-11-18 11:19:15 +01:00
Kai Bao
0c6adbbba0
some small cleaning up for Aquifer models
...
there should be no functional change.
2019-11-17 10:37:10 +01:00
Kai Bao
eea833ced2
correcting the way of calculate initial aquifer pressure
...
for AquiferFetkovich.
2019-11-17 10:37:10 +01:00
Kai Bao
383748b161
some cleaning up for the AquiferFetkovich
2019-11-17 10:37:10 +01:00
Kai Bao
21d69a7af0
making dp is Eval for AquiferFetkovich
2019-11-17 10:37:10 +01:00
Kai Bao
fabc2a6f22
adding AQUFET back to MissingFeatures.cpp
...
which was removed by mistake in PR #2162
2019-11-16 23:45:26 +01:00
Kai Bao
b36ac45fea
removing several keywords from MissingFeatures.cpp
...
COMPSEGS, AQUFET and PLYROCK
2019-11-16 22:44:24 +01:00
Joakim Hove
d91f66869a
Merge pull request #2159 from stefoss23/add_missing_kws
...
MissingFeatures: updated list, corrected spelling errors.
2019-11-16 08:44:34 +01:00
Atgeirr Flø Rasmussen
2a5c93356c
Merge pull request #2160 from joakim-hove/rename-well2
...
Rename Well2 -> Well and Group2 -> Group
2019-11-14 10:33:54 +01:00
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