Commit Graph

9730 Commits

Author SHA1 Message Date
Joakim Hove
c8e9c6e5fc
Merge pull request #1950 from stefoss23/ACTIONG
MISSING_FEATURES: added ACTIONG.
2019-07-26 14:00:01 +02:00
Steinar Foss
72a005e8b9 MISSING_FEATURES: added ACTIONG. 2019-07-26 12:41:35 +02:00
Markus Blatt
0823cdc5dd
Merge pull request #1942 from andrthu/edge-weights-method
Allow for different methods of specifying the edge weights when load balancing.
2019-07-23 12:36:07 +02:00
Andreas Thune
e4098df759 Allow for different edge weight methods during load balancing 2019-07-23 10:41:27 +02:00
Joakim Hove
70b8fd921f
Merge pull request #1939 from joakim-hove/group-names
Remove calls to Schedule::getGroups()
2019-07-15 07:42:12 +02:00
Kai Bao
ef4b5928fb
Merge pull request #1940 from akva2/janitoring
Some janitoring
2019-07-10 11:16:35 +02:00
Arne Morten Kvarving
b464896cc8 quell shadowing warnings 2019-07-10 10:08:39 +02:00
Arne Morten Kvarving
911727527b quell some unused parameter warnings 2019-07-08 12:14:24 +02:00
Arne Morten Kvarving
4d893c35e8 changed: remove unused method BlackoilWellModel::extractLegacyPressure_ 2019-07-08 11:23:55 +02:00
Joakim Hove
54c4fc2f9c Remove calls to Schedule::getGroups() 2019-07-08 07:18:41 +02:00
Joakim Hove
c1574a23d0
Merge pull request #1937 from joakim-hove/group2
Header file Group.hpp moved to Group/Group.hpp
2019-07-06 07:30:09 +02:00
Atgeirr Flø Rasmussen
2058d47fd2
Merge pull request #1922 from GitPaean/support_gor_wecon
adding GOR checking for WECON
2019-07-05 15:47:16 +02:00
Kai Bao
450f87551e adding GOR checking for WECON 2019-07-05 14:57:16 +02:00
Atgeirr Flø Rasmussen
70683b662b
Merge pull request #1933 from GitPaean/refactoring_wtest_further
refactoring the ration economic limit checking
2019-07-05 14:44:52 +02:00
Kai Bao
4be0a7aaa3
Merge pull request #1934 from GitPaean/wellopen_wtest
WELOPEN and WCON* interacting with WTEST and WECON
2019-07-05 11:43:07 +02:00
Kai Bao
30e5a20f86 WELOPEN and WCON* interacting with WTEST and WECON
WELOPEN and WCON* can open well closed due to various reasons, physical
            or economic.

If a well is shut with WELOPEN and WCON*, we do not try to re-open it
through WTEST
2019-07-05 08:50:58 +02:00
Joakim Hove
fd276843f2 Header file Group.hpp moved to Group/Group.hpp 2019-07-05 07:29:26 +02:00
Joakim Hove
7889a3a8fa
Merge pull request #1931 from joakim-hove/compord-partial-support-msg
Fix error message for COMPORD partially support keyword
2019-07-02 12:48:21 +02:00
Kai Bao
cbbd75164e refactoring the ration economic limit checking 2019-07-02 12:44:56 +02:00
Joakim Hove
a5eaf914e2 Fix error message for COMPORD partially support keyword 2019-07-02 06:10:50 +02:00
Atgeirr Flø Rasmussen
99afc4f152
Merge pull request #1919 from GitPaean/improving_wtest
improving WTEST results.
2019-07-01 13:59:03 +02:00
Kai Bao
327cf30c31 improving the WTEST results by initializing the explicit quantities 2019-07-01 12:39:09 +02:00
Atgeirr Flø Rasmussen
65652a05cf
Merge pull request #1893 from bska/check-arraydims-consistency
Flow: Verify Consistent Array Dimensions
2019-07-01 11:21:59 +02:00
Bård Skaflestad
6cf0710271 Flow: Verify Consistent Array Dimensions
The output code has an unfriendly error mode in which we
unceremoniously crash--without writing any data--if some declared
array dimensions from RUNSPEC aren't big enough to hold all the
dynamic objects (wells, groups, connections &c).

