OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 02:30:18 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,813 Commits 24 Branches 101 Tags 96 MiB
bc35ddf8bb
Commit Graph

4813 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arne Morten Kvarving
bc35ddf8bb fixup SPE script 2017-03-20 20:02:33 +01:00
Arne Morten Kvarving
7f247c1cc9 fixup norne script 2017-03-20 20:02:30 +01:00
Andreas Lauser
c5fd9ddb48 make the unit tests to explicitly use flow_legacy instead of flow 
the results of `flow_legacy` and `flow_ebos` are not bit-wise
identical. The same tests using `flow_ebos` should to be added when
re-organizing the unit tests the next time.
 2017-03-20 20:01:59 +01:00
Atgeirr Flø Rasmussen
0b0ef7e20f Merge pull request #1108 from andlaus/apply_wells_in_assemble 
BlackoilModelEbos: apply the well residual in assemble()
 2017-03-20 08:44:32 +01:00
Atgeirr Flø Rasmussen
2eb8816507 Merge pull request #1103 from totto82/output_rsrv_pc 
Fix output of rs and rv.
 2017-03-20 06:47:17 +01:00
Atgeirr Flø Rasmussen
553f345670 Merge pull request #1088 from GitPaean/correcting_bhp_limits_for_well_potentials 
more careful determination of the most restrictive bhp value
 2017-03-19 14:08:13 +01:00
Atgeirr Flø Rasmussen
f504ca34f4 Merge pull request #1041 from blattms/fix-output_writer-setup 
Fix output writer setup
 2017-03-17 18:12:52 +01:00
Atgeirr Flø Rasmussen
eaf9d136bf Merge pull request #1091 from GitPaean/calculating_surface_volume_fraction 
[WIP] using surface volume fraction instead of wellVolumeFraction() and wellVolumeFractionScaled() in a few places
 2017-03-17 14:31:31 +01:00
Bård Skaflestad
bdba47e5ac Merge pull request #1105 from atgeirr/change-default-output-dir 
Change default output dir
 2017-03-17 13:58:08 +01:00
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
Markus Blatt
13956625b6 Removed duplicate output writer setup. 
The cat must have dragged that in during some of the various rebases of this branch.
This introduced a segmentation fault as for the second setup eclIO was already null.
 2017-03-17 11:08:55 +01:00
Atgeirr Flø Rasmussen
a89af9c92f Updated output_dir in test driver scripts/ 2017-03-16 17:18:14 +01:00
Atgeirr Flø Rasmussen
059367e14d Change default output dir for flow_ebos. 2017-03-16 16:05:33 +01:00
Atgeirr Flø Rasmussen
4ea87b31b2 Change output dir default. 
With this the default output dir is the location of the deck file
(as stored in the IOConfig), rather than the current working directory.
 2017-03-16 15:43:46 +01:00
Atgeirr Flø Rasmussen
4eda4d9ff6 Remove unused code and simplify. 
- The output_interval_ member is no longer used (here).
 - After setup, the IOConfig contains the output dir, use it.
 2017-03-16 15:40:24 +01:00
Markus Blatt
0650f9b42e Deactivate gather code when MPI is not available. 
In this case some of the used classes do not exist.
 2017-03-16 14:52:59 +01:00
Markus Blatt
35ff439ee1 Make ParallelDebugOutput constructable with global or distributed grid view. 
That makes coding a little more me/fool proof.
 2017-03-16 14:52:59 +01:00
Markus Blatt
03cb9f4afa ParalleDebugOutput needs the distributed grid. 
Because for the global grid the communicator sees just one process.
Unfortunately this is not documented.
 2017-03-16 14:52:59 +01:00
Markus Blatt
2f95e33d59 Do not use the equilGrid in Ebos as it is deleted after the constructor. 
Instead we create our own global grid representation.
 2017-03-16 14:52:59 +01:00
Markus Blatt
fd3e3596a9 Setup output writer and write initial values in parallel correctly. 
Before this commit only the solution of process 0 was written.
To fix this we make the equilGrid of Ebos available. It is used
for the output writer. The properties written initially are gathered from
all processes first using the new gather/scatter utility.
 2017-03-16 14:52:59 +01:00
Markus Blatt
45cee3d9f4 Added missing header include. 2017-03-16 14:52:59 +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
Tor Harald Sandve
6c859836f3 Hack to make the intial output of rs and rv Ecl compatible. 
For cells with swat == 1 Ecl outputs; rs = rsSat and rv=rvSat, in all
but the initial step where it outputs rs and rv values calculated by the
initialization. To be compatible we overwrite rs and rv with the values
passed by the localState. Volume factors and densities needs to be
recalculated with the updated rs and rv values.
 2017-03-16 10:22:27 +01:00
Tor Harald Sandve
d640a16e5a Update rs and rv value for free oil and gas case 
The rs and rv values are not used by the simulator for the case with
free oil and gas (or water only case), but they must be updated for
output.
 2017-03-16 10:20:09 +01:00
Atgeirr Flø Rasmussen
b8adfbb52f Merge pull request #1101 from joakim-hove/allow-undefined-wells 
Policy change: warn when missing well/group.
 2017-03-15 20:50:27 +01:00
Joakim Hove
bdc9ffb578 Policy change: warn when missing well/group. 2017-03-15 15:41:25 +01:00
Atgeirr Flø Rasmussen
76df693ede Merge pull request #1098 from akva2/add_extra_plot 
added: generate a plot without ecl reference for norne runs
 2017-03-15 13:23:30 +01:00
Arne Morten Kvarving
33042a6f75 added: generate a plot without ecl reference for norne runs 
sometimes it is easier to compare without the extra data in the graphs
 2017-03-15 11:25:44 +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
Atgeirr Flø Rasmussen
345f10bc18 Merge pull request #1095 from andlaus/improve_FIP 
Fixes for the fluid in place code
 2017-03-15 11:14:33 +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
78995a7f61 Merge pull request #949 from akva2/move_msw_test 
convert MSW_2D_H__ into a regression test
 2017-03-15 09:56:33 +01:00
Kai Bao
2f3d142b38 a little more generalized implementation of BHP determination 
for well potentials calculation, not caring much about how many THP/BHP constraints exist.
 2017-03-14 15:07:10 +01:00
Kai Bao
18a75dcabc more careful determination of the most restrictive bhp value 
when computing the well potentials
 2017-03-14 14:58:21 +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
d973d07bc9 Merge pull request #1094 from akva2/print_banners 
changed: print some banners during test comparisons
 2017-03-13 16:07:25 +01: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
Arne Morten Kvarving
42ef0655ee changed: print some banners during test comparisons to make output more readable 2017-03-10 14:46:09 +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
Kai Bao
3a89f07f3c not using comp_frac for producers in getQs 2017-03-08 11:02:47 +01:00