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

8690 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Markus Blatt
7c30586fde Only compile code if non-empty code was submitted for DUNE/OPM. 
Also make the search fail if the compilation fails.
 2020-08-11 00:53:45 +02:00
Markus Blatt
d5388ba653 Fix compile check for dune-geometry from DUNE>2.7 
Dune::Geometry::makeQuadrilateral() is deprecated since 2.6 and has recently
been removed. We are using now using Dune::GeometryTypes::quadrilateral
 2020-08-11 00:25:23 +02:00
Joakim Hove
c7b93797b6
Merge pull request #1852 from joakim-hove/python-wellnames 
Add python wrapper for Schedule::wellNames( const std::string& )
 2020-07-02 09:50:57 +02:00
Joakim Hove
34bc004171
Merge pull request #1854 from bska/remove-unused-variable 
UDQDefine: Suppress 'Unused Variable' Warning
 2020-07-02 00:55:22 +02:00
Bård Skaflestad
adf90e3410 UDQDefine: Suppress 'Unused Variable' Warning 
Assign 'stod' result to a 'std::ignore' object to maintain the
'token_size' side effect without creating an otherwise unused value
of type 'double'.  While here, also put the 'next_token' helper into
an anonymous namespace to avoid generating warnings of the form

    no previous declaration for ...
 2020-07-01 22:49:49 +02:00
Joakim Hove
d6a3cdb986
Merge pull request #1832 from CeetronSolutions/python-pypi-cleanup 
Python pypi package work
 2020-07-01 13:34:26 +02:00
Joakim Hove
ab821b90a5 Add python wrapper for Schedule::wellNames( const std::string& ) 2020-07-01 11:01:12 +02:00
Joakim Hove
29a946eb9a
Merge pull request #1846 from joakim-hove/udq-sign-bug 
Udq sign bug
 2020-07-01 10:47:04 +02:00
Gaute Lindkvist
f7b080b7b6 Fix remaining double use of python/python and opm/opm folders in Python package generation 2020-07-01 03:25:11 -04:00
Bård Skaflestad
0ad97351c6
Merge pull request #1849 from totto82/addBrineOutput 
add brine output
 2020-06-30 17:08:07 +02:00
Gaute Lindkvist
c24d7f7798 Remove static python flags from generate-pypi script 2020-06-30 10:55:23 -04:00
Tor Harald Sandve
42e55ec342 Add brine output 2020-06-30 16:19:16 +02:00
Joakim Hove
9fd29db2de Add case with literal in scientific form 2020-06-30 13:04:49 +02:00
Joakim Hove
f09b534e1d Hack around UDQ parser which does not accept leading '-' 2020-06-30 13:01:00 +02:00
Joakim Hove
fc4511d365 Fix UDQParsing code to handle numerical values on scientific form 2020-06-30 12:51:59 +02:00
Bård Skaflestad
89cbb9ae24
Merge pull request #1847 from joakim-hove/use-sumstate-group-function 
Use SummaryState::has_group_var() / SummaryState::get_group_var()
 2020-06-30 11:46:05 +02:00
Joakim Hove
962b6f8150 Use SummaryState::get_group_var() / SummaryState::has_group_var() II 2020-06-30 11:26:08 +02:00
Joakim Hove
c663805694 Refactored UDQ token split code 2020-06-30 10:35:23 +02:00
Joakim Hove
d30b63508d Quote item in error message 2020-06-30 09:48:23 +02:00
Joakim Hove
8ad0c99c1d Make sure UDQ quote_split does not append empty string 2020-06-30 09:37:42 +02:00
Joakim Hove
7fce7a2c9c Bug in UDQ tokenizer 2020-06-30 08:40:06 +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
Gaute Lindkvist
3acc26558b Use file COPY instead of configure for straight copy in CMakeLists.txt 2020-06-25 09:52:43 -04:00
Gaute Lindkvist
a624d6c690 Remove static python flags from generate-pypi script 2020-06-25 09:26:38 -04:00
Gaute Lindkvist
27fdb0654d Revert "Support building Python module statically" 
This reverts commit d3b4f41acf.
 2020-06-25 09:26:12 -04: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
Gaute Lindkvist
474d4a90dc Add more metadata to setup.py for pypi page 2020-06-19 14:56:12 +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