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

8333 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Hove
fbfd95d2f2 Merge pull request #1711 from joakim-hove/welspecs-unknown 
Welspecs unknown
 2020-04-17 11:43:34 +02:00
Joakim Hove
a18539c63c Merge pull request #1620 from joakim-hove/run-pyaction 
Run pyaction
 2020-04-17 11:40:15 +02:00
Joakim Hove
53fddda62b Merge pull request #1715 from joakim-hove/keywords 
Add some missing keywords
 2020-04-17 11:37:51 +02:00
Joakim Hove
78577e94cc Add some missing keywords 2020-04-17 08:57:17 +02:00
Joakim Hove
3dbb922cc7 Fill on some of the unknown elements in WELSPECS report 2020-04-16 17:54:09 +02:00
Joakim Hove
315382bad8 Run PYACTION keywords 
The PYACTION keyword is implemented with a Python module with a run() function
in an external module.
 2020-04-16 14:13:54 +02:00
Williham Williham Totland
ead07d2f3f Passes line_number to columnwise data fetch function. 2020-04-16 09:39:46 +02:00
Joakim Hove
685ab301d2 Merge pull request #1691 from joakim-hove/UDQ-UNITS 
Default construct UDQ keywords with value 0 when defined with UNIT
 2020-04-16 09:27:28 +02:00
Joakim Hove
44c5a6c84c Merge pull request #1709 from joakim-hove/region-fip-keyword 
Minor fixup to REGION fip summary keyword regexp
 2020-04-16 09:27:01 +02:00
Joakim Hove
b899a1da64 Merge pull request #1703 from joakim-hove/well-store-dens-calc 
Check WELSPECS values
 2020-04-16 09:26:48 +02:00
Joakim Hove
637b1109aa Minor fixup to REGION fip summary keyword regexp 2020-04-16 07:05:51 +02:00
Joakim Hove
d79b817a58 Merge pull request #1707 from GitPaean/small_adjustment_aquifer_keywords 
small adjustments for a few AQU keywords
 2020-04-16 06:33:35 +02:00
Joakim Hove
2b0fcc974c Merge pull request #1686 from joakim-hove/cache-cell-volume 
Cache cell volume
 2020-04-16 06:32:05 +02:00
Joakim Hove
92e923b567 Merge pull request #1706 from joakim-hove/test-clean-srcdir 
Rework testing of Schedule exit status
 2020-04-15 21:56:55 +02:00
Kai Bao
585e18d85f small adjustments for a few AQU keywords 
AQUCT, AQUFET, AQUFETP
 2020-04-15 21:24:43 +02:00
Joakim Hove
43e2fced7d Simplified testing of exit status 2020-04-15 21:04:26 +02:00
Markus Blatt
8e3ba156a6 Merge pull request #1675 from blattms/refactor-policy-settings 
Fix policy warnings
 2020-04-15 21:01:35 +02:00
Joakim Hove
133ff18ee3 Make sure all generated files are in $work_dir 2020-04-15 20:50:51 +02:00
Joakim Hove
abaee17857 Add HAVE_OPENMP has opm_common_CONFIG_VAR 2020-04-15 20:33:22 +02:00
Joakim Hove
0cfc291039 Add function to calculate volume for all active cells - omp 2020-04-15 20:33:22 +02:00
Atgeirr Flø Rasmussen
0cdd6ba3d8 Merge pull request #1692 from joakim-hove/action-exit 
Action exit
 2020-04-15 17:11:15 +02:00
Markus Blatt
8816549f2f Try to set CMP0048 to NEW as we do not use VERSION 2020-04-15 14:17:53 +02:00
Markus Blatt
eb22f6cfd9 [CMake] Set PATH instead of LOCATION. 2020-04-15 14:17:53 +02:00
Markus Blatt
6707263385 DUNE does not need special treatment. 
No need to set *_ROOT for it, which triggers a CMP0074 warning
as the policy settings do not survive find_package calls.
 2020-04-15 14:17:53 +02:00
Markus Blatt
636ce45596 Set policy CMP0074 to NEW. 
We have been using  <PackageName>_ROOT like it is intended now.
 2020-04-15 14:17:53 +02:00
Markus Blatt
742d8943ca Move policy settings to OpmInit and into a macro OpmSetPolicies(). 
OpmInit.cmake is one of the first includes and most importantly before
the opm-*-prereqs.cmake files are include. The macro is needed to make
the policies set in all CMakefiles. OpmSetPolicies should be called in
the toplevel CMakeLists.txt file.

This fixes a lot of warnings experienced in downstream modules that
got triggered by the opm-*-prereqs.cmake files. At some calls the
policies were at other not.

