Commit Graph
10087 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen bddeaba880 Delete obsolete include directives and functions.
Also make other minor adjustments, in particular moving the function
getCubeDim() from WellsManagerDetail to WellHelpers.hpp.
2019-11-25 10:58:44 +01:00
Bård Skaflestad 334acd18ad Merge pull request #2164 from atgeirr/remove-wells-struct-rebased
Avoid using the Wells struct.
2019-11-25 09:56:06 +01:00
Atgeirr Flø Rasmussen 87188f5862 Avoid using the Wells struct. 2019-11-25 08:36:18 +01:00
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 5441d1ccd5 Merge pull request #2172 from stefoss23/specia-kw
added 'special' keywords to MissingFeatures.
2019-11-20 19:12:02 +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
Atgeirr Flø Rasmussen 171b83ae10 Merge pull request #2171 from joakim-hove/rm-rockfromdeck
Rm rockfromdeck
2019-11-20 07:51:40 +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
Atgeirr Flø Rasmussen 3d9a0341b2 Merge pull request #2161 from blattms/filter-connection-on-local-grid-after-loadbalance
Only filter in filterConnections_ on root process.
2019-11-19 09:09:32 +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 930f80b8c3 Merge pull request #2163 from GitPaean/adding_unsupported_keywords
adding AQUFET back to MissingFeatures.cpp
2019-11-17 00:42:14 +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
Bård Skaflestad ed323b64ed Merge pull request #2162 from GitPaean/removing_unsupported_keywords
removing several keywords from MissingFeatures.cpp
2019-11-16 23:35:08 +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
Markus Blatt bc98b20118 Only filter in filterConnections_ on root process.
When filterConnections_ is called the grid is not load
balanced, yet. Currently that means that grid() will also return the
unbalanced grid and all processes will see the whole global grid.

We will change semantics of the unbalanced grid soon: Only the root
process will see the whole grid and the others will see an empty
partition of it. Hence filtering on this partition will remove all
connections on all wells in the schedule for non-root processes and
produce wrong results.

For non-root process the filtering needs to be done on the load
balanced grid. This is accomplished by this commit.
2019-11-14 23:41:17 +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
Atgeirr Flø Rasmussen 36cc2f4837 Merge pull request #2156 from joakim-hove/STOP-well
Make sure the perforation pressures is initialized also for STOP wells
2019-11-12 21:31:46 +01:00
Joakim Hove b03078452f Make sure the perforation pressures is initialized also for STOP wells 2019-11-12 15:41:22 +01:00
Atgeirr Flø Rasmussen 96b4556926 Merge pull request #2144 from totto82/nupcolFix2
Various group control fixes
2019-11-08 17:38:25 +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
Atgeirr Flø Rasmussen 415f4adcef Merge pull request #2151 from joakim-hove/skip-processing
Skip processing of filename if external deck already exists.
2019-11-08 09:08:54 +01:00
Michael Sargado e1e1efbaaf Skip processing of filename if external deck already exists. 2019-11-07 21:03:30 +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
Joakim Hove f499d44131 Merge pull request #2126 from jmsargado/add_pybind11
Add pybind11
2019-11-06 17:02:00 +01:00
Bård Skaflestad 55a49b8146 Merge pull request #2073 from goncalvesmachadoc/goncalvesmachadoc-addProdInjReportPRT
Add Production and Injection Reports to PRT
2019-11-06 08:09:19 -06:00
Michael Sargado 1661f6579e Removed pycmake 2019-11-06 13:32:21 +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
Cintia Goncalves Machado 003fa994db Update ecloutputblackoilmodule.hh 2019-11-06 13:25:04 +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