OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 21:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,561 Commits 24 Branches 102 Tags 82 MiB
53aa151e1c
Commit Graph

1561 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
b40d2e63d0 Merge pull request #495 from osae/endscale 
Endpoint scaling and hysteresis for gwseg.
 2014-03-04 10:29:50 +01:00
Atgeirr Flø Rasmussen
c2b647d245 Add test data file for compute_initial_state.cpp. 2014-02-27 15:55:08 +01:00
Atgeirr Flø Rasmussen
d13bf03e1f Bugfix in RsSatAtContact: use min(), not max(). 
Also modified test to match output.
 2014-02-27 14:57:38 +01:00
Atgeirr Flø Rasmussen
1c9675605c Fix bug in RS initialisation. 
Also throw if default init is specified and datum != goc depth.
 2014-02-27 14:48:14 +01:00
Atgeirr Flø Rasmussen
200b5372dd Added simple program example for initialisation. 2014-02-27 13:55:15 +01:00
Atgeirr Flø Rasmussen
1b3cac2433 Remove debugging output. 2014-02-27 13:27:07 +01:00
Atgeirr Flø Rasmussen
af9c1fc4cc Add computeRs() function and use from InitialStateComputer. 2014-02-27 13:14:48 +01:00
Atgeirr Flø Rasmussen
f84162bc39 Add initStateEquil() function. 
It is not quite complete yet for the following reasons:
  - it does not compute state.surfacevol(),
  - the InitialStateComputer class does not compute Rs or Rv,
  - it has not been verified.
 2014-02-27 10:40:14 +01:00
Atgeirr Flø Rasmussen
4aaeff0078 Added Rv field to InitialStateComputer. 
It is currently not computed, as for Rs.
 2014-02-27 10:39:18 +01:00
Atgeirr Flø Rasmussen
0fbc3a1ccb Moved implementation of phaseSaturations() to _impl file. 2014-02-27 09:37:48 +01:00
Atgeirr Flø Rasmussen
a1192c09dc Refactor copying of region to global data. 2014-02-27 09:31:48 +01:00
Atgeirr Flø Rasmussen
a7c45d4e9f Rename PhasePressureSaturationComputer -> InitialStateComputer. 
Also add (unused so far) rs_ field to class.
 2014-02-27 09:08:39 +01:00
Atgeirr Flø Rasmussen
91ae9df907 Add test for live oil initialisation. 
The test is not finished or verified yet.
 2014-02-27 08:31:51 +01:00
Atgeirr Flø Rasmussen
27743b4a13 Enable live oil in initialisation. 2014-02-27 08:31:03 +01:00
Joakim Hove
e5f1e1b0b8 Merge remote-tracking branch 'upstream/master' into opm-parser-integrate 2014-02-26 23:16:10 +01:00
Atgeirr Flø Rasmussen
d5ffcc051c Removed redundant calcPressII() method. 
Pressure is also calculated in the calcPressSat() method.
 2014-02-26 14:49:06 +01:00
Atgeirr Flø Rasmussen
38c89f363d Made phase mixing functors a class hierarchy. 
In summary:
 - added RsFunction (base class),
 - made NoMixing, RsVD, RsSatAtContact inherit RsFunction,
 - RS and RV are no longer template arguments for EquilReg class,
 - EquilReg constructor now takes two shared_ptr<Miscibility::RsFunction>,
 - use of constructor updated, mostly using make_shared.
 2014-02-26 14:47:24 +01:00
Atgeirr Flø Rasmussen
8266c52d99 Made NoMixing a class. 
For uniformity with its sibling classes.
 2014-02-26 14:16:51 +01:00
Markus Blatt
2d54a7398b Refactored WellsManager to partial use without UnstructuredGrid. 2014-02-25 17:52:51 +01:00
Markus Blatt
f356d86701 Remove ambiguous functions increment and getCoordinate from unnamed namespace in favor to those from namespace UgGridHelpers 2014-02-25 15:45:50 +01:00
Markus Blatt
d307df71e7 Added suport for grid apart from UG for BlackoilPropertiesFromDeck 2014-02-25 15:45:15 +01:00
Markus Blatt
ab0b2a9c6b Added support for computePoreVolume for grids apart from UnstructuredGrid. 2014-02-25 15:12:16 +01:00
Markus Blatt
e30031dc77 Added missing namespace qualifiers. 2014-02-25 15:10:46 +01:00
Markus Blatt
c7e20e5eb3 Fixed unused parameter warning in initBlackoilStateFromDeck. 2014-02-25 15:10:18 +01:00
Atgeirr Flø Rasmussen
74573947bb Prune includes. 2014-02-24 16:11:50 +01:00
Atgeirr Flø Rasmussen
7e0bd62205 Moved equilibration utilities to separate file. 2014-02-24 16:09:04 +01:00
Atgeirr Flø Rasmussen
64b6a40191 Capitalize nested namespace names. 
equil -> Equil
miscibility -> Miscibility
 2014-02-24 15:55:14 +01:00
Kristian Flikka
a055b529ec Add handling of WGRUPCON to new-parser friendly WellsManager constructor 2014-02-24 15:24:33 +01:00
Atgeirr Flø Rasmussen
2b0fcfe748 Move RegionMapping class to its own header, add test. 
Class now resides in opm/core/utility/RegionMapping.hpp.
 2014-02-24 15:19:04 +01:00
