Commit Graph

14064 Commits

Author SHA1 Message Date
Paul Egberts
ab3be6dce4 adjustments to account for vaporized water 2022-04-08 22:36:39 +02:00
Tor Harald Sandve
6f29bf715c
Merge pull request #3778 from GitPaean/always_inner
[testing] always using inner iterations for testing purpose.
2022-04-08 15:44:33 +02:00
Tor Harald Sandve
8179dcd1bf
Merge pull request #3866 from totto82/wvfp4
support item 4 wvfpexp
2022-04-08 10:21:22 +02:00
Tor Harald Sandve
e501a84958 support item 4 wvfpexp 2022-04-08 08:43:13 +02:00
Tor Harald Sandve
0c9bb3990e
Merge pull request #3830 from plgbrts/vapwat
Adding explicit input specification of water-gas ratio (RVW) and RVW output plus simulator gas-water system with salt precipitation and water evaporation for
2022-04-07 09:03:26 +02:00
Markus Blatt
11ff26bb10
Merge pull request #3861 from bska/block-level-solvent-sat-smry
Retrieve Block Level Solvent Saturation When Requested
2022-04-06 12:13:25 +02:00
Bård Skaflestad
6dcde2c5f7 Retrieve Block Level Solvent Saturation When Requested
This commit adds support for the block level solvent saturation
summary output keyword "BNSAT".
2022-04-05 15:45:00 +02:00
Markus Blatt
282951dc44
Merge pull request #3848 from blattms/binary-package-version-no-buildtime
Use empty string for buildtime if BUILD_TIMESTAMP is not set.
2022-04-05 14:54:58 +02:00
Tor Harald Sandve
137ed557da
Merge pull request #3853 from totto82/fix_d_issues
Fix d issues
2022-04-04 12:50:56 +02:00
Tor Harald Sandve
fba9046201 Some more clean-up based on review 2022-04-04 11:37:31 +02:00
Tor Harald Sandve
69ffed06de Address comments from review
1) Add debug messages
2) Fix bug of missing else in the code
2022-04-04 08:24:32 +02:00
Tor Harald Sandve
5b53fcd8a6 guard against d = 0 2022-04-04 08:24:32 +02:00
Tor Harald Sandve
2e91d2f353 Do not throw when d = 0 instead continue with rs/rv = 0 2022-04-04 08:24:32 +02:00
Atgeirr Flø Rasmussen
245a87e296
Merge pull request #3851 from totto82/doublecheckecon
Avoid premature closing of wells due to econ limits
2022-04-01 10:01:47 +02:00
Tor Harald Sandve
21fd7e8e8b
Merge pull request #3855 from GitPaean/improving_logic_has_energy
reconstructing the if structure for has_energy in function StandardWell<TypeTag>::calculateSinglePerf()
2022-04-01 08:34:42 +02:00
Kai Bao
aa633ff98f reconstructing the if structure for has_energy
in StandardWell<TypeTag>::
    calculateSinglePerf()
2022-03-31 22:38:55 +02:00
Markus Blatt
ce0ec4ec38
Merge pull request #3854 from akva2/remove_debian_package
remove in-tree debian (ubuntu) packaging
2022-03-31 19:50:35 +02:00
Arne Morten Kvarving
a5374bb6b0 remove in-tree debian (ubuntu) packaging
ubuntu packages will be built using the debian packaging in the future
2022-03-31 15:44:14 +02:00
Tor Harald Sandve
8909b259d0 don't shut wells due to ratio when rate is negative 2022-03-28 10:50:15 +02:00
Tor Harald Sandve
71acf4e056 Double check econ potential limits
Sometimes the potentials are inaccurate as a safty measure we
also check that the rates are violated.
The rates are supposed to be less or equal to the potentials.
2022-03-28 10:50:15 +02:00
Bård Skaflestad
6b74ba512a
Merge pull request #3845 from bska/detect-invalid-cpdata
Don't Process Corner-Point Data If No Valid Cell Geometry
2022-03-25 15:33:27 +01:00
Bård Skaflestad
dfdfbbd7d7 Don't Process Corner-Point Data If No Valid Cell Geometry
If no cell has a valid corner-point geometry, typically caused by
using GDFILE to read non-finite data such as all ZCORN = -1.0E+20,
then we must not attempt to generate a grid structure.  If we do, we
will typically just fail somewhere deep down in the corner-point
processing code and generate a diagnostic message that's hard to
decipher.

With this commit we instead output a diagnostic message of the form

    Failed to create valid EclipseState object.
    Exception caught: No active cell in input grid has valid/finite cell geometry
    Please check geometry keywords, especially if grid is imported through GDFILE

This may not be a lot better than the original diagnostic

    Processing grid
    flow: ${ROOT}/opm-grid/opm/grid/cpgpreprocess/preprocess.c:768: is_lefthanded: Assertion `! searching' failed.
    Aborted (core dumped)

but does at least suggest that the grid data may be faulty.
2022-03-25 14:35:55 +01:00
Bård Skaflestad
0cd2ce6589
Merge pull request #3824 from totto82/notswitchthp
Avoid switching to thp control if production is decreasing or injection is increasing
2022-03-25 14:34:30 +01:00
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