Commit Graph

9673 Commits

Author SHA1 Message Date
Bård Skaflestad
7318bc080f Revert to Looping Well Names
The wells maintain their own insertion index, so we do not need to
infer the index from the well name order.
2021-01-20 16:56:29 +01:00
Joakim Hove
af66a6b5f5 Merge pull request #2226 from tskille/tcpu_unit
Adding unit SECONDS for summary vector TCPU
2021-01-20 16:35:13 +01:00
Torbjørn Skille
768cbb2c56 Adding unit SECONDS for summary vector TCPU 2021-01-20 15:02:30 +01:00
Joakim Hove
60aeb91a5e Merge pull request #2221 from joakim-hove/schedule-grid-pointers
Use pointers to grid and fieldprops in Schedule construction
2021-01-20 13:20:48 +01:00
Arne Morten Kvarving
09d658cb41 Merge pull request #2216 from dr-robertk/PR/fix-openmp-linking-issue
Linking issue when OpenMP is disabled.
2021-01-20 09:06:40 +01:00
Atgeirr Flø Rasmussen
503e527272 Merge pull request #2222 from OPM/revert-2215-use-ordinary-map-groups
Revert "Use std::map for groups"
2021-01-19 14:39:06 +01:00
Joakim Hove
ecce98a307 Revert "Use std::map for groups" 2021-01-19 12:40:01 +01:00
Joakim Hove
11b568e8e5 Merge pull request #2215 from joakim-hove/use-ordinary-map-groups
Use std::map for groups
2021-01-19 12:35:59 +01:00
Joakim Hove
a01b81d9ec Use pointers to grid and fieldprops in Schedule construction 2021-01-19 10:27:37 +01:00
Joakim Hove
a24bc9427e Merge pull request #2220 from joakim-hove/sched-state-python
Add very basic Python wrapping for ScheduleState
2021-01-19 10:15:34 +01:00
Joakim Hove
5a8cb5f562 Add very basic Python wrapping for ScheduleState 2021-01-19 09:51:22 +01:00
Joakim Hove
4b89487ef2 Merge pull request #2217 from joakim-hove/add-group-to-group
Use names in api for group-group update
2021-01-18 14:39:13 +01:00
Joakim Hove
499f1ce72f Merge pull request #2219 from joakim-hove/group-remove-define-step
Remove member to track create time from Group
2021-01-18 14:38:56 +01:00
Joakim Hove
888a646716 Remove member to track create time from Group 2021-01-18 12:19:54 +01:00
Joakim Hove
a618f39f9b Use names in api for group-group update 2021-01-18 11:39:07 +01:00
dr-robertk
3c66dcdd4b [bugfix][OpenMP] #ifdef _OPENMP should be used, otherwise linking errors
occur.
2021-01-18 10:34:15 +01:00
Joakim Hove
55cec7dd4d Use std::map for groups 2021-01-18 09:13:35 +01:00
Joakim Hove
462ab5f44a Merge pull request #2214 from joakim-hove/use-ordinary-map-commits
Use ordinary map commits
2021-01-15 14:31:07 +01:00
Joakim Hove
d3a1f6521f Change test to check for existence 2021-01-15 12:29:01 +01:00
Joakim Hove
8cd442e5b2 Use full well objects instead of well names 2021-01-15 12:25:27 +01:00
Joakim Hove
bee758bc37 Whitespace 2021-01-15 12:24:12 +01:00
Joakim Hove
7fc9d2bb73 Merge pull request #2212 from joakim-hove/sched-udq-active
Sched udq active
2021-01-15 10:24:27 +01:00
Joakim Hove
344972624a Use ScheduleState to manage UDQActive 2021-01-15 09:19:33 +01:00
Joakim Hove
bc3c3490bb Merge pull request #2211 from joakim-hove/sched-action
Sched action
2021-01-15 09:18:32 +01:00
Joakim Hove
c22b47f994 Use ScheduleState to manage Actionx 2021-01-15 07:51:51 +01:00
Joakim Hove
ccb0ecbea3 Merge pull request #2210 from joakim-hove/sched-vfp
Sched vfp
2021-01-15 07:39:34 +01:00
Joakim Hove
d7345edc95 Use ScheduleState to manage VFP tables 2021-01-14 21:28:19 +01:00
Joakim Hove
32dec137a7 Merge pull request #2207 from joakim-hove/sched-rptconfig
Sched rptconfig
2021-01-14 11:52:19 +01:00
Joakim Hove
65aab177df Manage RTPSCHED config in ScheduleState 2021-01-14 10:40:30 +01:00
Joakim Hove
b2bc40206a Merge pull request #2206 from joakim-hove/sched-static
Assemble static schedule information in ScheduleStatic
2021-01-13 13:19:22 +01:00
Joakim Hove
6453844fd6 Merge pull request #2209 from GitPaean/creating_aquifer_helpers
creating AquiferHelpers
2021-01-13 13:14:48 +01:00
Kai Bao
13c38b7eb9 creating AquiferHelpers
to make function neighborCellInsideReservoirAndActive more reusable.
2021-01-13 11:51:14 +01:00
Joakim Hove
2a95573570 Assemble static schedule information in ScheduleStatic 2021-01-13 11:49:29 +01:00
Joakim Hove
de0615e251 Merge pull request #2205 from joakim-hove/sched-network
Manage Network configuration with ScheduleState
2021-01-13 08:04:19 +01:00
Joakim Hove
bd596f06b4 Manage Network configuration with ScheduleState 2021-01-12 21:42:23 +01:00
Joakim Hove
5ab1ae67ec Merge pull request #2203 from joakim-hove/sched-wlist
Sched wlist
2021-01-12 21:14:29 +01:00
Joakim Hove
ad03c1f479 Merge pull request #2188 from jalvestad/actx-paren
Changes to Actionx - related data (IACN) due to use of parentheses in the action conditions
2021-01-12 21:13:51 +01:00
Joakim Hove
b6e78fe486 Manage well list with ScheduleState 2021-01-12 20:18:22 +01:00
Joakim Hove
c2e1aeb568 Merge pull request #2202 from joakim-hove/sched-gcon
Manage GConSale and GConSump with ScheduleState object
2021-01-12 20:17:44 +01:00
Joakim Hove
ddba87cf99 Manage GConSale and GConSump with ScheduleState object 2021-01-12 18:29:27 +01:00
Joakim Hove
9b150db251 Merge pull request #2201 from joakim-hove/sched-wtest-config
Handle well test configuration with ScheduleState
2021-01-12 17:50:27 +01:00
Jostein Alvestad
7056ce3970 removed comment line 2021-01-12 14:31:41 +01:00
Jostein Alvestad
8e4557646d changes based on reviewer comments to improve/clean code 2021-01-12 14:30:25 +01:00
Joakim Hove
c20417d69b Handle well test configuration with ScheduleState 2021-01-12 14:02:15 +01:00
Joakim Hove
a2810bdf2e Merge pull request #2200 from joakim-hove/clamp-chrono
Make sure ScheduleState time_points are clamped to std::time_t
2021-01-12 13:58:58 +01:00
Joakim Hove
aebbc56b07 Make sure ScheduleState time_points are clamped to std::time_t 2021-01-12 13:06:04 +01:00
Joakim Hove
c5b226a8c8 Merge pull request #2199 from joakim-hove/sched-global-whistctl-mode
Sched global whistctl mode
2021-01-12 12:25:00 +01:00
Jostein Alvestad
4825f291e7 Added unit tests for Actionx data with parentheses 2021-01-12 09:32:10 +01:00
Jostein Alvestad
025ee7b634 changes to Actionx unit test data 2021-01-12 09:32:09 +01:00
Jostein Alvestad
0efb585b4c some corrections to treatment of parentheses 2021-01-12 09:32:07 +01:00