OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,654 Commits 18 Branches 75 Tags 73 MiB
42e55ec342
Commit Graph

8654 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tor Harald Sandve
42e55ec342 Add brine output 2020-06-30 16:19:16 +02:00
Bård Skaflestad
0c35431a2f
Merge pull request #1844 from joakim-hove/use-sumstate-group-function 
Use SumState::has_group_var() / SumState::get_group_var()
 2020-06-29 21:09:34 +02:00
Bård Skaflestad
64ae1a8dea
Merge pull request #1834 from totto82/addPolymerOutput 
Add output for polymer production
 2020-06-29 17:06:53 +02:00
Joakim Hove
3e828e8578 Use SummaryState::has_group_var() / SummaryState::get_group_var() 2020-06-29 16:18:37 +02:00
Joakim Hove
eb48fb709a Add SummaryState::get_xxx() overloads with a default argument 2020-06-29 14:14:49 +02:00
Tor Harald Sandve
8c14eac213 add polymer density to the unit system 2020-06-29 13:53:42 +02:00
Bård Skaflestad
a067352ce0
Merge pull request #1843 from joakim-hove/restart-recover-udq 
Recover UDQ values from restart file
 2020-06-25 16:41:20 +02:00
Joakim Hove
1704a35a92 Recover UDQ values from restart file 2020-06-25 16:18:59 +02:00
Joakim Hove
efc2e7aa92
Merge pull request #1841 from joakim-hove/use-restart-groups 
Use Schedule::restart_groups()
 2020-06-25 14:19:31 +02:00
Joakim Hove
e65880aafb Use Schedule::restart_groups() 2020-06-25 14:18:19 +02:00
Tor Harald Sandve
13f07fdfef Polymer output 
Change polymer production output from volume -> mass
Polymer injection rates are read from the simulator and not computed based on the water rate and the polymer injection concentration given in the schedule
 2020-06-25 10:57:11 +02:00
Bård Skaflestad
2876751fe2
Merge pull request #1839 from joakim-hove/eval-udq 
Eval udq
 2020-06-24 14:15:27 +02:00
Bård Skaflestad
1a0b3b418c
Merge pull request #1836 from joakim-hove/restartview 
Restartview
 2020-06-24 14:13:17 +02:00
Bård Skaflestad
c07aec9c68
Merge pull request #1838 from joakim-hove/schedule-restart-group 
Schedule restart group
 2020-06-24 13:56:32 +02:00
Joakim Hove
cbe9bf2470 RestartView::hasKeyword: fix when <T> is not present at all 2020-06-24 12:59:43 +02:00
Joakim Hove
f6d160db32 Add convenience method Schedule::restart_groups() 2020-06-24 12:53:09 +02:00
Bård Skaflestad
feaadb4f6f
Merge pull request #1837 from joakim-hove/udq-named-constant 
Udq named constant
 2020-06-24 10:58:09 +02:00
Joakim Hove
633bbb6007 Introduce named constant for UDQ default value in restart files 2020-06-24 01:08:36 +02:00
Joakim Hove
c06708ebd0 Add std::string specialization in RestartView 2020-06-24 01:06:15 +02:00
Joakim Hove
ae5c6fe53e Made eval_udq into method UDQConfig::eval() 2020-06-24 01:05:59 +02:00
Joakim Hove
9ed3f223ea
Merge pull request #1840 from joakim-hove/udq-whitespace 
Remove trailing whitespace
 2020-06-24 01:05:21 +02:00
Joakim Hove
ad023d224b Remove trailing whitespace 2020-06-23 15:55:05 +02:00
Tor Harald Sandve
27e6e0735f Add output for polymer production 2020-06-23 09:57:36 +02:00
Atgeirr Flø Rasmussen
e719812e9b
Merge pull request #1833 from bska/disable-debug-output 
Group Data: Conditionally Enable Debug Output
 2020-06-22 22:17:36 +02:00
Bård Skaflestad
8e9e0b0977 Group Data: Conditionally Enable Debug Output 
This commit switches the group control debug output to std::cout
into a conditional mode that is controlled by a file-wide PP symbol

    ENABLE_GCNTL_DEBUG_OUTPUT

