OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-20 11:48:25 -06:00
Code Issues Packages Projects Releases Wiki Activity
15,832 Commits 24 Branches 102 Tags 90 MiB
2a20ad8283
Commit Graph

9982 Commits

Author SHA1 Message Date
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
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
Arne Morten Kvarving
351181f355 add missing WellSegments.hpp includes 2023-01-12 14:37:32 +01:00
Arne Morten Kvarving
c707d91684 WellConnectionAuxiliaryModule: add a typetag independent base class 
and put its code in a compile unit. allows embedding WellConnections.hpp
 2023-01-12 13:06:25 +01:00
Arne Morten Kvarving
c0f809e640 BlackoilWellModel: mode code using WellConnections to compile unit 2023-01-12 13:06:25 +01:00
Arne Morten Kvarving
93e59e73ac use Well::hasConnections 2023-01-12 12:54:23 +01:00
Arne Morten Kvarving
7f7b373a2d add missing WellConnections.hpp includes 2023-01-12 12:24:32 +01:00
Arne Morten Kvarving
e2b8092894 add missing RFTConfig.hpp includes 2023-01-12 10:39:49 +01:00
Arne Morten Kvarving
30c5069519 add missing UDQConfig.hpp includes 2023-01-12 09:39:36 +01:00
Arne Morten Kvarving
bc5aad9554 add missing UDQActive.hpp include 2023-01-11 15:25:56 +01:00
Tor Harald Sandve
f2ea6ce844 Add support for FIP* 2023-01-11 14:39:23 +01:00
Arne Morten Kvarving
88ece0fdd8 add missing Actions.hpp includes 2023-01-11 13:52:11 +01:00
Arne Morten Kvarving
bba9c2a297 move Balance usage to BlackoilWellModelGeneric 
now we do not need to include Balance.hpp in simulator objects
 2023-01-11 11:26:25 +01:00
Arne Morten Kvarving
09dc3d9449 add missing Balance.hpp includes 2023-01-11 11:26:25 +01:00
Arne Morten Kvarving
7034b5528d add missing ExtNetwork.hpp includes 2023-01-11 09:47:15 +01:00
Arne Morten Kvarving
5236a443f8 add missing GConSale.hpp includes 2023-01-11 08:49:47 +01:00
Tor Harald Sandve
ceb8d996aa Fix GPMAINT for groups without control 
If GPMAINT is used the group does not need a valid control object
 2023-01-10 15:59:21 +01:00
Arne Morten Kvarving
4e21e96660 add missing GConSump.hpp includes 2023-01-10 15:00:25 +01:00
Arne Morten Kvarving
7fffe402cd add missing NameOrder.hpp includes 2023-01-10 12:47:00 +01:00
Arne Morten Kvarving
4bdec3a58b avoid GasLiftOpt.hpp where possible 
and add where necessary
 2023-01-10 09:54:33 +01:00
Arne Morten Kvarving
e68d05a147 adapt to renamed GasLift(Group|Well) 2023-01-10 09:54:07 +01:00
Arne Morten Kvarving
b010a1717a add missing RPTConfig.hpp includes 2023-01-09 15:22:12 +01:00
Arne Morten Kvarving
1dd0897eca add missing GuideRateConfig.hpp includes 2023-01-09 14:26:03 +01:00
Arne Morten Kvarving
12a72b4d6e add missing include 2023-01-09 12:49:29 +01:00
Arne Morten Kvarving
fe09a6cdce replace <Runspec.hpp> with <Phase.hpp> where appropriate 2023-01-05 13:18:32 +01:00
Arne Morten Kvarving
469b38c321 remove unnecessary <Runspec.hpp> includes 2023-01-05 13:18:32 +01:00
Bård Skaflestad
716ea14cb0
Merge pull request #4345 from akva2/fix_macro 
avoid double underscored symbol
 2023-01-03 17:14:29 +01:00
Arne Morten Kvarving
eedd646523 avoid double underscored symbol 2023-01-03 16:34:49 +01:00
Arne Morten Kvarving
1903a43971 AdaptiveSimulatorTimer: avoid <iostream> include in header 2023-01-03 15:25:20 +01:00
Arne Morten Kvarving
df5edfb96f BISAI: remove unnecessary iostream include 2023-01-03 15:25:00 +01:00
Arne Morten Kvarving
64140f51c9 pass output stream 
there is no default argument any longer
 2023-01-03 15:24:28 +01:00
Bård Skaflestad
d58efe3bf9
Merge pull request #4343 from akva2/remove_sstream 
Remove sstream use in exception handling
 2023-01-02 16:37:33 +01:00
