OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 10:40:21 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,762 Commits 24 Branches 101 Tags 97 MiB
71e2d63a6e
Commit Graph

577 Commits

Author SHA1 Message Date
Robert Kloefkorn
4c118c6455 Merge remote-tracking branch 'upstream/master' into PR/cleanup-output-writers 2017-02-13 21:28:54 +01:00
Atgeirr Flø Rasmussen
27c0430932 Change include paths for moved headers. 2017-02-10 16:07:25 +01:00
Robert Kloefkorn
82658c92d0 Removal of SimulatorFullyImplicitBlackoilOutputEbos.{h,c}pp. 
All simulators now use SimulationDataContainer to store intermediate data that
is passed to the output Solution container. This is in cases not the most
efficient way, but it's unified to avoid errors from code duplication.
 2017-02-09 16:57:45 +01:00
Joakim Hove
270e5f9c0e Passing keys to the restart load function. 
- Renamed EclipseWriter -> EclipseIO.
 - Loading from restart file is a method on the EclipseIO class.
 2017-01-25 23:16:08 +01:00
Andreas Lauser
ef731672c9 remove the BlackoilPropsAdInterface abstraction layer 
instead, directly use BlackoilPropsAdFromDeck.
 2017-01-02 13:19:23 +01:00
Atgeirr Flø Rasmussen
edf883e747 Merge pull request #996 from andlaus/no_eigen_in_VFP_and_FIP 
mostly eliminate Eigen in the FIP and VFP code
 2017-01-02 12:56:30 +01:00
Andreas Lauser
c880efae5b mostly eliminate Eigen in the FIP and VFP code 
this code mostly used the Eigen vectors as arrays anyway, so let's use
`std::vector`.

also, this patch only "mostly eliminates" Eigen from from these parts
of the code because the source files of the VFP code still use
AutoDiffBlock; Unfortunately this cannot easily be changed because
`flow_legacy` depends on these methods. (`flow_ebos` does not use the
incriminating methods.)
 2016-12-30 11:46:27 +01:00
Andreas Lauser
ac4dcba7e0 BlackoilModelEnums: don't use high-level classes 
I consider the blackoil model enums to be pretty low level while the
"FluidProperties" code is IMO quite high level. this, using the latter
to define the former constitutes a layering violation IMO. note that
the fix is to simply use the enums from opm-core directly.
 2016-12-29 18:03:05 +01:00
babrodtk
5923f64322 Removed unused variable (which gave me compilation errors) 2016-12-22 13:00:51 +01:00
Kai Bao
b8e0cda83a putting update of water injection mobility to a separate function 
computeInjectionMobility() in BlackoilPolymerModel
 2016-12-16 08:56:35 +01:00
Kai Bao
4f3ce37b8e correcting one not helpful comments. 
which results from the re-organization of the code.
 2016-12-16 08:56:35 +01:00
Kai Bao
894bffd1b3 handling the injection mobility when mixing paramter not 1 
The treatment with shear-thinning is not well tested yet.
 2016-12-16 08:56:35 +01:00
Kai Bao
4f8ae4be73 putting the re-calculating wellflux inside if plyshlog 
it only happens when shear effect calculation is needed. No point to
re-calculate the well flux when no shear thinning needed.
 2016-12-16 08:56:35 +01:00
Kai Bao
9307a41fd5 using the polymer concentration in the polymer transport 
since we already introduce the polymer viscosity there, we should apply
the water and polymer viscosity ratio again.
 2016-12-16 08:56:35 +01:00
jokva
efc2a79540 Merge pull request #898 from joakim-hove/remove-stale-output 
Removed all calls to writeECLData.
 2016-12-06 16:06:15 +01:00
Atgeirr Flø Rasmussen
508da6689f Change include path for writeVtkData.hpp, or remove include. 2016-12-06 09:48:03 +01:00
Joakim Hove
7ef40b3512 Removed all calls to writeECLData. 2016-12-06 08:34:17 +01:00
Kai Bao
8148105ae3 Revert "changing polymer production concentration to be the grid block concnetration." 2016-12-05 15:05:56 +01:00
Kai Bao
81a73650de polymer production concentration to be the grid block concnetration. 
To be more consistent with the injection well.
 2016-12-05 12:52:21 +01:00
Andreas Lauser
8c5f92dbc4 extend and clean up the SimulatorReport 2016-11-25 21:19:57 +01:00
Atgeirr Flø Rasmussen
54ad92ff40 Merge pull request #931 from atgeirr/fix-deck-error 
Do not assign to dereferenced null pointers.
 2016-11-18 11:59:40 +01:00
