OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,961 Commits 18 Branches 75 Tags 73 MiB
32e4384109
Commit Graph

13961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Arne Morten Kvarving
cf55b176b0 ExtSmryOutput.hpp: forward EclipseState 2023-01-17 12:24:01 +01:00
Arne Morten Kvarving
b57a1d941f
Merge pull request #3254 from akva2/eclthermallawmanager_encapsulate 
EclThermalLawManager: move code to separate compile unit
 2023-01-17 12:23:38 +01:00
Arne Morten Kvarving
ee5b4240be EclThermalLawManager: replace naked throws with OPM_THROW 2023-01-17 11:39:32 +01:00
Arne Morten Kvarving
75a6b603c5 EclThermalLawManager: move code to separate compile unit 2023-01-17 11:39:30 +01:00
Arne Morten Kvarving
0a66661b98 EclipseIO.hpp: forward EclipseGrid 2023-01-17 10:42:32 +01:00
Arne Morten Kvarving
dc309147cb Connection.cpp: remove unnecessary ParseContext.hpp include 2023-01-17 09:53:54 +01:00
Bård Skaflestad
8e16ca04bd
Merge pull request #3366 from akva2/welltestconfig.hpp_reduce_hotness 
WellTestState: forward WellTestConfig
 2023-01-17 09:23:47 +01:00
Arne Morten Kvarving
c9074be104 WellTestState: forward WellTestConfig 2023-01-17 07:00:38 +01:00
Arne Morten Kvarving
06f1b6e8f9 make WellTestConfig::Reason a namespace scoped enum WTest::Reason 
and alias it as WellTestConfig::Reason
 2023-01-17 07:00:24 +01:00
Arne Morten Kvarving
5382a52649 WellTestState.hpp: remove unnecessary Well.hpp include 2023-01-17 07:00:14 +01:00
Bård Skaflestad
67dbd5baa8
Merge pull request #3365 from akva2/inputerroraction.hpp_reduce_hotness 
Schedule.hpp: forward InputErrorAction
 2023-01-16 23:27:18 +01:00
Bård Skaflestad
a476068dbd
Merge pull request #3362 from akva2/trancalculator.hpp_reduce_hotness 
FieldPropsManager.hpp: forward TranCalculator
 2023-01-16 22:54:53 +01:00
Arne Morten Kvarving
ddef6302e6 ParseContext: forward InputErrorAction 2023-01-16 22:17:50 +01:00
Arne Morten Kvarving
564943dc84 ParseContext: remove unnecessary OpmLog.hpp include 2023-01-16 22:17:50 +01:00
Arne Morten Kvarving
6397d5c262 ParseContext.hpp: remove default values for parameters 2023-01-16 22:17:50 +01:00
Arne Morten Kvarving
6312bf1189 Schedule.hpp: forward InputErrorAction 2023-01-16 22:17:50 +01:00
Arne Morten Kvarving
edf937e2e5 InputErrorAction: convert to enum class 2023-01-16 22:17:50 +01:00
Arne Morten Kvarving
b617c2af13 remove Fieldprops::TranMap 2023-01-16 21:49:12 +01:00