OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,755 Commits 9 Branches 35 Tags 15 MiB
75749c3dab
Commit Graph

4755 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert K
3f8d379c7f added new files. 2014-10-06 14:25:44 +02:00
Robert K
f6b1ac3556 Merge remote-tracking branch 'upstream/master' into timestepcontrol 2014-10-06 14:06:35 +02:00
Robert K
5af49ed90b the adaptive time stepping utility classes. 2014-10-06 14:06:07 +02:00
Andreas Lauser
a910f9f632 Merge pull request #659 from OPM/fix_cmake_3_0_warnings 
set CMake policies CMP0026 and CMP0048 to OLD
 2014-10-06 09:19:31 +02:00
Robert K
879dddc9b6 move protected area to the bottom and remove unused lines as well as halfTimeStep method. 2014-10-03 15:53:18 +02:00
Robert K
e1d1063e0d remove white spaces. 2014-10-03 14:14:01 +02:00
Robert K
0ed28121a1 reset to old state. 2014-10-03 14:10:56 +02:00
Robert K
e69c37167c renamed and split advance method. 2014-10-03 13:44:05 +02:00
Robert K
c371d4fa22 class for handling adaptive time steps. 2014-10-03 13:33:13 +02:00
Robert K
f6c9bc9090 improvement of the time step adjustment. 2014-10-02 14:04:32 +02:00
Andreas Lauser
7d8cb7f24f set CMake policies CMP0026 and CMP0048 to OLD 
this is required for CMake 3.0 to stop it complaining that we access
the LOCATION target property and set the *_VERSION_* variables ourselves.
 2014-10-01 14:26:22 +02:00
Robert K
92d5f43d82 sub step simulator timer. 2014-10-01 13:56:27 +02:00
Robert K
9517359d3f reset master. 2014-10-01 13:55:42 +02:00
Robert K
d42d0a6cbe SubStepSimulationTimer for time step control. Needs documentation and cleanup. 2014-09-30 15:55:26 +02:00
Atgeirr Flø Rasmussen
c3551dfdad Merge pull request #657 from GitPaean/PVT_viscosity_try 
Obtaining viscosity by doing a linear interpolation of the inverse of B*mu instead of mu directly.
 2014-09-23 22:44:37 +02:00
Kai Bao
ee265f5cb5 Changing the tolerance for blackoilfluid tests. 
Using the original strict relative tolerance for other properties than viscosity.
 2014-09-23 14:38:32 +02:00
Kai Bao
ef3e524c30 Changing nColumns to nRows. 2014-09-23 13:17:47 +02:00
Atgeirr Flø Rasmussen
c0627c2305 Merge pull request #654 from andlaus/fix_rate_conversion 
Fix rate conversion
 2014-09-22 14:36:52 +02:00
Kai Bao
175da5450f Changing the location of * in long formula. 2014-09-22 14:29:18 +02:00
Kai Bao
6a43935ea3 Deleting some commented lines. 2014-09-22 14:26:00 +02:00
Kai Bao
09404202da Changing the naming in PvtDead. 
To be consistent with the naming int PvtLive.
 2014-09-22 14:21:33 +02:00
Andreas Lauser
7ce561095c EclipseWriter: don't convert the unit inside the rate() function 
because if that is done, the integration for the production total is
wrong because the time step length is days and not seconds.

Note that the conversion now uses Opm::unit::convert::to(<>,
1/conversionFactor) instead of simply multiplying with the conversion
factor. I still think this obfuscates things more than it helps, but
[at] bska will hopefully want it this way...
 2014-09-22 14:16:41 +02:00
Andreas Lauser
6659070eac EclipseWriter: clarify a comment 2014-09-22 14:15:57 +02:00
Andreas Lauser
871f4694e3 Merge pull request #656 from atgeirr/cleanup-legacy-units 
Remove old legacy unit constants.
 2014-09-22 13:42:38 +02:00
Atgeirr Flø Rasmussen
383bd4d91e Remove old legacy unit constants. 
They should have been removed a long time ago, but were overlooked.
 2014-09-22 13:28:17 +02:00
