Commit Graph

3053 Commits

Author SHA1 Message Date
Andreas Lauser
093310c437 BlackoilModelEbos: apply the well residual in assemble()
This used to be done in solveJacobianSystem(), but this method is only
supposed to solve the linearized system of equations, not to modify it
IMO.

I tested this patch with Norne: It did not change anything.
2017-03-17 11:39:41 +01:00
Bård Skaflestad
d700f3e946 Merge pull request #1104 from atgeirr/allow-restart-without-opmextra
Allow restarting without OPMEXTRA field in restart file.
2017-03-17 11:18:06 +01:00
Atgeirr Flø Rasmussen
711e9bacb7 Allow restarting without OPMEXTRA field in restart file. 2017-03-16 13:34:24 +01:00
Atgeirr Flø Rasmussen
5517b8a3f3 Merge pull request #963 from blattms/allow-amg-with-matrix-block
Specialize direct solver for Dune::MatrixBlock.
2017-03-16 11:43:16 +01:00
Joakim Hove
bdc9ffb578 Policy change: warn when missing well/group. 2017-03-15 15:41:25 +01:00
Atgeirr Flø Rasmussen
5c7804935d Merge pull request #1078 from totto82/eventOve
Set timesteps after events
2017-03-15 11:20:20 +01:00
Atgeirr Flø Rasmussen
2283fc8258 Merge pull request #1083 from GitPaean/using_well_cell_rsrv
[Discussion] using rs rv from grid cells when calculating the volume ratio
2017-03-15 11:18:25 +01:00
Andreas Lauser
aa9966d7b8 flow_ebos FIP: fix the field totals code
this unifies the code paths of the code that calculates the FIP field
totals for the parallel and the sequential cases and makes the code
more robust because it does not hard-code the presence of an intensive
quantities cache anymore. also, rock compressibility is now also
included in the field totals instead of just the FIP regions. this was
forgotten in the last FIP PR because the region values are calculated
in a different class using completely different code. (i.e., regions
are done by the model, field totals by the simulator. that design
should win an award, IMO.)

with this patch, the field totals for Norne and SPE1 seem to match
those produced by E100 _very_ closely and also parallel and sequential
runs for Norne and SPE1 of flow_ebos produce exactly the same
numbers. (This is probably the case for all decks, but I haven't
tested anything else.)
2017-03-15 11:07:45 +01:00
Andreas Lauser
5194cc5122 BlackoilModelEbos: clean up and fix the FIP code
mainly this should now work properly in parallel, because non-interior
cells are not counted multiple times anymore. also, the number of
loops over the global arrays has been reduced, some variables have
been renamed and some comments were added.