Verify that the declared dimensions are indeed big enough for the
current simulation run before starting the simulator to ensure that we
don't waste a lot of computational effort if, for instance, the first
output is very close to the end of the simulation.
2019-06-30 23:50:38 +02:00
Bård Skaflestad
273e6a4dbc
Merge pull request #1924 from akva2/suppress_no_mpi
suppress some unused variables warnings without mpi
2019-06-29 16:06:25 +02:00
Bård Skaflestad
b35856e77e
Merge pull request #1926 from joakim-hove/add-udq-regression-test
Add UDQ_WCONPROD model to integration testing
2019-06-29 16:04:42 +02:00
Joakim Hove
9e2d6d1da7 Add UDQ_WCONPROD model to integration testing 2019-06-29 08:25:06 +02:00
Joakim Hove
9472ec59ff
Merge pull request #1925 from OPM/revert-1923-add-udq-regression-test
Revert "Add UDQ_WCONPROD model to integration testing"
2019-06-29 08:21:55 +02:00
Joakim Hove
4bc3c4d808
Revert "Add UDQ_WCONPROD model to integration testing" 2019-06-29 08:21:33 +02:00
Joakim Hove
e4ce86f3ce
Merge pull request #1923 from joakim-hove/add-udq-regression-test
Add UDQ_WCONPROD model to integration testing
2019-06-29 08:21:04 +02:00
Arne Morten Kvarving
4dbf2428f7 suppress some unused variables warnings without mpi 2019-06-28 14:20:51 +02:00
Joakim Hove
2a7c576509 Add UDQ_WCONPROD model to integration testing 2019-06-28 12:48:31 +02:00
Tor Harald Sandve
272a03c102
Merge pull request #1921 from andlaus/more_continue_on_error
ebos: by default, do not abort the simulation as quickly
2019-06-28 12:19:25 +02:00
Andreas Lauser
c67b9e66d3 ebos: by default, do not abort the simulation as quickly 2019-06-27 15:51:40 +02:00
Kai Bao
dfe22cb1a4
Merge pull request #1901 from totto82/fixMSWThrow
Make sure rvmax and rsmax is non-negtive in the getSurfaceVolume for MSW
2019-06-27 15:41:45 +02:00
Tor Harald Sandve
e2420a4361
Merge pull request #1916 from andlaus/abort_on_unknown_parameters
mebos, flow: adapt to the eWoms changes in handling unknown parameters
2019-06-27 14:59:35 +02:00
Andreas Lauser
2a2b183679 add comments to describe flag arguments 2019-06-27 14:27:18 +02:00
Tor Harald Sandve
fd26b61599
Merge pull request #1907 from andlaus/improve_time_integration
Improve time integration
2019-06-27 14:08:07 +02:00
Andreas Lauser
1bbf18d7c8 mebos, flow: adapt to the eWoms changes in handling unknown parameters
for `flow`, there's no change compared to the current behavior, `ebos`
and its variants will complain when it encounters unused parameters.
2019-06-27 11:51:28 +02:00
Atgeirr Flø Rasmussen
77e7a07756
Merge pull request #1918 from bska/printf-ptr
Format Specifier '%p' Requires Pointers to Void
2019-06-26 18:22:51 +02:00
Bård Skaflestad
a98caf1d2a Format Specifier '%p' Requires Pointers to Void
While here, also print both 'ctrls1' and 'ctrls2' instead of
printing 'ctrls2' twice.
2019-06-26 14:39:14 +02:00
Atgeirr Flø Rasmussen
766afa4602
Merge pull request #1917 from GitPaean/fixing_warnings_
more fixing for the tests
2019-06-26 14:35:00 +02:00
Bård Skaflestad
402320267a
Merge pull request #1912 from akva2/janitoring
Some janitoring
2019-06-26 14:04:03 +02:00
Kai Bao
c2d472cd96 considering FOAM in the switch 2019-06-26 13:21:03 +02:00
Kai Bao
24fe1c8fba more fixing for the tests 2019-06-26 13:19:11 +02:00
Atgeirr Flø Rasmussen
e731715924
Merge pull request #1915 from GitPaean/fixing_warnings_
fixing warnings under opm-simulators
2019-06-26 12:52:41 +02:00
Kai Bao
9a2fcdbfd5 fixing warnings in other folder under opm-simulators 2019-06-26 10:48:41 +02:00
Kai Bao
53b15527c2 fixing warnings under simulator/wells 2019-06-26 09:52:38 +02:00
Atgeirr Flø Rasmussen
aa06942695
Merge pull request #1911 from GitPaean/refactoring_wtest_for_wellcut_completions_continue
adapting to the upstream change
2019-06-26 09:34:19 +02:00
Kai Bao
1d5d883e99 adapting to the upstream change 2019-06-25 22:13:34 +02:00