OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2026-09-05 04:40:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
11,941 Commits 31 Branches 117 Tags
02957bcfda586a07334db1fa4e2cb86895b9a49d
Commit Graph
11941 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Bård Skaflestad 02957bcfda Merge pull request #2937 from joakim-hove/summary-pass-inplace 
Support summary keyword RHPV
 2020-11-24 21:50:03 +01:00
Joakim Hove 62b119170d Pass Inplace argument to Summary::eval() 2020-11-24 12:33:05 +01:00
Joakim Hove df292baeea Use Inplace::Phase enums instead of string tags 2020-11-24 12:33:05 +01:00
Atgeirr Flø Rasmussen c880bc8688 Merge pull request #2939 from goncalvesmachadoc/aquifer 
Fix well mixture for single-phase
 2020-11-24 10:19:18 +01:00
Cintia Goncalves Machado f0ba56652e restructure if 2020-11-24 09:05:18 +01:00
Cintia Goncalves Machado 82c8201f00 fix well Control Single-Phase 2020-11-23 18:40:37 +01:00
Bård Skaflestad 4ae70ee12e Merge pull request #2927 from akva2/disable_python_tests_debian_packaging 
Disable python tests in debian packaging
 2020-11-23 10:52:36 +01:00
Atgeirr Flø Rasmussen ea34c2c2df Merge pull request #2911 from atgeirr/network-add-glift 
Add the option to include gas lift for network calculations.
 2020-11-20 15:23:12 +01:00
Joakim Hove 26c3262a2a Merge pull request #2935 from joakim-hove/add-inplace 
Pass the initial inplace values to Summary::eval()
 2020-11-20 14:13:00 +01:00
Joakim Hove e962374856 Pass the initial inplace values to Summary::eval() 2020-11-20 10:02:16 +01:00
Atgeirr Flø Rasmussen 69d04b7000 Set and communicate ALQ properly in parallel. 2020-11-20 08:03:21 +01:00
Atgeirr Flø Rasmussen e15db6a892 Merge pull request #2934 from blattms/stdwell-assign-totalrate-once 
StandardWell only assing primary_variables_[WQTotal] once.
 2020-11-20 07:54:43 +01:00
Bård Skaflestad 729da46fd5 Merge pull request #2917 from bska/restore-2d_h-update 
Restore Case Name for 'msw_2d_h' Regression Test
 2020-11-20 01:15:06 +01:00
Bård Skaflestad e6d73f569a Use Unique CASENAME for 'SPE1CASE2' 
The 'update_reference_data' script refers to this as 'spe12', so
pick the same casename here.  While here, also ensure that we use
the correct 'DIR' specification for this test case.
 2020-11-19 22:42:36 +01:00
Bård Skaflestad 966d7e1761 Restore Case Name for 'msw_2d_h' Regression Test 2020-11-19 22:42:36 +01:00
Markus Blatt b21b6cf28c Merge pull request #2914 from ducbueno/rm-oclcontainer 
Removed WellContributionsOCLContainer class
 2020-11-19 21:27:55 +01:00
Markus Blatt fb5f2eb9d0 StandardWell only assing primary_variables_[WQTotal] once. 
There seems to be no need to assign the same value consecutively
as often as there are phases.
 2020-11-19 19:50:01 +01:00
Jose Eduardo Bueno 09e38a38e9 Fixed CMakeLists_files.cmake 2020-11-19 15:41:59 -03:00
Joakim Hove b2896d09ff Merge pull request #2920 from joakim-hove/use-original-IP 
Pass region in place values to the summary writer
 2020-11-19 17:13:04 +01:00
Atgeirr Flø Rasmussen 8716dbfcfd Add the option to include gas lift for network calculations. 2020-11-19 14:19:26 +01:00
Atgeirr Flø Rasmussen 307315a03d Merge pull request #2932 from atgeirr/glift-constify 
Make consistent use of const for alq-related state.
 2020-11-19 12:56:37 +01:00
Arne Morten Kvarving ebf0d2d0d7 Merge pull request #2929 from akva2/janitoring 
fixed: signed/unsigned comparison warnings
 2020-11-19 12:13:12 +01:00
Joakim Hove 6084f7c4d4 Use class Inplace to manage aggregated region properties in output 2020-11-19 11:38:18 +01:00
Atgeirr Flø Rasmussen 376aecfad5 Store producer status, only call getALQ() for producers. 
As it was, the getALQ() call would insert injectors into the ALQ maps,
leading to trouble.

Also, this gets rid of the slightly weird thing that the output data
structure's producer/injector status was only set after creation,
in BlackoilWellModel::wellData().
 2020-11-19 11:22:25 +01:00
