OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-01 03:37:15 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,603 Commits 25 Branches 60 Tags 288 MiB
8423b17832
Commit Graph

295 Commits

Author SHA1 Message Date
jonjenssen
d8def3d986
OpenVDS should always be used (#10166) 
* OpenVDS should always be used, remove optional defines
 2023-04-24 18:23:31 +02:00
Magne Sjaastad
90ccf447fb
Download and use openvds package (#10153) 
Download and use openvds package
 2023-04-24 17:10:51 +02:00
jonjenssen
0e7cf49b17
OpenVDS seismic access (#10145) 
Add OpenVDS support for reading seismic data from VDS files
 2023-04-21 16:38:04 +02:00
Magne Sjaastad
b7f8d0e0f1
Increase warning level 
* Set warning level to /W3 for MSVC to catch more warnings
* remove several excluded checks for clang
* removed several unused variables
* Hide warnings qwt
* add missing parentheses in logical expressions
* Remove double check on same logical expression
 2023-04-17 15:57:39 +02:00
Magne Sjaastad
cde96a39f6 Remove test code for ccache 2023-03-31 16:01:56 +02:00
Magne Sjaastad
7499811564
MSVC: Move seismic libraries into "Thirdparty" 2023-03-27 13:00:26 +02:00
jonjenssen
2e01f4a31d
Basic seismic support (#10010) 
Add basic seismic section support to eclipse and geomech views.
 2023-03-24 15:36:10 +01:00
Magne Sjaastad
d23c6b4bb6
Janitor: Several code hygiene adjustments (#9981) 
* Include all libraries in APP_FWK_LIBRARIES
* Several fixes detected by Static Code Analysis
* Remove unused code
* Add .clang.tidy
* Use QElapsedTimer
* Use horizontalAdvance
* Avoid | between enum of different classes
* Avoid illegal character
* Renaming and reorder of constructor initialization
 2023-03-23 15:49:06 +01:00
Magne Sjaastad
947185bdcc Visual Studio: Enable support for Static Code Analysis 2023-02-13 14:44:01 +01:00
Magne Sjaastad
863925f980 Avoid debug info flag /Z7 flag for release build 2023-01-28 09:42:44 +01:00
Magne Sjaastad
073343ce9b
CMake: Improve setting of debug info flags for buildcache 2023-01-27 18:31:35 +01:00
Magne Sjaastad
583c248cf9
Janitor issues 
* Use horizontalAdvance
* Remove unused code
* Hide some warnings from Qt code
* Remove message for _SILENCE_TR1_NAMESPACE_DEPRECATION_WARNING
* Use CMP0077 NEW
* Move roff libraries to folder Thirdparty
* avoid operator()==
* Remove cmake_minimum_required and set version to 3.15
 2023-01-24 12:29:27 +01:00
Magne Sjaastad
abc9e82ff5 System: Enable and use c++20 
Enable c++20 in top level cmake. Keep c++17 for GrpcInterface, as the protoc tool does not work with c++20.
Several code adjustments to fix compiler issues.
 2023-01-19 08:33:02 +01:00
Magne Sjaastad
424ecaa560 Maintenance: Issue submodule update once 
Avoid calling submodule update on specific subfolders. 
Fixes by cmake-format
 2023-01-17 09:39:10 +01:00
Magne Sjaastad
3354630726
Add optional support for ccache for MSVC (#9667) 2023-01-13 07:57:13 +01:00
Kristian Bendiksen
8b51160ac4
Roff support with submodule 
* Roff: Add initial roff support (with roffcpp as submodule).
* Roff: Create viewer when importing roff files.
* Roff: add timing for roff import.
* Roff: precompute active cell indexes.
* Roff: parallelize using OpenMP.
* Roff: Handle exceptions when importing.
* Roff: improvements from review.
* Invert ordering

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
 2022-12-19 15:28:26 +01:00
Magne Sjaastad
0fa001fc70
Opm Parser: Include PATHS when importing WSEGLINK 
* Opm Parser: Include PATHS when importing WSEGLINK
Add PATHS to supported keywords to be able to use include files with alias in file path.
* Move opm-parser-tests into OPM solution folder
 2022-10-21 07:47:27 +02:00
Magne Sjaastad
a52c8c9342 Install: Avoid installing QtAdvancedDocking as part of Resinsight install 2022-10-19 11:26:14 +02:00
Kristian Bendiksen
806c9af82b
9172 Remove dependency on QtScript 
* #9172 Update json encoding/decoding to avoid QtScript
* Janitor: remove unused debug code
* Janitor: minor cleanup
* Remove dependencies to Qt Script

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
 2022-10-18 10:07:16 +02:00
Magne Sjaastad
78516f3496 Set minimum CMake version to 3.15 to avoid warnings on MSVC 
Set CMake version on top level to avoid warnings on MSVC when warning level is set to something else than the default.

https://stackoverflow.com/questions/58708772/cmake-project-in-visual-studio-gives-flag-override-warnings-command-line-warnin
 2022-08-02 12:50:49 +02:00
Magne Sjaastad
7a0bfd4917 Use updated version of opm-common as submodule 
* Adjustments to build system for opm-common
* Add opm-common as submodule
* Disable use of unity build for opm-common
 2022-07-07 22:17:33 +02:00
jonjenssen
d5269abc6e
New dockingsystem (#9116) 
* Use Qt Advanced Docking as forked submodule
* Use new docking system in code
 2022-07-07 12:03:02 +02:00
jonjenssen
fa2cf302bb
Add qt advanced docking to third party folder and build environment (#9109) 
* Add qt advanced docking as submodule
 2022-07-05 11:06:10 +02:00
Magne Sjaastad
950ec38a14 Add userInterface unit tests 2022-05-31 15:05:07 +02:00
Magne Sjaastad
b98bd579d7
Janitor: Silence deprecation warnings for Qwt and nightcharts 2022-03-15 08:27:07 +01:00
Magne Sjaastad
7238894bf6
Janitor: Set minimum Qt version to 5.12 2022-03-12 16:43:48 +01:00
Eirik Marthinsen
316cb222d9 CMake: Add fast_float to list of submodules to init 
CMake is set to import submodules by default but fast_float was missing
from the list.
 2022-02-07 13:10:13 +01:00
Magne Sjaastad
2d2bf0bbc7
CMake : Improve handling of compiler flags (#8486) 
#8478 Code cleanup to fix some warnings

Several adjustments to improve the specification and usage of compile flags.
 2022-01-26 10:08:28 +01:00
Kristian Bendiksen
258fbddc10
Merge pull request #8387 from OPM/qtcharts-summary-plots 
Closes #8228 

Major refactoring of summary plotting. Now possible to create plots both with Qwt and QtChart as plotting tool.
 2022-01-17 13:14:21 +01:00
Magne Sjaastad
638f926429
cmake-format: Allow dangling parenthesis 2021-09-01 08:13:16 +02:00
Eirik Marthinsen
200d5c65a3 AutoVcpkg: Include Vcpkg toolchain 
Include the Vcpkg toolchain file after the installation of the first
package.

When building for the first time from a clean source tree, the Vcpkg
toolchain file does not exist. At the same time CMake is only reading
the toolchain file the very first time it is configuring, but since the
toolchain file is only created when vcpkg is configured on the first
call to vcpkg_install it will never read it. So it is not enough to just
reconfigure.

Note: It is not ideal to include it here since one might at some point
install and search for a package at an erlier point in the script and
fail to find it.

Alternative approaces that I considered:
- Include this file right after including AutoVcpkg. This would require
  1 recompilation for the file to be found and read which is
  unfortunate.
- Include this file in the config function in AutoVcpkg. This seemed
  difficult without including the file for every call to vcpkg_install,
  which seems unecessary.
 2021-08-30 19:40:35 +02:00
Magne Sjaastad
5bc599cd57
Include top level cmakelist and fix formatting 2021-04-29 10:42:16 +02:00
Magne Sjaastad
f3e769ad13 libecl : Hide compiler warnings on MSVC 2021-04-29 09:07:36 +02:00
Magne Sjaastad
2d9ac615f2 Add MacOS build support 2021-04-05 09:39:12 -07:00
Gaute Lindkvist
7c42b4ae7b Turn off bundling of testmodels by default" 2021-01-15 15:42:26 +01:00
Gaute Lindkvist
746b542dcf #7210 Optionally Copy TestModels in install stage 2021-01-15 15:42:26 +01:00
Kristian Bendiksen
3112f61890 Configure RESINSIGHT_USE_ODB_API in root CMakeLists.txt 2021-01-12 11:05:53 +01:00
Gaute Lindkvist
04d5daca67 Create a new ApplicationExe project for the executable 2021-01-11 15:27:45 +01:00
Kristian Bendiksen
e9d734f660 #6941 Add Grid Statistics plot using QtCharts. 
The feature is only enabled if QtCharts is installed.
 2020-12-10 10:00:50 +01:00
Magne Sjaastad
b0ec2895be Enable unity build on opm-common 2020-11-16 14:55:45 +01:00
Ruben Thoms
a180fc431b Include boost spirit in order to compile opm-common. 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
Kristian Bendiksen
c8c32efba2 Fix cmake 3.12 error: CMP0077 was not defined until 3.13. 2020-11-06 08:17:43 +01:00
Magne Sjaastad
15b5aef308
System : Do not autoinstall vcpkg packages by default (#6876) 
* System : Do not autoinstall vcpkg packages by default

* System : Enable autoinstall of vcpkg for github action
 2020-10-30 15:07:58 +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
Gaute Lindkvist
6d8eb4ccfa #6797 Add option (on by default) to force legacy OpenGL ABIon Linux 2020-10-27 12:38:50 +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
069b427d10 Require CMake 3.12 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
97bd2fc67f Workaround for byte / std::byte ambiguity on MSVC 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
61809b6e22 Require C++17 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
f7aed637f8 Require CMake 3.6 2020-10-20 11:05:10 +02:00
Gaute Lindkvist
9afac51bca #6567 Remove use of GNU GSL 2020-09-24 08:05:25 +02:00
Gaute Lindkvist
af84ae7432 #6472 Use CMake's CMAKE_CXX_STANDARD flag to require C++11 
* This should not hurt anywhere but may fix MacOS build issues
 2020-09-23 13:58:41 +02:00
Kristian Bendiksen
3b788cbbdf #6491 Silence "unused parameter" warnings. 2020-09-14 21:46:27 +02:00
Kristian Bendiksen
02944f4eca Add ifdefs for OpenMP usage. 2020-09-14 21:46:27 +02:00
Gaute Lindkvist
5ae0e6a511 Fix build issues with test app by making CAF CVF-datatype scripting optional 2020-09-08 13:44:55 +02:00
Magne Sjaastad
6e160fb594 #6398 System : Add unity build to Qwt and flowdiagnostics 2020-08-29 10:30:56 +02:00
Magne Sjaastad
2901ad2c54 #6398 System : Remove cotire 2020-08-29 10:30:56 +02:00
Magne Sjaastad
08723f403f Replace tabs with spaces 2020-06-16 22:07:14 +02:00
Magne Sjaastad
d2ccc684a5 Disable install of GSL 2020-06-16 22:07:14 +02:00
Magne Sjaastad
35c6e8b109 gha : Remove hardcoded VMAKE_INSTALL_PREFIX 2020-06-16 22:07:14 +02:00
Gaute Lindkvist
77090bce6a Update only Third Party git submodules that are used 2020-06-03 15:41:17 +02:00
Magne Sjaastad
9158f65ed2 Bundling of HDF5 : Include symlinks in addition to binary file 2020-05-28 14:27:56 +02:00
Magne Sjaastad
805c735ad3 buildcache : Remove Z7 from release build 
Avoid debug symbols in release build. Faster build and smaller object files.
 2020-05-21 18:34:18 +02:00
Magne Sjaastad
fd475589a5 Build : Adjust compiler flags for debug builds 
buildcache requires compiler flag /Z7 to be set for MSVC. Adjust these flags to be able to use caching for debug builds.
 2020-05-14 09:27:27 +02:00
Magne Sjaastad
e3115bfef9 Add support for compiler launcher using buildcache 
Use CMAKE_CXX_COMPILER_LAUNCHER if buildcache is found in path
 2020-05-08 11:28:55 +02:00
Magne Sjaastad
a1eb707b02 Add test project including cvf and fix compile issues 2020-05-08 11:28:55 +02:00
Magne Sjaastad
25ba7c380c CMake : Move all Gsl projects into solution folder Thirdparty/GSL 2020-04-27 11:10:39 +02:00
Gaute Lindkvist
c801d768d3 Removed qwt from source code tree and added submodule 2020-04-24 15:12:43 +02:00
Magne Sjaastad
616af75df3 #4035 System : Remove term souring from cmake and UI 
Use general term HDF5 when required
 2020-04-24 11:40:22 +02:00
Magne Sjaastad
4b372b438e System : Remove support for Qt4 2020-04-24 11:40:22 +02:00
Magne Sjaastad
e4547b8e0d Set GSL to OFF by default 
Build server in Equinor is not updated with required minimum version for CMake, set GSL off by default
 2020-04-23 14:48:20 +02:00
Gaute Lindkvist
87b631a23e Make GNU GSL optional 2020-04-22 10:52:02 +02:00
Gaute Lindkvist
60419f0985 Working Correlation Plot prototype 2020-04-17 13:54:21 +02:00
Magne Sjaastad
f216bf8d6a
Python doc improvements (#5669) 
* Add tests to xml data type inspection
* Add baseline for testing of PdmScripting
* #5631 Generate doc for Python
 2020-03-12 07:45:52 +01:00
Gaute Lindkvist
b2f55a3101 Make scriptability a CAF-feature 2020-03-05 08:40:46 +01:00
Magne Sjaastad
fddc15b1d8 #5370 Unity Build : Add config for ResInsight 2020-01-23 13:41:31 +01:00
Jacob Støren
d32db574cb #5318 Surface Intersection geometry with results 2020-01-17 13:24:25 +01:00
Magne Sjaastad
5d3082d4e2 #5056 AppFwk : Include cafCommandFeatures in ResInsight 2019-11-15 15:33:31 +01:00
Magne Sjaastad
32b5d7696d
System : Remove build warnings (#4963) 2019-11-01 10:00:07 +01:00
Magne Sjaastad
8a7dee705a System : Move include and compiler defs to ApplicationCode 2019-09-16 13:29:44 +02:00
Magne Sjaastad
8c189922e0 System : Move include of Eigen into ApplicationCode 2019-09-16 13:18:56 +02:00
Jacob Støren
236b0cb3d4 Support cmake version < 3.12 on the OBJECT type library cafCommandFeatures 2019-09-02 13:39:48 +02:00
Magne Sjaastad
b3c00c2038 Mark several cmake options as advanced 2019-08-12 09:52:19 +02:00
Magne Sjaastad
194c8b7278 Avoid linking ResInsight with catch2 2019-08-07 15:09:52 +02:00
Jacob Støren
ecd0c625d2 Put the strange chatch2 from libecl into the Thirdparty folder 2019-08-07 09:38:42 +02:00
Magne Sjaastad
a521748eda CMake : Propagate Qt4/Qt5 flag to AppFwk and VizFwk, use FORCE 2019-06-26 09:19:36 +02:00
Magne Sjaastad
546c5aef82 CMake : Propagate Qt4/Qt5 flag to AppFwk and VizFwk, add to cache 2019-06-26 08:14:54 +02:00
Magne Sjaastad
a6e1098716 CMake : Propagate Qt4/Qt5 flag to AppFwk and VizFwk 2019-06-26 08:00:42 +02:00
Magne Sjaastad
a4973dbb62 Revert "#4426 Linux : Avoid copy of libecl sym links" 
This reverts commit 055c1489b1.
 2019-06-25 14:31:59 +02:00
Magne Sjaastad
4de0799b2e #4426 Linux : Write out full path to source library file 2019-06-25 13:06:28 +02:00
Magne Sjaastad
055c1489b1 #4426 Linux : Avoid copy of libecl sym links 
Rename the libecl so file to match the file name ResInsight is depending on
 2019-06-24 19:56:00 +02:00
Magne Sjaastad
74718c38fc #4473 Qt5 : Set Qt5 as default Qt version 
Still possible to use Qt4 by RESINSIGHT_BUILD_WITH_QT5=OFF
 2019-06-07 12:32:22 +02:00
Gaute Lindkvist
6691dca4ca #4448 Clean up ResInsight Qt5-checks 2019-05-28 15:58:49 +02:00
Gaute Lindkvist
6ba9d42b45 #4448 Move Resinsight from -std=c++0x to -std=c++11 on GNU CXX 2019-05-28 15:58:49 +02:00
Gaute Lindkvist
8f3eb6a748 Add Qt5 test to AppFwk main CMakeLists.txt and update CAF to use CEE_USE_QT5 2019-05-28 15:58:48 +02:00
Magne Sjaastad
45c5a950a4 #4266 : libecl : Update version number in generated so 2019-05-10 09:10:28 +02:00
Magne Sjaastad
387d7cf7c2 System : Use appropriate mode when displaying a cmake message 2019-04-08 12:32:14 +02:00
Magne Sjaastad
dcac03dfd1 #4302 Install : Bundle HDF5 libraries 2019-04-08 12:26:52 +02:00