OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,896 Commits 27 Branches 61 Tags 309 MiB
61245ee43f
Commit Graph

11592 Commits

Author SHA1 Message Date
Magne Sjaastad
61245ee43f #6867 Summary Vector Names 6x : Include name updates from 6x 
Include updates from Peter Forster
 2020-11-03 04:34:20 -05:00
Gaute Lindkvist
9760dd1926 Add missing PRIVATE keyword in GrpcInterface\CMakeLists.txt 2020-11-03 10:31:12 +01:00
Gaute Lindkvist
71a0d88e26 Cross platform way of looking for CMake-versions of gRPC/Protobuf first 
* Then use PKG_CONFIG to try to find them,
 2020-11-03 10:31:12 +01:00
Gaute Lindkvist
71b191f8c5 Support non-cmake builds of gRPC 2020-11-03 10:31:12 +01:00
Magne Sjaastad
03ab2e592d #6862 Correlation Plots : Use full address when accessing summary data 2020-10-30 18:21:52 +01:00
github-actions[bot]
fe1bdf365e
Fixes by cmake-format (#6875) 
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
 2020-10-30 13:54:11 +01:00
Magne Sjaastad
91cc18f885 Early exit if no fracture model template is defined 2020-10-30 13:27:25 +01:00
github-actions[bot]
223fe756fe
Fixes by cmake-format (#6874) 2020-10-30 12:31:16 +01:00
Gaute Lindkvist
787dae4044
Automatic installation of vcpkg dependencies (#6848) 
* Added AutoVcpkg files to cmake directory.
* Add auto install of vcpkg packages
* Add grpc install to GrpcInterface module
* Set VCPKG_ROOT in GitHub actions

Co-authored-by: Ruben Thoms <ruben.thoms@ceetronsolutions.com>
 2020-10-30 12:29:57 +01:00
Gaute Lindkvist
514cca5f95
Simplify the CMake GRPC setup (#6852) 
* Simplify GRPC CMake setup.
* Move pip install code to CMake rather than github action to ensure the same Python version
* Remove redunant NO_MODULE in GRPC cmakefiles
* Use old CMP0077 policy (changed in Cmake 3.13) because our base line is 3.12.
* Make GrpcInterface a separate Object Library
* Update pip command to include --user and setuptools
* Update grpc python generation
* Remove unity build from GrpcInterface library
* Update github action to explictly set up Python
 2020-10-30 10:11:58 +01:00
Kristian Bendiksen
3e291e0c6b #6854 Fix asserts/crashes when layer extraction fails. 2020-10-28 14:38:51 +01:00
Kristian Bendiksen
935a2d11d7 #6835 Stimplan Model: Improve non-net layers. 
- Add checkbox to toggle non-net layers on/off
- Remove formation option, and use current formation for each element.
- Set default cutoff to 1.0
- Add range for cutoff input [0, 1.0]
- Scale elastic properties if less than cutoff.
- Introduce one new layer per element for each non-identical NTG less than cutoff.
 2020-10-28 10:02:04 +01:00
Kristian Bendiksen
88d30b74af Make python fracture model export command independent of fracture model plot. 2020-10-28 08:59:40 +01:00
Kristian Bendiksen
a9930e5fe0 #6833: Set eclipse case and time step in fracture model. 2020-10-28 08:59:40 +01:00
Gaute Lindkvist
5bc5f5ddb7 Allow arguments to findOrCreateWellLogExtractor methods to be nullptr 
It is a valid pattern for the methods and it should return nullptr in this case.
 2020-10-27 14:55:25 +01:00
Gaute Lindkvist
cc2531a551 Fix build issues due to not linking Eigen 2020-10-26 11:50:22 +01:00
Gaute Lindkvist
1482fdebf9 Add explicit constructor calls to parent class in RigWellPath 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
f30ad36c82 Remove some structured bindings to avoid unused variable warnings 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
0b6254bfb4 Fix build issues following merge from dev 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
0fc5e033f5 Add automatic well path grouping 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
9401a81097 Higher tolerances 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
f569d6872b Group only with selected paths 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
19a8aece0e Almost right 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
362dcb4dd1 Remove redundant part of hierarchical well paths 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
7684596829 Well Path Groups 2020-10-26 10:43:14 +01:00
github-actions[bot]
5ec3e2a7d7 Fixes by clang-format 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
195bcf2817 Skeleton for toggling grouping of well paths 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
395398587a Create a separate menu entry for importing "Grouped Well Paths" 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
7650d0bde8 Fix Linux build issue due to unused variable in unit test 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
90d4c2f9d3 More hierarchical work 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
0b19307be0 Support loading hierarchical well paths 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
52e3214b0e Add Well paths to other well paths 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
2a06f74076 Fix well log extraction not_null failure. 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
8e8534d61e Go via RimWellPathCollection::addWellPath for any well path addition 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
6622328622 Remove direct access to the well path field in RimWellPathCollection 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
aceac43652 Refactor RimWellPath and RigWellPath 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
c29cf315d2 Remove SILENCE_TR1_NAMESPACE warnings. We use a new gtest version now. 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
1614dfa9b8 Remove "using namespace std" (a C++17 MSVC bug) 2020-10-26 10:43:14 +01:00
Gaute Lindkvist
17ba1e49b6 Simplify some code with C++17 2020-10-26 10:43:14 +01:00
rubenthoms
1941a1f3d3
Boost and Eigen to vcpkg (#6817) 
* Moved boost subset installation to vcpkg.

* Moved Eigen to vcpkg.

Added packages to vcpkg-response files.
Removed unnecessary include_directories() calls.


Removed comments.

* Use target_link_library instead of boost_libraries

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
 2020-10-25 09:22:19 +01:00
Gaute Lindkvist
56d8da1419 Fix snapshot icons to be same height 2020-10-22 16:49:34 +02:00
Gaute Lindkvist
19a2e92a0a Make new code follow new C++17 guidelines 2020-10-22 10:36:30 +02:00
Gaute Lindkvist
90df4b8b54 Reduce number of warnings in the well log extractor 
* Suitable for patch.
 2020-10-22 10:36:30 +02:00
Kristian Bendiksen
246c918e13 Fix signed/unsigned comparison warnings. 2020-10-22 09:07:27 +02:00
Kristian Bendiksen
9a1397ecbc Revert "#6412 Hide experimental Stimplan features behind RESINSIGHT_DEVEL env var." 
This reverts commit ae18dc8898.
 2020-10-22 09:07:27 +02:00
Kristian Bendiksen
f09dad2fb9 Revert "Fracture Model Template: Hide new features behind experimental flag" 
This reverts commit 03ae6e5ee4.
 2020-10-22 09:07:27 +02:00
Kristian Bendiksen
899fa64e75 #6754 Update example python script with non-net-layers. 2020-10-22 09:07:27 +02:00
Kristian Bendiksen
82c7042eeb #6754 Scale porosity, permeability and elastic props by net-to-gross. 2020-10-22 09:07:27 +02:00
Kristian Bendiksen
390dbe5cc5 Move export to frk command from model plot to model. 2020-10-22 09:07:27 +02:00
Kristian Bendiksen
7d456f1cbb Refactor fracture model result calculation to be independent of display. 2020-10-22 09:07:27 +02:00