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

5663 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Atgeirr Flø Rasmussen
bb2a582aa8 Merge pull request #1028 from qilicun/format-message 
Format message
 2016-06-08 10:57:31 +02:00
Liu Ming
1db1b3d178 Output file name and line number. 2016-06-08 09:45:32 +02:00
Liu Ming
f948d9ea44 add a blank line. 2016-06-08 09:45:04 +02:00
Atgeirr Flø Rasmussen
7f355929ac Merge pull request #1026 from blattms/add-parallel-linfinity-norm 
Added utilities to compute a real L-infinity norm in parallel.
 2016-06-07 20:26:23 +02:00
Markus Blatt
324e60171c Added utilities to compute a real L-infinity norm in parallel. 2016-06-07 15:00:57 +02:00
Atgeirr Flø Rasmussen
681846686a Merge pull request #1024 from andlaus/lad_to_dad 
rename some variables from "Lad" to "Eval" (was: to "Dad")
 2016-06-07 11:43:42 +02:00
Atgeirr Flø Rasmussen
f5cf2d47e1 Merge pull request #1025 from totto82/fix_hydrocarbonstate 
Fix to handle cases without DISGAS and VAPOIL
 2016-06-07 11:38:16 +02:00
Andreas Lauser
20662fffb9 rename some variables from "*Lad" to "*Eval" 
this was an involuntary omission in the "local AD" to "dense AD"
rename...
 2016-06-07 11:14:11 +02:00
Tor Harald Sandve
ae9a10942e Fix to handle cases without DISGAS and VAPOIL 
- adds boolean has_disgas and has_vapoil to initHydroCarbonState()
 2016-06-07 08:18:09 +02:00
Andreas Lauser
42e5e41fa2 Merge pull request #1022 from andlaus/localad_to_densead 
rename "local AD" to "dense AD"
 2016-06-06 14:02:45 +02:00
Atgeirr Flø Rasmussen
39924206ca Merge pull request #1023 from qilicun/refine-messagetype 
paramemters output should go in Debug mode.
 2016-06-06 12:35:37 +02:00
Liu Ming
408ea0845d paramemters output should go in Debug mode. 2016-06-06 11:57:05 +02:00
Andreas Lauser
2d2f86f089 rename "local AD" to "dense AD" 2016-06-03 21:57:48 +02:00
Atgeirr Flø Rasmussen
7de314bb7e Merge pull request #1021 from blattms/add-missing-fstream-include 
Fix incomplete type error for std::ofstream in examples
 2016-05-27 11:15:33 +02:00
Markus Blatt
dbf425411f Fix incomplete type error for std::ofstream in examples 
On my system I got
```c++
error: variable ‘std::ofstream file’ has initializer but incomplete type
         std::ofstream file(fname.str().c_str());
```
This is fixed with this commit by including fstream. Previously,
this include might have happened implicitely.
 2016-05-27 08:59:00 +00:00
Atgeirr Flø Rasmussen
ef2125f39e Merge pull request #1019 from qilicun/log-more-messages 
Write more messages into OpmLog.
 2016-05-26 11:20:49 +02:00
Liu Ming
94ee69505a make toString() method as static. 2016-05-24 09:07:28 +08:00
Liu Ming
7eba8b01f5 fix strange indentation. 2016-05-23 10:55:36 +08:00
Liu Ming
eab67baa3b simplify the implementation. 2016-05-23 10:48:51 +08:00
Liu Ming
97eeee516d fix indentation and messages. 2016-05-23 10:47:26 +08:00
Liu Ming
341472456a write well related information into OpmLog. 2016-05-20 16:14:16 +08:00
Liu Ming
b7f7352b6d Add enum to string functions. 2016-05-20 16:13:37 +08:00
Atgeirr Flø Rasmussen
537c4dd730 Merge pull request #1010 from qilicun/log_timer_messages 
Log timer messages
 2016-05-20 08:39:14 +02:00
Atgeirr Flø Rasmussen
f582de6023 Merge pull request #1018 from qilicun/cleanup-prefix 
Cleanup the prefix.
 2016-05-20 08:37:39 +02:00
Liu Ming
d06b515c47 write the parameters information into OpmLog. 2016-05-20 14:30:43 +08:00
Liu Ming
f55d216561 log the warning messages to OpmLog. 2016-05-20 14:27:38 +08:00
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