OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-11-25 18:50:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
952 Commits 24 Branches 101 Tags 97 MiB
8a600747fa
Commit Graph

952 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
65350426f7 Finishing the first version of the getConvergence. 2014-05-06 17:09:00 +02:00
Kai Bao
7bb7e5fbb4 Finish the first version of getConvergence. 
The determination of disgas and vapoil is omitted and should be added
later.
 2014-05-06 15:47:08 +02:00
Kai Bao
cfc589b453 Add some outputing information 2014-05-05 17:54:32 +02:00
Bård Skaflestad
0ae44c32b1 Merge pull request #127 from andlaus/move_to_opm-parser 
Move to opm parser
 2014-05-02 17:01:27 +02:00
Andreas Lauser
ebb1da0662 replace all boost:: smart pointers by their std:: equivalents 
The std variants are part of c++-2011 and it's 2014 now. (they are
also available in GCC 4.4.)
 2014-05-02 16:17:54 +02:00
Andreas Lauser
b7f3ee7b79 rename "newParserDeck" to "deck" 2014-05-02 15:48:04 +02:00
Andreas Lauser
dbb19403fc completely remove the EclipseGridParser from the module 2014-05-02 15:47:52 +02:00
Andreas Lauser
553698a933 remove tests/integration_tests/sim_fibo_ad_test.cpp 
this test seems to compare the old and the new parser which does not
make sense anymore once the old parser is no longer available...
 2014-05-02 13:59:25 +02:00
Kai Bao
fecc161d7e The output for the first Newton iteration 
output the matrix, residual and the solution for the first Newton
iteration in opm/autodiff/NewtonIterationBlackoilSimple.cpp
 2014-05-02 10:49:44 +02:00
Andreas Lauser
83705279bb add the TABDIMS keyword to the data file for the fluid unit test 
that's necessary because the Eclipse RM references it in the table
keywords and the opm-parser needs the keyword to be present to use
it...
 2014-04-30 16:49:29 +02:00
Kai Bao
5c6503848e Merge remote-tracking branch 'upstream/master' 2014-04-28 15:50:34 +02:00
Bård Skaflestad
cd24e53d85 Merge pull request #128 from atgeirr/spe9-fixes 
Spe9 fixes
 2014-04-28 14:47:06 +02:00
Kai Bao
820e65e772 Merge remote-tracking branch 'atgeirr/spe9-fixes' 2014-04-28 14:09:06 +02:00
Atgeirr Flø Rasmussen
17400cebaf Fix bug in use of capillary pressure. 
Pcow must be subtracted, not added to oil pressure to obtain water pressure.
 2014-04-28 13:19:18 +02:00
Bård Skaflestad
bc279fa58f Merge pull request #125 from joakim-hove/use-parser-EclipseGrid 
Using the Parser::EclipseGrid to create GridManager
 2014-04-24 22:23:44 +02:00
Atgeirr Flø Rasmussen
4b4bb07d71 Changed the well control equations for dead wells. 
This is now done in the same way as in MRST.
Also added a minor debugging macro, and (commented out) uses of it.
 2014-04-24 18:50:49 +02:00
Bård Skaflestad
15a585106b Merge pull request #124 from atgeirr/well-variable-updating 
Changed well variable updating
 2014-04-24 13:32:43 +02:00
Joakim Hove
a6ec0bb59c Using the Parser::EclipseGrid to create GridManager 2014-04-24 11:47:01 +02:00
Bård Skaflestad
07cbf55668 Merge pull request #122 from atgeirr/suppress-warnings 
Suppress external and other warnings
 2014-04-23 13:31:13 +02:00
Atgeirr Flø Rasmussen
939489a534 Use v.data() instead of &v[0]. 2014-04-23 13:05:51 +02:00
Atgeirr Flø Rasmussen
ca8115c532 Add missing #include. 
While version.hh is included transitively via other dune includes,
this may change. So for future-proofing we include it here.
 2014-04-23 12:26:07 +02:00
Atgeirr Flø Rasmussen
57a5b4bc02 Use #if guards to handle different dune versions. 2014-04-23 11:12:55 +02:00
Atgeirr Flø Rasmussen
d7ba3b0fbc Merge branch 'master' into suppress-warnings 
Conflicts:
	cmake/Modules/UseWarnings.cmake
 2014-04-22 14:50:15 +02:00
Atgeirr Flø Rasmussen
05ecdf5df6 Merge pull request #123 from bska/sync-build 
Synchronise build system with OPM-Core
 2014-04-22 14:17:56 +02:00
Atgeirr Flø Rasmussen
9e5d98dddd Make updateWellControls() update well variables, too. 
Formerly only the control was changed. Now both well state and primary variables
will be modified to match control targets that were switched to (bhp or rates).
 2014-04-22 13:52:42 +02:00
