Commit Graph

15527 Commits

Author SHA1 Message Date
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
70e9a503a0
Merge pull request #4456 from akva2/rename_setparams
EclGenericVanguard: rename setParams to defineSimulationModel
2023-02-13 18:26:07 +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
Bård Skaflestad
623a03b822
Merge pull request #4454 from akva2/blackoilwellmodel_make_unique
BlackoilWellModel: prefer std::make_unique
2023-02-13 17:36:25 +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
Bård Skaflestad
52b9ec98fb
Merge pull request #4449 from akva2/simulatorreportsingle_cleanups
SimulatorReportSingle: some cleanups
2023-02-09 12:36:45 +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
949d03e564
Merge pull request #4448 from akva2/eclgenerictracermodel_remove_unused_member
EclGenericTracerModel: remove unused tracerResidual_ member
2023-02-09 10:37:26 +01:00
Arne Morten Kvarving
9bbce08bfa EclGenericTracerModel: remove unused tracerResidual_ member 2023-02-09 10:00:23 +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
Bård Skaflestad
65efc26faa
Merge pull request #4438 from akva2/parallel_restart_variadic_bcast
ParallelRestart: use variadic broadcast
2023-02-08 12:33:51 +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
Bård Skaflestad
80daae74b9
Merge pull request #4431 from OPMUSER/KRNUM-
Add KRNUM*- Keywords as Unsupported
2023-02-07 17:24:07 +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
Arne Morten Kvarving
989c048db6
Merge pull request #4430 from daavid00/fixFloresIndx
Fix to the flores indices
2023-02-07 13:34:30 +01:00
David Landa Marban
b3a5a659f4 Fix to the flores indices 2023-02-07 13:33:44 +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
530f18d26c
Merge pull request #4414 from akva2/hdf5_file
added: simple HDF5File class
2023-02-06 09:59:06 +01: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
Bård Skaflestad
b598c27605
Merge pull request #4415 from GitPaean/time_step_nochange
fix the running when solution does not change between time steps
2023-02-02 23:45:09 +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
Bård Skaflestad
e6042cdc62
Merge pull request #4275 from daavid00/flres
FLOWS and FLORES support
2023-02-02 13:03:57 +01:00
David Landa Marban
5600d7d9e5 FLOWS and FLORES support 2023-02-02 11:19:49 +01:00
Bård Skaflestad
27b794f8c0
Merge pull request #4423 from akva2/banners
changed: move banner printing to separate compile unit
2023-02-02 09:52:18 +01:00
Arne Morten Kvarving
e5dc2996e2 changed: move banner printing to separate compile unit 2023-02-01 22:54:55 +01:00
Bård Skaflestad
e25cabd06c
Merge pull request #4424 from akva2/cleanup_parallel_file_merger
ParallelFileMerger: some cleanups
2023-02-01 17:26:44 +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
Bård Skaflestad
5daf355a7b
Merge pull request #4418 from akva2/fix_prt_header_regression
fixed: regression from 82d2146c90
2023-01-31 15:52:41 +01:00