OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-29 04:23:48 -06:00
Code Issues Packages Projects Releases Wiki Activity
1,271 Commits 24 Branches 101 Tags 75 MiB
7fd9895a12
Commit Graph

1271 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert K
7fd9895a12 Merge remote-tracking branch 'upstream/master' into PR/EclipseWriter-revision-to-write-substeps 2015-01-12 12:35:22 +01:00
Atgeirr Flø Rasmussen
86e5677b8e Merge pull request #269 from totto82/rsrv_fix 
BUGFIX: Avoid inclusion of disgas in the vapoil contribution
 2015-01-12 10:08:13 +01:00
Tor Harald Sandve
088cac6801 BUGFIX: Avoid inclusion of disgas in the vapoil contribution 
A temporary copy is added to avoid inclusion of dissolved gas when the
vaporized oil contribution is added in the accumulation term for the oil
phase.
 2015-01-12 07:19:18 +01:00
Robert K
6b4a63787d cleanup of unused code. 2015-01-09 16:27:37 +01:00
Robert K
f11d1758c1 also write initial data when using adaptive time stepping. 2015-01-09 16:26:48 +01:00
Robert K
a9edc45a49 Added flag for matlab output. default behavior is the same as before. 
Also, avoid possibly uninitialized variables.
 2015-01-09 16:26:30 +01:00
Robert K
e7e63e1989 make writing of substeps work 2015-01-09 16:26:30 +01:00
Atgeirr Flø Rasmussen
7a3008db72 Merge pull request #265 from totto82/fix_stoppedwells2 
Account for the renaming in the wellsManager
 2015-01-09 13:16:37 +01:00
Atgeirr Flø Rasmussen
20599ab698 Merge pull request #263 from totto82/phase_pressure 
Use phase pressures for the fluid properties
 2015-01-09 10:35:34 +01:00
Tor Harald Sandve
eefac9584e Add on overload of computePressure() that accepts explicit saturations 
The overload is used direcly in variableState() to clean the code as
well as in the orignal computePressures(state) implementation.
 2015-01-07 12:46:12 +01:00
Tor Harald Sandve
23f1f443fc Fix the fall out in case of missing gas phase 2015-01-07 08:34:08 +01:00
Tor Harald Sandve
5572a14c20 Account for the renaming in the wellsManager 
Shut is renamed to stopped in the wellsManager in order to better
reflect the name logic in the deck. This PR implements the nessesary
change in opm-autodiff
 2014-12-19 07:18:36 +01:00
Atgeirr Flø Rasmussen
29df1cab88 Merge pull request #262 from bska/fix-make-install 
Fix "make install" in opm-autodiff
 2014-12-18 11:20:49 +01:00
Tor Harald Sandve
0a0a3b2ba6 Use phase pressures for the fluid properties 
There has been an inconsitancy in which pressure to use in the
evaluation of the fluid properties.
With this commit the phase pressure is used for all the evaluation of
the fluid properties.
 2014-12-18 08:51:08 +01:00
Bård Skaflestad
b9b2b9f520 Really catch up to file renaming. 
Pointy hat: @bska
 2014-12-17 11:39:51 +01:00
Bård Skaflestad
c04351d4ac Merge pull request #261 from atgeirr/master 
Fix call to DerivedGeology constructor.
 2014-12-17 11:37:15 +01:00
Bård Skaflestad
6c7bdecd30 Catch up to file renaming 
This fixes "make install" which would otherwise fail with a diagnostic
message of the form

   CMake Error at cmake_install.cmake:64 (FILE):
     file INSTALL cannot find
     opm/autodiff/ConservativeSparseSparseProduct.h

Thanks to HudsonBuildServer for highlighting the issue.
 2014-12-17 11:34:08 +01:00
Atgeirr Flø Rasmussen
e52af158fc Fix call to DerivedGeology constructor. 
New argument to constructor was not provided, still compiled
due to default argument.
 2014-12-17 11:32:20 +01:00
Bård Skaflestad
5ce5658892 Merge pull request #260 from atgeirr/add-generic-local-trans 
Add a generic (throwing) tpfa_loc_trans_compute_().
 2014-12-17 10:50:17 +01:00
Atgeirr Flø Rasmussen
e1af08c5d2 Add a generic (throwing) tpfa_loc_trans_compute_(). 
Without this, we may have link errors with CpGrid, since only
an UnstructuredGrid specialization was provided.
 2014-12-17 10:47:16 +01:00
Atgeirr Flø Rasmussen
012485e139 Merge pull request #259 from OPM/revert-241-write_transmissibilities 
Revert "register the transmissibilities at the EcliseWriter"
 2014-12-17 10:18:35 +01:00
Atgeirr Flø Rasmussen
5ae5525209 Revert "register the transmissibilities at the EcliseWriter" 2014-12-17 10:18:23 +01:00
Atgeirr Flø Rasmussen
1348658507 Merge pull request #249 from totto82/locTrans 
Compute half transmissibilities based on local coordinate system
 2014-12-17 00:20:11 +01:00
Atgeirr Flø Rasmussen
f8ad85d83e Merge pull request #241 from andlaus/write_transmissibilities 
register the transmissibilities at the EcliseWriter
 2014-12-16 23:35:26 +01:00
Atgeirr Flø Rasmussen
28af900f0b Merge pull request #250 from dr-robertk/PR/performance-avoid-zero-matrix-entries 
Further performance improvement by avoiding zeros in matrix-matrix product.
 2014-12-16 14:12:14 +01:00
Joakim Hove
f1e64a3b9b Merge pull request #257 from joakim-hove/move-log 
Renamed ParserLog -> OpmLog
 2014-12-16 13:23:17 +01:00