Arne Morten Kvarving
7dce14929b WellState: avoid use of sstream 2023-01-02 15:25:13 +01:00
Arne Morten Kvarving
ddb3f2dafb VFPHelpers: avoid use of sstream 2023-01-02 15:24:52 +01:00
Arne Morten Kvarving
ff0f9c05f0 MultisegmentWell: avoid use of sstream 2023-01-02 15:24:35 +01:00
Arne Morten Kvarving
99e5dab134 BlackoilWellModelGeneric: avoid use of sstream 2023-01-02 15:24:16 +01:00
Arne Morten Kvarving
17d54c1416 setupZoltanParams: avoid use of sstream 2023-01-02 15:24:03 +01:00
Arne Morten Kvarving
4abf4e6d38 TimeStepControl: avoid use of sstream 2023-01-02 15:23:48 +01:00
Arne Morten Kvarving
527280ab28 AdaptiveTimeSteppingEbos: avoid use of sstream 2023-01-02 15:23:34 +01:00
Arne Morten Kvarving
f00ebc8b1c setupPropertyTree: avoid use of sstream 2023-01-02 15:23:14 +01:00
Arne Morten Kvarving
48bdf6f14c add missing sstream includes 2023-01-02 15:21:42 +01:00
Arne Morten Kvarving
e25d77f705 WellContributions: avoid use of sstream 2023-01-02 15:19:40 +01:00
Arne Morten Kvarving
bcf64b4be8 PreconditionerFactory: avoid use of sstream 2023-01-02 15:19:26 +01:00
Arne Morten Kvarving
ccce1cfe86 OwningTwoLevelPreconditioner: avoid use of sstream 2023-01-02 15:19:08 +01:00
Arne Morten Kvarving
6d033fcf56 MILU: avoid use of sstream 2023-01-02 15:18:50 +01:00
Arne Morten Kvarving
4a0bdc38e1 ISTLSolverEbos: avoid use of sstream 2023-01-02 15:18:34 +01:00
Arne Morten Kvarving
52d871f998 FlexibleSolver: avoid use of sstream 2023-01-02 15:18:10 +01:00
Arne Morten Kvarving
b148b454c6 NonlinearSolverEbos: avoid use of sstream 2023-01-02 15:17:49 +01:00
Tor Harald Sandve
6c60bad193 fix combination of vapwat and disgas 2023-01-02 12:16:35 +01:00
Bård Skaflestad
be55de8176
Merge pull request #4338 from atgeirr/adjust-cpr-defaults 
Adjust cpr-related defaults
 2022-12-23 17:55:13 +01:00
Bård Skaflestad
2bc065fce6
Merge pull request #4337 from akva2/deferred_logger_no_sstream 
Avoid use of sstream in deferred logger header / macros
 2022-12-23 15:25:48 +01:00
Arne Morten Kvarving
1c2e186017 always include Evaluation.hpp 
even if we are using the dynamic specialization
 2022-12-23 13:34:35 +01:00
Arne Morten Kvarving
be7f94b731 include Math.hpp where required 2022-12-23 13:34:35 +01:00
Arne Morten Kvarving
254f9c0388 DeferredLoggingHelpers: avoid using stringstream 2022-12-23 09:40:10 +01:00
Arne Morten Kvarving
a020a993b5 WellInterface: use {fmt} to format error messages 2022-12-23 09:39:29 +01:00
Arne Morten Kvarving
a25479e5c2 WellInterfaceGeneric: use {fmt} to format error messages 2022-12-23 09:39:29 +01:00
Arne Morten Kvarving
8d81588ea4 WellConvergence: avoid use of stringstream to format error messages 2022-12-23 09:39:29 +01:00
Arne Morten Kvarving
5c22d2f50c WellAssemble: avoid use of stringstream to format error messages 2022-12-23 09:39:29 +01:00
Arne Morten Kvarving
a82b5aa474 StandardWell: pull fmt in impl file 
it is not used in the interface.
no real change to the code as such, but it better reflects the use.
 2022-12-23 09:39:29 +01:00
Arne Morten Kvarving
2dbfeb6038 StandardWell: use {fmt} to format error messages 2022-12-23 09:39:29 +01:00
Arne Morten Kvarving
59e5642678 StandardWellPrimaryVariables: use {fmt} to format error messages 2022-12-23 09:39:29 +01:00
Arne Morten Kvarving
4c3d933835 MultisegmentWell: use {fmt} to format error messages 2022-12-23 09:39:29 +01:00
Arne Morten Kvarving
dd9e2ad66a MultisegmentWellSegments: use {fmt} to format error messages 2022-12-23 09:39:29 +01:00
Arne Morten Kvarving
3083525e8e MultisegmentWellEval: use {fmt} to format error messages 2022-12-22 08:35:27 +01:00
Arne Morten Kvarving
9e789fc144 MultisegmentWellEval: remove unused headers 2022-12-22 08:35:27 +01:00
Arne Morten Kvarving
a631762d17 GasLiftSingleWell: pull fmt in impl file 
it is not used in the interface.
no real change to the code as such, but it better reflects the use.
 2022-12-22 08:35:27 +01:00
