Commit Graph

125 Commits

Author SHA1 Message Date
jonjenssen
da683bed9e Move Rig well related things to subfolder and update include statements 2024-10-31 15:08:59 +01:00
jonjenssen
88118ee4e1 Privatize grid cell array 2024-10-29 18:17:31 +01:00
Magne Sjaastad
383c7e071d
Merge in latest changes from main (#11782)
Merge main into dev after release of 2024.9.1
Includes changes to build related to conflicting Python requirements

ortools is used in the Komodo environment. This environment is not compatible with libprotoc 27 and newer. Use pinning to limit version of libprotoc<27.

Add dependency on typing_extensions
2024-10-16 09:27:09 +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
Håvard Berland
6b4e7fbdc9 Solve Python SyntaxWarning when running tests
Using is in this way has been triggering a SyntaxWarning since Python 3.8
2024-09-13 13:47:26 +02:00
Kristian Bendiksen
93f856cc53 Python: increase launch timeout. 2024-09-05 09:06:21 +02:00
Magne Sjaastad
b730a077f1 #11626 Python: By default, use port number assigned by GRPC
Using ResInsight in a server environment when many multiple versions of ResInsight is launched, can cause the port assignment to fail. Change the default value for launch_port from -1 to 0, as this will improve the logic used to assign a port to a new ResInsight session.

Using 0 will ask GRPC to find an available port to be used.
2024-08-21 09:29:18 +02:00
Samiha Hoque
4a2339661c
fix: GrpcInterface/Python/dev-requirements.txt to reduce vulnerabilities
The following vulnerabilities are fixed by pinning transitive dependencies:
- https://snyk.io/vuln/SNYK-PYTHON-SETUPTOOLS-7448482
Co-authored-by: snyk-bot <snyk-bot@snyk.io>
2024-08-12 14:00:17 +02:00
Magne Sjaastad
51ff9579aa Merge remote-tracking branch 'origin/main' into dev 2024-06-05 14:45:47 +02:00
Magne Sjaastad
84a07eed2b #11463 Look for resinsight_executable in JSON
Search for resinsight_executable in JSON-file located at ./share/rips/rips_config.json
2024-06-05 14:33:07 +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
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
b5666c333a Refactor connection between cases and views.
Eclipse grid views and contour maps are not longer a child of the case.
The views are not separate collections (one for grid and one for contour maps)
on root level.
2024-04-15 16:10:43 +02:00
Magne Sjaastad
bfda6519db
Cleanup includes
Use new tools in Visual Studio to help cleaning up includes and remove redundant includes.
2024-03-07 19:45:43 +01:00
Magne Sjaastad
e94ac51568
Optionally install python modules defined in dev-requirements.txt 2024-02-15 09:47:20 +01:00
Magne Sjaastad
e83b2e92f3
Add and use clang-tidy for GrpcInterface 2024-01-29 15:00:55 +01:00
Magne Sjaastad
9738e69f8d
Add delete of object from Python
* Move several methods to protected
* Add delete() to Python rips objects
* Move functions to RiaGrpcHelper

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2024-01-29 08:46:45 +01:00
magnesj
c6234483e6 Python code linting changes detected by black 2024-01-26 08:58:27 +01:00
Magne Sjaastad
14faf607f4 Improve error message for ResInsight exe and rips version mismatch 2024-01-18 08:54:56 +01:00
Magne Sjaastad
e67f09a4ff Add completions settings to example 2023-12-16 17:40:11 +01:00
Magne Sjaastad
a78f8f8982 Use enum instead of string 2023-11-17 09:53:30 +01:00
Kristian Bendiksen
db77ea5762 Perforation Interval: make properties scriptable from Python. 2023-10-09 08:35:42 +02:00
Kristian Bendiksen
1899184a41 Janitor: Remove deprecated method. 2023-09-11 17:39:38 +02:00
Kristian Bendiksen
1edac5762d #10568 StimPlan Template: Add python api for appending Pressure Table Items 2023-09-07 09:18:41 +02:00
Kristian Bendiksen
4b12f82583 Python: require python version >= 3.8. 2023-08-23 09:47:44 +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
github-actions[bot]
e4d5871072 Python code linting changes detected by black (#10455)
Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2023-07-11 09:22:14 +02:00
Magne Sjaastad
f20a83c710 Add create_statistics_case
Remove original implementation not working in gridcasegroup.py
Add create_statistics_case object method
2023-07-11 09:22:14 +02:00
Magne Sjaastad
f72fcdd868 Use descendants() 2023-07-11 09:22:14 +02:00
Magne Sjaastad
ad4930db79
Add script used to compute statistics on generated data in Python 2023-07-06 12:58:22 +02:00
Magne Sjaastad
8f83d25c9d
Publish Python package to pypi when a commit is tagged
* Publish to pypi from main workflow
* Remove pinning
* Include version info for proto tool in RiaVersionInfo.py
2023-06-29 14:07:04 +02:00
Magne Sjaastad
36811e7f94
Prepare for release RC_04
* Add example for import_case for ROFF
* Add field and object keywords
2023-06-12 15:52:20 +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
Magne Sjaastad
0c90f67dcc
Change API for PdmObjectHandle and PdmFieldHandle
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
2023-05-12 21:41:34 +02:00
Jørgen Herje
862e67755a
Add Python support for import of property files for .roff and .grdecl (#10183)
- Add RimcEclipseCase
- Add tests for import case properties (.roff and .grdecl)
- Make rips handle list of strings as input in Pyton API
2023-04-27 10:53:33 +02:00
Jørgen Herje
457dc9080f
Refactor classes in RigWellResultPoint.h
* Move RigWellResultFrame implementation into separate file
Update/correct includes accordingly

* First step of moving attributes from public to private
- Move public members to private and create interface
- Single public member remains due to strong dependency on usage of reference and reference to its object public members

* Second step of moving attributes from public to privatee
- Remove usage of reference directly to attributes. Interface with copy and set.
- Moving attributes in RigWellResultFrame and RigWellResultBranch

* Move class RigWellResultBranch into separate file
2023-04-14 11:00:45 +02:00
Magne Sjaastad
d2f435c00a
Improved simulation well visualization
* Move members to private in RigWellResultPoint
* Create simulation well path geometry using well topology
* Add separate MSW well pipe centerline computations
* Review comments

---------

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2023-02-28 16:06:37 +01:00
Magne Sjaastad
eb8c0c1de7 Add missing include and update example 2023-02-05 10:24:44 +01:00
jonjenssen
21ccd733a8 Python code linting changes detected by black 2023-02-01 10:32:58 +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
c8dbf3d125
Trim spaces and avoid spaces in generated address text
* Trim spaces and avoid spaces in generated address text
* Fix unit test
2023-01-24 11:26:34 +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
Kristian Bendiksen
7215504b16 Python: add unit test for load_case for roff, roffasc and grdecl. 2023-01-06 14:57:17 +01:00
Kristian Bendiksen
8f33caef74 Fracture: Make conductivity type scriptable from python. 2022-12-20 08:44:42 +01:00
Magne Sjaastad
38bfa9ef1f
#9588 Accumulate N cells for AABB tree 2022-12-19 15:24:53 +01:00
Magne Sjaastad
cfa9d07d8e #9563 Reorganize how and when objects are deleted when shutting down GRPC 2022-12-11 10:15:26 +01:00
Kristian Bendiksen
69ccce225c #9470 Fracture Template: make perforation length scriptable.
Also use it in example script.
2022-11-25 07:41:27 +01:00
Kristian Bendiksen
26dd61a604 Python: Add api and example to get fracture template scale factors. 2022-10-28 15:09:34 +02:00
Kristian Bendiksen
737eb9693a Thermal Fracture: add api for changing time step from python 2022-10-24 12:01:34 +02:00