Kai Bao
ad54f1aa62 Fixing test_wetgas in test_blackoilfluid. 2014-09-22 13:19:35 +02:00
Kai Bao
5d3017e6c6 Merge remote-tracking branch 'upstream/master' into PVT_viscosity_try 2014-09-22 13:01:13 +02:00
Kai Bao
be26c0af18 Fixing the blackoilfluid test. 2014-09-22 12:29:40 +02:00
Kai Bao
ee73105c95 Using resize to allocate memory for 1/BMu. 2014-09-22 10:28:23 +02:00
Atgeirr Flø Rasmussen
0bb2fdeee4 Merge pull request #655 from atgeirr/disable-thirdparty-warnings 
Refactor disabling of third-party warnings
 2014-09-22 08:46:56 +02:00
Atgeirr Flø Rasmussen
9afe054c25 Remove include guards from warning suppression headers. 
They are intended to temporarily change compiler state, and may be
included multiple times in a single compilation unit.
 2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen
170f8171d6 Remove header generation, add define for warning suppression. 
Thanks to @akva2 for original patch.
 2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen
a47e6775bd Honor SILENCE_EXTERNAL_WARNINGS in suppression headers. 2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen
c838f34dc6 Add new headers. 2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen
1dd215834b Refactor third-party warning suppression. 
Use header files from opm/core/utility/platform_dependent instead of
build-system generated ones for suppressing warnings from dune or Eigen.
 2014-09-20 10:36:10 +02:00
Atgeirr Flø Rasmussen
763c9de6ef Add disabling and reenabling header files. 
The files check for compiler versions to avoid using incompatible
pragmas. Only enabled for gcc >= 4.6 and clang.
 2014-09-20 10:36:10 +02:00
Joakim Hove
cb3b1c18fe Merge pull request #652 from andlaus/table_improvements 
adapt the the table related API changes of opm-parser
 2014-09-19 15:27:29 +02:00
Andreas Lauser
88df84157d blackoil fluids test: add section markers to make EclipseState happy 
this is necessary because tables now must be queried using
EclipseState instead of directly. This implies that EclipseState can
be instantiated in the first place...

TODO (?): allow EclipseState instatiation for decks without a grid.
 2014-09-19 15:27:12 +02:00
Andreas Lauser
c7dfd096aa SatFuncBase.hpp: convert DOS line endings to unix ones 
i.e. \r\n -> \n
 2014-09-19 14:40:52 +02:00
Andreas Lauser
bd0bfc172b adapt the the table related API changes of opm-parser 2014-09-19 14:40:35 +02:00
Kai Bao
2b18b8f27f Finshing changing Pvt_liveGas 
Remains to be verfied.
 2014-09-18 15:28:38 +02:00
Kai Bao
eadbffa99b Changing the PvtLiveOil to use 1/BV for viscosity. 
Pssing the simple 2D test.
 2014-09-18 12:46:45 +02:00
Atgeirr Flø Rasmussen
81101fe292 Merge pull request #653 from atgeirr/fix-warnings 
Avoid release mode warnings.
 2014-09-18 12:43:02 +02:00
Atgeirr Flø Rasmussen
6d1cfc0fb2 Avoid release mode warnings. 
Variables only used in asserts have been removed, their content used
directly in the assert() instead.
 2014-09-18 11:31:03 +02:00
Kai Bao
0b69961d9e A little more comment about B and b. 2014-09-17 11:15:58 +02:00
Kai Bao
d393d147a4 Updating the calculation of mu and dmudp for PvtDead. 2014-09-14 17:33:43 +02:00
Kai Bao
d9acd0f3b8 Rewriting the d_mu_d_p for deadGas. 2014-09-14 16:24:37 +02:00
Kai Bao
d9eb3ea30f Chaning using the new interpolation for viscosity 2014-09-12 13:39:16 +02:00
Bård Skaflestad
e056289200 Merge pull request #651 from andlaus/EclipseWriter_use_deck_pressure_units 
use the same units for pressure output as for pressure input from the deck
 2014-09-10 13:30:09 +02:00
Andreas Lauser
38eed1875a EclipseWriter: replace /= by unit::convert::to() 
as insisted on by [at] bska
 2014-09-10 11:41:26 +02:00