Commit Graph
1567 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen c6d38f543c Rename sim_fibo_ad[_cp] -> flow[_cp].
In line with the decision we made to use "flow" as name for the
fully implicit black-oil simulators.
2015-02-27 12:35:03 +01:00
Bård Skaflestad 90ff9c055d Merge pull request #320 from atgeirr/fix-pvtregions
Fix pvt regions
2015-02-27 12:29:42 +01:00
Atgeirr Flø Rasmussen 22d0d7cd27 Remove extra call to extractPvtTableIndex(). 2015-02-27 12:26:12 +01:00
Atgeirr Flø Rasmussen 4d9a30807b Fix test_rateconverter failure.
- Make test use three phases, not two.
 - Avoid interpolation failure by adding a line to PVDG.
2015-02-27 10:20:30 +01:00
Atgeirr Flø Rasmussen 635fea1cad Remove pvtTableIdx_ from BlackoilPropsAdFromDeck.
It was not used by the properties, this commit also fixes the bug that
pvtTableIdx_ was initialized instead of cellPvtRegionIdx_.
2015-02-27 10:20:30 +01:00
Atgeirr Flø Rasmussen ba86dc191c Fix handling of multiple pvt-regions in BlackoilPropsAdFromDeck. 2015-02-27 10:20:30 +01:00
Bård Skaflestad d53cf1cf54 Merge pull request #318 from atgeirr/cleanup
Remove unused classes and example
2015-02-27 10:11:39 +01:00
Atgeirr Flø Rasmussen f3cfe26edb Correct function comment. 2015-02-23 13:42:51 +01:00
Atgeirr Flø Rasmussen d9ce8625cf Remove unused classes.
After this, the two affected tests fail due to bugs in PVT region
support in BlackoilPropsAdFromDeck.
2015-02-23 13:42:51 +01:00
Markus Blatt d62264d567 Moves functions that do not depend on Eigen to Opm::UgGridHelpers.
As a result we only have one faceCentroid(int) function the returns const double* and
FieldVector<double,3> for UnstructuredGrid and CpGrid, respectively. The codes is
adapted to this.
2015-02-23 12:24:40 +01:00
Markus Blatt 97fcd69d77 Removes empty namespace regions. 2015-02-23 11:38:03 +01:00
Markus Blatt 9fa1bba8da Moves Opm::UgGridHelpers from opm-autodiff to dune-cornerpoint
For historic (or no apparent) reason the free function grid interface
was added to opm-autodiff. As it depends on whether or not dune-cornerpoint
is present this seems rather unnatural. Therefore this commit removes the
functionality unconditionally from opm-autodiff.

Note that there is a corresponding commit in dune-cornerpoint that adds it
there.
2015-02-23 11:02:13 +01:00
Atgeirr Flø Rasmussen eb89236552 Merge pull request #317 from blattms/generic-equil
Modified sim_fibo_ad_cp to also allow running with EQUIL keyword.
2015-02-20 18:24:05 +01:00
Atgeirr Flø Rasmussen 0ce57cb6db Merge pull request #316 from blattms/parallel-verbose-on-0
Print status output only on rank 0 for parallel runs.
2015-02-20 18:11:38 +01:00
Markus Blatt bc58cfb3b9 Corrects missing space around if and operators. 2015-02-20 16:06:19 +01:00
Markus Blatt fd10c97e46 Fxied typo wether -> whether. 2015-02-20 16:03:08 +01:00
Markus Blatt bcc3ab7d95 Rename variable verbosity_ to terminal_output_. 2015-02-20 16:02:06 +01:00
Markus Blatt 62507b9cf6 [bugfix] Do not check verbosity when increase omega due to oscillation.
If oscillating then the same measures have to be taken on all
processes. This was not the case before the commit. Instead only
process 0 would have adapted omegas and we have produced wrong
results.

Kudos to Atgeirr for detecting this while reading the code.
2015-02-20 15:56:34 +01:00
Markus Blatt 9517dc08b3 Do not print message about querying output parameter for p>0. 2015-02-20 15:47:57 +01:00
Markus Blatt 4b110fb00b Fixes missing indentation. 2015-02-20 15:44:28 +01:00
Markus Blatt 46e0e0b0f7 Makes one argument constructors explicit to prevent type conversion. 2015-02-20 15:31:38 +01:00
Markus Blatt 007acfe018 Modified sim_fibo_ad_cp to also allow running with EQUIL keyword.
With now generic implementation of the initStateEquil in opm-core
we added the necessary grid helper functionlality for CpGrid and activated
the processing if the EQUIL keyword is there.
2015-02-20 12:23:35 +01:00
Markus Blatt d35d301a4b Print status output only on rank 0 for parallel runs. 2015-02-20 11:35:47 +01:00
Atgeirr Flø Rasmussen 1ba856ebfe Merge pull request #314 from totto82/avg_press
Use the average well block pressure when evaluating the properties
2015-02-20 08:36:49 +01:00
Atgeirr Flø Rasmussen ab835ec443 Merge pull request #308 from atgeirr/resv-injectors
Implement RESV limit targets for INJECTOR wells.
2015-02-19 15:45:18 +01:00
Atgeirr Flø Rasmussen fec50b491a Merge pull request #311 from totto82/fix_verticalscaling
Apply the swatinit scaling to new_props
2015-02-19 11:29:00 +01:00
Atgeirr Flø Rasmussen 1e5b691a49 Merge pull request #313 from blattms/redistgridhandle-without-grid
Remove the unsused grid members from BlackoilPropsDataHandle.
2015-02-19 10:03:43 +01:00
Tor Harald Sandve 70a6a2ebf8 Use the average well block pressure when evaluating the properties
The average well block pressure is used instead of the well cell
pressure when the well properties are evaluated.
Temperature, rs, rv, phase conditions are still well cells values.

