Commit Graph

4174 Commits

Author SHA1 Message Date
Arne Morten Kvarving
b238bba53b FlowMainEbos: move ExtraConvergenceOutput code to compile unit 2023-02-28 16:02:08 +01:00
Atgeirr Flø Rasmussen
b5678bf5cb
Merge pull request #4495 from atgeirr/add_timing_block
Add timing block
2023-02-28 15:00:17 +01:00
Arne Morten Kvarving
143139c6ee FlowMainEbos: move parallel file merge code to separate compile unit
avoid some headers in simulator objects
2023-02-28 14:05:51 +01:00
Arne Morten Kvarving
fe011bbd41 FlowMainEbos: prefer std::make_unique 2023-02-28 13:58:52 +01:00
Atgeirr Flø Rasmussen
7acc6feb18 Make names more consistent. 2023-02-28 13:58:02 +01:00
Arne Morten Kvarving
5f08897247 fixed: add missing HAVE_MPI ifs 2023-02-28 09:49:01 +01:00
Atgeirr Flø Rasmussen
e9d1bbc355
Merge pull request #4481 from akva2/hdf5_enable_compression
HDF5File: enable gzip compression
2023-02-28 08:13:51 +01:00
Atgeirr Flø Rasmussen
8efb30d2bb
Merge pull request #4482 from totto82/addGasWaterEnergy
Add gaswater energy simulator
2023-02-28 08:01:06 +01:00
Atgeirr Flø Rasmussen
3e62a6817f
Merge pull request #4483 from GitPaean/wrong_direction_flow_not_converged
not considering wells with wrong flow direction as converged
2023-02-28 07:55:07 +01:00
Arne Morten Kvarving
5fd5753ed7 fixed: mixed-up input and output paths for restart serialization 2023-02-27 12:17:00 +01:00
Kai Bao
460aa5027b not considering wells with wrong flow direction as converged
under THP constraint, well can get converged with wrong flow direction
(e.g. a producer is injecting), becasue we cut off the wrong flow
direction as zero rate in the VFP evaluation
2023-02-24 14:30:45 +01:00
Arne Morten Kvarving
8b673c09cc HDF5File: enable gzip compression 2023-02-24 11:56:17 +01:00
Atgeirr Flø Rasmussen
1b92971e8b
Merge pull request #4478 from akva2/serialization_output_dir
fixed: output OPMRST file to output dir
2023-02-23 11:18:21 +01:00
Tor Harald Sandve
5028e0fbf1 Add gaswater energy simulator 2023-02-23 09:25:50 +01:00
Bård Skaflestad
4e8381b6f9
Merge pull request #4370 from totto82/computeCVIR
compute CVIR and CVPR
2023-02-22 17:38:33 +01:00
Bård Skaflestad
d364b7b80c
Merge pull request #4479 from akva2/serialization_missing_perfdata
RestartSerialization: add missing PerfData
2023-02-22 15:53:42 +01:00
Arne Morten Kvarving
da4784b314 AquiferConstantFlux: add restart serialization support 2023-02-22 14:41:07 +01:00
Arne Morten Kvarving
9418110d3e AquiferConstantFlux: mark method override 2023-02-22 14:41:07 +01:00
Arne Morten Kvarving
6073af784d AquiferConstantFlux: add missing includes 2023-02-22 14:41:07 +01:00
Arne Morten Kvarving
070f3677f7 fixed: output OPMRST file to output dir
will look in both output dir and input file dir on load
2023-02-22 14:26:23 +01:00
Arne Morten Kvarving
bdd75a3a59 SingleWellState: serialize PerfData 2023-02-22 13:59:59 +01:00
Arne Morten Kvarving
8d339c464c PerfData: add serialization support 2023-02-22 13:59:59 +01:00
Tor Harald Sandve
054d832bff compute CVIR and CVPR 2023-02-22 08:54:47 +01:00
Kai Bao
7a67b16c3e addressing review comments for PR OPM/opm-simulators#4429 2023-02-21 15:27:05 +01:00
Kai Bao
73dc31a7a5 updating AquiferConstantFlux with AQUFLUX
not recreating new instances to avoid unnecessary cost from constructor.
2023-02-21 13:20:36 +01:00
Kai Bao
71119b6e42 WIP in making AQUFLUX running in parallel. 2023-02-21 13:20:36 +01:00
Kai Bao
7bd1cd9aa1 following the AQUFLUX design change from opm-common 2023-02-21 13:20:36 +01:00
Kai Bao
9a0ea0cb97 WIP in adding summary output for AQUFLUX aquifers
FAQR and FAQT are not working properly yet.
2023-02-21 13:20:36 +01:00
Kai Bao
248f6b73d9 WIP of supporting AQUFLUX from simulator side 2023-02-21 13:20:36 +01:00
Bård Skaflestad
37959ee26a
Merge pull request #4468 from vkip/fix_connpress_report
Fixing MSW connection pressure output
2023-02-17 17:44:39 +01:00
Vegard Kippe
f527267593 Fixing MSW connection pressure output 2023-02-17 12:17:41 +01:00
Bård Skaflestad
981299c2e0
Merge pull request #4461 from totto82/injalq
Fix default alq injector
2023-02-17 11:58:03 +01:00
Bård Skaflestad
1369889074 Fix Sequential Build
Include <cassert> for 'assert' macro.
2023-02-16 16:36:53 +01:00
Arne Morten Kvarving
c50fcc5818 added: store a hash of the grid cell mapping on each process
this is a simple sanity check to make sure the restarted run
has the same grid partitioning as the original run.
2023-02-16 14:49:38 +01:00
Arne Morten Kvarving
8c3400f562 added: parallel support to HDF5File / HDF5Serializer 2023-02-16 14:49:38 +01:00
Arne Morten Kvarving
a60b7e50ca added: ability to specify .OPMRST file to be used
useful, in particular for testing.
2023-02-16 13:56:29 +01:00
Arne Morten Kvarving
72133deadc added: support for loading serialized state from .OPMRST file 2023-02-16 13:48:36 +01:00
Arne Morten Kvarving
ed170026c1 added: support for saving serialized state to OPMRST file
uses a HDF5 container
2023-02-16 13:46:36 +01:00
Arne Morten Kvarving
524c1320bb add serialization support to SimulatorFullyImplicitBlackoilEbos
this is the top of the hierarchy so a test would basically
be a full restart test
2023-02-16 12:38:02 +01:00
Arne Morten Kvarving
a21d59977d SimulatorReport: add serialization support 2023-02-16 11:56:40 +01:00
Arne Morten Kvarving
f0ca3120ff SimulatorReportSingle: add serialization support 2023-02-16 11:56:40 +01:00
Arne Morten Kvarving
28e7da5468 BlackoilWellModelGeneric: add serialization support 2023-02-16 11:19:06 +01:00
Arne Morten Kvarving
90fbdcee0a WGState: add serialization support 2023-02-16 10:48:34 +01:00
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