Commit Graph

4098 Commits

Author SHA1 Message Date
Arne Morten Kvarving
f2a14b2d07 SimulatorTimer: add serialization support 2023-02-13 18:01:16 +01:00
Arne Morten Kvarving
4786deeffc SimulatorTimer: include boost header instead of forwarding
drop the pointer usage which was used to enable forwarding
2023-02-13 17:59:35 +01:00
Arne Morten Kvarving
c6632d5b83 added: file for extra serialization packers
for now, it holds a packer for boost::gregorian::date
2023-02-13 17:53:05 +01:00
Arne Morten Kvarving
05f92a1133 EclGenericVanguard: rename setParams to defineSimulationModel
setParams is a rather generic method name, be more specific
2023-02-13 17:49:59 +01:00
Bård Skaflestad
d45a08a6cf
Merge pull request #4455 from akva2/perforationdata_missing_include
PerforationData: add missing include
2023-02-13 17:40:50 +01:00
Arne Morten Kvarving
2ed2734365 PerforationData: add missing include 2023-02-13 16:15:45 +01:00
Arne Morten Kvarving
a72a9e55a0 BlackoilWellModel: prefer std::make_unique 2023-02-13 16:04:03 +01:00
Kai Bao
0d00337275
Merge pull request #4409 from GitPaean/update_well_state_with_thp_target2
update well state when switching to THP control for producers
2023-02-10 16:08:32 +01:00
Bård Skaflestad
2156e16478
Merge pull request #4453 from akva2/regionaveragecalculator_missing_include
RegionAverageCalculator: add missing include
2023-02-10 16:02:47 +01:00
Arne Morten Kvarving
7a5f60a7bd RegionAverageCalculator: add missing include 2023-02-10 15:09:16 +01:00
Markus Blatt
8b7c87ba52
Merge pull request #4434 from akva2/parwelmorepriv
ParallelWellinfo: make some more templates private
2023-02-09 16:51:32 +01:00
Arne Morten Kvarving
382fd73fca SimulatorReportSingle: pass argument as std::ostream
no reason for this to explicitly be an ostringstream
2023-02-09 11:35:27 +01:00
Arne Morten Kvarving
cb3b50f4b7 SimulatorReportSingle: use in-class initializers
this way there are no explicit ctors, which again means
brace initialization works
2023-02-09 11:35:27 +01:00
Bård Skaflestad
4148df3752
Merge pull request #4444 from akva2/adaptivetimesteppingebos_cleanups
AdaptiveTimeSteppingEbos: some cleanups
2023-02-08 16:41:46 +01:00
Arne Morten Kvarving
1919f6ae54 std::string default construct to empty string 2023-02-08 15:26:39 +01:00
Arne Morten Kvarving
8beb8adfc6 replace typedef with using 2023-02-08 15:26:39 +01:00
Arne Morten Kvarving
02215964ae AdaptiveTimeSteppingEbos: add missing includes
and replace iostream with sstream which is actually in use
2023-02-08 15:26:39 +01:00
Bård Skaflestad
c451c2aada
Merge pull request #4439 from akva2/targetcalculator_missing_include
TargetCalculator: add missing include
2023-02-08 14:55:15 +01:00
Arne Morten Kvarving
997284ca52 TargetCalculator: add missing include 2023-02-08 09:26:11 +01:00
Arne Morten Kvarving
fe68741a68 ParallelRestart: use variadic broadcast
micro optimization, there is no reason to do this in two operations
2023-02-08 09:22:55 +01:00
Arne Morten Kvarving
8bc996e291 ParallelWellinfo: make some more templates private
to encapsulate some headers in compile unit. also clean
up include list in the process
2023-02-07 15:53:11 +01:00
Kai Bao
57bf959efd update well state when switching to THP control for producers
hopefully, it begins at a reasonably good initial point. When the Newton
iteration begins with certian solution region, the nonlinear solution
might fail.
2023-02-07 14:50:07 +01:00
OPMUSER
dfb42a0adb Add KRUMR- and KRNUMT- to Unspported Keyword List 2023-02-07 12:33:30 +08:00
OPMUSER
a069219146 Add KRNUM*- Keywords as Unsupported
KRNUMX-, KRNUMY-, KRNUMZ- keywords are not supported.
2023-02-07 12:21:30 +08:00
Arne Morten Kvarving
d73d52e162 added: simple HDF5File class
bare minimum to enable reading and writing byte arrays
2023-02-06 09:44:50 +01:00
Kai Bao
899ab9b13d fix the running when solution does not change between time steps
The PID time step control will not pose any constraint on the time step
size by returning a largest possible time step size.
2023-02-02 22:36:43 +01:00
Atgeirr Flø Rasmussen
235a8a7f78 Avoid copying the matrix in the ILU preconditioner.
When the matrix already exists and has the correct sparsity structure
(which is assumed by the calling update()), we can copy just the data,
avoiding the need for allocation and matrix construction.
2023-02-02 14:10:16 +01:00
Arne Morten Kvarving
e5dc2996e2 changed: move banner printing to separate compile unit 2023-02-01 22:54:55 +01:00
Arne Morten Kvarving
cb14b1e690 cosmetics 2023-02-01 15:42:04 +01:00
Arne Morten Kvarving
9d1cbd5389 ParallelFileMerger: prefer std::make_unique 2023-02-01 15:41:52 +01:00
Arne Morten Kvarving
303f42b082 ParallelFileMerger: avoid including fstream in header 2023-02-01 15:40:51 +01:00
Arne Morten Kvarving
385f526d77 fixed: regression from 82d2146c90
missing PRT header
2023-01-31 15:18:25 +01:00
Kai Bao
9a12869cdb making sure to check the network nodal pressure constraint
when checking the THP constraint for producers.
2023-01-26 14:04:58 +01:00
Kai Bao
a9a69a6d70 including <optional> header to WellContainer 2023-01-24 10:34:57 +01:00
Markus Blatt
d2f55c59fc
Merge pull request #4359 from totto82/fixGPMAINT2
Fix GPMAINT for groups without control
2023-01-23 14:12:00 +01:00
OPMUSER
8c98a1b3dc Remove CPR from UnsupportedFlowKeywords.cpp 2023-01-20 14:37:28 +08:00
Bård Skaflestad
7c1cf03773
Merge pull request #4400 from blattms/use-cpr-from-datafile
Use CPR if specified in RUNSPEC / Make cprw the default
2023-01-19 16:59:48 +01:00
Markus Blatt
a69c8436ad Use cprw as default CPR variant if CPR is requested. 2023-01-19 15:54:33 +01:00
Markus Blatt
b67388e6f0 Use cpr if requested in RUNSPEC section of data file.
Can be overwritten using command line parameter `--linear-solver=...`.
2023-01-18 22:02:35 +01:00
Arne Morten Kvarving
715e0e1c82 fix Damaris setup in Main 2023-01-18 15:37:41 +01:00
Bård Skaflestad
da4e2deb6a
Merge pull request #4397 from akva2/summarystate_hpp_include
SummaryState.hpp: add missing and forward where possible
2023-01-18 14:58:47 +01:00
Arne Morten Kvarving
49fb1e1b6f
Merge pull request #4396 from akva2/main_cpp
Main: introduce a compile unit
2023-01-18 14:24:30 +01:00
Arne Morten Kvarving
e89a68b2ff Main.hpp: forward WellTestState 2023-01-18 14:01:43 +01:00
Arne Morten Kvarving
2b756a8202 Main: forward Action::State 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
7991af9c66 Main.hpp: forward UDQState 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
4aab577275 Main: move code for setting up Damaris to compile unit 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
560b0e5cbb Main: move code for setting up Vanguard to compile unit 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
c901570c9b Main.hpp: remove unnecessary Python.hpp include 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
82d2146c90 Main: move code for reading deck to compile unit 2023-01-18 14:01:42 +01:00
Arne Morten Kvarving
aa03b0c379 GasLiftGroupInfo.hpp: forward SummaryState 2023-01-18 13:42:32 +01:00
Arne Morten Kvarving
1729c1a414 Main: move some code to separate compile unit 2023-01-18 12:26:10 +01:00
Arne Morten Kvarving
fef009f792 Main: remove unused method and associated filesystem include 2023-01-18 12:22:50 +01:00
Arne Morten Kvarving
aee8a764e2 GasLiftSingleWellGeneric.hpp: include WellProductionControls.hpp instead of Well.hpp 2023-01-18 11:56:21 +01:00
Arne Morten Kvarving
93b3e8151e WellInterface.hpp: remove unnecessary Well.hpp include 2023-01-18 11:53:15 +01:00
Arne Morten Kvarving
998e5d8e64 WellAssemble.hpp: remove unnecessary Well.hpp include 2023-01-18 11:48:03 +01:00
Arne Morten Kvarving
d091858f46 GlobalWellInfo.hpp: remove unnecessary Well.hpp include 2023-01-18 11:24:25 +01:00
Arne Morten Kvarving
f109718242 SingleWellState.hpp: include WellEnums.hpp instead of Well.hpp 2023-01-18 11:24:25 +01:00
Arne Morten Kvarving
2a6b2b4957 MultisegmentWellEval.hpp: remove unnecessary Well.hpp include 2023-01-18 11:24:25 +01:00
Arne Morten Kvarving
f3fae9d23b WellConstraints.hpp: remove unnecessary Well.hpp include
forward WellInjectorCMode, WellProducerCMode and SummaryState
2023-01-18 11:24:25 +01:00
Arne Morten Kvarving
df181f2200 WellState.hpp: remove unnecessary Well.hpp include
forward WellStatus
2023-01-18 11:24:25 +01:00
Arne Morten Kvarving
7b2b18045e adjust to upstream enum changes 2023-01-18 11:24:25 +01:00
Arne Morten Kvarving
6d97ca97a1 add missing Well.hpp includes 2023-01-18 11:24:25 +01:00
Bård Skaflestad
8dcab4b236
Merge pull request #4392 from akva2/well_hpp_include
eclgenerictracermodel.cc: add missing Well.hpp include
2023-01-17 17:08:56 +01:00
Arne Morten Kvarving
bcf944b408 GasLiftGroupInfo.hpp: forward Well 2023-01-17 16:08:46 +01:00
Arne Morten Kvarving
ffcfc5e2ea Main.hpp: remove unnecessary ErrorGuard.hpp include 2023-01-17 13:30:39 +01:00
Arne Morten Kvarving
240c039f53 readDeck: make the ErrorGuard an internal detail 2023-01-17 13:30:39 +01:00
Arne Morten Kvarving
8179935217 Main.hpp: remove unnecessary ParseContext.hpp include 2023-01-17 09:36:35 +01:00
Arne Morten Kvarving
56df430bd6 readDeck: make the ParseContext an internal detail 2023-01-17 09:36:31 +01:00
Bård Skaflestad
6eb97c0165
Merge pull request #4388 from akva2/parser_hpp_cleanup
Main.hpp: remove unneccesary Parser.hpp include
2023-01-17 09:20:07 +01:00
Bård Skaflestad
537542e6ae
Merge pull request #4387 from akva2/arraydimchecker_cpp_cleanup
Main.hpp: remove unnecessary ArrayDimChecker.hpp include
2023-01-17 09:19:43 +01:00
Arne Morten Kvarving
978d130f30 Main.hpp: remove unneccesary Parser.hpp include 2023-01-17 07:56:37 +01:00
Arne Morten Kvarving
d6b7e1c253 Main.hpp: remove unnecessary ArrayDimChecker.hpp include 2023-01-17 07:36:02 +01:00
Arne Morten Kvarving
7a1cf45ed5 BlackoilWellModel: move code using WellTestConfig to compile unit 2023-01-17 07:22:17 +01:00
Arne Morten Kvarving
cc4fd831a8 add missing WellTestConfig.hpp includes 2023-01-17 06:04:56 +01:00
Arne Morten Kvarving
60b23e8bb1 move ParseContext configuration to readDeck
this way we do not need to include InputErrorAction in Main.hpp
2023-01-16 22:17:39 +01:00
Arne Morten Kvarving
fd94ca7031 add missing InputErrorAction.hpp includes 2023-01-16 22:17:39 +01:00
Arne Morten Kvarving
3a01e89585 adjust to InputErrorAction change to enum class 2023-01-16 22:17:39 +01:00
Bård Skaflestad
40c51f9829
Merge pull request #4381 from bska/tag-unused-parameters
Tag Unused Parameter as [[maybe_unused]]
2023-01-16 15:31:52 +01:00
Bård Skaflestad
171a591659 Tag Unused Parameter as [[maybe_unused]]
Suppresses warnings about unused arguments.  While here, also split
a long line for readability and include a number of standard headers
that were missing before.
2023-01-16 14:50:58 +01:00
Bård Skaflestad
7eaa2b91bc
Merge pull request #4382 from akva2/units_hpp_cleanups
Units.hpp: some cleanup
2023-01-16 13:47:49 +01:00
Arne Morten Kvarving
3745a4c02d clean up Units.hpp includes
include it where required instead of relying on other
headers to pull it in
2023-01-16 12:21:29 +01:00
Arne Morten Kvarving
7c797f9e7b add missing FieldData.hpp includes 2023-01-16 11:34:17 +01:00
Bård Skaflestad
11c0e085f9
Merge pull request #4193 from hnil/amgcl_fix
- fix compilation of amgcl bindings in bda by not doing anything for …
2023-01-16 11:23:39 +01:00
Arne Morten Kvarving
343c7b7e57 add missing Units.hpp includes 2023-01-16 10:17:59 +01:00
Arne Morten Kvarving
d8ce4bfd0c add missing WVFPEXP.hpp includes 2023-01-14 00:30:56 +01:00
Markus Blatt
e03227501a
Merge pull request #4376 from akva2/wellmicpproperties_hpp_include
add missing WellMICPProperties.hpp includes
2023-01-13 19:02:00 +01:00
Arne Morten Kvarving
d5fbbdc328 add missing WellEconProductionLimits.hpp includes 2023-01-13 15:26:24 +01:00
Arne Morten Kvarving
c0e9193e50 WellInterface: move code using WellMICPProperties to compile unit 2023-01-13 14:11:46 +01:00
Arne Morten Kvarving
f74f2ded8e add missing WellMICPProperties.hpp includes 2023-01-13 14:01:56 +01:00
Arne Morten Kvarving
d011bb29ae StandardWell: move code using WellPolymerProperties to compile unit 2023-01-13 13:02:37 +01:00
Arne Morten Kvarving
f860490c9f WellInterface: move code using WellPolymerProperties to compile unit 2023-01-13 13:02:37 +01:00
Arne Morten Kvarving
97f76412ae add missing WellPolymerProperties.hpp includes 2023-01-13 13:02:37 +01:00
Arne Morten Kvarving
325963fb63 add missing WellTracerProperties.hpp includes 2023-01-13 12:03:46 +01:00
Arne Morten Kvarving
71bf868ddb WellInterface: move code using WellBrineProperties to compile unit 2023-01-13 11:14:18 +01:00
Arne Morten Kvarving
131f52773f add missing WellBrineProperties.hpp includes 2023-01-13 11:14:18 +01:00
Arne Morten Kvarving
a29d5f81b6 WellInterface: move code using WellFoamProperties to compile unit 2023-01-13 10:18:26 +01:00
Arne Morten Kvarving
a0f85c8a93 add missing WellFoamProperties.hpp includes 2023-01-13 10:18:26 +01:00
Arne Morten Kvarving
0c91d6f6c1 MultisegmentWellGeneric.hpp: forward WellSegments 2023-01-12 14:37:32 +01:00
Arne Morten Kvarving
1bf36dfc08 MultisegmentWell: move code using WellSegments to compile unit 2023-01-12 14:37:32 +01:00
Arne Morten Kvarving
61d485cbe5 remove unimplemented prototypes 2023-01-12 14:37:32 +01:00