OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-24 16:30:02 -06:00
Code Issues Packages Projects Releases Wiki Activity
15,420 Commits 24 Branches 102 Tags 84 MiB
240c039f53
Commit Graph

9742 Commits

Author SHA1 Message Date
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
Arne Morten Kvarving
4b3a6f37d5 move calculation part of handleAccelerationPressureLoss to MultisegmentwellSegments 2022-12-19 16:03:54 +01:00
Arne Morten Kvarving
70702738cc move pressureDropValve to MultisegmentWellSegments 2022-12-19 16:03:54 +01:00
Arne Morten Kvarving
fb0ec18aba move pressureDropAutoICD to MultisegmentWellSegments 2022-12-19 16:03:54 +01:00
Arne Morten Kvarving
133f2a92bb move pressureDropSpiralICD to MultisegmentWellSegments 2022-12-19 16:03:54 +01:00
Arne Morten Kvarving
4acfec9d1d move getFrictionPressureLoss to MultisegmentWellSegments 2022-12-19 16:03:54 +01:00
Arne Morten Kvarving
ef7b2aca4e move computeSegmentFluidProperties to MultisegmentWellSegments 2022-12-19 16:03:54 +01:00
Arne Morten Kvarving
4a9cedf452 move getSegmentSurfaceVolume to MultisegmentWellSegments 2022-12-19 16:03:53 +01:00
Arne Morten Kvarving
9c19120855 move getHydroPressureLoss to MultisegmentWellSegments 2022-12-19 16:03:27 +01:00
Arne Morten Kvarving
40adc0ddbd move segment_depth_diffs_ to MultisegmentWellSegments 2022-12-19 16:03:27 +01:00
Arne Morten Kvarving
5755c94256 move segment_inlets_ to MultisegmentWellSegments 2022-12-19 16:03:27 +01:00
Arne Morten Kvarving
2766427df0 move segment_perforations_ and perforation_segment_depth_diffs_ to MultisegmentWellSegments 2022-12-19 16:03:26 +01:00
Arne Morten Kvarving
aa684a10b8 added: MultisegmentWellSegments 
this is a container class for per-segment properties in MultisegmentWell
 2022-12-19 15:55:20 +01:00
Arne Morten Kvarving
bc0610171d MultisegmentWellEval: use symbols from primary variables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
654c252bb8 MultisegmentWellAssemble: simplify assembleControlEq 
by passing primary variables
 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
3b80b913da MultisegmentWellPrimaryVariables: make data members private 
and add generic read-only accessor to evaluations
 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
e1cd54b267 MultisegmentWell: move updateUpwindingSegments to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
37607c570a MultisegmentWell: move updateWellStateFromPrimaryVariables to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
dbdcb2d5ce MultisegmentWell: move getWQTotal to MultisegmentWellPrimaryVariables 
also drop otherwise unused getSegmentWQTotal
 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
6b47f9bf1a MultisegmentWell: move getQs to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
62297b2a63 MultisegmentWell: move getSegmentRate to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
99020fe33b MultisegmentWell: move getBhp to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
bb377c0a47 MultisegmentWell: move getSegmentPressure to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
f99ecd15ac MultisegmentWell: move getSegmentRateUpwinding to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
8e9b004cfc MultisegmentWell: move surfaceVolumeFraction to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
2e2a49b935 MultisegmentWell: move volumeFractionScaled to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
e539614fff MultisegmentWell: move volumeFraction to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
b112a793c5 MultisegmentWell: move updatePrimaryVariablesNewton to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
6404d69201 MultisegmentWell: move processFractions to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
5212e9c100 MultisegmentWell: move updatePrimaryVariables to MultisegmentWellPrimaryVariables 2022-12-19 13:05:39 +01:00
Arne Morten Kvarving
e1fccd47dc added: MultisegmentWellPrimaryVariables 
this is a container class for the primary variables in
multisegment well
 2022-12-19 13:05:39 +01:00
Bård Skaflestad
c50cdc2454
Merge pull request #4331 from akva2/msw_avoid_mutable 
MultisegmentWell: avoid mutable primary variables
 2022-12-19 12:34:13 +01:00
Bård Skaflestad
c42e0051e3
Merge pull request #4329 from blattms/treat-connection-not-attached-to-segments-correctly 
[bugfix,mswells] Throw for connections not attached to segments correctly.
 2022-12-16 17:12:27 +01:00
Markus Blatt
8cde90fbd0 [bugfix,mswell] Throw for connections not attached to segments. 
If there are connections of a multisegment well that are not
connected to any segment, we throw with a meaningful error message
instead of a silent segmentation fault. In that case an invalid segment index
of zero would be returned. The corresponding storage index returned by
segmentToNumberIndex ould become -1. This previously lead to segmentation
faults when using it to index a container.
 2022-12-16 16:12:47 +01:00
Arne Morten Kvarving
f4c2aa3a35 MultisegmentWell: primary variables no longer needs to be marked mutable 2022-12-16 15:07:46 +01:00
Arne Morten Kvarving
f782673b2d MultisegmentWell: make updatePrimaryVariables non-const 
this will obviously update state
 2022-12-16 15:07:35 +01:00
Arne Morten Kvarving
ef992080cf MultisegmentWell: make updatePrimaryVariablesNewton non-const 
this will obviously update state
 2022-12-16 15:07:12 +01:00
Arne Morten Kvarving
ac91db281a MultisegmentWell: make processFractions non-const 
this updates state
 2022-12-16 15:06:36 +01:00
Arne Morten Kvarving
6b61af21b3 MultisegmentWell: make initPrimaryVariablesEvaluation non-const 
this will obviously update state
 2022-12-16 15:06:03 +01:00
Arne Morten Kvarving
10a671e88c MultisegmentWell: make updateWellState non-const 
this will obviously update state
 2022-12-16 15:05:06 +01:00
Bård Skaflestad
63654a73fc Don't Output INFOSTEP File by Default 
This commit introduces a new helper class,

    ConvergenceOutputConfiguration

which parses comma separated option strings into a runtime
configuration object for whether to output additional convergence
information and, if so, what information to output.

Supported option string values are

  * "none"       -- Dont want any additional convergence output.

  * "steps"      -- Want additional convergence output pertaining to the
                    converged solution at the end of each timestep.

  * "iterations" -- Want additional convergence output pertaining to each
                    non-linar ieration in each timestep.

Option value "none" overrides all other options.  In other words, if the
user requests "none", then there will be no additional convergence
output, even if there are other options in the option string.

We add a new option, ExtraConvergenceOutput (command line option
--extra-convergence-output), which takes a string argument expected
to be a comma separated combination of these options.  The default
value is "none".  Finally, make the INFOSTEP file output conditional
on the user supplying "steps" as an argument to the new option.
 2022-12-15 13:02:09 +01:00