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

5670 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liu Ming
9f90e6cc3f output timer messages for terminal and log file. 2016-05-09 13:31:04 +08:00
Liu Ming
684614fe77 use ostream not std::cout directly. 2016-05-09 13:30:28 +08:00
Markus Blatt
e7a0b60b1c Prevent dereferencing the end iterator. 
This happened for empty regions and surfaced when compiling
with "-D_GLIBCXX_DEBUG  -DDEBUG -DGLIBCXX_FORCE_NEW".
 2016-05-06 21:40:33 +02:00
Atgeirr Flø Rasmussen
a5d858f396 Merge pull request #1005 from akva2/add_downstream_trigger_support 
added: downstream build support in the jenkins trigger
 2016-05-03 15:27:09 +02:00
Atgeirr Flø Rasmussen
022e594850 Merge pull request #1006 from atgeirr/bump-version 
dune.module: change version to 2016.10-pre
 2016-05-03 14:35:28 +02:00
Atgeirr Flø Rasmussen
b248655314 dune.module: change version to 2016.10-pre 2016-05-03 14:31:32 +02:00
Arne Morten Kvarving
94266d37fc added: downstream build support in the jenkins trigger 
use 'jenkins build this with downstreams please'.

this will build all downstreams against the PR, and
execute their tests. PR's for upstream and downstream modules
can be specified.

the aggregated test results are attached to the job result on jenkins.
 2016-04-29 22:52:09 +02:00
Atgeirr Flø Rasmussen
1fbc689f6c Merge pull request #1003 from babrodtk/two_phase_bugfixes 
Two phase bugfixes
 2016-04-28 15:42:59 +02:00
babrodtk
131e900cf3 Code cleanup 2016-04-26 07:48:58 +02:00
babrodtk
c8d5174113 Runs first iterations of two-phase test case plausibly 2016-04-26 07:48:58 +02:00
babrodtk
404929fe34 Checkpoint 2016-04-26 07:48:58 +02:00
Arne Morten Kvarving
6db874cbd7 fixed: debian packaging 
superlu package was renamed in xenial
 2016-04-22 15:28:21 +02:00
Joakim Hove
f9b7a5fe66 Merge pull request #1002 from pgdr/eclipsegrid-is-input 
Using getInputGrid API from Parser
 2016-04-20 15:50:13 +02:00
Pål Grønås Drange
973438128c Using getInputGrid API from Parser, changed GridManager to no longer accept Deck in constructor 2016-04-20 08:51:10 +02:00
Pål Grønås Drange
668cd14755 Fixed major indentation issue---whole file indented arbitrarily 2016-04-19 15:20:34 +02:00
Atgeirr Flø Rasmussen
b07f4dd494 Merge pull request #1000 from akva2/updates_for_16.04_packaging 
Updates for 16.04 packaging
 2016-04-18 11:13:13 +02:00
Arne Morten Kvarving
34ee734737 update debian packaging 
- README file was renamed
- build with MPI enabled and add related dependencies
 2016-04-18 11:02:56 +02:00
Arne Morten Kvarving
6d9ae3f050 update redhat packaging 
- README file was renamed
- use boost 1.48 only on rhel6. rhel7 supplies a newer boost by default.
 2016-04-18 11:02:29 +02:00
Andreas Lauser
30956131ec Merge pull request #999 from andlaus/nested_ad 
Fix build
 2016-04-18 11:01:27 +02:00
Andreas Lauser
145d61d751 adapt code w.r.t. the removal of the tags for Opm::Evaluation 2016-04-15 18:48:47 +02:00
Atgeirr Flø Rasmussen
b6e381d627 Merge pull request #998 from totto82/bugfix_wellgroup 
BUGFIX. Comparison with null pointer
 2016-04-15 13:16:23 +02:00
Tor Harald Sandve
e76b9dd7f1 BUGFIX. Comparison with null pointer 2016-04-15 12:56:04 +02:00
Atgeirr Flø Rasmussen
165b17564d Merge pull request #997 from totto82/Fix_guiderates 
Bugfix in setup guiderates
 2016-04-15 08:46:17 +02:00
Tor Harald Sandve
972c55ea52 Add COMPDAT to wells_group.data 
Without COMPDAT the wells will be shut and thus not added to the well
collection.
 2016-04-15 08:32:38 +02:00
Bård Skaflestad
b307259ce2 Merge pull request #995 from atgeirr/remove-sims 
Update CMake list with deleted files, and delete files moved to opm-simulators.
 2016-04-14 12:47:43 +02:00
