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

5786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Liu Ming
a44ab90759 Cleanup the prefix. 2016-05-20 08:54:12 +08:00
Atgeirr Flø Rasmussen
2a43e9631f Merge pull request #1011 from qilicun/format-output-relperm-diagnostics 
Unify output messages format.
 2016-05-19 15:06:52 +02:00
Liu Ming
b3db61bf7e remove the prefix from raw string, using OpmLog format. 2016-05-19 10:07:36 +08:00
Liu Ming
b5e78ab1ec use StreamLog to output messages. 2016-05-19 09:48:12 +08:00
Liu Ming
3028e819c6 remove internal counter. 2016-05-19 09:47:57 +08:00
Liu Ming
b25a964597 remove internal messages container. 2016-05-19 09:28:34 +08:00
Liu Ming
98a413bf5c use tag for terminal output control. 2016-05-19 09:22:03 +08:00
Atgeirr Flø Rasmussen
747ec8fa8c Merge pull request #1015 from totto82/hydrocarbonState 
Add member hydroCarbonState to the BlackoilState
 2016-05-18 14:16:53 +02:00
Liu Ming
d660dea73b add missing braces. 2016-05-16 09:04:54 +08:00
Tor Harald Sandve
79f04b6c9e Fixing PR comments 
- Use std::vector<HydroCarbonState> instead of std::vector<int>
- Use the initializer list to initialize members in constructors
- Fix indent
- Return OilOnly for cases without gas to avoid potential trouble
further down the line
 2016-05-13 12:49:45 +02:00
Tor Harald Sandve
cb4b698b51 Add method for calculating the initial hydroCarbonState 
The following hydroCarbonState are used
    enum HydroCarbonState {
        GasOnly = 0,
        GasAndOil = 1,
        OilOnly = 2
    };
Cells almost filled with water are treated as a GasAndOil state
 2016-05-13 09:10:13 +02:00
Tor Harald Sandve
31133af803 Add member hydroCarbonState to the BlackoilState 
The hydroCarbonState is used to store the hydroCarbonState
  State 1: Gas only
  State 2: Gas and Oil
  State 3: Oil only
An empty vector is return at initialization as
no default values are provided by the blackoilstate.
 2016-05-12 10:32:39 +02:00
Liu Ming
dd510244f8 unify the format. 2016-05-10 14:52:13 +08:00
Liu Ming
da70ab4e84 use OpmLog only for error messages. 2016-05-10 14:13:33 +08:00
Atgeirr Flø Rasmussen
8b43643e25 Merge pull request #1009 from blattms/prevent-dereferencing-past-the-end 
Prevent dereferencing the end iterator.
 2016-05-09 09:40:53 +02:00
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
babrodtk
3fd6a47e1c Fixed bug where phase_pos was used instead of phase_used 2016-04-20 09:48:15 +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