Commit Graph

7490 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Arne Morten Kvarving
f1e5ce372b FieldPropsManager.hpp: forward TranCalculator 2023-01-16 20:23:03 +01:00
Arne Morten Kvarving
7468f23875 (Eclipse|Restart)IO: forward Restart(Key|Value) 2023-01-16 15:19:48 +01:00
Bård Skaflestad
a47716e97c Merge pull request #3361 from akva2/fielddata.hpp_reduce_hotness
FieldPropsManager.hpp: forward FieldData
2023-01-16 14:53:17 +01:00
Bård Skaflestad
d281e50cde Merge pull request #3360 from akva2/units.hpp_reduce_hotness
Well.hpp: remove unnecessary Units.hpp include
2023-01-16 13:48:38 +01:00
Bård Skaflestad
2bc2ea372a Merge pull request #3357 from akva2/wvfpexp.hpp_reduce_hotness
Well.hpp: forward WVFPEXP
2023-01-16 13:24:29 +01:00
Arne Morten Kvarving
6994efa497 FieldPropsManager.hpp: forward FieldData 2023-01-16 13:06:14 +01:00
Arne Morten Kvarving
31b17021a2 Keywords.hpp: add missing string include 2023-01-16 13:05:37 +01:00
Arne Morten Kvarving
b5948efa4f Well.hpp: remove unnecessary Units.hpp include 2023-01-16 12:06:58 +01:00
Arne Morten Kvarving
9daf73f152 Well.hpp: remove unnecessary ActiveGridCells.hpp include 2023-01-16 12:03:19 +01:00
Atgeirr Flø Rasmussen
78d63b422a Forward declare structs as struct, not class, to silence warnings. 2023-01-16 10:33:58 +01:00
Arne Morten Kvarving
f51c065772 Well.hpp: forward WVFPEXP 2023-01-16 09:57:57 +01:00
Arne Morten Kvarving
74098e23cd Well.hpp: forward WellEconProductionLimits 2023-01-13 21:16:06 +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
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
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