Arne Morten Kvarving
d9c801033a
cosmetics
2023-02-16 09:52:36 +01:00
Arne Morten Kvarving
b7a531b93a
WellState: add serialization support
2023-02-16 09:43:39 +01:00
Arne Morten Kvarving
6d93b2d12f
ALQState: add serialization support
2023-02-16 08:35:34 +01:00
Arne Morten Kvarving
b87bf2b3ae
GroupState: add serialization support
2023-02-15 22:57:44 +01:00
Arne Morten Kvarving
1a5ae624b1
GroupState: add gpmaint_state to comparison operator
2023-02-15 22:51:19 +01:00
Arne Morten Kvarving
7f36bac579
WellContainer: add serialization support
2023-02-15 21:55:19 +01:00
Atgeirr Flø Rasmussen
e1942d145f
Merge pull request #4437 from akva2/singlewellstate_serialize
...
SingleWellState: add serialization support
2023-02-15 15:29:08 +01:00
hnil
79d7698dd8
added timeblocks in linear solver
2023-02-15 15:07:58 +01:00
Bård Skaflestad
3be62f4bb6
Merge pull request #4460 from totto82/fixVREP
...
FIX VREF for groups with both gas and water injectors
2023-02-15 14:34:52 +01:00
Arne Morten Kvarving
60a5273d0e
SingleWellState: add serialization of dynamic state
2023-02-15 13:56:25 +01:00
Tor Harald Sandve
be2b021167
Fix default alq injector
2023-02-15 13:42:50 +01:00
Tor Harald Sandve
5356dbbaa8
FIX VREF for groups with both gas and water injectors
2023-02-15 13:35:12 +01:00
Arne Morten Kvarving
482c32b117
SegmentState: add serialization support
2023-02-15 12:59:18 +01:00
hnil
fd98d8ea27
added timing blocks to most important parts
2023-02-15 09:41:37 +01:00
Arne Morten Kvarving
0a1df9d6f7
Merge pull request #4426 from akva2/blackoilaquifermodel_serialize
...
BlackoilAquiferModel: add serialization of dynamic state
2023-02-14 19:00:42 +01:00
Arne Morten Kvarving
d5f22dbc99
BlackoilAquiferModel: add serialization of dynamic state
2023-02-14 17:51:25 +01:00
Bård Skaflestad
273477ef2c
Merge pull request #4458 from atgeirr/fix-warnings
...
Fix a few warnings in recently added code.
2023-02-14 16:43:22 +01:00
Arne Morten Kvarving
a66fd75715
AquiferNumerical: add serialization of dynamic state
2023-02-14 16:15:25 +01:00
Arne Morten Kvarving
03f6309ff7
AquiferFetkovich: add serialization of dynamic state
2023-02-14 16:15:25 +01:00
Arne Morten Kvarving
51e5e61c39
AquiferCarterTracy: add serialization of dynamic state
2023-02-14 16:15:25 +01:00
Arne Morten Kvarving
6dc63b2da8
AquiferAnalytical: add serialization of dynamic state
2023-02-14 16:15:25 +01:00
Markus Blatt
7449a32d2d
Merge pull request #4427 from atgeirr/do-not-recreate-matrix-ilu0
...
Avoid copying the matrix in the ILU preconditioner.
2023-02-14 16:11:14 +01:00
Atgeirr Flø Rasmussen
358d9997ee
Fix a few warnings in recently added code.
2023-02-14 15:46:08 +01:00
Arne Morten Kvarving
a90189c78d
HDF5File: add recursive group creation in write
2023-02-14 13:15:43 +01:00
Arne Morten Kvarving
e5c2fcfaf2
added: HDF5File::list
...
lists a given HDF5 group
2023-02-14 13:15:43 +01:00
Arne Morten Kvarving
13a54bbdbb
AdaptiveTimeSteppingEbos: add serialization support
2023-02-13 22:03:58 +01:00
Arne Morten Kvarving
5f6bc76512
PIDAndIterationCountTimeStepControl: add serialization support
2023-02-13 22:03:19 +01:00
Arne Morten Kvarving
1827de96a2
PIDTimeStepControl: add serialization support
2023-02-13 22:03:19 +01:00
Arne Morten Kvarving
87bc1d8c10
HardcodedTimeStepControl: add serialization support
2023-02-13 22:03:19 +01:00
Arne Morten Kvarving
bd538cf61d
SimpleIterationCountTimeStepControl: add serialization support
2023-02-13 22:03:19 +01:00
Bård Skaflestad
e89b28c9a2
Merge pull request #4419 from akva2/eclgenericvanguard_setup_params
...
changed: introduce EclGenericVanguard::SetupParams
2023-02-13 21:12:01 +01:00
Bård Skaflestad
2c702aee78
Merge pull request #4416 from akva2/simulatortimer_serialize
...
SimulatorTimer: add serialization support
2023-02-13 21:08:31 +01:00
Arne Morten Kvarving
c33240f5c1
changed: introduce EclGenericVanguard::SimulationModelParams
...
this is a struct that holds the information transferred
from the simulator prior to vanguard instantation.
this way we can avoid the static members for state,
which causes issues for serialization (in particular, it makes
it impossible to compare two instances like we do in tests).
2023-02-13 18:52:38 +01:00
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