finally this fixes the average pressure for regions that do not
contain hydrocarbons (or at least it unifies it with the approach for
regions that contain hydrocarbons).
2017-03-15 11:07:45 +01:00
Andreas Lauser
3e1758f5c8 the first time FIP needs to be reported is before the simulation starts 2017-03-15 11:07:45 +01:00
Andreas Lauser
384fcc5114 BlackoilModelEbos: minor stylistic improvements
mainly indentation fixes and removal of duplicate blank lines.
2017-03-15 11:06:28 +01:00
Atgeirr Flø Rasmussen
d4ce1eddc9 Merge pull request #1097 from nairr/add_timestamp_fip_output
Add timestamp fip output
2017-03-14 14:17:09 +01:00
dr-robertk
029bc6daa7 Merge pull request #1010 from blattms/ebos-parallel-convergence
Switch off non-owner entries during accumulation in getConvergence
2017-03-14 14:13:19 +01:00
nairr
71e2d63a6e Adds information regarding report step, elapsed time, simulation date,
simulator name, version, field title etc to the fip output
2017-03-13 16:48:19 +00:00
Atgeirr Flø Rasmussen
840c15bb63 Merge pull request #1092 from joakim-hove/opmextra-optional
Mark OPMEXTRA as not required restart data.
2017-03-10 23:04:56 +01:00
Atgeirr Flø Rasmussen
81ebba2df8 Merge pull request #1064 from GitPaean/fixing_thp_initialization
when no THP control/limit, thp value will be set to zero.
2017-03-10 10:23:15 +01:00
Joakim Hove
b4f9e88403 Mark OPMEXTRA as not required restart data. 2017-03-10 09:58:16 +01:00
Tor Harald Sandve
19a16ceeca Set timesteps after events
The time step after an event can either be set using
timestep_in_days_after_event or using the TUNING keyword in the deck.
2017-03-09 08:54:44 +01:00
Atgeirr Flø Rasmussen
e8bddf6de2 Add FIP features to multisegment sim. 2017-03-03 13:47:09 +01:00
Kai Bao
b5e2c5262f using rs rv from grid cells when calculating the volume ratio
during computeWellFlux for StandardWellsDense.
2017-03-02 14:21:00 +01:00
Atgeirr Flø Rasmussen
429baf082c Update to match revised extra data interface from opm-output. 2017-03-01 09:50:32 +01:00
Atgeirr Flø Rasmussen
1175c389b0 Add SI/double preserving feature to restart I/O.
The parameter "restart_double_si" (defaults to false) will when true
cause the RESTART_SOLUTION data (only) to be read/written with measure
equal to measure::identity, thereby suppressing unit conversions. Also,
the output layer will be told to output all (not just RESTART_SOLUTION
but also RESTART_AUXILIARY) restart data as doubles.
2017-03-01 08:45:49 +01:00
Atgeirr Flø Rasmussen
378addd000 Update legacy sim to also read time step from restart. 2017-03-01 08:45:42 +01:00
Atgeirr Flø Rasmussen
ffaa48295a Add restart I/O of suggested timestep length. 2017-03-01 08:45:34 +01:00
babrodtk
ba2973dbbe Fixed apparent bug in outputting PDPB 2017-02-27 10:28:31 +01:00
Atgeirr Flø Rasmussen
930f0ea9a0 Merge pull request #1076 from atgeirr/fix-conditional-visc-output
Fix conditional viscosity output
2017-02-24 17:55:18 +01:00
Andreas Lauser
bb56d53150 Merge pull request #1075 from babrodtk/initial_restart
Update for writing initial values to restart file
2017-02-24 16:04:38 +01:00
babrodtk
6ed7b9dcb9 Moved computation of FIP before output to summary 2017-02-24 11:32:36 +01:00
Atgeirr Flø Rasmussen
cef4f5d9e5 Avoid signed/unsigned comparison. 2017-02-24 10:57:17 +01:00
Atgeirr Flø Rasmussen
980a6191b2 Bugfix: make viscosity output conditional. 2017-02-24 10:56:44 +01:00
babrodtk
729a220e5c Updated to iterate over elements instead of cell indices, though this changes the output values 2017-02-24 10:48:42 +01:00
Atgeirr Flø Rasmussen
296b0c61d6 Merge pull request #1068 from babrodtk/initial_restart
Added writing initial timestep data to restart
2017-02-24 09:17:30 +01:00
Atgeirr Flø Rasmussen
10f6c64502 Merge pull request #1072 from atgeirr/fix-wellstate
Towards fixing restart for flow_ebos
2017-02-24 09:11:25 +01:00
Atgeirr Flø Rasmussen
560b39e933 Merge pull request #1073 from dr-robertk/PR/revert-1070
Revert PR 1070 to use auto instead of preprocessor statements.
2017-02-24 08:56:34 +01:00
Robert Kloefkorn
9e30d4b27c Revert PR 1070 to use auto instead of preprocessor statements. 2017-02-23 15:46:52 +01:00
Atgeirr Flø Rasmussen
3071807418 Add docs for Compat.hpp. 2017-02-23 15:39:58 +01:00
Atgeirr Flø Rasmussen
8b8d029d2d Merge pull request #1069 from babrodtk/fix_visc_output
Updated so that VOIL/VGAS/VWAT are supported keywords
2017-02-23 15:27:49 +01:00
babrodtk
ef1c8909f2 This enables compiling with Eigen 3.3 2017-02-23 11:34:41 +01:00
Atgeirr Flø Rasmussen
2577eee159 Add wellsToState() overload for dense well state class. 2017-02-23 10:35:11 +01:00
Atgeirr Flø Rasmussen
512ab189ee Refactor to use wells_ data member. 2017-02-23 10:31:00 +01:00
Atgeirr Flø Rasmussen
7db75f1e12 Add needed include directive. 2017-02-23 10:22:19 +01:00
Atgeirr Flø Rasmussen
2e8ff72e9e Rename template variable for clarity. 2017-02-23 10:21:45 +01:00
Atgeirr Flø Rasmussen
260944cfb0 Split Compat.hpp in header and implementation.
Avoids tedious recompiles of legacy sims when changing certain
ebos-specific classes.
2017-02-23 10:19:21 +01:00
Atgeirr Flø Rasmussen
5c9fb9d32a Refactor setting of new members into own functions. 2017-02-23 09:51:00 +01:00
babrodtk
3e44bb1e4e Updated so that VOIL/VGAS/VWAT are supported keywords 2017-02-22 11:18:24 +01:00
babrodtk
1e5df1b720 Added writing initial timestep data to restart 2017-02-22 10:12:47 +01:00
Andreas Lauser
9dab0323ce flow_ebos FIP: create the element iterator object as part of the for statement
IMO, the previous solution was easier to read and a few lines shorter,
but I don't really care about how this is done...
2017-02-21 13:53:08 +01:00
Andreas Lauser
1f7be0d324 flow_ebos FIP: add comments about the pore volume calculation 2017-02-21 13:33:24 +01:00
Andreas Lauser
a27a2c33a7 flow_ebos FIP: consider all pore volume modifiers
for now "all pore volume multipliers" means compressibility. the
storage term of the simulator includes them, so they need to be
considered when calculating the fluid in place as well.
2017-02-21 10:03:11 +01:00
Andreas Lauser
9df4b21369 flow_ebos: fix the calculation of the original fluid in place
for Norne the numbers are now very close to those of the ECL
reference. ("very close" means < 0.01 % deviation of pressure and
initial fluid volume for the field totals.)
2017-02-20 16:28:20 +01:00