Bård Skaflestad
a64f660bff
Merge pull request #2589 from alfbr/group-tests5
...
Group tests5
2020-05-05 19:58:13 +02:00
Markus Blatt
d26c993d86
Merge pull request #2579 from akva2/quell_dep_warning_boost_1.71
...
quell deprecation warnings with boost 1.71
2020-05-05 17:29:33 +02:00
Alf Birger Rustad
0b7e9489a6
Update data for 9_3E/D cases.
2020-05-05 09:58:09 +02:00
Alf Birger Rustad
3194d06a69
Update data for model4 group test.
2020-04-30 15:39:06 +02:00
Alf Birger Rustad
1920ec567a
Include 2B tests in update_data.
2020-04-30 10:35:29 +02:00
Arne Morten Kvarving
e3a0137dd1
quell deprecation warnings with boost 1.71
2020-04-30 09:47:58 +02:00
Alf Birger Rustad
75f5b1c2e1
Update the data.
2020-04-27 21:16:04 +02:00
Bård Skaflestad
87d58a08b1
Merge pull request #2553 from alfbr/add-group-tests
...
Added the remaining group tests that are correct.
2020-04-27 13:43:19 +02:00
Bård Skaflestad
f0ed53a6f1
Vertical Extent: Prune Unneeded 'cellcount' Parameter
...
The purpose of this function is to determine the vertical extent of
a set of cells. Counting the number of cells in the region is not
its responsibility.
2020-04-22 20:10:19 +02:00
Joakim Hove
2696160f56
Merge pull request #2520 from akva2/extra_tests
...
add norne and norne_parallel as ExtraTests
2020-04-22 13:35:25 +02:00
Alf Birger Rustad
9f74869fbb
Enable update data for the tests.
2020-04-22 11:40:12 +02:00
Bård Skaflestad
9625d0b48c
Merge pull request #2531 from GitPaean/msw_keywords
...
adding the summary output for several pressure drop values for MSW
2020-04-17 20:54:49 +02:00
Kai Bao
954e5e769a
addressing comments from OPM/opm-common#1695
2020-04-17 14:34:48 +02:00
Alf Birger Rustad
b69076a021
Added 9_1A through 9_2A tests.
2020-04-17 13:58:54 +02:00
Joakim Hove
e04e77fa30
Add PYACTION / UDQ testcase
2020-04-17 11:39:43 +02:00
Joakim Hove
61053fb30b
Merge pull request #2537 from joakim-hove/add-actionx-test
...
Add test based on ACTIONX
2020-04-16 11:29:28 +02:00
Joakim Hove
e64c251a8c
Add test based on ACTIONX
2020-04-15 09:42:31 +02:00
Bård Skaflestad
fd2d8536eb
Refactor Phase Saturation Derivation Procedure
...
This commit introduces a new helper class,
Opm::EQUIL::Details::PhaseSaturations<>
that subsumes the responsibility of the existing helper function
Opm::EQUIL::phaseSaturations<>()
and generalises that functionality to arbitrary depth points within
single cells. This is in preparation of adding support for the N<0
case of the initial fluid in place procedure defined in the EQUIL
keyword. The class consumes an already equlibrated pressure table
for the pertinent equilibration region, calculates capillary
pressure values and inverts Pc curves to derive saturation values.
If the capillary pressure curves are constant within a cell, then a
simple depth consideration with respect to the implied sharp phase
interface is used to derive saturation values. We also preserve
existing support for SWATINIT-type initialisation of the water
saturation field.
Switch InitialStateComputer<>::calcPressSatRsRv() over to using the
pressure and saturation helper classes instead of the original
helper functions since this provides additional control. Also
remove those helper functions to reduce risk of confusion over which
method to use. Update the unit tests accordingly.
2020-04-14 23:01:02 +02:00
Bård Skaflestad
6243e62b69
Equilibration: Reenable Existing Unit Tests in 'test_equil.cc'
...
These unit test were previously disabled. While here, also fix some
'missing declaration' errors by putting the test functions into a
private namespace.
At some point we should rewrite this to use Boost.Test.
2020-04-14 23:01:02 +02:00
Arne Morten Kvarving
e5b32dd82d
add norne and norne_parallel as ExtraTests
...
to execute these you have to use ctest -C ExtraTests
or 'make extra_test'
2020-04-14 16:02:21 +02:00
Alf Birger Rustad
fe22e34a7a
Change to small case, consitent with the ohter test names.
2020-04-13 14:15:33 +02:00
Alf Birger Rustad
369061af9d
Update reference solutions.
2020-04-13 14:09:53 +02:00
Atgeirr Flø Rasmussen
0c8ce54b71
Merge pull request #2498 from blattms/cherry-pick-hnil-flexible-clean-interface-rebased
...
Cleaned up flexible solver improvements.
2020-04-02 15:28:10 +02:00
Atgeirr Flø Rasmussen
2fbad2eb59
Merge pull request #2511 from joakim-hove/wellpi
...
Use only wconnection transmissibility without WellPI scaling
2020-03-31 18:59:51 +02:00
Joakim Hove
58717905ee
Use only wconnection transmissibility without WellPI scaling
2020-03-31 18:12:29 +02:00
Markus Blatt
a8184df3c2
Corrected expected exception type in PreconditionerFactory test
2020-03-31 16:49:37 +02:00
Markus Blatt
dcb316f442
Make update method of preconditioners parameter-less again.
...
Previously, it got passed the weights only needed for CPR.
Additionally those were passed with the parameter tree to the
update method and constructor.
Now the CPR constructor gets a function to use for recalculating
the weights and the property is not changed. Unfortunately this
means that the preconditioner creators of the factory get another
parameter.
2020-03-31 16:49:37 +02:00
Joakim Hove
d6a1d3029e
Use std::shared_ptr for Python handle to Schedule
2020-03-31 12:28:07 +02:00
Joakim Hove
30216212c4
Add Python argument to Schedule constructor
2020-03-26 10:15:07 +01:00
Arne Morten Kvarving
b3bf3c58b2
changed: use TracerConfig from opm-common
2020-03-23 15:52:53 +01:00
Arne Morten Kvarving
3b64e9875c
changed: use serialization objects from opm-common in tests
...
this allows us to macrofy the test instantations
2020-03-23 09:57:54 +01:00
Joakim Hove
8cfed1ec13
Update serialization testing with PyAction
2020-03-20 17:24:42 +01:00
Joakim Hove
91572522d6
Add global index to Connection
2020-03-20 08:17:00 +01:00
Arne Morten Kvarving
59d1ff9b88
updates in EclMpiSerializer to avoid explicit instances in serializer
...
now the serializer is 'standard', as in we only require basic types
+ stl containers. this should make the actual implementation pretty
pluggable. will ease replacing our serialization routines
with those in Dune 2.7 later.
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
777e2f7683
remove old serialization support for VFPProdTable
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
58b0ed66fc
remove old serialization support for VFPInjTable
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
d905e0f037
remove old serialization support for UnitSystem
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
02af915917
remove old serialization support for Dimension
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
37ab44d805
remove old serialization support for UDAValue
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
eef690f910
remove old serialization support for Group
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
714caef9c6
remove old serialization support for GroupProductionProperties
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
d496b93cfa
remove old serialization support for GroupInjectionProperties
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
2c41427f3b
remove old serialization support for Well
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
eda5fc2d33
remove old serialization support for WellType
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
9aa464c4ac
remove old serialization support for WellSegments
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
fde0e42e8d
remove old serialization support for Segment
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
e53584ffec
remove old serialization support for Valve
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
2bb892139d
remove old serialization support for SpiralICD
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
41950690fd
remove old serialization support for WellInjectionProperties
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
0cb3e1426c
remove old serialization support for WellProductionProperties
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
a35ba93629
remove old serialization support for WellConnections
2020-03-19 09:31:52 +01:00
Arne Morten Kvarving
8cd3d3c9b9
remove old serialization support for Connection
2020-03-19 09:31:08 +01:00
Arne Morten Kvarving
1a4f8f861f
remove old serialization support for WellTracerProperties
2020-03-19 09:31:08 +01:00
Arne Morten Kvarving
2e34b91b53
remove old serialization support for WellBrineProperties
2020-03-19 09:31:08 +01:00
Arne Morten Kvarving
8a0959b026
remove old serialization support for WellPolymerProperties
2020-03-19 09:31:08 +01:00
Arne Morten Kvarving
99898ad79e
remove old serialization support for WellFoamProperties
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
d6c49bf801
remove old serialization support for WellEconProductionLimits
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
d791636919
remove old serialization support for WellGuideRate
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
faffa0678b
remove old serialization support for Deck
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
81663e2942
remove old serialization support for Action::Actions
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
781b11fb07
remove old serialization support for Action::Condition
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
18a1e735fb
remove old serialization support for Action::Quantity
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
5c89c48554
remove old serialization support for Action::AST
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
2c1d45ea54
remove old serialization support for ActionX
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
c5f36bd7cc
remove old serialization support for DeckKeyword
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
a289008c96
remove old serialization support for Location
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
96cadcc43a
remove old serialization support for DeckRecord
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
d9ab0e7522
remove old serialization support for ASTNode
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
195bb87712
remove old serialization support for DeckItem
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
32176b90ef
remove old serialization support for GConSump
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
486c9ce8dd
remove old serialization support for GConSale
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
52bd4cb81c
remove old serialization support for GuideRateConfig
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
1d254914e1
remove old serialization support for GuideRateModel
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
7389959b88
remove old serialization support for WListManager
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
778f1cfb8e
remove old serialization support for WellTestConfig
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
a936523165
remove old serialization support for MessageLimits
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
07d91add01
remove old serialization support for Tuning
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
9071072565
remove old serialization support for Events
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
e5e8c0c516
remove old serialization support for OilVaporiationProperties
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
c00d2f2cb3
remove old serialization support for TimeMap
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
bbf3b80b3a
remove old serialization support for RFTConfig
2020-03-19 09:31:07 +01:00
Arne Morten Kvarving
6d74eb8e88
remove old serialization support for RestartConfig
2020-03-19 09:31:07 +01:00
Joakim Hove
006b87050d
Remove numRemoved member from WellConnections
2020-03-18 15:41:21 +01:00
Joakim Hove
805236ee22
Move Connection ordering attribute from Well to WellConnections
2020-03-18 14:28:29 +01:00
Arne Morten Kvarving
f12c83bd8e
remove old serialization support for TableManager
2020-03-17 12:29:35 +01:00
Arne Morten Kvarving
258fed1bd5
remove old serialization support for Tabdims
2020-03-17 12:29:16 +01:00
Arne Morten Kvarving
8a3cb58981
remove old serialization support for Aqudims
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
05d02dcd66
remove old serialization support for TableSchema
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
7f2f1309bd
remove old serialization support for TableContainer
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
198ea25dcb
remove old serialization support for TableColumn
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
9002949707
remove old serialization support for SolventDensityTable
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
c409f7a084
remove old serialization support for SkprpolyTable
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
d9e28a7129
remove old serialization support for SimpleTable
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
4ad1353e53
remove old serialization support for RocktabTable
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
44cab76c57
remove old serialization support for Rock2dtrTable
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
cda171ff47
remove old serialization support for Rock2dTable
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
6f070e6bcf
remove old serialization support for Regdims
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
2784dc5800
remove old serialization support for PvtgTable, PvtoTable, PvtxTable
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
5c5afb1b4a
remove old serialization support for PvtwsaltTable
2020-03-17 12:27:59 +01:00
Arne Morten Kvarving
cfe091ce1e
remove old serialization support for PolyInjTable, SkprwatTable, PlymwinjTable
2020-03-17 12:27:59 +01:00