Arne Morten Kvarving
a8d2bbeb4a GasLiftCommon: avoid pulling fmt in header 2022-12-22 08:35:27 +01:00
Arne Morten Kvarving
e7f921825c BlackoilWellModel: use {fmt} to format error message 2022-12-22 08:35:27 +01:00
Tor Harald Sandve
7c832b00f8
Merge pull request #4292 from totto82/addRsw 
Add support for gas in water
 2022-12-21 13:39:42 +01:00
Atgeirr Flø Rasmussen
ba734bc9ad Change default CPR preconditioner recreation behaviour. 2022-12-21 13:23:26 +01:00
Atgeirr Flø Rasmussen
3832b02367 Adjust default behaviours for CPR variants. 
- Remove two unused parameters. CprEllSolvetype is never used, and CprEllMaxIter
   is not used correctly as is (if used, it should change the maximum iterations of
   the coarse solver, not the repeats of the preconditioner) and is better left for
   JSON file customization.
 - Make the default AMG setup for "cpr" (including "cpr_trueimpes" and "cpr_quasiimpes")
   match the setup for "cprw". In particular, beta = 0.0 (not 1e-4) and
   prolongationdamping = 1.0 (not 1.6).
 - Just as we override the default maximum number of linear iterations for cpr and cprw
   (unless the user actually specified on the command line) to 20 instead of 100, we
   change the default reduction to be 0.005 instead of 0.01.
 2022-12-21 13:23:13 +01:00
Tor Harald Sandve
5854b8a7a1 Support gas dissolution in water (Rsw) 
- adapt to interface change in waterPvt()
- add gas + water + disgasw simulator

Note
- MSW is not supported
- EQUIL initialization is not supported
 2022-12-21 13:13:52 +01:00
Tor Harald Sandve
42093324ac
Merge pull request #4335 from totto82/clampRSRV 
clamp rs/rv in rate converter between 0.0 and rs/rv max
 2022-12-21 09:40:40 +01:00
Tor Harald Sandve
17fcae23ad Start using code within BURN_RESV_BRIDGES 
clamp rs/rv in rate converter between 0.0 and rs/rv max
 2022-12-20 13:49:29 +01:00
Bård Skaflestad
8dcb37570b Rename Convergence Output Option 
This commit renames the previously introduced command line option
ExtraConvergenceOutput (--extra-convergence-output) into the more
descriptive

    OutputExtraConvergenceInfo (--output-extra-convergence-info)

Suggested by: [at]OPMUSER
 2022-12-20 12:32:14 +01:00
Bård Skaflestad
858ca8fa49 Output Non-Linear Convergence to Separate File if Requested 
This commit enables outputting non-linear convergence metrics, i.e.,
the MB and CNV values, per phase, for each non-linear iteration in
each timestep.  If the user passes the option value "iterations" to
the --extra-convergence-output command line option, this commit will
create a new output file, CASE.INFOITER, that holds

    * report step
    * time step within that report step
    * elapsed time
    * MB and CNV values per phase
    * well convergence status

for each non-linear iteration.

We use an asynchronous file writing procedure and confer ownership
of the report step's unprocessed convergence reports to this
procedure just before the end of

    SimulatorFullyImplicitBlackoilEbos::runStep()

At that point, the convergence reports are about to go out of scope.
The asynchronous protocol uses a dedicated queue of output requests,
class ConvergenceReportQueue, into which the producer-i.e., member
function runStep()-inserts new convergence reports and from which
the output thread, ConvergenceOutputThread::writeASynchronous(),
retrieves those requests before writing the file data.
 2022-12-20 10:14:13 +01:00
Arne Morten Kvarving
5a839e8f93 MultisegmentWellSegments: store properties as Scalar 
instead of literal double
 2022-12-19 16:03:54 +01:00
Arne Morten Kvarving
c1e05fae18 MultisegmentWellSegments: make members private 
and add various read-only accessors
 2022-12-19 16:03:54 +01:00
Arne Morten Kvarving
12b15b5038 move updateUpwindingSegments to MultisegmentWellSegments 2022-12-19 16:03:54 +01:00