Commit Graph

1636 Commits

Author SHA1 Message Date
Tor Harald Sandve
e2b0ad581c Merge pull request #1956 from goncalvesmachadoc/watvap
Finalize VAPWAT keyword
2021-12-09 15:37:04 +01:00
goncalvesmachadoc
805686dad2 clean test 2021-12-08 17:43:21 +01:00
Bård Skaflestad
84bf899380 Merge pull request #2593 from plgbrts/salt_prec
salt solubility table allowing specification of solubility per region
2021-12-08 15:52:18 +01:00
Paul Egberts
48124f12f4 added test for solubility table for 2 regions 2021-12-06 21:43:42 +01:00
Joakim Hove
2a612b5c64 Allow using mode LIFT in WELTARG 2021-12-03 10:39:02 +01:00
Paul Egberts
3ead0f48d2 add test for salt solubility table 2021-12-02 16:43:54 +01:00
Joakim Hove
c4bdff2b39 ScheduleDeck constructed with time_point argument 2021-11-26 09:11:53 +01:00
Joakim Hove
2d0e92750d Merge pull request #2866 from joakim-hove/schedule-dump
Implement schedule dump to deck functionality
2021-11-25 11:10:11 +01:00
Joakim Hove
48854bfbeb Use std::optional<> for tracer details 2021-11-23 15:01:11 +01:00
Joakim Hove
c081a764a7 Implement schedule dump to deck functionality 2021-11-23 15:00:33 +01:00
Joakim Hove
f572937529 Add template<> Deck::get<T>() to get keywords 2021-11-23 14:06:37 +01:00
Daniel
90ce7bc6cb Replaced call to Deck::getKeyword(kw, index) with deck[kw][index] 2021-11-23 14:00:38 +01:00
Daniel
b0f757eb50 Replace Deck::getKeyword(std::string) with operator[std::string] 2021-11-23 14:00:38 +01:00
Joakim Hove
6d669c9b6c Merge pull request #2853 from joakim-hove/wstats
WSTAT
2021-11-22 09:50:04 +01:00
Joakim Hove
78a90e1dec Create Network::Balance constructor based on default values 2021-11-18 15:29:38 +01:00
Joakim Hove
2a50e28085 Test ensure that WSTAT is included in SummaryConfig 2021-11-17 12:10:48 +01:00
Daniel
fe24c0717c Replace Deck::getKeyword(size_t) with operator[size_t] 2021-11-16 18:36:27 +01:00
Joakim Hove
84c551a6df Record use of GEO keywords as ACTIONX keyword 2021-11-12 16:52:23 +01:00
Joakim Hove
1d6a930784 Add test for COMPDAT as ACTIONX keyword 2021-11-12 15:08:16 +01:00
Joakim Hove
10314ce169 Merge pull request #2826 from daniepin/applyAction-refactor
Combine ScheduleGrid and FieldPropsManager
2021-11-12 15:04:37 +01:00
Bård Skaflestad
def4dd2c68 Return Restart State Object by Move()
Useful since we don't get in-place construction when returning a
composite object.  Also useful if we decide to make RstState a
move-only type.
2021-11-12 13:06:31 +01:00
Joakim Hove
ee105b7bbf Remove base class DeckViewInternal and create new class DeckView 2021-11-12 08:09:29 +01:00
Joakim Hove
fb1dcd0203 Merge pull request #2817 from joakim-hove/schedule-fp
Schedule fp
2021-11-12 07:52:58 +01:00
Joakim Hove
d61f2356db Remove unused variables 2021-11-10 16:21:28 +01:00
Joakim Hove
f1e768e184 Add struct SimulatorUpdate to transport results back to simulator 2021-11-10 15:57:56 +01:00
Joakim Hove
243beeb96a Add functionality to update FieldProps with schedule multipliers 2021-11-10 15:05:36 +01:00
Joakim Hove
948504444d Remove ParseContext::UNSUPPORTED_SCHEDULE_GEO_MODIFIERS 2021-11-10 15:05:36 +01:00
Daniel
faefde1a4f Modify ACTIONX tests 2021-11-09 13:01:36 +01:00
Joakim Hove
a51a220a24 Add test for ACTIONX with trailing COMPDAT 2021-11-09 12:33:22 +01:00
Daniel
d8a2061a14 Modify loadCOMPDAT() to not take a FieldPropsManager* as an argument 2021-11-09 12:16:40 +01:00
Joakim Hove
b1b7ed5ecb Merge pull request #2818 from joakim-hove/rename-geo-modifiers
Rename EclipseState::apply_geo_keywords -> apply_schedule_keywords
2021-11-08 11:46:25 +01:00
Bård Skaflestad
da9d550f05 Support GRAVITY As Fallback for DENSITY
This commit activates support for the 'GRAVITY' keyword.  We treat
this as a fallback alternative to the 'DENSITY' keyword.
2021-11-07 20:20:56 +01:00
Joakim Hove
3d17cee393 Rename EclipseState::apply_geo_keywords -> apply_schedule_keywords 2021-11-07 19:55:09 +01:00
Joakim Hove
0595aa8fea Merge pull request #2801 from joakim-hove/affected-wells
Register well as "touched" by WCONHIST and WCONINJE in ACTIONX block
2021-11-05 12:02:01 +01:00
Daniel
45dd77938b Removed constructor from ScheduleGrid, added perm prop to tests
Changed (BASE_SIM.DATA, BASE_SIM_THPRES.DATA, RESTART_SIM.DATA),  testblackoilstate3.DATA and testrft.DATA since they affect the tests in test_Restart.cpp, test_restartwellinfo.cpp and test_RFT.cpp respectively.
2021-11-04 11:29:12 +01:00
Daniel
931cebb12f Add Props struct to CompletedCells::Cell 2021-11-04 11:29:12 +01:00
Daniel
39723102a9 Add permability property to CompletedCells 2021-11-04 11:29:12 +01:00
Joakim Hove
f2db4651d0 Register well as "touched" by WCONHIST and WCONINJE in ACTIONX block 2021-11-04 09:37:36 +01:00
Atgeirr Flø Rasmussen
af8fc94188 Merge pull request #2802 from akva2/remove_gcc7_compat
changed: drop gcc7 compatibility
2021-11-01 15:29:52 +01:00
Arne Morten Kvarving
6465cfe1ea changed: drop gcc7 compatibility
this means getting rid of the Opm::filesystem namespace
and directly using std::filesystem, as well as dropping
some of the compat code for the tr filesystem.