Arne Morten Kvarving be48b3505d remove unused variable 2020-11-19 11:10:33 +01:00
Arne Morten Kvarving a95cc3dcbc fixed: signed/unsigned comparison warnings 2020-11-19 11:03:06 +01:00
Bård Skaflestad 433a8f8d99 Merge pull request #2930 from joakim-hove/store-schedule 
Remove arguments
 2020-11-19 11:03:01 +01:00
Atgeirr Flø Rasmussen 8a5203814b Make consistent use of const for alq-related state. 
A const well state was passed to functions that were modifying it by
calling setALQ(). Now the setALQ() method is made non-const, mutable
references to the well state are passed where sensible. The getALQ()
method uses map::at() instead of map::operator[] and no longer modifies
current_alq_. With this, it is now easy to see which methods modify the
well state and which don't. The alq-related members in the
WellStateFullyImplicitBlackoil class are no longer 'mutable'-qualified.
 2020-11-19 10:09:52 +01:00
Joakim Hove 2043d792c1 Remove arguments 2020-11-18 15:40:22 +01:00
Tor Harald Sandve 0ac2f922d3 Merge pull request #2851 from osae/extboSimulators 
Alternative solvent extension for the black oil model.
 2020-11-18 14:01:36 +01:00
Markus Blatt ea3c899080 Merge pull request #2882 from atgeirr/msw-add-well-contrib 
Implement addWellContributions() for multi-segment wells
 2020-11-18 13:44:24 +01:00
Jose Eduardo Bueno a9c2a684c6 Removed WellContributionsOCLContainer class (rebase) 2020-11-18 09:14:31 -03:00
Arne Morten Kvarving e4fc08813e disable python tests in debian packaging 2020-11-18 10:55:46 +01:00
Arne Morten Kvarving 16d644032c add cmake option to disable the python tests 
due to bugs in the openmpi on bionic, this test fails to
execute properly in pbuilder environments. instead
of rebuilding openmpi without dynamic loading
(which is the suggested fix) and potentially break users
systems, this is a non-intrusive workaround to be used
for packaging.

also add explicit option for python support to make it
visible in cmake frontends.
 2020-11-18 10:55:46 +01:00
Arne Morten Kvarving 7b58071b8e Merge pull request #2924 from akva2/janitoring 
remove unused variable
 2020-11-18 10:53:50 +01:00
Arne Morten Kvarving 608b27096b remove unused cmake option 2020-11-18 09:40:43 +01:00
Ove Sævareid 940af0f15d Fixed typo. 2020-11-17 19:42:41 +01:00
Ove Sævareid aca6335585 Handle OnePhaseIndices 2020-11-17 18:07:33 +01:00
Markus Blatt 991e73048a Merge pull request #2926 from OPM/consistent-pvt-for-groups 
Use consisten pvt region index for groups in parallel.
 2020-11-17 16:56:49 +01:00
Arne Morten Kvarving e02a19f499 Merge pull request #2925 from akva2/packaging_numpy 
add python3-numpy to debian packaging
 2020-11-17 15:22:33 +01:00
Ove Sævareid 63c97d54d0 Rebase issue. 2020-11-17 14:50:57 +01:00
Arne Morten Kvarving cff02ee105 remove unused variable 2020-11-17 13:22:35 +01:00
Markus Blatt 41843f2667 Use consistent pvt region index for groups in parallel. 
In serial we use the first cell of the first well to determine the
pvt region index for a group. Previously, we used the first cell of
the first local well in a parallel run. Unfortunately that may lead
to different pvt region indices being used for the same goup on
different processes.

We fix this by using the same approach in parallel as we already use
in serial. For this we use Well::seqIndex() to determine the needed
ordering.
 2020-11-17 12:54:45 +01:00
Atgeirr Flø Rasmussen d69dbf598e Response to review comments. 2020-11-17 12:53:04 +01:00
Ove Sævareid b132df610f Missing template argument. 2020-11-17 12:39:21 +01:00
Ove Sævareid 98b2ed5bd4 Cleaning up various issues. 2020-11-17 12:39:21 +01:00
Arne Morten Kvarving 9819183949 add python3-numpy to debian packaging 
required after newly introduced test
 2020-11-17 12:38:30 +01:00
Ove Sævareid 0f7e66e151 Alternative solvent extension for the black oil model. 2020-11-17 12:33:19 +01:00
Markus Blatt 09a4a04c22 Merge pull request #2896 from atgeirr/refactor-well-calc 
Refactor well calculations
 2020-11-17 09:40:19 +01:00
Markus Blatt 64fa5a2b30 Merge pull request #2858 from Tongdongq/ilu-reorder-strategy 
Added cmdline parameter --ilu-reorder-strategy
 2020-11-17 09:35:12 +01:00