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
1,445 Commits 24 Branches 101 Tags 96 MiB
818b653c15
Commit Graph

1445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Atgeirr Flø Rasmussen
818b653c15 Removed extra overload of relperm(). 2015-03-09 09:40:30 +01:00
Atgeirr Flø Rasmussen
a347e35304 Removing extra overloads of rsSat() and rvSat(). 
Also a few minor fixes to docs and indentation while in the area.
 2015-03-09 09:40:30 +01:00
Atgeirr Flø Rasmussen
64769f1062 Merge pull request #332 from atgeirr/fix-compile-error 
Fix compile error instroduced by merging #275.
 2015-03-09 09:39:02 +01:00
Atgeirr Flø Rasmussen
ae31c034b6 Fix compile error instroduced by merging #275. 
Moved output directory code near top again, changed rank query
to use Dune::MPIHelper instead of the grid.
 2015-03-09 09:37:16 +01:00
Joakim Hove
8e9cc4728e Merge pull request #275 from joakim-hove/use-OpmLog 
Using OpmLog instead of explicit logger
 2015-03-09 08:08:07 +01:00
Joakim Hove
9b7d84bd9f ERT-830: Using OpmLog instead of explicit logger 2015-03-09 08:00:13 +01:00
Bård Skaflestad
eed6b0a4a3 Merge pull request #329 from atgeirr/fix-rateconverter-test 
Fix for test failures after #327.
 2015-03-05 16:27:28 +01:00
Atgeirr Flø Rasmussen
17117e7a0e Avoid storing return value in reference. 
Normally this is OK for by-value returns, but here the right hand side
was changed to call ADB::value(), which returns by reference.
 2015-03-05 16:07:04 +01:00
Atgeirr Flø Rasmussen
17b2a0e726 Merge pull request #327 from atgeirr/simplify-props 
Simplify properties
 2015-03-05 14:01:41 +01:00
Atgeirr Flø Rasmussen
d9d3554cb7 Merge pull request #328 from dr-robertk/PR/tolerance-wells 
Output Newton and Lienar solver iterations
 2015-03-05 11:32:47 +01:00
Robert Kloefkorn
b20733eb29 nitpick adjustments. 2015-03-05 11:28:11 +01:00
Robert Kloefkorn
05260e9582 added number of linear and newton iterations to output. 2015-03-05 10:40:20 +01:00
Robert Kloefkorn
e5eec509d2 make terminal output a parameter to avoid output. 2015-03-05 10:40:20 +01:00
Robert Kloefkorn
06396b4b82 FullyImplicitBlackoilSolver: added tolerance for well convergence as parameter. 2015-03-05 10:40:15 +01:00
Atgeirr Flø Rasmussen
4be1671b4f Merge pull request #326 from dr-robertk/PR/tolerances-as-parameters 
Allow tolerances to be set in parameter files.
 2015-03-03 14:39:08 +01:00
Atgeirr Flø Rasmussen
fbf06c06e7 Remove extra overloads of bWat(), bOil() and bGas(). 
Remaining method is the one taking AD objects. This modification
required changes to a few more places than anticipated:
  - RateConverter
  - FullyImplicitBlackoilSolver::computeWellConnectionPressures()
In these places, the call now is a little more complex and there
might be a very minor performance loss, until we optimize the
bX() functions to check for the no-derivatives case.
 2015-03-03 14:33:19 +01:00
Robert Kloefkorn
96bda6a453 FullImplicitBlackOil and CPR: allow for dynamically changed tolerances from parameter 
file. Default is as before.
 2015-03-03 13:42:03 +01:00
Atgeirr Flø Rasmussen
1195ced57a Remove obsolete comment. 2015-03-03 13:19:42 +01:00
Atgeirr Flø Rasmussen
1d68f7e846 Remove extra overloads of muGas() and muWat(). 
This change has been made in both BlackoilPropsAdInterface
and BlackoilPropsAdFromDeck. Only remaining overloads are
those using AD objects and passing the PhasePresence for
each data point.
 2015-03-03 13:14:31 +01:00
Atgeirr Flø Rasmussen
965be0471f Remove non-AD overload of muWat(). 
The AD version is made a little smarter, detecting the
case of input with no derivatives. Existing use of the
non-AD rewritten.
 2015-03-03 12:56:30 +01:00
Bård Skaflestad
5a390f0d27 Merge pull request #323 from blattms/uggridhelpers-completion 
Moves functions that do not depend on Eigen to Opm::UgGridHelpers. [3/3]
 2015-03-02 18:50:06 +01:00
Markus Blatt
5e66f2844b Moves include of iterterator facades to cornerpoint 2015-03-02 16:22:22 +01:00
Bård Skaflestad
e1805f3224 Merge pull request #322 from blattms/bugfix-blackoilsate 
[bugfix] read only from the sendState in BlackoilStateDataHandle.
 2015-03-02 11:30:11 +01:00
Markus Blatt
aaf82d2a65 [bugfix] read only from the sendState in BlackoilStateDataHandle. 
During BlackoilStateDataHandle::gather we did read values from the
state where we should only receive values to. With this commit we
read from the state where we should send values.

Kudos to Bard for noticing this.
 2015-03-02 11:10:02 +01:00
Atgeirr Flø Rasmussen
e1c9eea997 Merge pull request #321 from atgeirr/remove-unused-variable 
Remove unused variable.
 2015-03-02 10:35:13 +01:00
Atgeirr Flø Rasmussen
94742bd560 Remove unused variable. 2015-03-02 10:33:44 +01:00
Atgeirr Flø Rasmussen
09f6e8aacb Merge pull request #319 from blattms/removes-uggridhelpers-cpgrid 
Moves Opm::UgGridHelpers from opm-autodiff to dune-cornerpoint
 2015-03-02 10:10:26 +01:00
Atgeirr Flø Rasmussen
80692675ba Merge pull request #315 from atgeirr/rename-simulator 
Rename "sim_fibo_ad" to "flow"
 2015-02-27 12:36:47 +01:00
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