Atgeirr Flø Rasmussen
78a927c859 Update CMake list with deleted files. 2016-04-14 11:29:17 +02:00
jokva
eacbd4f214 Merge pull request #994 from pgdr/use-eclipse3dproperties 
@bska We're merging as-is for now, and we've made a note to replace `shared_ptr` and maintain (and document!) this property. Those changes will obviously be internal and you won't notice a difference.
 2016-04-13 11:01:43 +02:00
Tor Harald Sandve
acade0bb5f Bugfix in setup guiderates 
- Handle shut wells
- Use the groups control type to determine which phase to calculate
the guide rates from. i.e for a ORAT controlled group, calculate the
guide rates from the oil phase well potentials etc.
 2016-04-12 13:05:56 +02:00
Pål Grønås Drange
284f3702a2 Using API get3DProperties() 2016-04-11 15:23:35 +02:00
Pål Grønås Drange
fee514375d Using API get3DProperties() 2016-04-11 15:13:38 +02:00
Pål Grønås Drange
1e0356d392 This commit introduces non-trivial changes as GridProperty no longer is stored as a shared pointer. This file needs a thorough read-through, and it would be nice with some documentation. 2016-04-08 16:41:41 +02:00
Pål Grønås Drange
9dbae15cc9 uses new api, made reference instead of copy 2016-04-08 16:31:59 +02:00
Pål Grønås Drange
8a7bf1ef3c Updated opm-core to use new EclipseState API in opm-parser 2016-04-08 16:30:01 +02:00
Atgeirr Flø Rasmussen
277b3a2e58 Merge pull request #993 from atgeirr/remove-unused-code 
Removed SimulatorOutput class from this module.
 2016-04-07 15:47:56 +02:00
Atgeirr Flø Rasmussen
90e9374a2b Renoved SimulatorOutput class from this module. 2016-04-07 15:41:40 +02:00
Atgeirr Flø Rasmussen
ccb34c14ec Merge pull request #992 from atgeirr/module-renaming 
Module renaming
 2016-04-06 15:37:44 +02:00
Arne Morten Kvarving
33bb10b98f fixed: use shallow clones on jenkins 2016-04-06 10:10:23 +02:00
Atgeirr Flø Rasmussen
b5cbf0ea2d Rename HAVE_DUNE_CORNERPOINT -> HAVE_OPM_GRID. 
Note that this is quite strange since opm-core is upstream and not downstream
from opm-grid. However, when this file is used from opm-autodiff the macro is used.
 2016-04-05 15:14:02 +02:00
Atgeirr Flø Rasmussen
2b9b1f8b05 Merge pull request #987 from qilicun/refactor-relpermDiagnostics 
Refactor relperm diagnostics using OpmLog functionalities.
 2016-04-04 15:04:44 +02:00
Arne Morten Kvarving
ccac8fe6ac Merge pull request #989 from akva2/jenkins_reboot 
Jenkins reboot
 2016-04-04 14:40:01 +02:00
Arne Morten Kvarving
7bc1ec7693 add jenkins build scripts 2016-04-04 14:36:24 +02:00
Atgeirr Flø Rasmussen
a20da3a6d2 Merge pull request #988 from totto82/gc_default 
Calculate default guide rates using the well potentials
 2016-04-04 14:12:48 +02:00
Tor Harald Sandve
e1298ff21b Minor fixes based on PR comments 
- fix comments, typos add missing reference arguments.
 2016-04-04 08:10:24 +02:00
Liu Ming
5e6e4b2a38 mistake: count warning as error. 2016-04-02 11:53:36 +08:00
Liu Ming
53485a7ae7 do not write error summary twice. 2016-04-02 11:45:18 +08:00
Tor Harald Sandve
0fb81945f6 Calculate default guide rates using the well potentials 
The default guide rates are caculated using the well potentials.
The well potentials are calculated in the simulator and given as input
to the wellsManager.
 2016-04-01 15:00:21 +02:00
Liu Ming
88d41057c0 refactor relperm diagnostics using OpmLog functions. 2016-04-01 12:27:03 +08:00
Atgeirr Flø Rasmussen
09c31b67ca Merge pull request #984 from totto82/bugfix_groupcontrol 
BUGFIX. Call setupGuideRates before groupcontrol is applied
 2016-03-31 13:28:08 +02:00
Atgeirr Flø Rasmussen
730f1e88b7 Merge pull request #977 from kjellkongsvik/Remove_OutputWriter 
Remove output writer
 2016-03-31 09:42:33 +02:00
Tor Harald Sandve
b8bad8b26b BUGFIX. Call setupGuideRates before groupcontrol is applied 2016-03-31 09:32:09 +02:00