we still need the FileSystem.hpp/cpp files though as unique_path
is not part of std::filesystem.
2021-11-01 12:36:42 +01:00
Daniel Pinjusic
f8b8cad95a Refactored ScheduleGrid to use public struct cell 2021-10-26 13:36:54 +02:00
Joakim Hove
a17fe175d2 Merge pull request #2775 from joakim-hove/actionx-compdat-compsegs-fix
Actionx compdat compsegs fix
2021-10-25 17:38:20 +02:00
Joakim Hove
e323c4a88c Make sure Schdule keyword is retained in FileDeck::skip 2021-10-24 10:08:46 +02:00
Joakim Hove
5f0bd0a5c7 Implement FileDeck::Index::operator+(std::size_t shift) 2021-10-24 10:01:48 +02:00
Williham Williham Totland
4134b98701 Introduce class SchduleGrid to be used as grid by Schedule class 2021-10-22 08:35:17 +02:00
Joakim Hove
ace87a357a Handle skipping in SCHEDULE section 2021-10-20 14:02:13 +02:00
Joakim Hove
6ca08afb74 Merge pull request #2763 from joakim-hove/wtmult-simple
Basic support for WTMULT
2021-10-20 08:31:43 +02:00
Joakim Hove
24d1f58aca Merge pull request #2767 from joakim-hove/rst-deck-output
Rst deck output
2021-10-20 08:01:21 +02:00
Bård Skaflestad
5e3ba88dde Merge pull request #2759 from joakim-hove/restart-errors
Validate restart input in constructor
2021-10-19 21:52:54 +02:00
Joakim Hove
22edbe79ab DeckKeyword - slash termination correctly initialized 2021-10-19 19:13:15 +02:00