Commit Graph

8868 Commits

Author SHA1 Message Date
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
Gaute Lindkvist
29bb9f05be Add simple pypi howto 2020-06-19 13:38:55 +02:00
Cintia Goncalves Machado
784abc7069 deleteSolidPhasefromPhases 2020-06-19 13:31:33 +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
Gaute Lindkvist
16505b421a Rename package to lowercase 'opm' instead of 'Opm' 2020-06-18 10:32:05 -04:00
Gaute Lindkvist
5515422d02 Add docker files and scripts for creating cross-distro PyPI packages 2020-06-18 10:32:05 -04: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
Cintia Goncalves Machado
6ab09afb0c fixPermFactTest 2020-06-18 16:23:41 +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
Gaute Lindkvist
cbd23e71ef Add generation of a setup-package.sh script for creating PyPI-packages 2020-06-16 13:08:33 +02:00
Gaute Lindkvist
9ed75f030b Rename python/python folder to python/opm
This makes bdist_wheel find and add the library binary files.
2020-06-16 13:08:33 +02:00