Commit Graph
14241 Commits
Author SHA1 Message Date
Tor Harald Sandve f4d81e33f1 Avoid switching to thp control if it results in higher rates 2022-03-25 09:12:15 +01:00
Tor Harald Sandve 2d6794f077 Merge pull request #3849 from hakonhagland/glift_debug_rank
Cleanup gaslift debugging output code
2022-03-24 14:13:33 +01:00
Håkon Hægland a3c131955f Omit one redundant debugging message 2022-03-24 13:47:57 +01:00
Håkon Hægland fbd6c03dd6 Cleanup glift debugging output code 2022-03-24 12:42:46 +01:00
Tor Harald Sandve da8653bb50 Merge pull request #3847 from totto82/init_msw
improve initialization msw new wells
2022-03-24 12:07:06 +01:00
Tor Harald Sandve 32dfdc6198 improve initialization msw new wells 2022-03-24 09:53:46 +01:00
Markus Blatt 08fd5da6a7 Use empty string for buildtime if BUILD_TIMESTAMP is not set.
In combination with the relevant changes in opm-common this
prevent flow in binary Linux packages from having a timestamp in the
executable that changes with every rebuild.

With the changes in opm-common  one can now set the variable
OPM_BINARY_PACKAGE_VERSION to a meaningful version string (Debian
11.2: 2021.10-4). If that is done and flow is built from tarballs it
will now not have a time stamp and print the package version to the
PRT file. E.g.

Flow Version     =  2021.10 (Debian 11.2: 2021.10-1)
2022-03-23 22:46:40 +01:00
Markus Blatt f550d08122 Merge pull request #3843 from blattms/debian-use-dist-packages-only-for-usr-prefix
[python] Make sure Python files are installed similar to opm-common.
2022-03-23 15:14:36 +01:00
Tor Harald Sandve 519b5dd8cc Merge pull request #3810 from totto82/refactor_bhpFromThpLimit_1
Refactor bhp from thp limit
2022-03-22 13:57:52 +01:00
Markus Blatt 5c29a3c3e7 Make determining whether to use dist-packages more bullet proof.
Seems like getsitepackages is not always implemented.
2022-03-22 12:06:23 +01:00
Markus Blatt 17ca01b607 [python] Make sure Python files are installed similar to opm-common.
Instead of always using site-packages we query the sitepackages path
from Python. If it matches dist-packages then we use dist-packages if
we install below /usr, otherwise site-packages is used.

This will also make sure that the Python files end up in the same
location as for the ones of opm-common. This should make using them
easier.
2022-03-22 12:06:12 +01:00
Tor Harald Sandve c067e5fafd Merge pull request #3834 from totto82/avoid_closing
Handle case where bhp target is violated
2022-03-22 11:56:21 +01:00
Tor Harald Sandve 7d5a0a74eb Handle case where bhp target is violated 2022-03-21 09:52:41 +01:00
Kai Bao 8e61733ec0 Merge pull request #3839 from GitPaean/fixing_scaling_rates
fixing the scaling of segment rates
2022-03-15 22:03:38 +01:00
Paul Egberts c316865681 fix initialization for the single phase cases 2022-03-14 15:10:03 +01:00
Kai Bao e05a0b276e fixing the scaling of segment rates
when initial segment rate is zero.
2022-03-14 14:01:24 +01:00
Bård Skaflestad ad9086284d Merge pull request #3838 from totto82/equil_wat_gas
fix initialization EQUIL + water and gas

Fixes #2029
2022-03-11 13:10:34 +01:00
Tor Harald Sandve 82099705ac fix initialization EQUIL + water and gas 2022-03-11 12:38:38 +01:00
Kai Bao 6394c89f77 Merge pull request #3835 from GitPaean/scaling_segment_pressure
using addition to update segment pressure when bhp is changed
2022-03-11 10:24:54 +01:00
Kai Bao 2c18d09ce1 fixing test_wellstate 2022-03-10 22:19:12 +01:00
Markus Blatt a7e2b25627 Merge pull request #3836 from blattms/spelling-fix
Fixes spelling shoule -> should
2022-03-09 17:59:45 +01:00
Markus Blatt 6e7e0098ce Fixes spelling shoule -> should 2022-03-09 17:23:59 +01:00
Kai Bao ccfd4152d3 using addition to update segment pressure
when bhp is changed. It is much safer and more reasonable.

using multiplication is more likely to result in dramatic values.
2022-03-09 14:23:59 +01:00
Joakim Hove ae32b44124 Merge pull request #3833 from hakonhagland/gl_active
Use new VFPProdTable constructor
2022-03-09 10:16:29 +01:00
Håkon Hægland 367e26a719 Use new constructor
Refer to opm-common/pull #2971. In order to use the new constructor
proposed in that PR, the constructor must now be passed a boolean
variable signalling if gaslift is active.
2022-03-09 09:11:10 +01:00
Tor Harald Sandve 690b33aaad Merge pull request #3706 from hakonhagland/glift_it
Extend VFP calculations to two-phase flow.
2022-03-08 12:59:22 +01:00
Håkon Hægland 3cf181b2ee Throw exception instead of using assert
Throw an exception if two-phase gas lift optimization is used for
other phases than oil and water.
2022-03-07 15:58:11 +01:00
Håkon Hægland 438a712e54 Gas lift optimization for two-phase oil-water.
Add gas lift optimization support for two-phase oil-water flow.
2022-03-07 15:19:43 +01:00
Paul Egberts 390a5a4b82 clean up 2022-03-06 21:02:22 +01:00
Paul Egberts d89672e4a3 some clean up 2022-03-06 20:51:57 +01:00
Markus Blatt 0203939bc6 Merge pull request #3828 from bska/report-unique-failed-dewpoint-cells
Report Unique IJK Tuples for Failed Bubble/Dew Point Calculations
2022-03-03 10:44:47 +01:00
Bård Skaflestad f6e8a9bfac Report Unique IJK Tuples for Failed Bubble/Dew Point Calculations
This commit switches the debug file's records of "failed" bubble and
dew point pressure calculations from a non-unique list of linearised
Cartesian indices to a unique list of (1-based) (I,J,K) tuples.
This format is hopefully easier to read for humans.