Atgeirr Flø Rasmussen
71bd419c03 Do not assign to dereferenced null pointers. 2016-11-17 13:18:02 +01:00
Kai Bao
8474ff2895 fixing all the simulators that call solveWellEq. 
Not all the group control functionalities working for allt the
simulators. Some need to be fixed later.
 2016-11-16 13:25:35 +01:00
Jørgen Kvalsvik
1c6a4b34da Update to shared_ptr-less parser interface. 2016-10-20 14:08:04 +02:00
Atgeirr Flø Rasmussen
93ffb318cd Merge pull request #855 from andlaus/opm-parser_units 
adapt to the removal of the unit system of opm-core
 2016-10-18 15:25:42 +02:00
Andreas Lauser
d76bf11902 adapt to the removal of the unit system of opm-core 
the one which is in opm-parser is now a drop-in replacement.
 2016-10-10 17:00:09 +02:00
Joakim Hove
39be053aef Using data::Solution for transfer of 3D data. 2016-10-10 10:52:51 +02:00
babrodtk
8ff349253c Fixed uninitialized bug, and added logging/comment 2016-10-07 15:11:59 +02:00
babrodtk
b774982878 Initial version of summary data 2016-10-07 15:06:53 +02:00
Tor Harald Sandve
45eae4bbc8 Output solvent saturation 
-- Compat.hpp is moved to opm-simulators
-- add SSOL if solvent is present
 2016-09-27 08:40:04 +02:00
Atgeirr Flø Rasmussen
06e41bdaca Merge pull request #819 from blattms/use-defunct-wells-from-loadbalancer-for-wellsmanager 
Use names of defunct wells from loadbalancer for wellsmanager
 2016-09-19 13:42:42 +02:00
babrodtk
5b75649a07 Simplified arguments to computeWaterShearVelocityFaces 2016-09-15 15:56:06 +02:00
babrodtk
537c5d71b8 Added missing code for polymer model for output 2016-09-15 11:40:36 +02:00
babrodtk
f7e3185546 Fixed bug where rsSat/rvSat were never set 2016-09-14 15:41:47 +02:00
Markus Blatt
33edf62a78 Use set of names of defunct wells from load balancer for parallel WellManager. 
Instead of the WellsManager guessing which wells are handled by other
processes we now use tha ouput of the load balancer to compute wells
that are handled by other processes.

With the previous approach it was not possible to calculate this information
correctly. Wells with only one completion next to the border of the
processes' partition were represented on multiple processes. In additition
wells that the eclipse schedule section defined with completions on non-active
cells in sequential runs were not at all calculated in parallel runs.

With the new approach the CpGrid::loaBalance routine returns the set names of
wells that are not handled by this process when setting up the simulation. This
information is then used throughout the simulation.
 2016-09-13 10:58:26 +02:00
babrodtk
739976535f Added rs and rv output capabilities 2016-09-07 14:55:53 +02:00
babrodtk
40b2b95d87 Extended the support for keywords for restart file output 2016-09-07 14:55:53 +02:00
babrodtk
35bed24465 Initial version for outputting cell data 2016-09-07 14:55:53 +02:00
Liu Ming
4b88d4edd1 use PV weighted pressure when HCPV is zero. 2016-09-07 14:00:30 +08:00
Liu Ming
1943978dbd update PAV formulation. 2016-09-05 10:38:57 +08:00
Atgeirr Flø Rasmussen
b5e986df5f Remove well state argument from computeFluidInPlace(). 2016-08-30 13:34:18 +02:00
Liu Ming
a492a60a64 document computeFluidInPlace function. 2016-08-30 10:30:26 +02:00
Liu Ming
056708574c compute fluid in place by regions. 2016-08-30 10:30:25 +02:00
Liu Ming
28583e4237 Add computeFluidInPlace function. 2016-08-30 10:30:25 +02:00
Liu Ming
5f059da0a4 look for water injector only, if not find, just continue to next step. 2016-08-12 08:27:07 +08:00
Atgeirr Flø Rasmussen
ac11db635c Merge pull request #778 from qilicun/polymer-well-iters 
well iterations should start from 0.
 2016-08-05 09:07:35 +02:00
Liu Ming
635c6b3986 well iterations should start from 0. 2016-08-04 10:54:31 +08:00
Liu Ming
6256199176 log the message to OpmLog. 2016-08-04 10:24:15 +08:00
Liu Ming
ec06eebc06 set polymer rates to the right well. 2016-08-04 10:22:49 +08:00
Atgeirr Flø Rasmussen
5581771917 Merge pull request #776 from qilicun/debug-polymer 
fix polymer in flow bug.
 2016-08-03 08:52:17 +02:00