Commit Graph

13636 Commits

Author SHA1 Message Date
Markus Blatt
dd0ac8a669 [python] Use assertEqual instead of deprecated assertEquals-
Prevents warnings like
```
1: test_faults (tests.test_state.TestState2.test_faults) ... /<<PKGBUILDDIR>>/obj-arm-linux-gnueabihf/python/tests/test_state.py:124: DeprecationWarning: Please use assertEqual instead.
1:   self.assertEquals([], self.state.faultNames())
```
On Debian unstable.
2023-01-13 18:14:28 +01:00
Bård Skaflestad
f98180652c Merge pull request #3354 from akva2/wellmicpproperties.hpp_reduce_hotness
Well.hpp: forward WellMICPProperties
2023-01-13 16:21:21 +01:00
Arne Morten Kvarving
c58fc34a71 Well.hpp: forward WellMICPProperties 2023-01-13 15:29:28 +01:00
Bård Skaflestad
39552dd224 Merge pull request #3352 from akva2/wellpolymerproperties.hpp_reduce_hotness
Well.hpp: forward WellPolymerProperties
2023-01-13 15:28:28 +01:00
Bård Skaflestad
2ffe99a149 Merge pull request #3349 from plgbrts/permfact
Permfact table fix
2023-01-13 15:09:25 +01:00
Bård Skaflestad
df232628fd Merge pull request #3351 from bska/user-normal-serialization-for-udq-state
Prefer Standard Serialization Mechanism for UDQState
2023-01-13 14:47:36 +01:00
Arne Morten Kvarving
80dabaea3b Well.hpp: forward WellPolymerProperties 2023-01-13 14:04:12 +01:00
Bård Skaflestad
d94d048872 Merge pull request #3350 from akva2/welltracerproperties.hpp_reduce_hotness
Well.hpp: forward WellTracerProperties
2023-01-13 14:03:47 +01:00
Bård Skaflestad
c2800bed76 Prefer Standard Serialization Mechanism for UDQState
The serialization code handles nested structures out of the box and
does not need dedicated logic anymore.

While here, also move the serializationTestObject member function's
implementation to the .cpp file.
2023-01-13 13:49:04 +01:00
Arne Morten Kvarving
0750cc8cc2 Well.hpp: forward WellTracerProperties 2023-01-13 12:40:04 +01:00
Bård Skaflestad
48c9d29b1f Merge pull request #3348 from akva2/wellbrineproperties.hpp_reduce_hotness
Well.hpp: forward WellBrineProperties
2023-01-13 12:39:44 +01:00
Paul Egberts
7a78aea922 permfact json file fix 2023-01-13 12:10:01 +01:00
Paul Egberts
59dfa6f4b1 permfact table fix 2023-01-13 11:40:36 +01:00
Arne Morten Kvarving
5f6d3176b8 Well.hpp: forward WellBrineProperties 2023-01-13 11:36:00 +01:00
Bård Skaflestad
cd73e44539 Merge pull request #3347 from akva2/wellfoamproperties.hpp_reduce_hotness
Well.hpp: forward WellFoamProperties
2023-01-13 11:35:31 +01:00
Arne Morten Kvarving
253bb22e3c Well.hpp: forward WellFoamProperties 2023-01-13 10:16:37 +01:00
Arne Morten Kvarving
608e5cd42b Merge pull request #3345 from bska/expose-segment-set-type
Pull SegmentSet Out to Main OPM Namespace
2023-01-12 17:28:19 +01:00
Bård Skaflestad
70d66b64ee Pull SegmentSet Out to Main OPM Namespace
This way we can forward-declare the class and won't have include the
SegmentMatcher header whenever we need to declare a function that
takes or returns a SegmentSet.

