OilfieldToolsNet/opm-common
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,013 Commits 18 Branches 75 Tags
e2ef6bc662d896b5cc64da8bda8714329b1b37d3
Commit Graph

10013 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
e2ef6bc662 Simplify test fixture 2021-03-24 09:40:04 +01:00
Bård Skaflestad
37aee167eb Merge pull request #2377 from joakim-hove/rst-test-fix 
Fix test assert and temporarily disable
 2021-03-23 15:51:06 +01:00
Joakim Hove
a62d73a424 Merge pull request #2376 from joakim-hove/rst-test-fixtures 
Update test fixtures
 2021-03-23 13:02:48 +01:00
Joakim Hove
227a07ed06 Fix test assert and temporarily disable 2021-03-23 11:40:32 +01:00
Joakim Hove
8258d65900 Update test fixtures 2021-03-23 09:33:06 +01:00
Joakim Hove
6609ca265c Merge pull request #2372 from joakim-hove/summary-state-connections 
Add special treatment of connection variables in SummaryState
 2021-03-23 07:22:45 +01:00
Joakim Hove
5f91bfa7d0 Merge pull request #2375 from GitPaean/aquifer_cell_volumes 
function to ouput the cell volume for numerical aquifer cells
 2021-03-22 22:33:30 +01:00
Kai Bao
2a67eb44ed function to ouput the cell volume for numerical aquifer cells 2021-03-22 15:18:47 +01:00
Joakim Hove
596c3a9db3 Merge pull request #2370 from joakim-hove/actionx-prt-prefix 
Add prefix the schedule messages to highlight ACTIONX rerun
 2021-03-22 10:54:27 +01:00
Joakim Hove
12c63f7346 Use Summarystate::update_conn_var from Summary 2021-03-21 15:21:41 +01:00
Joakim Hove
5b3787ec46 Add special treatment of connection variables in SummaryState 2021-03-21 15:20:45 +01:00
Joakim Hove
d2cb2eeec4 Add prefix the schedule messages to highlight ACTIONX rerun 2021-03-19 22:30:37 +01:00
Bård Skaflestad
77f058645f Merge pull request #2368 from jalvestad/intehead_corrections 
Corrections to InteHead to account for ROCKOPTS data and Well lists
 2021-03-19 21:14:53 +01:00
Jostein Alvestad
278cd0a240 eliminated WellDims and used WellTableDims instead 2021-03-19 13:59:40 +01:00
Jostein Alvestad
d0f177d94c corrections to inteHead - rockopts, well lists 2021-03-19 13:59:39 +01:00
Joakim Hove
70a658c91d Merge pull request #2367 from joakim-hove/well-cmode 
Add shortcuts to get injectorcontrols from Well
 2021-03-19 12:48:42 +01:00
Tor Harald Sandve
61ad81b701 Merge pull request #2315 from bska/record-dynamic-status 
Record Dynamic Well Status in Output Wells
 2021-03-19 09:07:38 +01:00
Joakim Hove
f345d37dd1 Add shortcuts to get injectorcontrols from Well 2021-03-18 19:30:09 +01:00
Bård Skaflestad
89e3efb2e4 Record Dynamic Well Status in Output Wells 
This commit adds a new data member

    Well::Status dynamicStatus

to the data::Well object.  This member records the simulator's
notion of a well's open/shut/stop status and is especially needed to
support WECON-type status changes once the simulator maintains both
open and shut wells.

While here, also change multiple summary primitives to not look up
the same values repeatedly.
 2021-03-18 17:26:33 +01:00
Joakim Hove
27b4110314 Merge pull request #2355 from totto82/guideRateInj 
Add guiderate for injection groups
 2021-03-18 17:04:34 +01:00
Markus Blatt
18ccbcfa03 Merge pull request #2362 from blattms/use-add-compile-definitions 
Use add_compile_definitions to add defintions
 2021-03-18 15:04:34 +01:00
Joakim Hove
b206a7542e Merge pull request #2365 from bska/ancon-accum-effective-face-area 
Accumulate Effective Aquifer Connection Face Area
 2021-03-18 11:00:34 +01:00
Bård Skaflestad
3c6c827a75 Accumulate Effective Aquifer Connection Face Area 
We need this information to form part of the per-connection restart
output to the "SCAQ" array.  The accumulation uses the same
procedure as for the total influx coefficient, but is always based
on the geometric face area instead of the tabulated aquifer influx
coefficient.
 2021-03-17 21:04:30 +01:00
Markus Blatt
05128745cf Some modules may still export definitions using -D, strip it. 2021-03-17 17:27:26 +01:00
Markus Blatt
213f0c0afa Only add -D for older CMake versions. 2021-03-17 16:57:00 +01:00
Joakim Hove
a3984dbcb6 Merge pull request #2364 from blattms/remove-boost-python-include 
Removes inclusion of boost-python header
 2021-03-17 16:55:10 +01:00
