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

5724 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kai Bao
bc1fb8e477 WIP in adding class DynamicListEconLimited 
to handle the closed wells and connection dynamically based on the
economic limits provied by keyword WECON
 2016-06-30 14:41:14 +02:00
Atgeirr Flø Rasmussen
9c6eeae068 Merge pull request #1045 from qilicun/time-messages-to-PRT-file 
Change adaptive time stepping message type to OpmLog::note
 2016-06-30 09:19:49 +02:00
Liu Ming
50573d1168 output well iterations if it is a valid number. 2016-06-30 09:03:30 +08:00
Liu Ming
2c25bb8262 Add space. 2016-06-28 15:26:06 +08:00
Liu Ming
745666468f output well iterations and non-linear iterations. 2016-06-28 13:40:32 +08:00
Bård Skaflestad
c1b4ed8bc8 Merge pull request #1050 from blattms/make-wells_equal-work-for-null-wells 
Make wells_equal work for null wells.
 2016-06-27 15:18:09 +02:00
Markus Blatt
cd32e65632 Use NULL instead of 0 in null comparison. 2016-06-27 14:38:30 +02:00
Markus Blatt
7d97ef7e4a Make wells_equal work for only one null pointer. 2016-06-27 13:29:44 +02:00
Markus Blatt
f66f699fca Make wells_equal work for null wells. 
This is needed to run test cases without wells with debugging on.
Without this commit we get segmentation fault in an assert statement.
 2016-06-27 12:21:45 +02:00
Atgeirr Flø Rasmussen
2177aa745e Merge pull request #1027 from totto82/fix_2p_equil_init 
Fix two phase equil initialization
 2016-06-24 14:42:48 +02:00
Tor Harald Sandve
fd049a6962 Fixing some nitpicks 2016-06-24 13:36:05 +02:00
Atgeirr Flø Rasmussen
3d5689dc72 Merge pull request #1046 from pgdr/add-dimens-to-norne-deck-test 
Added DX/DY/DZ to norne_pvt.data
 2016-06-21 22:45:36 +02:00
Pål Grønås Drange
f1024bb210 Added DX/DY/DZ to norne_pvt.data 2016-06-21 16:10:32 +02:00
Liu Ming
afc9e4453a get current date time. 2016-06-21 11:25:05 +08:00
Liu Ming
49d5d4c79a mark time stepping messages type as OpmLog::note 2016-06-21 08:44:32 +08:00
Atgeirr Flø Rasmussen
bdebcf48a3 Merge pull request #1043 from pgdr/remove-return-type-warn 
Remove warnings (by throwing), added copyright header
 2016-06-20 22:34:40 +02:00
Pål Grønås Drange
06cd6c85f3 Using OPM_THROW to log messages, fixed Copyright headers 2016-06-20 17:20:33 +02:00
Atgeirr Flø Rasmussen
7ddf390bf8 Merge pull request #1044 from akva2/fix_jenkins_again 
fixed: broken array loop in jenkins script
 2016-06-20 15:00:25 +02:00
Joakim Hove
c686ec69d7 Merge pull request #1041 from jokva/removal-shared_ptr-well 
WellPtr and GroupPtr deprecated
 2016-06-20 14:57:10 +02:00
Arne Morten Kvarving
08e8297b47 fixed: broken array loop in jenkins script 
python, bash, c++, fortran. sometimes you get lost in the syntax jungle.
 2016-06-20 14:44:37 +02:00
Pål Grønås Drange
4323b2f4fa Remove [-Wreturn-type] warnings (added throw), added copyright header 2016-06-20 14:13:29 +02:00
Tor Harald Sandve
db03e88090 Fix bug for OIL-GAS case 
- Differentiate between active and canonical phase index
 2016-06-20 11:14:36 +02:00
Tor Harald Sandve
bd9c514457 Fix reference pressure for oil-water problem 
In opm-material the wetting phase is the reference phase for two-phase
problems i.e water for oil-water system, but for flow it is always oil.
Add oil capillary pressure value to shift the reference phase to oil
 2016-06-20 10:36:24 +02:00
Tor Harald Sandve
4db70d1902 Fix two phase EQUIL initialization 2016-06-20 10:36:24 +02:00
Atgeirr Flø Rasmussen
d9c33cbcb6 Merge pull request #1039 from atgeirr/fix-compile-maxabs-unsigned 
Avoid ambiguous calls to abs with unsigned integers.
 2016-06-17 08:02:20 +02:00
