Commit Graph

295 Commits

Author SHA1 Message Date
Magne Sjaastad
53a31c88c9 Add support for use of precompiled Octave binaries on Windows 2024-12-05 19:30:03 +01:00
Magne Sjaastad
3fac7d2045 Add message in CMake for download of OpenVDS 2024-11-29 15:43:38 +01:00
jonjenssen
10ce20074b Update to OpenVDS 3.4.4 for improved segy importer 2024-11-29 06:34:50 +01:00
Magne Sjaastad
2814b92055
Qt6: Adjustments (#11804)
* Qt6: Avoid insertWidget, use addWidget
In Qt6, the insertWidget function checks if the index parameter is valid based on current widgets present in the layout. This is error prone, and use addWidget to avoid manual counting of index.

* Disable use of Qt keyword foreach

* Replace use of QRegExp with QRegularExpression
Replace use of QRegExp with QRegularExpression
Remove dependency on qt5compat module
Simplify an expression based on review

* Remove Qt5 ifdefs

* Guard access out of bounds seen in debug build

* Avoid reuse of string variable

* Disconnect all signals from the QOpenGLContext
The call stack when this assert happens indicates that there are more signals to be disconnected from the object. Crash is fixed by disconnecting all signals.

Assert seen in debug build:

ASSERT failure in caf::Viewer: "Called object is not of the correct type (class destructor may have already run)", file C:\Qt\6.6.3\msvc2019_64\include\QtCore/qobjectdefs_impl.h, line 130

* Fix issue related to delete of a linked view
Guard null pointer use in view linker. Remove complicated cleanup in destructor in Rim3dVew.
2024-10-28 13:09:18 +01:00
Magne Sjaastad
bb047e82d3 #11827 Use FetchContent_MakeAvailable
FetchContent_Populate() is deprecated
2024-10-28 13:08:18 +01:00
Magne Sjaastad
ca4a7b9000
Remove obsolete code related to Qt5
* Remove bundling of openssl1.1
* Remove obsolete compile flags
* Remove use of obsolete RimCommandObject
* Use QColor::isValidColorName
QColor::isValidColor is deprecated in Qt 6.6, QColor::isValidColorName was introduced in 6.4

* Make sure debug DLLs are copied when required
* Remove Qt5 from AppFwk
* Remove obsolete copy of Qt  DLLs
2024-10-07 10:16:48 +02:00
Magne Sjaastad
b9448c2430
Additional Openssl adjustments 2024-10-04 15:28:42 +02:00
Magne Sjaastad
212f5bf5ae
Add support for Qt6 and disable Qt5
Required changes to use Qt6 and disable support for Qt5. There are still some adjustments related to Qt6 to be done, but these changes are not required to make Qt6 compile on relevant systems.

* Build system changes Qt6
* Override enterEvent
* Update QKeySequence
* QtChart changes
* Use QScreen to instepct dotsPerInch
* Add app->quit()
* Required updates for code related to QString
* Use RiaQDateTimeTools
* Required changes related to regular expressions
* Support compile on Qt  < 6.5
When version < 6.5 is found, qt_generate_deploy_app_script() is disabled. Compilation of ResInsight will work, but the install target will be incomplete.
* Octave: add missing header.
* Qt Advanced Docking: force Qt6 where both Qt5 and Qt6 is available.

---------

Co-authored-by: magnesj <1793152+magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2024-09-30 11:21:17 +02:00
Kristian Bendiksen
69d947309a Ubuntu 24.04 support: modernize pip install, and silence gcc 13 warnings. 2024-09-27 14:42:53 +02:00
Magne Sjaastad
41256e0b75
Include build server OS as text in about dialog 2024-08-27 07:38:53 +02:00
Kristian Bendiksen
3f2c669bc4 Respect RESINSIGHT_ENABLED_HDF5 flag on linux. 2024-08-16 15:46:22 +02:00
Magne Sjaastad
f0e19b0fb5 Use vcpkg for fast-float and spdlog 2024-08-14 13:58:11 +02:00
Kristian Bendiksen
694d2eda66 Add background data loader framework and well path loaders. 2024-08-14 11:32:07 +02:00
jonjenssen
899fdba5db
ODB 2020 and 2024 support (#11544)
* Support picking up and using odb 2020 or 2024 libraries from internal build server.
2024-07-03 12:44:16 +02:00
Magne Sjaastad
e0b84ae36a #11536 Add library to support strong typing of objects 2024-07-01 14:09:26 +02:00
Magne Sjaastad
a45de57541 Include precombiled version of OpenSsl 1.1.1 on Windows 2024-06-25 11:21:04 +02:00
Magne Sjaastad
a862f4eca0
Use cmake to find and install runtime dependencies 2024-06-17 18:33:28 +02:00
magnesj
7d50b5162e Fixes by cmake-format 2024-06-17 13:12:30 +02:00
Magne Sjaastad
2a8c69bc49 Install arrow and parquet DLLs 2024-06-17 13:02:02 +02:00
Magne Sjaastad
b050cac1d2
Make it possible to build Octave plugins independent to main build
The building of Octave plugins within main ResInsight build on RHEL8 cause the build to use gcc-12, and gcc-12 is extremely slow when building opm-common.

Adjust the CMake configuration so it is possible to build the Octave plugins as an independent build job. The plugin binaries can then be uploaded to an external server. The main ResInsight build  can download the binaries and include them in the install package for ResInsight.

Use the flag RESINSIGHT_USE_EXTERNAL_OCTAVE_PLUGINS to download external Octave plugin binaries.
2024-06-04 07:42:50 +02:00
Magne Sjaastad
1e07b239d1
Simplify configuration and use of vcpkg
* Simplify configuration and use of vcpkg
* Use 22.04
* Set and use BUILD_TYPE = Release
* Use -DVCPKG_BUILD_TYPE=release
2024-05-31 08:56:29 +02:00
Kristian Bendiksen
577ef1e154 Add support for well paths from OSDU. 2024-05-24 15:19:43 +02:00
Kristian Bendiksen
809f559792 Add test for reading Parquet files using Apache Arrow. 2024-05-22 15:24:22 +02:00
Magne Sjaastad
96481d81a8
Add tool used to extract project file revisions from project file database
* Add tool used to extract project file versions from database
* Delete old records from backup to limit number of records to 50
2024-05-04 13:21:31 +02:00
Magne Sjaastad
98144078c8
Rename to resdata
* Rename to resdata
* Remove development feature for storing grid import type in project file
* Clean up comments
2024-04-22 19:56:10 +02:00
Kristian Bendiksen
3255b649ca #11072 Refactor: remove homemade atomic counter.
std::atomic was introduced in C++11, and provides same functionality in
platform-independent way.

Fixes #11072.
2024-04-17 15:41:15 +02:00
Magne Sjaastad
a0ecdf47a5
Show git SHA for command line parameter --version 2024-02-27 12:10:19 +01:00
jonjenssen
5391179e16
Add separate target for unit tests for easier test access. Remove unit tests from ResInsight application. (#11184)
Clean up cmake configuration a bit, and pull down gtest when needed, no longer use a thirdparty subfolder
Add a ResInsight-tests target to run the unit tests
2024-02-11 20:04:04 +01:00
Magne Sjaastad
0ff5365406 Move run_Glsl2Include into VizFwk folder on Windows 2024-01-30 08:34:23 +01:00
Sigurd Pettersen
10a579fac5
Add support in VizFwk for using QOpenGLWidget derived view widget (#11091)
* Refactor to deprecate existing QGLWidget derived widget

Renamed cvfqt::OpenGLWidget to cvfqt::GLWidget_deprecated
Renamed cvfqt::CvfBoundQGLContext to cvfqt::CvfBoundQGLContext_deprecated
Renamed cvfqt::OpenGLContext to cvfqt::OpenGLContext_QGLContextAdapter_deprecated
Added cvf::OpenGLUtils

* Marked existing QtMinimal and QtMultiView as deprecated

* Additional deprecated renaming

* Added missing type

* Added missing include

* Fixes to get snippets up and running before introducing new OpenGL widgets

* Added class for OpenGLInfo

* Refactored cvf::OpenGLContext and cvf::OpenGLContextGroup, and added first cut impl of cvfqt::GLWidget and cvfqt::OpenGLWidget

* Removed unused TriggerTBBCopy.txt

* Initial support for compilation on Qt6

* Added QtMinimal and QtMinimal_GLWidget

* Refactored SnippetRunner to handle utilize cvfqt::OpenGLWidget

* Removed unused code

* Fixes and workarounds from compiling on linux

* Fixes by clang-format (#11056)

Co-authored-by: sigurdp <sigurdp@users.noreply.github.com>

* Added QTMultiView test app based on cvfqt::OpenGLWidget

* Removed includes of QOpenGLFunctions

* Modifications for compile with Qt6

* Added test bench for cvfqt::OpenGLWidget

* Minor fixes

* Force to use Qt5

* Fixes by cmake-format

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: sigurdp <sigurdp@users.noreply.github.com>
2024-01-23 08:48:05 +01:00
Magne Sjaastad
5c096748c8
Optionally log messages to file (#11059)
* Add spdlog as submodule
* Add RiaFileLogger
* Control use of file logger from preferences
2024-01-15 17:51:03 +01:00
jonjenssen
50a766591b
Enable INP support without ODB libraries (#10990)
Enable INP support without ODB libraries
2024-01-03 11:55:35 +01:00
jonjenssen
ccdad6aaaf Update ads version number 2023-12-12 11:40:55 +01:00
Magne Sjaastad
b3865d2d4a OpenVds: Update path to latest 3.2
Previous OpenVds version was removed from server, update to latest available 3.2 version
2023-12-11 10:30:21 +01:00
Magne Sjaastad
1417facef9 Avoid specific version info in URL for prebuild binaries for Windows 2023-12-04 14:59:29 +01:00
Kristian Bendiksen
fa7a56f1e2 #10861 Add import/export for grid calculations 2023-11-28 11:42:21 +01:00
Magne Sjaastad
81809efee9 Add support for grid import using opm-common
Add support for import of geometry and results for main grid. Currently no support for LGR.

Add selection in Preferences to either use libecl or opm-common for grid import.

If RESINSIGHT_DEVEL flag is set, display reader in an Eclipse case to make it possible to compare Eclipse and opm-common in same project.

Add more includes to custom-opm-common to be able to support this functionality. opm-common is unchanged.
2023-08-28 13:46:50 +02:00
Magne Sjaastad
559f02c13a Add support for linking with opm-common debug library 2023-08-28 13:46:50 +02:00
Kristian Bendiksen
7aabe8c4a8 Python: add type hinting to python code.
Types are checked using mypy.

Fixes #10394.
2023-08-23 09:47:44 +02:00
Magne Sjaastad
7a6569066c
Update opm-common for summary network names
* Use updated opm-common for summary node vectors
* Update use of precompiled opm-common
2023-08-14 11:13:05 +02:00
jonjenssen
9a219ddcb2 Update docking framework to latest version and add fix to make redocking of floating windows work on WSL/wayland 2023-05-21 15:15:46 +02:00
Magne Sjaastad
bce8177033
Delete some unused variables and disable warnings 2023-05-21 15:15:09 +02:00
Magne Sjaastad
f4dd1d363d
Add prefix to cmake options
Add missing RESINSIGHT_ prefix to cmake options
GHA: Fix warnings
2023-05-19 15:03:04 +02:00
Kristian Bendiksen
5b5a302f21 Regression Analysis: Avoid fetching Eigen 2023-05-16 09:42:18 +02:00
Kristian Bendiksen
c23cdee17d #7206 Add regression analysis. 2023-05-16 09:42:18 +02:00
Magne Sjaastad
c55d46c080
GHA: Use precompiled opm-common
* GHA: Use precompiled opm-common
* Fix cmake logic
2023-05-02 12:32:09 +02:00
Magne Sjaastad
bb0ae9e381
Add optional download of binaries in build
* #10202 Download and use binaries as part of a build
2023-05-01 18:44:05 +02:00
magnesj
3c1f0862e4 Fixes by cmake-format 2023-05-01 18:35:59 +02:00
Magne Sjaastad
b447ff86bb Add optional support for download of geomech dependencies 2023-05-01 18:35:59 +02:00
Magne Sjaastad
0907f57de9
Use target_include_directory
* Fwk: Avoid use of include_directories
* Remove target_include_directories from Commands
* Refactor cmake includes
- Avoid using include_directories, and use target_include_directories.
- Use add_subdirectory directly from main cmakefile, do not use in ApplicationLibCode.
2023-04-25 13:14:26 +02:00