OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,876 Commits 18 Branches 75 Tags
ea64c290010ce46cbeb38d8950ecae6ee13cbef8
Commit Graph

13876 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
b034c91483 Merge pull request #3379 from bska/prepare-udq-assign-segment 
Prepare for Handling UDQ ASSIGN for Segments
 2023-02-03 17:50:17 +01:00
hnil
9613cdd917 Added empty marco which can be used for timing with forexample Tracy 2023-02-02 14:19:51 +01:00
Bård Skaflestad
2b2330ab24 Prepare for Handling UDQ ASSIGN for Segments 
This commit adds support for constructing UDQ ASSIGN records for
enumerated well items such as those encountered in UDQs at the
segment level, e.g.,

    ASSIGN SUSPECT PROD01    123.456 /
    ASSIGN SUSPECT PROD02 17 654.321 /

We do not support this syntax quite yet, but this is a step on the
way there.
 2023-02-02 12:43:16 +01:00
Bård Skaflestad
e67a49b10f Merge pull request #3387 from akva2/aquifer_missing_include 
SingleNumericalAquifer: add missing include
 2023-02-02 12:29:21 +01:00
Arne Morten Kvarving
2e15535afe SingleNumericalAquifer: add missing include 2023-02-02 11:41:50 +01:00
Bård Skaflestad
f1326bb134 Merge pull request #3224 from daavid00/flres 
FLOWS and FLORES support
 2023-02-02 10:37:23 +01:00
Arne Morten Kvarving
d04a30592a Serializer: handle Dune::BlockVector as vectors 2023-02-01 14:49:15 +01:00
Arne Morten Kvarving
6ba29b0920 Serializer: allow generic vector classes 
needs to adhere to stl's interface
 2023-02-01 14:48:39 +01:00
Arne Morten Kvarving
e211a8cbf6 Serializer: handle Dune::FieldVector as arrays 2023-02-01 14:39:32 +01:00
Arne Morten Kvarving
7e6b28317a Serializer.hpp: add missing include 2023-02-01 10:48:48 +01:00
Arne Morten Kvarving
b138598518 changed: rename the packer used in test_Serialization to MemPacker 
make it a public header so it can be reused elsewhere.
 2023-02-01 10:48:48 +01:00
Atgeirr Flø Rasmussen
59ae098ff8 Merge pull request #3385 from daavid00/fixMacbuild 
Fixing broken built in macOS
 2023-02-01 10:39:53 +01:00
David Landa Marban
78ed39bd51 Fixing broken built in macOS 2023-02-01 09:56:15 +01:00
Tor Harald Sandve
9b3e1f92bf Merge pull request #3364 from hakonhagland/imbnum3 
Adds support for directional relative permeabilities with hysteresis
 2023-01-30 12:33:36 +01:00
Markus Blatt
b83f10d2d7 Merge pull request #3373 from bska/support-numbered-udq-scalars 
Add Numbered Item to UDQ Scalars
 2023-01-27 15:49:21 +01:00
Håkon Hægland
5430dc46a4 Compute the oil-water scaled info 
We need to compute the oil-water scaled info even if we are running a
two-phase case without water (e.g. gas-oil) since the oil-water scaled
info is used when computing the initial condition
 2023-01-24 21:50:43 +01:00
Bård Skaflestad
b3dd728a2e Add Numbered Item to UDQ Scalars 
This is in preparation of adding UDQs at the segment level.  We will
probably need to rethink the UDQ scalars and UDQ sets at some point,
since the lookup and assignment operations become more expensive
from adding this piece of information.

While here, also add containers for segment level UDQs to the UDQ
state object.  These are currently unused, but adding them here
simplifies follow-up work.

Finally, add some Doxygen-style documentation to the UDQ set and
scalar types.
 2023-01-24 19:45:46 +01:00
Kai Bao
2b2c05d9a1 Merge pull request #3377 from GitPaean/updating_nodal_pressure_schedule 
we need to update the nodal pressure when a new NODEPROP is specified in the schedule
 2023-01-23 12:36:46 +01:00
Kai Bao
e5bb64fb65 when a new NODEPROP is specified 
we need to update the nodal pressure. Master branch uses std::map::insert(), the new
value will not be used if the node exists already.
 2023-01-23 11:42:33 +01:00
David Landa-Marbán
37ec6667cf Merge branch 'OPM:master' into flres 2023-01-19 15:11:56 +01:00
Arne Morten Kvarving
0801519f97 Merge pull request #3376 from akva2/restartvalue_move_to_cpp 
RestartValue: move some more code to compile unit
 2023-01-19 14:28:53 +01:00
Markus Blatt
55a9f44d49 Merge pull request #3374 from akva2/pavgcalculatorcollection.hpp_reduce_hotness 
Summary.hpp: forward PAvgCalculatorCollection
 2023-01-19 14:05:28 +01:00
