Commit Graph

14083 Commits

Author SHA1 Message Date
github-actions[bot]
a7f2db852e
Fixes by clang-format (#6995)
Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2020-11-16 13:53:37 +01:00
Ruben Thoms
f563748e1b Included stdexcept. 2020-11-16 11:34:09 +01:00
Ruben Thoms
edb8c5ff81 Fixed unity build issues. 2020-11-16 11:34:09 +01:00
Ruben Thoms
c4ec51fd8b Added opm-common as include directory to Commands project.
Fixed other deprecated class object instantiations.
2020-11-16 11:34:09 +01:00
Kristian Bendiksen
eea9e88bfe Parse and display VFPPROD tables. 2020-11-16 11:34:09 +01:00
Ruben Thoms
1b9a674213 Merged in VFP-tables commit 263beb8cf6a9f84a0a68ae50456eb8af2d44053b. 2020-11-16 11:34:09 +01:00
Ruben Thoms
6636a29882 Merged in VFP-tables commit 874433680d65ec3ce2735c06f1212fb478e413b1. 2020-11-16 11:34:09 +01:00
Ruben Thoms
d1fc39a51c Merged in VFP-tables commit 95f1742eab2b9dae391a253a5452b0f143d07abd. 2020-11-16 11:34:09 +01:00
Ruben Thoms
a180fc431b Include boost spirit in order to compile opm-common. 2020-11-16 11:34:09 +01:00
Magne Sjaastad
df2a6fb9d9 Update opm-common based on 2020.04 branch
Use branch https://github.com/CeetronSolutions/opm-common/commits/windows-fixes-2020.04
Update from 34ff4827569bb04190743e7aae3404794ccd188a
2020-11-16 11:34:09 +01:00
Magne Sjaastad
011174153e Minor compiler fixes 2020-11-16 11:34:09 +01:00
rubenthoms
0747547aaf Added CMake files for generating and including OPM-common as a ThirdParty library. 2020-11-16 11:34:09 +01:00
rubenthoms
9742317e98 Added tests for OPM-common. 2020-11-16 11:34:09 +01:00
rubenthoms
dd3a3efa19 Added directory for generated content from OPM-common, filled with the parser keywords. 2020-11-16 11:34:09 +01:00
rubenthoms
ca01feeb2f Added OPM-common as a ThirdParty library. 2020-11-16 11:34:09 +01:00
Magne Sjaastad
223cf5357f
Add boost-spirit 2020-11-16 11:19:04 +01:00
Magne Sjaastad
5dfb67a91f
Improve vcpkg cache (#6989)
Improve vcpkg cache
2020-11-15 09:26:42 -08:00
Magne Sjaastad
203cccaef2 #6978 Fault Import : Make sure faults in separate text file is imported 2020-11-13 01:13:50 -08:00
Magne Sjaastad
f94cd760e5 #6978 Fault Import : Make sure faults in separate text file is imported 2020-11-13 09:40:08 +01:00
Magne Sjaastad
659a1091b8
Update actions based on deprecated functions (#6979) 2020-11-12 19:14:11 +01:00
Magne Sjaastad
92b66914ad
Merge pull request #6975 from OPM/merge-patch-branch
Merge patch branch into dev
2020-11-12 01:07:34 -08:00
Magne Sjaastad
1a3a155d36 Merge remote-tracking branch 'origin/2020.10-patch-01' into dev 2020-11-12 09:06:28 +01:00
Magne Sjaastad
5abf2b3b00 Set version to 2020.10.1-RC02 2020-11-12 09:00:32 +01:00
Magne Sjaastad
40ce62e546
gha : Update run-vcpkg to latest 2020-11-11 21:47:42 +01:00
Kristian Bendiksen
4e2273b357 #6935 Extend python example with more than one model. 2020-11-11 15:46:22 +01:00
Kristian Bendiksen
f146402864 #6936 StimPlanModel: missing update when changing eclipse case or time step in plot. 2020-11-11 15:45:49 +01:00
Kristian Bendiksen
f6ba901105 #6937 StimPlanModel: fix missing update in plot when toggling elastic scaling property 2020-11-11 15:45:49 +01:00
Kristian Bendiksen
d5f5207177 #6934 StimPlanModel: allow user-defined depth bounding box for data extraction 2020-11-11 15:45:49 +01:00
Kristian Bendiksen
91a35784a0 #6948 StimPlan Model: Make sure extraction normal always points downwards. 2020-11-11 15:45:49 +01:00
Magne Sjaastad
1f2b1f208c #6962 Python: case.replace use simulationName
In Python, the folder name is added to simulation name to a combined name like 'folderName--simulationName' for the imported Grid Model. Only the simulationName should be used.
2020-11-11 09:05:31 -05:00
Magne Sjaastad
a0bc915b18 #6968 Import Dialog : Replace realization-N with realization-* 2020-11-11 09:05:31 -05:00
Magne Sjaastad
e9656cc167 #6963 Import Dialog : Add recently used folders and search terms in registry 2020-11-11 09:05:31 -05:00
jonjenssen
7f3df954ad Bugfix: show y axis text even if ensemble and summary curves are turned off. 2020-11-11 09:01:07 -05:00
Magne Sjaastad
451a049e0a
Replace use of add-path
Replace use of add-path

Output from gha
The add-path command is deprecated and will be disabled soon. Please upgrade to using Environment Files. For more information see: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
2020-11-11 08:02:34 +01:00
Magne Sjaastad
30c717db16
Replace use of add-path
Replace use of add-path

Output from gha
The add-path command is deprecated and will be disabled soon. Please upgrade to using Environment Files. For more information see: https://github.blog/changelog/2020-10-01-github-actions-deprecating-set-env-and-add-path-commands/
2020-11-11 07:58:55 +01:00
Magne Sjaastad
f336dfec97 #6957 Data source stepping : Add stepping on aquifer 2020-11-10 09:58:48 -05:00
Magne Sjaastad
34fe05ba33 #6958 Plot Title UDQ : Show vector name in plot title 2020-11-10 09:58:48 -05:00
Magne Sjaastad
0e2d021148 #6959 Calculated curve : Make sure relevant calculations are recalculated 2020-11-10 09:58:48 -05:00
Magne Sjaastad
e3ef1b436a #6960 Curve Calculator : Add to right-click menu of main case collection 2020-11-10 09:58:48 -05:00
Magne Sjaastad
00bcf3f048 #6871 Closing Grid Model : Update project tree in plot window 2020-11-09 20:29:17 +01:00
Magne Sjaastad
68dc74ec63 #6843 Grid Cross Plot : Set default legend mapping type to discrete 2020-11-09 13:47:52 -05:00
Magne Sjaastad
7b3fdbcf38 #6843 Grid Cross Plot : Check if valid before accessing tickValues 2020-11-09 13:47:52 -05:00
Magne Sjaastad
76fa87625c #6843 Grid Cross Plot : Render discrete colors, not continous 2020-11-09 13:47:52 -05:00
magnesj
0258874e17 Fixes by clang-format 2020-11-09 08:31:57 -05:00
Magne Sjaastad
6efad29aa6 Use peter-evans/create-pull-request@v3 2020-11-09 08:31:57 -05:00
Magne Sjaastad
a7ede034f4 gha: Use clang-format 10 2020-11-09 08:31:57 -05:00
Kristian Bendiksen
303b0ea163 #6946 StimPlan Model Plot: Fix incorrect colors in facies track. 2020-11-09 12:44:32 +01:00
Kristian Bendiksen
5c99872c7f #6938 Use unscaled porosity for elastic property lookup.
The elastic properties are already scaled by net-to-gross. Scaling the porosity
by net-to-gross before looking up the properties was applying the scaling twice.

Closes #6938.
2020-11-09 12:44:09 +01:00
Kristian Bendiksen
bd2678fe57 #6931 Fix missing scaling for porosity and permeability. 2020-11-09 12:43:41 +01:00
Kristian Bendiksen
f9cc1bd95c #6932 Make curve colors for initial stress and initial pressure consistent. 2020-11-09 06:22:19 -05:00