OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,003 Commits 9 Branches 35 Tags 15 MiB
05b2adb28d
Commit Graph

5003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Liu Ming
ad7b064556 Merge pull request #1 from jorgekva/linsolver_petsc 
Improvements to FindPetsc.cmake module
 2014-09-22 09:48:29 +08: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
Jørgen Kvalsvik
48b54d321a Simplifcations in FindPetsc logic 
Removes a lot of the conditionals in the makefile. As reflected in the
comments, find_* won't run if the target variable is already set, and appending
empty list elements changes nothing. In order to make reading the file easier
these conditionals have mostly been removed.
 2014-09-19 12:32:50 +02:00
Jørgen Kvalsvik
60ca9698ba PETSC_ROOT now sets NO_DEFAULT_PATH 
Allows a specific PETSC_ROOT to override and replace default search paths. Now,
if PETSC_ROOT is passed and the find_library calls cannot find the libraries,
the makefile will only search in user provided directories.
 2014-09-19 11:40:20 +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
Jørgen Kvalsvik
95357155e4 FindPetsc uses system-provided MPI if available 
When building with USE_MPI=ON the FindPetsc now uses the system provided
MPI if available. Falls back to looking for the PETSc provided unimpi for
sequential builds.
 2014-09-17 13:33:41 +02:00
Kai Bao
0b69961d9e A little more comment about B and b. 2014-09-17 11:15:58 +02:00
Jørgen Kvalsvk
b595dd0abd FindPets searches default paths w/ general namings 
Removed the NO_DEFAULT_PATH flag as this really isn't working for most systems
(where PETSc will be installed from a repository and in /usr or /). Path suffix
parameters extended to accept more version-less configs too, to be compatible
with a default PETSc (debian style) install.
 2014-09-16 11:42:23 +00:00
Jørgen Kvalsvk
3204518bcc Removes broken conditional check. 
The FindPetsc module would check for a PETSC_ROOT and not attempt to look for
mpi and the petsc header if this was not set, which it in most cases won't be.
If the variable is set then the conditional include is redundant, as it will
search the explicitly passed paths first anyways.
 2014-09-16 11:42:23 +00:00
Jørgen Kvalsvk
18b6b4c566 Fixes status message when PETSc couldn't be found. 2014-09-16 11:42:17 +00: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
Tor Harald Sandve
e44b045260 Remove fix for GOC and WOC above/below reservoir 2014-09-02 14:49:09 +02:00
Atgeirr Flø Rasmussen
a8bce79f15 Merge pull request #645 from bska/fix-out-of-bounds-indexing 
effectiveExtent: Fix out-of-bounds indexing
 2014-09-01 13:39:40 +02:00
Bård Skaflestad
7f874c0d64 effectiveExtent: Fix out-of-bounds indexing 
Commit 96cf137 introduced support for Peaceman index calculation
that honoured general completion directions (X,Y,Z).  This was
accomplished through a permutation index that reordered the
permeability and geometric extent components according to a local
coordinate system along the completion.

In a complete breakdown of logic, however, the d-component extent
vector was indexed as though it were a d-by-d matrix.  This commit
restores sanity to the processing.

Pointy hat: @bska.
 2014-09-01 13:30:32 +02:00
Bård Skaflestad
3fbb201e52 Merge pull request #644 from atgeirr/fix-braces-warning 
Use double braces for std::array init to avoid warning.
 2014-09-01 10:27:27 +02:00
Atgeirr Flø Rasmussen
c55a887904 Use double braces for std::array init to avoid warning. 
Warning triggered at least using clang.
 2014-09-01 10:09:27 +02:00
Atgeirr Flø Rasmussen
18304eb54d Merge pull request #643 from bska/ctf-horizontal 
Introduce Support for Horizontal Completions and Net-To-Gross Ratios
 2014-09-01 10:04:56 +02:00