Commit Graph

1236 Commits

Author SHA1 Message Date
Tor Harald Sandve
246c339b13 Pass gridView instead of the vanguard to the initialization 2020-11-27 13:46:04 +01:00
Tor Harald Sandve
6c06a72466 dunify and make the initialization parallel 2020-11-27 12:38:17 +01:00
Bård Skaflestad
966d7e1761 Restore Case Name for 'msw_2d_h' Regression Test 2020-11-19 22:42:36 +01:00
Joakim Hove
20f7503d67
Merge pull request #2913 from joakim-hove/add-parallel-test-pavg
Add packing test for class PAvg
2020-11-17 08:19:28 +01:00
Joakim Hove
f4deebeb77 Add packing test for class PAvg 2020-11-11 15:17:34 +01:00
Joakim Hove
da2bc2affd Refactor application of NNC / EDITNNC
- The edit manipulations from EDITNNC have already been applied to the NNC data
  from opm-common

- The NNC data structures are guaranteed to be ordered, both with cell1 <= cell2
  and the NNCs are in ascending order

- The NNC output to EGRID / INIT files is based on std::vector<NNCdata>
2020-11-10 16:59:30 +01:00
Joakim Hove
b46a98e6dc Add regression test for summary + completion variables 2020-11-09 16:06:58 +01:00
Bård Skaflestad
6f032e8efe
Merge pull request #2876 from akva2/equil_to_boost_test
Use boost::test in test_equil
2020-10-28 13:02:13 +01:00
Arne Morten Kvarving
4edb27bd37 fixed: drop some shadowing typedefs 2020-10-28 12:11:52 +01:00
Arne Morten Kvarving
1064c62e10 test_equil: change to boost::test 2020-10-28 12:11:52 +01:00
Bård Skaflestad
fb962da061
Merge pull request #2877 from akva2/ecl_output_to_boost_test
Use boost::test in test_ecl_output
2020-10-28 11:41:21 +01:00
Arne Morten Kvarving
939a132af7 test_ecl_output: change to boost::test 2020-10-27 12:59:58 +01:00
Arne Morten Kvarving
cf15d07a94 changed: measure reltol as percentage in macro
this to make it similar to how BOOST_CHECK_CLOSE works.
2020-10-27 12:55:08 +01:00
Arne Morten Kvarving
3c1c3ba1f6 changed: measure relative error in a more standard way (knuth)
|(value-expected)/expected| < tol or |(value-expected)/value| < tol
instead of
|(value-expected)/(value+expected)|

this is how boost::test defines its check
2020-10-27 12:55:08 +01:00
Arne Morten Kvarving
1006991795 changed: measure reltol as percentage in macro
this to make it similar to how BOOST_CHECK_CLOSE works.
2020-10-27 12:09:44 +01:00
Arne Morten Kvarving
6d1f8c75d6 changed: measure relative error in a more standard way (knuth)
|(value-expected)/expected| < tol or |(value-expected)/value| < tol
instead of
|(value-expected)/(value+expected)|

this is how boost::test defines its check
2020-10-27 12:09:44 +01:00
Joakim Hove
f46e7d998f Add integration test for reporforated norne model 2020-10-27 11:53:52 +01:00
Joakim Hove
ba25f35c57 Add regression testing for model UDQ_M3 2020-10-26 11:21:47 +01:00
Joakim Hove
887b13705d
Merge pull request #2743 from joakim-hove/udq-test-M2
Add udq test UDQ_M2
2020-10-23 20:32:00 +02:00
Arne Morten Kvarving
246344fb8f fix typo 2020-10-23 12:34:20 +02:00
Joakim Hove
237db3be6d Add udq test UDQ_M2 2020-10-22 17:12:35 +02:00
Joakim Hove
1dc586272b Use cmake testname in dictionary of tests in update_reference_data.sh 2020-10-22 11:43:17 +02:00
Joakim Hove
de5eaa8227 Add regression test udq_actionx/UDQ_M1 2020-10-22 09:03:29 +02:00
Bård Skaflestad
b6e0bd1b7b Add Calculator for Connection/Well Productivity Index
Switches between using the logarithmic and unit scaling factor based
on whether or not the well has an explicit, positive drainage radius
(WELSPECS item 7).  Does presently not include the D factor.

Add a set of unit tests to exercise the facility.
2020-10-13 15:42:35 +02:00
Atgeirr Flø Rasmussen
65817c9068 Removed old amg/cpr code that can be replaced.
The replacement consists of using the FlexibleSolver code.
2020-10-08 15:12:41 +02:00
Bård Skaflestad
e39333895c Provide Simulator's Dynamic CTF in data::Connection
This is in preparation of implementing the WELPI feature.
2020-10-05 23:14:24 +02:00
Bård Skaflestad
fde3c476c3 Chase Group/Node Summary API Update
This is in preparation of adding support for outputting the network
node pressure quantity, GPR, to the summary file.  In particular,
'GroupValues' is renamed to 'GroupAndNetworkValues' and has new
individual datamembers for the former group-level data and the new
node-level data.

