Commit Graph

2785 Commits

Author SHA1 Message Date
Arne Morten Kvarving
7b903660a0 UDQState: remove unused serialization code 2022-09-07 10:08:54 +02:00
Arne Morten Kvarving
a2bade84a4 added: append function in SummaryState
this appends information from one instance to another.
needed to handle semantics used in parallel serialization
2022-09-07 08:17:48 +02:00
Tor Harald Sandve
072b8be064 add support for temperature and analytical aquifers 2022-09-01 12:28:22 +02:00
Kai Bao
632f1457b1 throw for an inconsistent DATES setup 2022-08-26 10:07:21 +02:00
Kai Bao
f1986689b5 fixing a schedule test and adding another for PR3035 2022-08-24 16:07:19 +02:00
Atgeirr Flø Rasmussen
ba120652b5 Merge pull request #3104 from atgeirr/fix-packing
Prepare for fixing packing of Rates, fix bug in Connection comparison operator
2022-08-24 15:23:44 +02:00
Atgeirr Flø Rasmussen
6c5e2541bc Do not test equality for unneeded objects.
They are not equal in any case, now that the comparison operator
for Connection is fixed.
2022-08-24 14:50:39 +02:00
Kai Bao
61e68dccb6 fixing running when only analytical aquifer connections defined
without this, the restart writer will trigger a segmentation fault
error.

And also, some minor refactoring and function development so that the
simulator can check whether there are valid connections defined for
aquifers with certain id.
2022-08-24 09:31:20 +02:00
Arne Morten Kvarving
5df933460b changed: remove (basically) empty Well(Injection|Production)Properties.hpp 2022-08-11 11:47:54 +02:00
Tor Harald Sandve
189a043c6d add unit gas oil ratio rate for output of drsdt 2022-08-10 15:42:50 +02:00
Arne Morten Kvarving
260a0c2dc3 replace Unused.hpp with [[maybe_unused]] or anonymous variables 2022-08-02 10:32:00 +02:00
Bård Skaflestad
9af8c785b2 Merge pull request #3085 from akva2/cleanup_schedule
Cleanup Schedule.hpp usage
2022-07-30 00:42:06 +02:00
Arne Morten Kvarving
e82ec7a274 clean up includes in Schedule.hpp 2022-07-29 18:37:57 +02:00
Markus Blatt
6561138236 Merge pull request #3067 from GitPaean/fixing_multiple_wpimult
fixing multiple WPIMULT records
2022-07-29 10:24:50 +02:00
Arne Morten Kvarving
ec57a4d10b changed: remove include of Schedule.hpp in header
and deal with the consequences
2022-07-27 17:13:45 +02:00
Markus Blatt
92ebef3bc9 Merge pull request #3084 from akva2/cleanup_stream_includes
clean up stream includes
2022-07-27 17:08:28 +02:00
Markus Blatt
5532176af4 Merge pull request #3083 from akva2/cleanup_deck
changed: remove include of Deck.hpp in header
2022-07-27 17:06:26 +02:00
Arne Morten Kvarving
068bff1ebc clean up stream includes 2022-07-27 16:05:01 +02:00
Arne Morten Kvarving
5e7191c79e changed: remove include of Deck.hpp in header
and deal with the consequences
2022-07-26 18:42:39 +02:00
Arne Morten Kvarving
ef6d448077 changed: remove include of EclipseState.hpp in header
and deal with the consequences
2022-07-26 16:03:52 +02:00
Bård Skaflestad
a79ee15082 Decouple Opm::Box From EclipseGrid
This commit switches to constructing Box instances from a GridDims
and two call-back functions instead of taking an EclipseGrid
directly.  The two call-back functions are a predicate for active
cells and a translation from Cartesian to active cell indices
respectively.

This is intended to simplify working with nested boxes, such as
those that occur for local grid refinement.
2022-07-05 14:27:49 +02:00
Kai Bao
eccce0209c simplify the updateDerivativeSinglephase
and also finishing the singlephase test.
2022-07-05 14:20:59 +02:00
Kai Bao
b87867d144 multple MPIMULT keywords within one report step is handled
and ScheduleTests is updated with tests
2022-07-05 10:52:25 +02:00
Svenn Tveit
1cddf4b5d4 Changed order of input 2022-07-01 09:03:48 +02:00
trinemykk
1204f3c94e Merge pull request #4 from GitPaean/add-chi-flash-trine
some shallow cleaning up
2022-06-30 14:45:17 +02:00
Trine Mykkeltvedt
c1b0d88a89 added a setup for co2 and brine that gives single phase in the flash, need to add a refrence solution for comparison at some point 2022-06-30 14:42:26 +02:00
Kai Bao
0310d25e99 some shallow cleaning up 2022-06-30 14:36:59 +02:00
Trine Mykkeltvedt
1d2db38172 testing all three solution strategies for test_co2brine_ptflash and also, a refrence result comparison is added 2022-06-30 13:56:55 +02:00
Kai Bao
ffa12e5d09 adding a test for WPIMULT to test new functionality
from this PR.
2022-06-30 13:30:36 +02:00
Kai Bao
dac57ac2eb testing all three solution strategies for test_threecomponents_ptflash
and also, the reference result comparison is added.
2022-06-29 23:54:00 +02:00
Bård Skaflestad
1516b63a39 Merge pull request #3065 from blattms/ordered-map-truncate-key
Use only first 8 characters as fault name when comparing/searching.
2022-06-28 10:22:35 +02:00
Trine Mykkeltvedt
3d8826fc28 some copyright for some new files 2022-06-27 13:11:28 +02:00
Markus Blatt
d4cd92ee40 Support ignoring additional characters in key of OrderedMap.
At least for faults we should only look at the first 8 characters.
2022-06-27 11:14:22 +02:00
Bård Skaflestad
013b279682 Apply Generalised ACTNUM Handling to All Grid Types
Commit eca858335 introduced a more comprehensive way of forming the
initial ACTNUM array used when constructing the EclipseGrid from a
corner-point description.  This commit applies that strategy to all
known grid types.  As an additional benefit this will also cover one
special case that was not handled and would effectively discard the
work done in the generalised initial ACTNUM construction.

