Commit Graph

12298 Commits

Author SHA1 Message Date
Kai Bao
4c92f22677 for numerical aquifer, flux_rate_ should not be summed across processes
it will be taken care of in ecloutputblackoilmodule.hh

              aq.fluxRate += data.fluxRate;
              aq.volume += data.volume;
2021-02-22 23:15:26 +01:00
Kai Bao
867b769fcb only handling the interior elements for numerical aquifer 2021-02-22 23:15:26 +01:00
Kai Bao
a43c45e6ff setting numerical aquifer cells water saturation to 1.0
was removed accidently during cleaning up
2021-02-22 23:15:26 +01:00
Kai Bao
5e408ad71b trying to make the numerical aquifer runs in parallel
the current approach is not necessarily correct. When aquifer cells are
on the overlap layers, things are much more complicated.

But it mostly affects only the summary output of the numerical aquifers.
The well data should be fine.
2021-02-22 23:15:26 +01:00
Kai Bao
ab9b43249c using the water volume instead of pore volume
when calculating the nuemricla aquifer pressure.
2021-02-22 23:15:26 +01:00
Kai Bao
2b85e93ef6 some cleaning up
not functionality changes.
2021-02-22 23:15:26 +01:00
Kai Bao
524e63a255 adapting to the upstream interface change. 2021-02-22 23:15:26 +01:00
Kai Bao
c1a61e3b72 fixing the numerical aquifer related after rebasing 2021-02-22 23:15:26 +01:00
Kai Bao
a755b54afc rebasing and fixing the compilation.
The equilibration needs to be fixed for numerical aquifers.
2021-02-22 23:15:26 +01:00
Kai Bao
74f2fcd121 WIP in using pinched grid for numerical aquifer 2021-02-22 23:15:26 +01:00
Kai Bao
b6fdb7cc8e using global index when accessing pore volume in numerical aquifer 2021-02-22 23:15:26 +01:00
Kai Bao
65bde5d65b making sure the aquifer cells have the correct cell volume
because AQUNUM can specify different cells volume, which is indepedent
of the grid coordinates.
2021-02-22 23:15:26 +01:00
Kai Bao
c246dc6938 applying the face area when calculating the flux rate
For NNC is not needed, but some NNC is converted to some non-NNC, we
need the face area.
2021-02-22 23:15:26 +01:00
Kai Bao
8d7c3aa0ca getting numerical aquifer ready for summary output
it works well for some cases, while not the other one. More
investigation is ongoing.
2021-02-22 23:15:26 +01:00
Kai Bao
6008aa8339 begining simulator code for numerical aquifer
most of the functionality is to collect data for summary output.
2021-02-22 23:15:26 +01:00
Kai Bao
ef67d9a9e7 using the specified pressure for numerical aquifer
NOT totally sure how to use this pressure value, do we need to consider
the capillary pressure?
2021-02-22 23:15:26 +01:00
Kai Bao
80c0073a69 set water saturations for numerical aquifer cells to be 1. 2021-02-22 23:15:26 +01:00
Kai Bao
1d5b60a600 using the depth specified by numerical aquifer
for numerical aquifer cells, instead of the depth calculated from the
grid geometry.
2021-02-22 23:15:26 +01:00
Joakim Hove
a5c5dc2ec9
Merge pull request #3071 from joakim-hove/rft-config
Use ScheduleState for RFT configuration
2021-02-19 10:35:33 +01:00
Markus Blatt
d693c3da42
Merge pull request #3050 from joakim-hove/actionx-welpi
Support combination of ACTIONX and WELPI
2021-02-18 22:09:16 +01:00
Bård Skaflestad
2594a9af83
Merge pull request #3023 from totto82/addFlowCo2
Add diffusion in Flow
2021-02-18 18:33:38 +01:00
Joakim Hove
aca3b246ae Add empty() methods for updateEclWell and wellPI in ebos 2021-02-18 16:53:50 +01:00
Joakim Hove
ff51c2d7ee Handle WELLPI keyword in ACTIONX
When an ACTIONX has evaluated to True we inspect the keyword payload and if it
contains WELPI we query the well model for current wellpi values and pass that
along as context to the Schedule::applyAction()
2021-02-18 16:53:50 +01:00
Tor Harald Sandve
4ca3c2af72 clean-up commented code 2021-02-18 13:49:35 +01:00
Joakim Hove
b92f06544c Use ScheduleState for RFT configuration 2021-02-18 10:47:59 +01:00
Joakim Hove
fc398c8555
Merge pull request #3067 from joakim-hove/add-tran-parallel-test
Add parallel test of partial TRAN EDIT
2021-02-17 16:44:15 +01:00
Joakim Hove
d65cb22e69
Merge pull request #3066 from joakim-hove/vfp-warnings
Use class based enums for VFP flow types
2021-02-16 13:37:57 +01:00
Tor Harald Sandve
5deb410bd5 clean-up in flow_bo_diffusion.cpp and flow_co2.cpp 2021-02-16 12:23:36 +01:00
Tor Harald Sandve
361de71c96 add optional flow_bo_diffusion simulator for testing 2021-02-16 12:21:58 +01:00
Tor Harald Sandve
1abbd9c776 add diffusivity to eclTranmissibility 2021-02-16 12:21:58 +01:00
Tor Harald Sandve
3457d46a00 add flow_co2 gas-oil simulator with diffusion for testing 2021-02-16 12:21:58 +01:00
Joakim Hove
8bb4302bb6
Merge pull request #3068 from joakim-hove/remove-aq-mult
Remove multiplier in aquifer connected area
2021-02-16 11:16:14 +01:00
Joakim Hove
abf48b0782 Remove multiplier in aquifer connected area 2021-02-16 10:02:36 +01:00
Joakim Hove
2df154017b Add parallel test of partial TRAN EDIT 2021-02-16 08:04:12 +01:00
Joakim Hove
d2e6d80265 Improve warning when invalid values are encountered in VFP 2021-02-16 07:48:59 +01:00
Joakim Hove
471a19e851 Pass table argument to getGFR() and getWFR() 2021-02-15 22:36:51 +01:00
Joakim Hove
fda1d65494 Pass table argument to VFP getFLo() 2021-02-15 22:21:56 +01:00
Joakim Hove
6383f3c1ac Use class based enums for VFP flow types 2021-02-15 19:17:39 +01:00
Joakim Hove
27b4dabd6a
Merge pull request #3063 from joakim-hove/aquconn-default
Aquifer connected cell area - unconditional access to double
2021-02-15 09:20:10 +01:00
Joakim Hove
ee79698802
Merge pull request #3065 from joakim-hove/haswell
Implement BlackoilWellModel::hasWell() method
2021-02-15 09:04:12 +01:00
Joakim Hove
b7f3a07939 Aquifer connected cell area - unconditional access to double 2021-02-14 20:47:22 +01:00
Joakim Hove
99a61e120b Implement BlackoilWellModel::hasWell() method 2021-02-13 10:37:45 +01:00
Joakim Hove
591826ea4e
Merge pull request #3060 from joakim-hove/wellpi-extract
Extract method wellPI() from existing lambda implementation
2021-02-13 08:55:35 +01:00
Joakim Hove
0299af26ed Extract method wellPI() from existing lambda implementation 2021-02-12 11:49:04 +01:00
Joakim Hove
0dc3d1f694
Merge pull request #3057 from joakim-hove/wellpi-scaling
Use Well::convertDeckPI()
2021-02-12 09:24:21 +01:00
Joakim Hove
648b0f6581 Use Well::updateDeckPI( ) 2021-02-11 13:47:27 +01:00
Markus Blatt
fd7c4e3d24
Merge pull request #3053 from totto82/fixBoundaryMPI
fix boundary face index on process boundaries
2021-02-11 09:07:19 +01:00
Bård Skaflestad
4f112e443f
Merge pull request #3055 from joakim-hove/wellpi-update-connections
Extract functionality to update ecl_well
2021-02-10 21:15:20 +01:00
Markus Blatt
21676d2645
Merge pull request #3051 from blattms/support-non-gpu-devs-opencl
Allow usage of non-gpu devices with OpenCL.
2021-02-10 19:48:54 +01:00
Joakim Hove
89eb6e5659 Extract functionality to update ecl wells to separate function 2021-02-10 15:17:36 +01:00