Bård Skaflestad
71c046bef4
Merge pull request #808 from joakim-hove/injection-unitsystem
...
Add UnitSystem member to Well2 class
2019-06-12 11:46:45 +02:00
Bård Skaflestad
0a3d26e9be
Merge pull request #806 from joakim-hove/UDAValue-reset
...
Uda value reset
2019-06-12 11:02:48 +02:00
Joakim Hove
edbc9d2af7
UDAValue: add reset() methods
2019-06-12 10:13:01 +02:00
Joakim Hove
f3abbf4981
UDAValue: add method assert_numeric()
2019-06-12 10:13:01 +02:00
Joakim Hove
3961f724db
Add UnitSsystem member to Well2 class
2019-06-08 12:39:22 +02:00
Joakim Hove
08305b6e30
Extract Summary::eval() out from Summary::add_timestep()
2019-06-07 14:45:18 +02:00
Joakim Hove
40b556112f
Add operator<< support to UDAValue
2019-06-06 15:58:36 +02:00
Joakim Hove
ec20274fa3
Add serialization of SummaryState
2019-06-03 14:55:38 +02:00
Bård Skaflestad
9aee2bee71
Merge pull request #668 from joakim-hove/udq-fieldset
...
UDQ field and group variables
2019-06-03 12:01:37 +02:00
Joakim Hove
32a1c3b5da
Merge pull request #762 from joakim-hove/well-controls
...
Well controls
2019-05-29 06:46:47 +02:00
Joakim Hove
2682eef9b3
Merge pull request #788 from joakim-hove/remove-welltest
...
Removed well testing from Schedule constructor
2019-05-27 20:13:45 +02:00
Joakim Hove
5c65299c0a
Add size() and num_wells() methods to SummaryState
2019-05-27 17:56:27 +02:00
Joakim Hove
35a70310c6
Removed well testing from Schedule constructor
2019-05-27 17:47:55 +02:00
Joakim Hove
54af290cc0
Extend UDQ eval code
...
With this commit the code to evaluate UDQ values has been extended/refactored in
many ways:
- There is an increased awarenwss of variable type, i.e. a well related UDQ
versus a field related UDQ. The variable type flows through the AST, and it
is verified that the expression to evaluate and the target variable are of
compatible types.
- Have added support for UDQ field variables and UDQ group variables.
- The UDQSet type and the UDQDefine::eval() have been refactored to multiplex
on all the UDQ types, and the specialized UDQWellSet has been removed.
2019-05-27 16:43:22 +02:00
Joakim Hove
c8b0988191
Add size() and num_wells() methods to SummaryState
2019-05-27 16:43:22 +02:00
Joakim Hove
779a2b8d89
Add group awareness to SummaryState
2019-05-27 14:38:13 +02:00
Joakim Hove
418241137c
Rebase fixup
2019-05-24 15:31:27 +02:00
Joakim Hove
01db100439
WellProductionProperties and WellInjectionProperties are private
2019-05-24 15:31:27 +02:00
Joakim Hove
51aee6e8cb
Add structs InjectionControls and ProductionControls
2019-05-24 15:31:27 +02:00
Kai Bao
01c0820d4c
addressing reviewing comments from PR#720
...
and adding more tests
2019-05-24 10:19:50 +02:00
Kai Bao
d11d26a2f1
adding test WrongDistanceCOMPSEGS
2019-05-24 10:19:50 +02:00
Kai Bao
584defebe0
ParseContext is used to handle the exceptions when parsing COMPSEGS
2019-05-24 10:19:50 +02:00
Joakim Hove
94b160258e
Remove old well implementation
2019-05-22 21:44:50 +02:00
Joakim Hove
8231b84a11
Add method bool Well2::predictionMode()
2019-05-20 16:13:20 +02:00
Joakim Hove
9e288a9d78
Refactor SummaryState
...
- Change SummaryState::add() -> SummaryState::update(), the
SummaryState::update() method is semantically aware of totals.
- Add an internal variable to the SummaryState class to keep track of the
elapsed simulation time.
2019-05-13 11:06:32 +02:00
Joakim Hove
294c8aa2f7
Merge pull request #767 from GitPaean/fixing_wconprod
...
clearning existing controls when handleWCONPROD
2019-05-12 11:58:37 +02:00
Kai Bao
de17c851bc
clearning existing controls when handleWCONPROD
2019-05-11 14:07:15 +02:00
Arne Morten Kvarving
9b9fc2ef37
mark constructors explicit
2019-05-10 12:43:02 +02:00
Joakim Hove
1c82a8ad39
Add alternative well implementation Well2
2019-05-09 09:20:23 +02:00
Joakim Hove
0f3dabc3aa
Internalize a global WHISTCTL setting in the Schedule object
2019-05-02 16:01:29 +02:00
Joakim Hove
92caf4f010
Merge pull request #747 from joakim-hove/grouptree<<
...
Add operator<< to GroupTree class + whitespace
2019-05-01 14:42:26 +02:00
Joakim Hove
894ad7a226
Add operator<< to GroupTree class + whitespace
2019-05-01 13:42:07 +02:00
Joakim Hove
b148769cc6
Internalize UDA values in the deck
2019-04-28 16:08:02 +02:00
Joakim Hove
656878d649
Add class UDAValue to hold UDA values from the Deck
2019-04-28 16:08:02 +02:00
Joakim Hove
f4009fc6d8
Add default constructor for unit Dimension
2019-04-28 16:08:02 +02:00
Joakim Hove
fffe259621
Misc minor changes: whitespace++
2019-04-23 07:25:05 +02:00
Joakim Hove
b955ecf6b4
Merge pull request #737 from joakim-hove/process-segments
...
Add WellSegments::process() front-end method
2019-04-20 13:14:01 +02:00
Joakim Hove
5cfb91df24
Merge pull request #736 from joakim-hove/remove-branch-number
...
Remove unused member WellSegments::m_branch_number
2019-04-20 13:13:46 +02:00
Joakim Hove
fbece57167
Add WellSegments::process() front-end method
2019-04-19 12:35:10 +02:00
Joakim Hove
54f45eaba7
Remove unused member WellSegments::m_branch_number
2019-04-19 12:03:01 +02:00
Joakim Hove
167a7a8c38
Merge pull request #733 from joakim-hove/use-wellname
...
Use wellname in Group::addWell()
2019-04-18 21:12:29 +02:00
Joakim Hove
9c93a9349c
Use wellname in Group::addWell()
2019-04-18 16:45:24 +02:00
Joakim Hove
44f8a5d94e
Use DeckItem::to_bool( )
2019-04-18 16:24:54 +02:00
Joakim Hove
d5f240050a
Implement unique() method on DynamicState
2019-04-18 08:09:31 +02:00
Joakim Hove
5e76f624ef
Remove Schedule::getWells(group, step)
2019-04-17 14:47:00 +02:00
Joakim Hove
b5dbc3d8e5
Delete unused code for ?CON serialization
2019-04-17 14:28:58 +02:00
Joakim Hove
4b657fc4cf
Use reference instead of value
2019-04-11 14:03:08 +02:00
Joakim Hove
a4e66a5484
White space change
2019-04-11 14:03:08 +02:00
Joakim Hove
164ab30fa1
The WELTARG treatment is moved out from Schedule.cpp
2019-04-11 12:13:43 +02:00
Joakim Hove
2997338eb2
Merge pull request #712 from joakim-hove/udq-tokens
...
Internalize UDQ tokens in the UDQ define keyword
2019-04-09 18:29:27 +02:00