Add unit tests to exercise the ACTNUM handling for other grid types.
2022-06-24 14:01:17 +02:00
Markus Blatt
b4eb8fbd4f OrderedMap: Remove template parameter for key type.
It is only used with std::string anyway.
2022-06-24 09:32:10 +02:00
Kai Bao
8fd9168dd1 adding includes files to test_components
But many components do not have the criticalVolume and acentricFactor
defined. So test_components does not compile.
2022-06-24 00:30:55 +02:00
Kai Bao
35321b9825 renaming ChiFlash to PTFlash 2022-06-23 23:55:37 +02:00
Kai Bao
0f8df5cca1 white space cleaning up
no functionality change.
2022-06-23 22:44:20 +02:00
Bård Skaflestad
d35abfddb6 Implement Defaulted Table Copy for DENSITY and GRAVITY
Use the same targeted strategy as for PVTW.
2022-06-23 16:04:50 +02:00
Bård Skaflestad
54ba23d71b Implement Defaulted Table Copy for PVTO and PVTG
The existing mechanism did not handle this case sufficiently well.
It is likely that we will have to polish this approach, but for now
use an explicit table copy to ensure that we have structurally
correct backing table data.
2022-06-23 16:04:50 +02:00
Bård Skaflestad
a066d2b95f Implement Defaulted Table Copy for PVDO and PVDG 2022-06-23 16:04:50 +02:00
Bård Skaflestad
433cc4d649 Treat All-Defaulted PVTW Record as Copy of Previous
A simulation model may choose to give PVTW data as

    PVTW
      1.0 1.0 1.0e-5 0.2 0.0 /
      /  -- record 2 (copied from record 1)

if, for instance, the oil and/or gas tables are different in regions
1 and 2, but the water is the same.  In this case we must properly
copy record 1 into record 2 and essentially recreate the table.

To this end, decouple the 'PvtwTable' from the 'FlatTable' machinery
and make the former into an independent type containing vector<>
instead of inheriting from vector<>.  Implement the default->copy
behaviour in the new PvtwTable::PvtwTable(const DeckKeyword&)
constructor.
2022-06-23 16:04:50 +02:00
Trine Mykkeltvedt
6b6990a7fc moved and renamed fluidsystems and parametercache in chifluid 2022-06-22 14:59:38 +02:00
Trine Mykkeltvedt
7de58ae532 moved the components to opm/material/components, and made subsequent changes for checking of the components 2022-06-22 14:35:55 +02:00
Bård Skaflestad
0a287ca914 Add Well and Group Level Efficiency Factor Summary Vectors
This commit adds support for the GEFF, WEFF, and WEFFG summary
vectors that report the efficiency factors at the well (WEFAC) and
group (GEFAC) levels.  WEFFG additionally accounts for efficiency
factors in a well's superior groups in the group tree.
2022-06-22 11:52:58 +02:00
Trine Mykkeltvedt
06de60a6fb removed unused files and started removing julianame 2022-06-22 11:36:47 +02:00
Kai Bao
e91ea58286 removing test_chiflash_scalar and test_chiflashspe5
they are not needed anymore.
2022-06-21 15:56:02 +02:00
Kai Bao
530157c092 fixing the compilation of test_chiflash
one reason is some code does not compile with DUNE2.6. And DUNE2.6 is
still supported by OPM.
2022-06-21 15:53:25 +02:00
Bård Skaflestad
4d76351111 Merge pull request #3049 from atgeirr/fix-actnum-equals-manipulation
Fix ACTNUM manipulation with EQUALS
2022-06-21 09:59:33 +02:00
Atgeirr Flø Rasmussen
a97df7c889 Use BOOST_CHECK_EQUAL_COLLECTIONS. 2022-06-21 09:32:31 +02:00