Joakim Hove
78ba6760da ERT-747: Renamed ParserLog -> Logger 2014-12-15 12:23:09 +01:00
Joakim Hove
d948777ea0 Merge pull request #255 from andlaus/remove_strict_parsing 
adapt to the removal of the "strict parsing" concept
 2014-12-11 13:20:08 +01:00
Bård Skaflestad
9a599d0e24 Merge pull request #256 from totto82/addregionTrans 
Add contribution from region multipliers
 2014-12-10 17:02:08 +01:00
Tor Harald Sandve
25a4bb5fbe Add contribution from region multipliers 
The multiplier contribution from the getRegionMultiplier is added to the
face multipliers. The getRegionMultiplier method is called with the cell
index on both side of the face in order to return the correct region
multiplier across faults.
 2014-12-10 11:46:49 +01:00
Tor Harald Sandve
6ae7f460ff Implement code style comments 2014-12-10 07:34:56 +01:00
Tor Harald Sandve
02724b7f7a Implement comments for PR#249 
1) Add the possibility for the user to chose between local and global
coordinate permeability in the transmissibility calculations.
2) Trow for CpGrid
3) Add default for switch
 2014-12-10 07:29:05 +01:00
Tor Harald Sandve
b11534b137 Compute half transmissibilities based on local coordinate system 
hTrans(cellFaceIdx) = K(cellNo,j) * sum( C(:,i) .* N(:,j), 2) /
sum(C.*C, 2),
Only for diagonal tensors, off-diagonal permeability values are ignored
without warning
 2014-12-10 07:29:05 +01:00
Andreas Lauser
69c4a6d591 adapt to the removal of the "strict parsing" concept 2014-12-09 14:18:42 +01:00
Atgeirr Flø Rasmussen
c051c7bd85 Merge pull request #254 from bska/cmake_254 
Synchronise build system with OPM core
 2014-12-08 15:31:31 +01:00
Arne Morten Kvarving
a9deb4b367 fix opm-parser find rule 
deals with the fallout of opm-parser #365 and #366
 2014-12-08 15:26:48 +01:00
Arne Morten Kvarving
5dca993b69 add check-commits target 2014-12-08 15:26:18 +01:00
Andreas Lauser
6e52a7bc3b 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-12-08 15:24:49 +01:00
Andreas Lauser
c3304ed1a1 FindQuadmath: add -fext-numeric-literals if the compiler supports it 
this is required for GCC >= 4.8 to support the 'Q' suffix for floating
point literals (which are used in the quadmath.h header)

In order to prevent compilers which eat the flag but do not support it
from complaining constantly, it is tested for with "-Werror" enabled...
 2014-12-08 15:24:48 +01:00
Andreas Lauser
57879ab6c9 make the regex test more thorough 
it seems like the std::regex delivered up to gcc 4.8 has problems with
constructs such as ".+". (at least if they appear at the end of a
regex...)
 2014-12-08 15:24:47 +01:00
Andreas Lauser
926685cc2c ERT: link to the threads library of the OS 
this is required to make the opm-core build succeed if ERT was build
with -DBUILD_SHARED_LIBS=OFF . (without it, I get errors like

    /home/and/src/ert/devel/libert_util/src/thread_pool_posix.c:328: error: undefined reference to 'pthread_create'
 2014-12-08 15:24:46 +01:00
Andreas Lauser
cd8e4ad6a3 ewoms: make it possible to use the dune-alugrid module instead of the ALUGrid manager in dune-grid 2014-12-08 15:24:45 +01:00
Andreas Lauser
37ab6ef8a0 add support for the new DUNE-ALUGrid module 
this is basically the dune-grid grid manager for ALUGrid properly
out-sourced into an own module. (it does not require an external
library anymore, so it simplifies the build quite a bit.) Also, the
DUNE-ALUGrid module has quite a few new features and performance
improvements compared to the old code from dune-grid. For details, see

http://users.dune-project.org/projects/dune-alugrid
 2014-12-08 15:24:44 +01:00
Andreas Lauser
444e2be623 Build system: mark ERT as REQUIRED 
de facto, this does not change anything because opm-parser is required
and it has a hard dependency on ERT. It is good style to declare all
prerequisites explicitly in each module, though. Thanks to [at]bska
for the catch.
 2014-12-08 15:24:43 +01:00
Arne Morten Kvarving
a4fcc0a99f fixed: ERT depends on libdl 
this issue was triggered with static libs for ERT
 2014-12-08 15:24:38 +01:00
Andreas Lauser
05a607c7c9 use extended regular expressions in the test for std::regex 
for some compilers (e.g., GCC < 4.9) the default is buggy and
opm-parser thus uses extended expressions...

thanks to [at]bska for digging this up!
 2014-12-08 15:23:51 +01:00
Andreas Lauser
4a7dea3747 FindCXX11Features: check for a usable std::regex 
and add a config.h variable in the opm-parser test.
 2014-12-08 15:23:28 +01:00
Andreas Lauser
8119580a8d Find-ewoms.cmake: update prerequisites 2014-12-08 15:23:07 +01:00
Andreas Lauser
dff4e8f51c add the boost::regex library as a prerequisite 
this is required for regex-matching keywords. Once GCC 4.9 is the
minimum compiler version to be supported, this can be dropped in favor
of std::regex ...
 2014-12-08 15:23:06 +01:00
Andreas Lauser
526af686d8 Findopm-parser.cmake: Fix it up, next try 
thanks to Arne Morten Kvarving, Bård Skaflestad and Roland Kaufmann
for the discussion.
 2014-12-08 15:22:56 +01:00