Commit Graph

7770 Commits

Author SHA1 Message Date
Joakim Hove
edf01bdcda Initialize Schedule from restart file 2020-03-13 09:09:25 +01:00
Joakim Hove
952965ee07 Merge pull request #1570 from joakim-hove/schedule-cmp
Add context aware Schedule::cmp() function
2020-03-13 09:02:45 +01:00
Joakim Hove
191c50173a Add context aware Schedule::cmp() function 2020-03-13 08:03:36 +01:00
Joakim Hove
e9bbab8b0d Merge pull request #1569 from joakim-hove/rst-schedule-parts
Rst schedule parts
2020-03-12 21:05:33 +01:00
Joakim Hove
a28f146d71 Add Well constructor based on restart well 2020-03-12 20:09:09 +01:00
Joakim Hove
e1dbd72689 Remove const and use std::move() when updating internal shared ptr 2020-03-12 18:11:25 +01:00
Joakim Hove
23bdbe51f2 Add wtype, drainage_radius and efficiency_factor members to rst::well 2020-03-12 18:11:25 +01:00
Joakim Hove
bf00fec1f9 Add Connection constructor based on RestartIO::connection 2020-03-12 18:11:25 +01:00
Joakim Hove
03be91a951 Add members cf_kind, cf, skin_factor and r0 to rst::connection 2020-03-12 18:11:25 +01:00
Joakim Hove
ee5f311a04 RestartIO::state - use internal UnitSystem member 2020-03-12 17:47:41 +01:00
Joakim Hove
034656b9fb Remove test application rst_load 2020-03-12 17:41:08 +01:00
Joakim Hove
0fa1be6f54 Add accessor to in productionControls 2020-03-12 17:40:15 +01:00
Joakim Hove
c7695a7ac1 Moved declarations 2020-03-12 17:34:54 +01:00
Joakim Hove
8342d78fa0 Merge pull request #1556 from joakim-hove/connection-segment-attach-bug
Fixed: do not update insert_index when linking segment -> connection
2020-03-12 12:56:04 +01:00
Joakim Hove
fcfed6e125 Merge pull request #1563 from atgeirr/add-has-method-guiderate
Add GuideRate::has() method.
2020-03-12 12:55:44 +01:00
Joakim Hove
d5855edc55 Fixed: do not update insert_index when linking segment -> connection 2020-03-12 11:01:56 +01:00
Joakim Hove
82028ca20d Merge pull request #1564 from akva2/less_shared_ptr
changed: store Regdims and Eqldims as regular members, not shared ptrs
2020-03-12 11:00:46 +01:00
Arne Morten Kvarving
c8c8ef006d changed: store Regdims and Eqldims as regular members, not shared ptrs 2020-03-12 08:53:36 +01:00
Bård Skaflestad
0ec72754dd Merge pull request #1555 from joakim-hove/connection-def-segment-zero
The numerical value 0 is used to signify no connection <-> segment
2020-03-11 14:14:17 -05:00
Bård Skaflestad
dce9a2222f Merge pull request #1562 from joakim-hove/segment-reorder-refactor
Segment reorder refactor
2020-03-11 13:43:34 -05:00
Bård Skaflestad
7732e42658 Merge pull request #1552 from akva2/eclstate_serialize
add serialization template to EclipseState
2020-03-11 12:12:49 -05:00
Joakim Hove
d79350f20a Merge pull request #1560 from joakim-hove/rawkeyword-cleanup
Remove unused file
2020-03-11 16:30:07 +01:00
Joakim Hove
96f22730ca Minor reformatting 2020-03-11 16:14:21 +01:00
Joakim Hove
af02d6620d Align code 2020-03-11 15:46:00 +01:00
Joakim Hove
472984233f Use Segment instance for outlet segment 2020-03-11 15:42:49 +01:00
Atgeirr Flø Rasmussen
ce930d0158 Add virtual destructor for EclipseState class. 2020-03-11 15:19:47 +01:00
Atgeirr Flø Rasmussen
be2337e2c1 Add GuideRate::has(). 2020-03-11 15:19:47 +01:00
Joakim Hove
9b1d045631 Add segmentOrder() overload to avoid dummy argument 2020-03-11 14:49:17 +01:00
Joakim Hove
83ace5c03e Remove unused file 2020-03-11 14:33:12 +01:00
Bård Skaflestad
683723aa56 Merge pull request #1558 from joakim-hove/segment-use-named-index
Use enum values to look up indices when assembling segment info
2020-03-11 08:08:41 -05:00
Joakim Hove
222e0e7699 Use named constants in ISEG init 2020-03-11 13:39:42 +01:00
Joakim Hove
61894b5c3a Use enum values to look up indices when assembling segment info 2020-03-11 11:45:08 +01:00
Joakim Hove
3cc78f2487 The numerical value 0 is used to signify no connection <-> segment 2020-03-11 08:11:22 +01:00
Bård Skaflestad
64206e1d9a Merge pull request #1549 from akva2/serializer_summaryconfig
add serialization template to SummaryConfig
2020-03-10 20:20:08 -05:00
Arne Morten Kvarving
35eb136986 Merge pull request #1554 from dr-robertk/PR/cmake-check-include-file
[bugfix][cmake] Fix FindParMETIS check
2020-03-10 15:36:05 +01:00
Robert Kloefkorn
8de70f9128 [bugfix][cmake] Fix FindParMETIS check by adding missing
include(CheckIncludeFile).
2020-03-10 15:33:29 +01:00
Bård Skaflestad
cb7e40345f Merge pull request #1550 from akva2/followup_stonetype
changed: relocate and rename StoneType enum
2020-03-10 07:57:26 -05:00
Arne Morten Kvarving
1da29f8bd8 add serialization template to EclipseState 2020-03-10 13:47:11 +01:00
Arne Morten Kvarving
6a2c036582 add serialization template to SummaryConfig
remove accessors that was only required for the external serialization
support
2020-03-10 13:09:08 +01:00
Arne Morten Kvarving
c2108265b3 Merge pull request #1548 from akva2/simplify_oilvap_equality
simplify the OilVaporization equality operator
2020-03-10 12:31:10 +01:00
Joakim Hove
e3600cfc19 Merge pull request #1551 from joakim-hove/opmpack-fix2
Fix opmpack copy_file option in the case of empty directories
2020-03-10 12:22:30 +01:00
Arne Morten Kvarving
9b22cab024 changed: relocate and rename StoneType enum
unfortunate naming, unfortunate location
2020-03-10 11:09:49 +01:00
Joakim Hove
02fd4ab340 Fix opmpack copy_file option in the case of empty directories 2020-03-10 11:03:45 +01:00
Arne Morten Kvarving
d945dee95b simplify the OilVaporization equality operator
in particular the UNDEF -> false condition causes issues
in user code.
2020-03-10 09:55:46 +01:00
Joakim Hove
b8a30805d3 Merge pull request #1547 from joakim-hove/update-binary-testdata
Update embedded testdata with more items in restart file
2020-03-09 19:13:00 +01:00
Joakim Hove
cab6e21df6 Update embedded testdata with more items in restart file 2020-03-09 17:55:50 +01:00
Joakim Hove
ed0018ac98 Merge pull request #1546 from joakim-hove/rst-small
Rst small
2020-03-09 16:56:30 +01:00
Joakim Hove
b9b7cdc801 Merge pull request #1544 from joakim-hove/restart-items
Restart items
2020-03-09 16:55:57 +01:00
Joakim Hove
2edb1f4621 Add Well::DrainageRadius and Well::EfficiencyFactor to restart file 2020-03-09 16:52:03 +01:00
Joakim Hove
34984de671 Merge pull request #1519 from joakim-hove/add-welltype-class
Add WellTypes class
2020-03-09 16:40:22 +01:00