Markus Blatt
6cf4250f18 Removes inclusion of boost-python header 2021-03-17 16:02:41 +01:00
Markus Blatt
6d9a924930 Add -D qualifier to DEFINITIONS if missing for old CMake. 2021-03-17 15:36:24 +01:00
Joakim Hove
fe99038df6 Merge pull request #2363 from joakim-hove/action-wells-specified 
Make sure action results contain well for fully specified condition
 2021-03-17 13:44:09 +01:00
Markus Blatt
a4f73a3a7c Use add_compile_definitions for newer CMake versions. 
add_definitions is deprecated.
Note the new command does not need the -D qualifier but will detect
if there is one and act accordingly. This helps with package
configuration files that have "-DVAR" in their COMPILE_DEFINTIONS

As some packages actually already add the -D qualifier we now detect
that to be able to support old CMake version without
add_compile_definitions. In this case we prevent adding another -D
and use add_definitions.
 2021-03-17 11:16:13 +01:00
Joakim Hove
d02ae5e650 Make sure action results contain well for fully specified condition 2021-03-17 10:08:35 +01:00
Markus Blatt
66ed9bcf75 Merge pull request #2360 from blattms/fix-docker-pypi 
Determine Python include directory to fix docker pypi builds
 2021-03-16 22:05:00 +01:00
Markus Blatt
ee11a57b6c Honor PYTHON_EXECUTABLE even if we use Python3. 2021-03-16 20:32:50 +01:00
Markus Blatt
9bc0536d13 Do not use the imported Python3 library directly. 
It just a hassle (need to search for Python3 downstream,
cannot be backwards compatible).
 2021-03-16 20:32:50 +01:00
Markus Blatt
1ed6166f1f Determine Python include directory to fix docker pypi builds 
Whenever OPM_ENABLE_PYTHON is on we need to set PYTHON_INCLUDE_DIRS
as it is needed to find Python.h (shouldn't we even need to link the
library?).

This could (in theory) be done by using by issuing
find_package(Python3 REQUIRED COMPONENTS Interpreter Development)
or
find_package(PythonLibs REQUIRED).

Unfortunately, both do not work (for yet unknown reasons) when we
build pypi packages in docker (even with setting the PYTHON_EXECUTABLE
or Python3_EXECUTABLE correctly).

Hence we now use python manually to determine these.
 2021-03-16 20:32:36 +01:00
Tor Harald Sandve
5f30a969f0 clean-up the interface of the guiderates 2021-03-16 15:53:35 +01:00
Joakim Hove
39a8233238 Merge pull request #2358 from joakim-hove/test-remove-special 
Remove special mnemomics from testing
 2021-03-16 14:01:03 +01:00
Joakim Hove
17639d821d Remove special mnemomics from testing 2021-03-15 22:33:16 +01:00
Joakim Hove
b189cc907f Merge pull request #2356 from atgeirr/minor-fixes 
Minor fixes
 2021-03-15 22:31:54 +01:00
Joakim Hove
eb652ac232 Merge pull request #2353 from joakim-hove/remove-unneeded-cmake-include 
Remove cmake include of pybind11 CMakeLists.txt
 2021-03-15 16:41:24 +01:00
Atgeirr Flø Rasmussen
675cb40dd4 Silence a few warnings. 2021-03-15 14:19:15 +01:00
Joakim Hove
ae7edda588 Merge pull request #2351 from joakim-hove/remove-find-cwrap 
Removed cmake module FindCwrap
 2021-03-15 13:39:52 +01:00
Markus Blatt
b7ce9c0fe2 Merge pull request #2348 from blattms/external-fmtlib-2 
Enable usage of fmtlib on the system.
 2021-03-15 13:26:23 +01:00
Atgeirr Flø Rasmussen
6518e5d905 Add missing <string> include. 2021-03-15 12:57:57 +01:00
Tor Harald Sandve
8941cc7c02 Add guiderate for injection groups 2021-03-15 12:29:20 +01:00
Joakim Hove
2a2ce8c826 Merge pull request #2354 from blattms/python-libs-only-for-embedded 
Only search for Python libs if OPM_ENABLE_EMBEDDED_PYTHON is ON.
 2021-03-15 12:28:04 +01:00
Markus Blatt
0455c48d2f Only search for Python libs if OPM_ENABLE_EMBEDDED_PYTHON is ON. 
Apparently it is not needed in the other cases.
Fixes an issue that arose from #2344 and restores the old behaviour
concerning the libraries.
 2021-03-15 10:19:10 +01:00
Joakim Hove
52caefae34 Remove cmake include of pybind11 CMakeLists.txt 2021-03-15 09:27:19 +01:00
Joakim Hove
0ae020cb8b Removed cmake module FindCwrap 2021-03-13 16:22:16 +01:00
Joakim Hove
8d11fc5458 Merge pull request #2344 from blattms/search-for-python3 
Explictly search for python3 (CMake >= 3.12.0) and send error if only python2 is found
 2021-03-13 16:20:04 +01:00