On the other hand new warnings about soon to be deprecated policies
CMP0026 and CMP0048 appear at least for cmake version 3.13.4.
But that should be fixed in another PR.
 2020-04-15 14:17:53 +02:00
Joakim Hove
593ee3174c Merge pull request #1704 from blattms/remove-old-boost-locale-hack 
Revert hack for old boost versions (commit 59863939)
 2020-04-15 13:39:58 +02:00
Markus Blatt
4882e2d782 Revert hack for old boost versions (commit 59863939) 
We do not support boost in that version anymore and do not use its
locales anyway.

Closes #1667
 2020-04-15 12:51:13 +02:00
Joakim Hove
4d9be76910 Check WELSPECS value for FIP_REGION and DENSITY_CALCULATION 2020-04-15 11:54:15 +02:00
Joakim Hove
3072f0dabe Add pvt_table as member for Well 2020-04-15 11:26:57 +02:00
Joakim Hove
e417ca6688 Merge pull request #1694 from joakim-hove/pyaction-api 
Add api for PyAction::run()
 2020-04-14 19:06:19 +02:00
Joakim Hove
12bbf19425 Merge pull request #1700 from akva2/janitoring 
Some more janitoring
 2020-04-14 16:34:38 +02:00
Joakim Hove
1c84c4c3f3 Add new keyword EXIT 
The keyword EXIT is a opm only keyword which can be used to terminate the whole
simulation as part of the ACTIONX keyword.
 2020-04-14 16:32:52 +02:00
Arne Morten Kvarving
b8a66cb0fa Merge pull request #1699 from akva2/clang_with_std++fs 
changed: add option for using clang with libstdc++
 2020-04-14 16:12:43 +02:00
Arne Morten Kvarving
f23257cbf5 initialize variables to avoid (faulty) compiler warnings 2020-04-14 14:10:37 +02:00
Arne Morten Kvarving
784389d228 remove unused variables 2020-04-14 14:10:33 +02:00
Atgeirr Flø Rasmussen
f494f6d5ce Merge pull request #1696 from joakim-hove/explicit-schedule 
Add explicit to one argument Schedule constructor
 2020-04-14 13:23:26 +02:00
Joakim Hove
6c34c0304f Merge pull request #1698 from atgeirr/fix-dxdydztops-performance 
Address performance issue for DX/DY/DZ/TOPS grids.
 2020-04-14 13:03:03 +02:00
Joakim Hove
f9b5946b25 Merge pull request #1697 from akva2/janitoring 
fixed: avoid shadowing warnings
 2020-04-14 13:02:07 +02:00
Arne Morten Kvarving
2f2cbea424 changed: add option for using clang with libstdc++ 
when using clang, whether or not we should link to stdc++fs
cannot easily be detected. it depends on the c++ lib used
(libstdc++ vs libc++), as well as the versions of these.

to avoid messing up in general, this adds an option for forcing
linking to stdc++fs, even when using clang. it defaults to false
to not break existing build setups where it works. is required
for building on jenkins
 2020-04-14 11:44:32 +02:00
Arne Morten Kvarving
33e3d36ef5 fixed: avoid shadowing warnings 2020-04-14 11:28:10 +02:00
Atgeirr Flø Rasmussen
11f555c156 Address performance issue for DX/DY/DZ/TOPS grids. 
The sumIdir() and sumJdir() methods were called inside loop
nests over i and j. Since the methods themselves were linear in
nx and ny, respectively, this was a quadratic algorithm. Performance
only becomes an issue for large (> 10k) values of NX or NY, which
was thought not to ever happen. This assumption was wrong.
 2020-04-14 11:28:07 +02:00
Joakim Hove
84eaef0372 Add explicit to one argument Schedule constructor 2020-04-14 11:27:26 +02:00
Joakim Hove
e980713572 Merge pull request #1693 from joakim-hove/unused 
Unused
 2020-04-13 08:29:12 +02:00
Joakim Hove
466e21e37e Add api for PyAction::run() 2020-04-13 08:01:09 +02:00
Joakim Hove
648a8d1413 Remove unused arguments 2020-04-13 07:54:10 +02:00
Joakim Hove
0c91724927 Changes in Schedule default construction - add Python argument 2020-04-13 07:52:47 +02:00
Joakim Hove
750e7b8b24 Default construct UDQ keywords with value 0 when defined with UNIT 2020-04-12 08:38:59 +02:00
Bård Skaflestad
8202c2007e Merge pull request #1690 from joakim-hove/write-report-ss 
Write report to stringstream and not stdout
 2020-04-11 23:31:24 +02:00
Joakim Hove
161d337dd3 Write report to stringstream and not stdout 2020-04-11 22:03:31 +02:00