Update BlackoilWellModel::groupData() and CollectToIORank
accordingly and bring the parallel restart facility in line with the
new layout.
2020-09-20 22:26:07 +02:00
Joakim Hove
1b0cc8d2ad Rename Location -> KeywordLocation 2020-09-16 21:07:18 +02:00
Arne Morten Kvarving
1b626ead49 add serialization test for Opm::Network::Node 2020-09-16 08:47:06 +02:00
Tor Harald Sandve
2f37742c21 add model6 to update ref 2020-09-14 15:56:48 +02:00
Joakim Hove
a920828b1c Add test of PINCH::ALL + MULTZ with a barrier 2020-09-10 09:04:31 +02:00
Joakim Hove
7d3ff894ee
Merge pull request #2765 from joakim-hove/add-pinch-testing
Add regression testing for MULTZ + PINCH::ALL
2020-09-08 10:12:22 +02:00
Joakim Hove
3a3e217941 Add regression testing for MULTZ + PINCH::ALL 2020-09-08 08:35:52 +02:00
Bård Skaflestad
bdc34a7580 Distribute Group Values at Parallel Restart
Mostly to prepare for restoring the groups' active controls from
restart information.
2020-09-03 01:11:32 +02:00
Bård Skaflestad
a0373ed428 Support Distributing Guiderates in Parallel Restart
In preparation of distributing group-related information (e.g.,
the active constraint).
2020-09-03 01:11:32 +02:00
Arne Morten Kvarving
0e71c0e29b changed: remove SET_BOOL_PROP macro usage 2020-08-27 13:01:51 +02:00
Arne Morten Kvarving
e8248b44ff changed: remove NEW_TYPE_TAG macro usage 2020-08-27 13:01:51 +02:00
Markus Blatt
944b646092 Add WELLDIMS to datafile of test_ecl_output.
Somehow the checking is now stricter for the tests due to
the changes in eclbasevanguard. Fixes test failures of
test_ecl_output.
2020-08-27 09:05:09 +02:00
Arne Morten Kvarving
74fac38d85 changed: remove GET_PROP_TYPE / GET_PROP macro usage 2020-08-27 08:19:39 +02:00
Arne Morten Kvarving
82a35e53b7 changed: remove TTAG macro calls 2020-08-27 08:19:39 +02:00
Tor Harald Sandve
9d72b6ad1a clean-up saltved implementation based on code review 2020-08-18 11:04:39 +02:00
Tor Harald Sandve
491b532a6a Add trivial saltvd table for cases without saltvd given in the deck 2020-08-18 10:55:43 +02:00
Joakim Hove
9f5e69cde3 Test TLMixpar pack/unpack 2020-08-12 14:46:04 +02:00
Joakim Hove
b9b1e734cb Add data::GroupValues member to RestartValue 2020-07-04 10:06:03 +02:00
Atgeirr Flø Rasmussen
c94eec872f Allow well operators with FlexibleSolver. 2020-06-30 12:33:57 +02:00
Arne Morten Kvarving
bb03896ad2 add spe1_thermal_watvisc as regression test 2020-06-26 09:49:07 +02:00
Atgeirr Flø Rasmussen
427eac5132 Use macro for instantiations, and clean up includes. 2020-06-19 16:37:43 +02:00
Atgeirr Flø Rasmussen
5105b80e50
Merge pull request #2667 from atgeirr/flexible-solver-separate-compile-unit
Use explicit instantiation for FlexibleSolver to reduce compile times.
2020-06-19 15:03:30 +02:00
Joakim Hove
d89a2e5eb7
Merge pull request #2674 from joakim-hove/use-action-state
Add Action::State member to EclPropblem and pass it to io/ActionX
2020-06-18 18:39:08 +02:00
Bård Skaflestad
bc3632f3f0
Merge pull request #2592 from alfbr/udq-test
Udq test
2020-06-18 13:36:33 +02:00
Atgeirr Flø Rasmussen
f24b2cd708 Split instantiation files to enable parallel build. 2020-06-17 13:03:57 +02:00
Joakim Hove
b52366926a Add Action::State member to EclPropblem and pass it to io/ActionX 2020-06-17 12:25:03 +02:00
Atgeirr Flø Rasmussen
2dc2e053d1 Change order of constructor arguments.
This allows simplification, and having just two constructors.
2020-06-17 09:31:19 +02:00
Bård Skaflestad
cab9be486c update_data: Move List of Changed Tests to Commit Message Body
This way we are less at risk of overrunning GitHub's 256 character
limit for issue/PR title lengths when a PR happens to affect many
regression tests.
2020-06-13 12:14:36 +02:00
Joakim Hove
df11bb5b55 Changes in running of restart regression tests
- The parallel test gets a designated driver
 - The serial test is run with default adpative timestepping
2020-06-08 12:53:29 +02:00
Joakim Hove
195d2b1c21 Rename SpiralICD -> SICD 2020-05-28 11:10:51 +02:00
Alf Birger Rustad
6f24671bff Update data. 2020-05-05 22:10:13 +02:00
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