that we set to zero here.  This allows the developers to turn on
additional debug output when needed without confusing those who are
not actively working on the feature.
 2020-06-22 17:35:42 +02:00
Atgeirr Flø Rasmussen
3cda13c7a2
Merge pull request #1831 from akva2/fix_missing_config_h_include 
fixed: include config.h for HAVE_OPENMP
 2020-06-19 14:55:49 +02:00
Joakim Hove
ae28999d5b
Merge pull request #1829 from akva2/janitoring 
Some janitoring
 2020-06-19 13:09:12 +02:00
Arne Morten Kvarving
4bc00663ea fixed: include config.h for HAVE_OPENMP 2020-06-19 12:55:04 +02:00
Arne Morten Kvarving
970d6339dd fixed: forward struct as struct 2020-06-19 11:52:12 +02:00
Arne Morten Kvarving
d7bdb448f5 add some trivial checks to avoid unused variable warnings 2020-06-19 09:43:48 +02:00
Arne Morten Kvarving
841124a47d mark variable maybe_unused to avoid compiler warnings 
unused without openmp
 2020-06-19 09:43:34 +02:00
Atgeirr Flø Rasmussen
146e5930e2
Merge pull request #1828 from joakim-hove/remove-unused 
Remove unused variable
 2020-06-19 06:54:51 +02:00
Joakim Hove
216a220ee8 Remove unused variable 2020-06-18 22:34:24 +02:00
Arne Morten Kvarving
29010dd7e3
Merge pull request #1823 from joakim-hove/action-state 
Add class Action::State to keep track of ACTIONX count
 2020-06-18 19:15:17 +02:00
Joakim Hove
dd1591f1a2 Use Action::State object to keep track of actions being run 2020-06-18 16:45:39 +02:00
Joakim Hove
f54245f1ca Add class Action::State to keep track of ACTIONX count 2020-06-18 16:45:39 +02:00
Joakim Hove
7d856b4933 Add id member to ActionX objects 2020-06-18 16:45:39 +02:00
Bård Skaflestad
2123884655
Merge pull request #1408 from jalvestad/extend_udq_actx_rst 
Changes to extend and improve the ECL-compatible restart
 2020-06-18 16:29:52 +02:00
Bård Skaflestad
35100cc8bb
Merge pull request #1827 from akva2/janitoring 
anonymize to quell unused parameter warning
 2020-06-18 09:50:08 +02:00
Arne Morten Kvarving
8d3680c7b5 anonymize to quell unused parameter warning 2020-06-18 08:27:48 +02:00
Joakim Hove
986f0acad7
Merge pull request #1826 from akva2/add_missing_initializer 
fixed: add missing initializer
 2020-06-17 15:44:22 +02:00
Joakim Hove
0edc9acc48
Merge pull request #1825 from joakim-hove/gpmaint-serialize-fix 
Fix: bug in serializer function for GPMaint class
 2020-06-17 15:29:43 +02:00
Arne Morten Kvarving
643b8b179d fixed: add missing initializer 2020-06-17 14:32:42 +02:00
Joakim Hove
3478263de9 Fix: bug in serializer function for GPMaint class 2020-06-17 12:45:23 +02:00
Markus Blatt
8c6cd2f10f
Merge pull request #1810 from blattms/support-pinch-nogap 
Support querying GAP/NOGAP mode for Pinch form EclipseGrid.
 2020-06-15 17:27:15 +02:00
Jostein Alvestad
0679d2b233 corrections to SGRP - index error > 0. 2020-06-15 09:55:46 +02:00
Jostein Alvestad
7d3df69416 Corrected an errors and a misprint 2020-06-15 09:55:44 +02:00
Jostein Alvestad
1751120b79 corrected logic error in AggregateWellData.cpp 2020-06-15 09:55:42 +02:00
Jostein Alvestad
c846716044 add variable to hold min value of nonzero uda 2020-06-15 09:55:40 +02:00
Jostein Alvestad
fea794ee17 further corrections of unit tests and code clean up 2020-06-15 09:55:38 +02:00