OilfieldToolsNet/opm-core
4
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,695 Commits 9 Branches 35 Tags
08d6cbcafaa58fbe143bc1a227fcf695e6046285
Commit Graph
4695 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove 08d6cbcafa Added test for SHUT well 2014-10-07 12:12:15 +02:00
Joakim Hove 6a16b0f1e5 Removed 'dead' data at the end of test data. 2014-10-07 12:11:17 +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
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
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
Andreas Lauser 5dd00f93c3 use the same units for pressure output as for pressure input from the deck 
before, the output was always metric, regardless of whether the deck
used metric or field units...
 2014-09-09 18:58:34 +02:00
Joakim Hove 5541f1553a Merge pull request #650 from andlaus/rename_getCF 
rename getCF() to getCompletionFactor()
 2014-09-07 07:21:32 +02:00
Andreas Lauser 9a44720e32 rename getCF() to getConnectionTransmissibilityFactor() 2014-09-06 22:28:21 +02:00
Atgeirr Flø Rasmussen 2b83e3bbe2 Merge pull request #649 from andlaus/change_threephase_model_default 
change the default of the "threephase_model" parameter from "simple" to ...
 2014-09-03 14:56:10 +02:00
Andreas Lauser da25fb699d change the defaults for pvt_tab_size and sat_tab_size to -1 
this causes the code to use linear instead of spline
interpolation. thanks to @atgeirr for pointing this out..
 2014-09-03 14:42:43 +02:00
Andreas Lauser 8a8c71bc63 change the default of the "threephase_model" parameter from "simple" to "gwseg" 
Using "simple", the Norne deck aborts with an exception.

Note: SPE1 and SPE9 still seem to work fine with this but there might
be small differences so that the reference solutions of the Jenkins
server might need to be updated...
 2014-09-03 13:37:52 +02:00
Atgeirr Flø Rasmussen dfb7483e1e Merge pull request #648 from bska/fix-peaceman 
effectiveRadius: Fix Numerator Formula
 2014-09-02 15:46:36 +02:00
Atgeirr Flø Rasmussen 6c0f90b8cc Merge pull request #647 from totto82/fix_init 
Fix initialization
 2014-09-02 15:42:24 +02:00
Bård Skaflestad 9591aec757 effectiveRadius: Fix numerator formula 
We must take the square root of the permeability ratios, not use them
as is.  This was lost in the refactorisation commit 96cf137.

Pointy hat: @bska.
 2014-09-02 15:12:50 +02:00
Tor Harald Sandve a7ecde25ce Include goc and woc in the span for the phase pressure calculation 2014-09-02 14:49:09 +02:00