Thanks to [at]blattms for suggesting the gatherv() helper function
which greatly simplifies the communication pattern.

Example from selected time steps in a real field case with Cartesian
dimensions 137-by-236-by-58:

  - Original
  Finding the dew point pressure failed for 2 cells [1467066, 1467066]
  Finding the dew point pressure failed for 8 cells [1467063, 1467063, 1467066, 1467066, 1467066, 1467066, 1467066, 1467066]

  - This commit
  Finding the dew point pressure failed for 1 cell [(71,89,46)]
  Finding the dew point pressure failed for 2 cells [(68,89,46), (71,89,46)]
2022-03-02 22:49:28 +01:00
Paul Egberts 797fdc278b water-gas ratio input and output plus simulator for salt precipitation and water evaporation 2022-03-01 20:52:43 +01:00
Atgeirr Flø Rasmussen 131bb6585f Merge pull request #3827 from bska/smry-phase-press-blk
Support Calculating Phase Pressures for Water/Gas at Block Level
2022-03-01 09:44:20 +01:00
Bård Skaflestad 6ac998e4e4 Support Calculating Phase Pressures for Water/Gas at Block Level
This commit adds support for calculating/extracting the block-level
phase pressures for water (BWPR) and gas (BGPR) for summary output
purposes.
2022-02-28 23:42:48 +01:00
Markus Blatt d5b74006c5 Merge pull request #3826 from bska/dont-capture-flux-unless-needed
Don't Capture Local Flux Data Unless Needed
2022-02-26 16:38:24 +01:00
Bård Skaflestad eb55456565 Don't Capture Local Flux Data Unless Needed
This is a potentially expensive operation and so we should not run
it unless such values are actually needed for output purposes (e.g.,
inter-region flow summary vectors).
2022-02-25 11:31:57 +01:00
Bård Skaflestad 18812281b6 Merge pull request #3823 from tskille/add_rxft
adding regression testing of RXFT summary cases
2022-02-24 09:23:54 +01:00
Torbjørn Skille 005241a13b adding regression testing of RXFT summary cases 2022-02-24 08:20:31 +01:00
Markus Blatt e2c3cbd84a Merge pull request #3821 from bska/add-iregflow-parallel-test
Add Parallel Comparison Test for RxFy Summary Vectors
2022-02-23 20:26:07 +01:00
Bård Skaflestad d2d1e1d95b Add Parallel Comparison Test for RxFy Summary Vectors
Sequential regression tests will be added later.
2022-02-23 15:33:44 +01:00
Tor Harald Sandve 8cfbe1d791 Merge pull request #3816 from totto82/control_well_testing
Set well control to thp or bhp in well testing
2022-02-23 10:36:17 +01:00
Bård Skaflestad 5f6750bb34 Merge pull request #3820 from goncalvesmachadoc/btemp
add BTCNFHEA
2022-02-22 00:49:27 +01:00
goncalvesmachadoc ac51cecfd4 block press and temp when no oil is present 2022-02-21 18:12:30 +01:00
goncalvesmachadoc a191722a25 add BTCNFHEA 2022-02-21 17:36:31 +01:00
Markus Blatt eb7ffdb47c Merge pull request #3811 from bska/communicate-iregflows
Communicate Inter-Region Flows to I/O Rank
2022-02-18 20:47:23 +01:00
Bård Skaflestad 840a29f8ef Communicate Inter-Region Flows to I/O Rank
This commit ensures that compute inter-region flow rates on all
ranks and collect those on the I/O rank using CollectDataToIORank.

We add a trivial EclInterRegFlowMap data member to the communication
object.  This data member only knows the pertinent FIP region array
names, but uses existing read/write support to collect contributions
from all ranks into this "global" object.  We then pass this global
object on to the summary evaluation routine.
2022-02-18 14:53:43 +01:00
Markus Blatt d7b5d0f686 Merge pull request #3796 from bska/accumulate-iregflow-values
Accumulate Inter-Region Phase Flow Rate Contributions
2022-02-18 14:28:20 +01:00
Bård Skaflestad ecec83349b Capture Bulk Connection Fluxes to Accumlate Inter-Region Flows
This commit adds a new grid traversal that computes fluxes-presently
surface level component fluxes-for all bulk connections on the
current MPI rank.  We aggregate those fluxes, if applicable, into a
container for inter-region flows, but this support could be extended
to capturing the full 3D vector flow rates for restart output if
needed.
2022-02-18 10:29:56 +01:00
Bård Skaflestad 1e121799c8 Add Multi-Array Aware Accumulator for Inter-Region Flow Rates
This commit introduces a new helper class

    Opm::EclInterRegFlowMapSingleFIP

that wraps a vector of

    Opm::EclInterRegFlowMapSingleFIP

along with the associate array names (e.g., "FIPNUM" and any
additional "FIP*" arrays).  We implement the same operations as the
*SingleFIP type and simply loop over the internal accumulators to
affect the operations.

Add unit tests to exercise the new class, including simulating
multiple MPI ranks that are communicated to a single I/O rank for
summary output purposes.
2022-02-18 10:29:56 +01:00