Perforation pressures are stored in the well state
2015-02-19 09:58:17 +01:00
Markus Blatt 5e72774b89 Remove the unsused grid members from BlackoilPropsDataHandle.
Previously BlackoilPropsDataHandle did hold a grid for sending
and receiving that were either not used or we could prevent their
usage. Therefore this commit removes them from the class and queries
all needed information from the property objects.
2015-02-19 09:35:18 +01:00
Atgeirr Flø Rasmussen 46cfaa1432 Merge pull request #312 from atgeirr/fix-warnings
Fix warnings
2015-02-19 09:14:05 +01:00
Atgeirr Flø Rasmussen e96036bdb3 Move helper functions to namespace detail.
These were in the anonymous namespace, which was not wrong but lead to
false-positive unused function warnings on some compilers, probably due
to being used only from within templates. This allows us to keep the
warning activated by default.
2015-02-19 09:07:42 +01:00
Atgeirr Flø Rasmussen b83bb7bf92 Remove unused function. 2015-02-19 09:03:22 +01:00
Tor Harald Sandve 44e9d2a34e Fix PR comments
1) swatinit() is changed to setSwatInitScaling() to make it obvious that
we are modifying the props.
2) the descriptions of saturation and pc now makes more sense
3) the method is removed from the sibling class and the interface and
the type of new_props is changed from BlackoilPropsAdInterface to
BlackoilPropsAdFromDeck
5) The same modification is added to sim_fibo_ad_cp
2015-02-19 08:34:55 +01:00
Tor Harald Sandve 013d1d3499 Apply the swatinit scaling to new_props
The capillary pressure function in new_props is scaled to match the
capillary pressure function in props.

This is a temporary workaround while the simulator uses two different
property object.
2015-02-19 08:18:39 +01:00
Atgeirr Flø Rasmussen 47d9b3438e Merge pull request #310 from atgeirr/fix-warnings
Fix warnings and adapt to API changes
2015-02-18 13:16:07 +01:00
Atgeirr Flø Rasmussen f0190dd2bb Remove const from bool return type.
Since it has no effect for value types, and generates a warning.
2015-02-17 13:45:14 +01:00
Atgeirr Flø Rasmussen 850845c61d Suppress re-declaration warning. 2015-02-17 13:44:52 +01:00
Atgeirr Flø Rasmussen 17ade0457f Suppress unused argument errors. 2015-02-17 13:44:33 +01:00
Atgeirr Flø Rasmussen a4024a3f9e Remove unused functions. 2015-02-17 13:42:26 +01:00
Atgeirr Flø Rasmussen 355bfb0e70 Suppress signed/unsigned warning.
Also fix formatting.
2015-02-17 13:41:31 +01:00
Atgeirr Flø Rasmussen 7cdb65cff3 Suppress unused argument warnings. 2015-02-17 13:41:00 +01:00
Atgeirr Flø Rasmussen 75d98c7e3b Remove uneeded function argument. 2015-02-17 13:40:09 +01:00
Atgeirr Flø Rasmussen bd2f659770 Adapt to API change in WellsManager. 2015-02-17 13:22:43 +01:00
Atgeirr Flø Rasmussen 3873e5d810 Merge pull request #309 from chflo/opm-166
opm-166: Fix due to signature change in method thresholdPressures
2015-02-17 10:49:43 +01:00
chflo 82839f9580 opm-166: Fix due to signature change in method thresholdPressures 2015-02-17 09:53:57 +01:00
Atgeirr Flø Rasmussen 484f1e4438 Merge pull request #302 from blattms/distribute-input-props-data
Adds data redistribution capabilities and makes sim_fibo_ad_cp parallel.
2015-02-16 12:48:03 +01:00
Markus Blatt 684da9aa84 Throw an excpetion if either eclipse or matlab output is activated. 2015-02-16 11:52:50 +01:00
Markus Blatt 3eb13e74dd Adds braces to if() return; 2015-02-16 11:42:42 +01:00
Markus Blatt f19a83bbda Remove superluous casts. 2015-02-16 11:40:49 +01:00
Markus Blatt 3575fdce6a Removes stackobject_to_heap. 2015-02-16 11:24:05 +01:00