Atgeirr Flø Rasmussen
c689bc757f Added class RsSatAtContact (not tested). 2014-02-24 13:47:03 +01:00
Atgeirr Flø Rasmussen
83d0487097 Add test case with overlapping transitions. 
Capillary pressure functions and contact depths
have been modified to ensure a large overlap.
 2014-02-21 14:50:45 +01:00
Atgeirr Flø Rasmussen
6c8babc7d2 Fix bug in saturation initialisation. 
We shall only use gas-water capillary to initialise when we would get
unphysical saturations otherwise.
 2014-02-21 14:47:14 +01:00
Atgeirr Flø Rasmussen
6ef6b82ab5 Merge branch 'no-spline-default' into initialisation. 
Necessary since test case behaviour depends on changes in
BlackoilPropertiesFromDeck class.
 2014-02-21 11:01:44 +01:00
Atgeirr Flø Rasmussen
50637e1a3b Make linear interpolation default for saturation properties. 
This includes relative permeability and capillary pressure functions.
The default has been to make a monotone spline from the given table
values and use a fine, uniform sampling of that. Now the default
is to use the tables as-is. It is still possible to use the spline
approach. For example in the class BlackoilPropertiesFromDeck one
may pass nonzero values for the 'pvt_tab_size' and 'sat_tab_size'
parameters, corresponding to how fine the spline will be sampled.
 2014-02-21 09:54:47 +01:00
Atgeirr Flø Rasmussen
7d63cb9204 Add test case with capillary transition region. 2014-02-21 08:55:15 +01:00
Atgeirr Flø Rasmussen
b2be489e6e Add saturation computation to and rename computer class. 
Opm::equil::DeckDependent::PhasePressureComputer ->
Opm::equil::DeckDependent::PhasePressureSaturationComputer
 2014-02-21 08:52:25 +01:00
Atgeirr Flø Rasmussen
dc6bcead91 Add test case for capillary inversion. 2014-02-21 08:32:15 +01:00
Atgeirr Flø Rasmussen
4ec65f2f8f Add another test deck for initialisation. 
This deck includes capillary functions.
 2014-02-20 15:39:15 +01:00
Atgeirr Flø Rasmussen
e1069cf39b Fix bugs in saturation initialisation and helpers. 2014-02-20 15:24:27 +01:00
Markus Blatt
b328c13bc0 Assume begin_cell_centroid to what the name tells us: an iterator over then centroids. 
Therfore we do not need to call center() in getCoordinate. This is done in the iterator
class returned from CpGrid.
 2014-02-20 10:45:08 +01:00
Markus Blatt
21864388bd Merge remote-tracking branch 'origin/opm-parser-integrate' into refactor-for-cpgrid-support 
Resolved Conflicts:
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/props/rock/RockFromDeck.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck.hpp
	opm/core/props/satfunc/SaturationPropsFromDeck_impl.hpp
 2014-02-19 15:22:18 +01:00
Atgeirr Flø Rasmussen
b09dd7750a Add saturation init facilities. 
This adds the function phaseSaturations() and some helpers:
satFromPc() and satFromSumOfPcs().
 2014-02-19 13:42:07 +01:00
Atgeirr Flø Rasmussen
ebb6eaf742 Complete pressure test for dead-oil deck. 2014-02-19 13:41:20 +01:00
Atgeirr Flø Rasmussen
2ebaef62a0 Modify test data. 2014-02-19 13:40:02 +01:00
Atgeirr Flø Rasmussen
82216fa24f Add (defaulted) gravity argument in some places. 
This is done to facilitate testing, using gravity = 10 m/s^2 for example.
 2014-02-19 13:38:21 +01:00
osae
c93c1252e5 Endpoint scaling and hysteresis for gwseg. 
Activation of eps and hysteresis treatment for gwseg. Also some
additional initialization.
 2014-02-18 13:49:35 +01:00
Markus Blatt
d5f470cb68 Refactored parts needed for Blackoil in autodiff to get rid of UG dependency. 
This patch refactors (hopefully) all parts of opm-core that are needed
by the fully implicite black oil solver in opm-autodiff and that inherently
relied on UnstructuredGrid.

We added a new simple grid interface consisting out of free functions
that will allow us to use CpGrid without copying it to an UnstructuredGrid
by the means of the GridAdapter. Using this interface we have add methods that
allow specifying the grid information (global_cell, cartdims, etc.) wherever
possible to prevent introducing grid parameters for the type of the grid.
Unfortunately this was not possible everywhere.
 2014-02-17 13:23:01 +01:00
Kristian Flikka
ab42682399 Removed old EclipseGridParser from WellsManager constructor, WGROUPCON still missing 2014-02-14 15:36:32 +01:00
Joakim Hove
4982a913ee Merge pull request #493 from flikka/wellsmanager-group-refactor 
Adding support for creation of groups from "new style" Wells and Groups (new parser)
 2014-02-14 13:54:24 +01:00
Kristian Flikka
d1494e7daa Removed the previously introduced getAndUnRootChild method 2014-02-14 13:46:54 +01:00