Inspired by recent work by [at]akva2.
2023-01-12 16:51:38 +01:00
Bård Skaflestad
938e0e135b Merge pull request #3344 from akva2/wellsegments.hpp_reduce_hotness
Well.hpp: forward WellSegments
2023-01-12 16:32:36 +01:00
Arne Morten Kvarving
60181dd5f4 WellSegments: make enum forwardable 2023-01-12 14:37:46 +01:00
Arne Morten Kvarving
574407746d Well.hpp: forward WellSegments 2023-01-12 14:37:46 +01:00
Bård Skaflestad
30dc1db44a Merge pull request #3343 from akva2/wellconnections.hpp_reduce_hotness
Well.hpp: forward WellConnections
2023-01-12 13:58:29 +01:00
Arne Morten Kvarving
17e8063caa Well: add hasConnections
this allows user code to query if there are connections without pulling
in the WellConnection class
2023-01-12 12:53:54 +01:00
Arne Morten Kvarving
cc68336d22 Well.hpp: forward WellConnections 2023-01-12 12:24:38 +01:00
Bård Skaflestad
43dbf3f043 Merge pull request #3342 from akva2/rftconfig.hpp_reduce_hotness
ScheduleState.hpp: forward RFTConfig
2023-01-12 11:36:13 +01:00
Arne Morten Kvarving
cb6a0aba4b Merge pull request #3320 from akva2/python_build_cmake
changed: build opm-common python extension using cmake
2023-01-12 11:08:27 +01:00
Arne Morten Kvarving
a1003c648d ScheduleState.hpp: forward RFTConfig 2023-01-12 10:34:22 +01:00
Bård Skaflestad
652ae6757f Merge pull request #3341 from akva2/udqconfig.hpp_reduce_hotness
ScheduleState.hpp: forward UDQConfig
2023-01-12 10:33:04 +01:00
Arne Morten Kvarving
5d854d1d6d changed: build opm-common python extension using cmake
only use setup.py to generate wheels. adjust pypi packaging
accordingly
2023-01-12 10:14:38 +01:00
Arne Morten Kvarving
a8e5fa4d52 ScheduleState.hpp: forward UDQConfig 2023-01-12 09:39:20 +01:00
Bård Skaflestad
85fc610c85 Merge pull request #3340 from akva2/udqactive.hpp_reduce_hotness
ScheduleState.hpp: forward UDQActive
2023-01-11 16:11:56 +01:00
Arne Morten Kvarving
165a22e289 remove trailing semicolons from namespace closure braces 2023-01-11 15:17:55 +01:00
Arne Morten Kvarving
21d60f4eba ScheduleState.hpp: forward UDQActive 2023-01-11 15:17:06 +01:00
Arne Morten Kvarving
f10d7e4fd3 AggregateActionxData.hpp: remove unnecessary UDQActive.hpp include 2023-01-11 15:17:06 +01:00
Bård Skaflestad
0d550ddc3a Merge pull request #3339 from akva2/actions.hpp_reduce_hotness
ScheduleState.hpp: forward Action::Actions
2023-01-11 14:43:15 +01:00
Arne Morten Kvarving
5e74b915b5 ScheduleState.hpp: forward Action::Actions 2023-01-11 13:51:28 +01:00
Markus Blatt
032a9ba291 Merge pull request #3337 from akva2/balance.hpp_reduce_hotness
ScheduleState.hpp: forward Network::Balance
2023-01-11 13:29:17 +01:00
Arne Morten Kvarving
7b938a0115 ScheduleState.hpp: forward Network::Balance 2023-01-11 11:29:27 +01:00
Bård Skaflestad
89957cdbd7 Merge pull request #3335 from akva2/extnetwork.hpp_reduce_hotness
ScheduleState.hpp: forward Network::ExtNetwork
2023-01-11 11:28:48 +01:00
Arne Morten Kvarving
36b196624a ScheduleState.hpp: forward Network::ExtNetwork 2023-01-11 10:36:22 +01:00
Bård Skaflestad
3a0a4885c9 Merge pull request #3334 from akva2/drop_group.hpp_include
AggregateNetworkData.hpp: remove unnecessary Group.hpp include
2023-01-11 10:35:23 +01:00
Bård Skaflestad
340095d5c8 Merge pull request #3333 from akva2/gconsale.hpp_reduce_hotness
ScheduleState.hpp: forward GConSale
2023-01-11 09:59:43 +01:00
Arne Morten Kvarving
cf24cc99f0 AggregateNetworkData.hpp: remove unnecessary Group.hpp include 2023-01-11 09:53:10 +01:00
Arne Morten Kvarving
b843783223 ScheduleState.hpp: forward GConSale 2023-01-11 08:49:09 +01:00
Bård Skaflestad
4ff9f59c7b Merge pull request #3332 from akva2/gconsump.hpp_reduce_hotness
ScheduleState.hpp: forward GConSump
2023-01-10 16:38:30 +01:00
Bård Skaflestad
f247edbab5 Merge pull request #3331 from akva2/remove_empty_headers
Remove some empty headers
2023-01-10 15:45:00 +01:00
Arne Morten Kvarving
89d531e10a ScheduleState.hpp: forward GConSump 2023-01-10 14:59:55 +01:00
Bård Skaflestad
540c1c7abf Merge pull request #3330 from akva2/wlistmanager.hpp_reduce_hotness
ScheduleState.hpp: forward WListManager
2023-01-10 14:57:15 +01:00
Arne Morten Kvarving
0dbfbd10df remove empty header InjectionControls.hpp 2023-01-10 14:50:50 +01:00
Arne Morten Kvarving
235a964ebc remove empty header ProductionControls.hpp 2023-01-10 14:35:50 +01:00