Arne Morten Kvarving
eed2a179ca RestartValue: move some more code to compile unit 2023-01-19 13:40:15 +01:00
Arne Morten Kvarving
abce488f3b Summary.hpp: forward PAvgCalculatorCollection 2023-01-19 13:19:27 +01:00
Bård Skaflestad
b82508dd7c Merge pull request #3372 from akva2/summarystate.hpp_reduce_hotness 
ActionContext: forward SummaryState
 2023-01-18 15:42:44 +01:00
Markus Blatt
00442c2e2e Merge pull request #3371 from akva2/well_enums 
Move well enums and controls to separate classes
 2023-01-18 14:13:27 +01:00
Markus Blatt
476a65ddae Merge pull request #3370 from bska/udq-config-tidy 
Fuse Multiple DEFINE Types Into Single Evaluation Loop
 2023-01-18 14:12:16 +01:00
Arne Morten Kvarving
f8eca58408 ActionContext: forward SummaryState 2023-01-18 13:48:46 +01:00
Bård Skaflestad
daa3f8b670 Fuse Multiple DEFINE Types Into Single Evaluation Loop 
This commit switches the implementation of eval_define() into a
single loop over UDQConfig::input_index instead of multiple loops
over subsets of the same input index.  While this is more complex
logic, it saves forming multiple intermediate quantities that will
for the most part be discarded.

This is also in preparation of adding support for segment level
UDQs, which would necessitate another loop in the previous control
structure.

While here, also switch to using structured bindings where
appropriate and pruning a few other intermediate objects.
 2023-01-18 13:22:23 +01:00
Arne Morten Kvarving
6a23f5d891 Merge pull request #3369 from bska/name-order-tidy 
Slight Polish to NameOrder Component
 2023-01-18 12:18:16 +01:00
Arne Morten Kvarving
a1892961ca Merge pull request #3368 from bska/udq-func-tidy 
Adjust Whitespace And Simplify Logic Slightly
 2023-01-18 11:54:48 +01:00
Arne Morten Kvarving
b61f97aeba changed: move ProductionControls to separate header 
and make the class member type with a using statement.
allows for forwarding
 2023-01-18 11:45:21 +01:00
Arne Morten Kvarving
82093da0bb changed: move InjectionControls to separate header 
and make the class member type with a using statement.
allows for forwarding
 2023-01-18 11:44:32 +01:00
Arne Morten Kvarving
9ef643345d Schedule.hpp: forward Well 2023-01-18 11:01:41 +01:00
Arne Morten Kvarving
31d83cf0a7 eval_uda.hpp: remove unnecessary Well.hpp include 
also remove ScheduleTypes.hpp include, forward Phase and InjectorType
 2023-01-18 11:01:41 +01:00
Arne Morten Kvarving
904e879cbe Wells.hpp: include WellEnums.hpp not Well.hpp 2023-01-18 10:32:16 +01:00
Arne Morten Kvarving
33f095d145 ScheduleState.hpp: include WellEnums.hpp instead of Well.hpp 
and forward Well
 2023-01-18 10:23:45 +01:00
Arne Morten Kvarving
120a56930c GuideRateModel.hpp: forward WellGuideRateTarget 2023-01-18 10:14:01 +01:00
Arne Morten Kvarving
955ef0c2d4 GuideRateConfig.hpp: include WellEnums.hpp not Well.hpp 2023-01-18 10:08:52 +01:00
Arne Morten Kvarving
6f5cb645ff GuideRate.hpp: forward WellGuideRateTarget 2023-01-18 10:04:26 +01:00
Bård Skaflestad
6a3a0dc422 Adjust Whitespace And Simplify Logic Slightly 
Mostly for readability and maintainability.
 2023-01-18 09:41:32 +01:00
Bård Skaflestad
c859027b86 Slight Polish to NameOrder Component 
Mostly whitespace, but one instance of preferring a standard
algorithm over a raw loop.
 2023-01-18 09:40:53 +01:00
Arne Morten Kvarving
4d90ab1c72 move string conversion of WellGasInflowEquation to WellEnums.cpp 2023-01-18 09:39:49 +01:00
Arne Morten Kvarving
8e29ef4c07 move string conversion of WellGuideRateTarget to WellEnums.cpp 2023-01-18 09:33:50 +01:00
Arne Morten Kvarving
6565ea0f1f move string conversion of WellWELTARGCMode to WellEnums.cpp 2023-01-18 09:26:34 +01:00
Arne Morten Kvarving
0ef729ba72 move printing of WellProducerCMode to WellEnums.cpp 2023-01-18 09:20:43 +01:00
Arne Morten Kvarving
a540ac54b8 move printing of WellInjectorCMode to WellEnums.cpp 2023-01-18 09:08:27 +01:00
Arne Morten Kvarving
3d0ca8438b move printing of WellStatus to WellEnums.cpp 2023-01-18 08:59:09 +01:00
Arne Morten Kvarving
3c4a64f7f4 move Well enums to separate file 
and the class member types are constructed with using statements.
this allows for forwarding of the enums, and for using the enums
without dragging in Well.hpp
 2023-01-18 08:58:30 +01:00
Bård Skaflestad
736e1b9f5c Merge pull request #3367 from akva2/eclipsegrid_hpp_cleanup 
Some small header cleanups
 2023-01-17 13:29:06 +01:00