Atgeirr Flø Rasmussen
9b2acf96bf Merge pull request #1042 from andlaus/update_dune.module 
add opm-output as a dependency to dune.module
 2016-06-16 15:21:21 +02:00
Andreas Lauser
aee0020a98 add opm-output as a dependency to dune.module 
without it, building with dunecontrol fails...
 2016-06-16 14:09:02 +02:00
Atgeirr Flø Rasmussen
f3f6170881 Merge pull request #1038 from qilicun/equil-check 
Rise up a warning if equil region has no active cells.
 2016-06-16 10:02:49 +02:00
Jørgen Kvalsvik
6e2099d293 WellPtr and GroupPtr deprecated 
shared_ptr aliases are considered deprecated and has largely been
removed upstream (and replaced by raw pointers).
 2016-06-16 09:33:43 +02:00
Atgeirr Flø Rasmussen
89cb2680a1 Make specialization for all unsigned integer types. 2016-06-16 08:47:21 +02:00
Bård Skaflestad
8f4d65a0c2 Merge pull request #1037 from atgeirr/add-phasepresence-ops 
Add operator== and operator!= to PhasePresence.
 2016-06-15 19:56:11 +02:00
Bård Skaflestad
6fdfcefaa0 Merge pull request #1040 from atgeirr/fix-linsolverfactory-default-solver 
Set default solver depending on configuration.
 2016-06-15 17:34:41 +02:00
Atgeirr Flø Rasmussen
15e12c89bf Merge pull request #1034 from qilicun/minor-format-change 
Minor format changes
 2016-06-15 15:10:57 +02:00
Atgeirr Flø Rasmussen
8f2e2c91b1 Merge pull request #1029 from blattms/make-ownermask-accessible 
Make ParallelIstlInformation::ownerMask_ accessible.
 2016-06-15 15:08:58 +02:00
Atgeirr Flø Rasmussen
8b2ebc690b Address review comments. 2016-06-15 15:01:45 +02:00
Atgeirr Flø Rasmussen
e6da69575a Set default solver depending on configuration. 2016-06-15 14:32:00 +02:00
Atgeirr Flø Rasmussen
291b13c2d4 Avoid ambiguous calls to abs with unsigned integers. 2016-06-15 10:55:42 +02:00
Liu Ming
34805c1bf7 it should be the same number in EQLNUM. 2016-06-15 16:53:51 +08:00
Liu Ming
a824ef9c22 use correct region number. 2016-06-15 16:52:32 +08:00
Liu Ming
cb82608779 Rise up a warning if equil region has no active cells. 2016-06-15 15:40:38 +08:00
Atgeirr Flø Rasmussen
b5dc48af0e Make new ops const. 2016-06-15 09:20:19 +02:00
Atgeirr Flø Rasmussen
fcb99e425d Add operator== and operator!= to PhasePresence. 
This makes it simpler to write code debugging or inspecting changed phase configurations.
 2016-06-15 08:57:20 +02:00
Liu Ming
d87afa29ab fix indentation issue. 2016-06-15 11:26:06 +08:00
Liu Ming
881ed8fc49 unify output. 2016-06-15 11:24:20 +08:00
Atgeirr Flø Rasmussen
1b6048016b Merge pull request #1031 from akva2/opm_output_upstream 
update jenkins build scripts
 2016-06-13 13:37:00 +02:00
Bård Skaflestad
bbd6a5f03d Merge pull request #1035 from akva2/revert_umfpack 
Revert "Check for HAVE_UMFPACK in LinearSolverFactory"
 2016-06-13 12:37:58 +02:00
Arne Morten Kvarving
ba255d89d3 Revert "Check for HAVE_UMFPACK in LinearSolverFactory" 
This reverts commit f54c74db06.
 2016-06-13 10:43:21 +02:00
Atgeirr Flø Rasmussen
192bb54e70 Merge pull request #1017 from jokva/umfpack-correct-preprocessor-directive 
Check for HAVE_UMFPACK in LinearSolverFactory
 2016-06-13 08:43:30 +02:00
Liu Ming
413e3fe381 add "\n" at the end of the message. 2016-06-13 13:55:01 +08:00
Liu Ming
6ae9c3104f minor format changes 2016-06-13 13:49:58 +08:00