Andreas Lauser
d9920e34eb make the "-Wl,--as-needed" flag optional 
as there is not much harm done if it is not used but it may cause the
build to fail if it is present (read: it causes _my_ build to fail),
it defaults to OFF.
 2014-04-22 13:35:26 +02:00
Andreas Lauser
4fd75a4433 do not add the "-Wl,--as-needed" linker flag in FindSuiteSparse.cmake 
because if umfpack is fully linked but some other library is
underlinked, it causes the build to fail. This flag is better dealt
with in the "UseOnlyNeeded.cmake" module...
 2014-04-22 13:35:25 +02:00
Atgeirr Flø Rasmussen
d3ec9f63ff Fix option name to match name in use in conditional. 
Also add a useful doc string.
 2014-04-22 13:35:24 +02:00
Andreas Lauser
73db2c388c add support for the UG grid library 
recently UG has become free software (yay!), so we can now support it
with a good conscience. The CMake module is based on the "UseUG.cmake"
module of dune-grid but it is quite a bit simpler and actually
works. (I cannot see how UseUG.cmake can work without ever including
the ug-config*.cmake files...)

the UG source code is available here:

https://github.com/ugfem/ug
 2014-04-22 13:35:23 +02:00
Atgeirr Flø Rasmussen
5b79c0247f Change option name and generated header names. 2014-04-22 13:34:59 +02:00
Atgeirr Flø Rasmussen
682d8c394e Added more warnings to suppression list, sorted list. 2014-04-22 13:33:35 +02:00
Arne Morten Kvarving
cd95b9da9d add option to quell dune(-istl) warnings 2014-04-22 13:32:29 +02:00
Bård Skaflestad
81394512b4 Search for MPI support 
The build system depends on knowing if MPI is available.  Explicitly
search for MPI to honour that requirement.  Don't rely on ISTL's
transitive searching for the same.
 2014-04-22 13:31:08 +02:00
Markus Blatt
33a2d23a02 Export HAVE_DUNE_ISTL for other modules. 
This is e.g. needed in the parallel version of autodiff to
test whether ISTL is there.
 2014-04-22 13:31:07 +02:00
Kai Bao
3bdfbfd78c Merge remote-tracking branch 'upstream/master' 2014-04-22 09:27:50 +02:00
Bård Skaflestad
814e6fe414 Merge pull request #118 from atgeirr/cpr-preconditioning-again 
Cpr preconditioning again
 2014-04-15 21:47:05 +02:00
Atgeirr Flø Rasmussen
e9d6a0e8e0 Fix bugs relating to misused face_cells variable. 2014-04-15 20:49:47 +02:00
Atgeirr Flø Rasmussen
e4a6ab1c86 Use non-deprecated leafGridView() method. 2014-04-15 20:49:17 +02:00
Atgeirr Flø Rasmussen
b0b206e9b8 Remove unused variable. 2014-04-15 20:48:50 +02:00
Atgeirr Flø Rasmussen
7a1d221da3 The reference phase is always the oil phase. Removed explicit warning. 2014-04-15 20:48:15 +02:00
Atgeirr Flø Rasmussen
de695f3cd5 Avoid warning by not storing MPIHelper instance reference. 2014-04-15 20:47:37 +02:00
Atgeirr Flø Rasmussen
1e75efd097 Add generation and use of warning-suppressing headers. 2014-04-15 20:46:45 +02:00
Atgeirr Flø Rasmussen
5acb27f506 Update CpGrid version to use new classes. 2014-04-15 12:11:13 +02:00
Atgeirr Flø Rasmussen
dc622c6a7a Add forgotten #include <config.h>. 2014-04-15 12:10:43 +02:00
Atgeirr Flø Rasmussen
9ae24f9380 Merge branch 'master' into cpr-preconditioning-again 
Conflicts:
	CMakeLists_files.cmake
	examples/test_implicit_ad.cpp
 2014-04-15 11:48:36 +02:00
Bård Skaflestad
03218f5470 Merge pull request #100 from blattms/master-refactor-for-cpgrid-support 
Adds fully implicite black oil solver working with CpGrid
 2014-04-15 00:03:16 +02:00
Markus Blatt
91a4d59fcc Merge pull request #2 from bska/master-refactor-for-cpgrid-support 
Fix build in !HAVE_DUNE_CORNERPOINT case
 2014-04-14 11:10:01 +02:00
Bård Skaflestad
3ca4a32163 Merge pull request #121 from andlaus/pvdco_to_pvcdo 
fix typo: it's PVCDO, not PVDCO
 2014-04-11 17:41:34 +02:00
Andreas Lauser
e92cac6d0c fix typo: it's PVCDO, not PVDCO 2014-04-11 11:54:56 +02:00
Bård Skaflestad
1cbffa09de Fix memory leak 
Function GridManager::createGrdecl() generally allocates memory
(using std::malloc()) for the MAPAXES keyword data output of the
'grdecl' structure.  Release those resources before leaving the
scope to prevent memory leak introduced in commit fdca540.
 2014-04-10 12:25:28 +02:00