Commit Graph
100 Commits
Author SHA1 Message Date
Magne Sjaastad fe63231db9 Add support for multiple curve sets in one VFP plot
- support selection of multiple values for multiple producer variables
- use one color for curves in a curve set representing a VFP curve collection
- use symbols to indicate individual family values for curves
- show all required values to identify curves as curve legend text and curve mouse hover text
- make sure all available settings of axis property object is applied to the plot axis
- support display of all curve data using "Show Plot Data"
2024-06-12 09:35:28 +02:00
Magne Sjaastad 13532b0fe4 Add partial specialization for float and double
In PdmFieldWriter::writeFieldData, the numeric values are converted to string with a selected precision. isEqual() is used when comparing values for field editors in PdmFieldUiCap<FieldType>::valueOptions()
2024-06-12 09:35:28 +02:00
Magne Sjaastad 015f248dd9 Show properties for selected object in main project tree
There can be several project trees in a project. Ensure that the selected object in the main project tree is displayed in the property editor.
2024-06-12 09:35:28 +02:00
Magne Sjaastad 742bb5f0d2 #11485 Disable Python and unit test to fix build on GitHub
Recent changes on GitHub is breaking the build. Temporarily disable Python and unit tests as a workaround.

https://github.com/actions/runner-images/issues/10004
2024-06-10 11:44:36 +02:00
Magne Sjaastad 431c8f5a27 Build release only for vcpkg packages 2024-06-09 12:17:25 +02:00
Magne Sjaastad ea17b1ec07 #11482 Add fault mesh line thickness option 2024-06-07 11:13:10 +02:00
Magne Sjaastad f7dccd8149 #11482 Show mesh lines by default for faults in contour maps
Add settings used to control the visibility of fault mesh
2024-06-07 11:13:10 +02:00
Magne Sjaastad a6fe630e5f Temporary LGR: Make sure the view is updated based on new LGRs
A missing update caused the regression test TestCase_Create_Lgr_For_Completions  to fail due to missing visibility of temporary LGRs.
2024-06-07 11:10:13 +02:00
Magne Sjaastad 51ff9579aa Merge remote-tracking branch 'origin/main' into dev 2024-06-05 14:45:47 +02:00
Magne Sjaastad 41d5e498d7 Simplify PdmDocument class and move fileName to private
Remove resolveReferencesRecursively() and initAfterReadRecursively() from PdmDocument::readFile(). These functions will be called in RiaApplication::loadProject after the file paths modifications are done. This will ensure that file paths can be used in initAfterRead() functions.
2024-06-05 14:35:01 +02:00
Magne Sjaastad beccd2454e Move updatedFilePathFromPathId() to private
File paths are now updated in initAfterRead()
2024-06-05 14:35:01 +02:00
Magne Sjaastad a952fbce7e Move function to RiaProjectFileTools
Rename to RiaProjectFileTools
2024-06-05 14:35:01 +02:00
Magne Sjaastad 27339a91fa Guard nullpointer crash 2024-06-05 14:35:01 +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 acfbd94263 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 10:55:52 +02:00
Magne Sjaastad 08dc3885a0 Octave: Change default port number and add custom port number to Preferences 2024-06-04 10:55:52 +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 1c899df063 Octave: Change default port number and add custom port number to Preferences 2024-06-03 10:17:21 +02:00
Magne Sjaastad 3f535e5b62 Add bundling of QtNetworkAuth 2024-06-01 14:40:20 +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 1d57b9032b Custom vfp plot (#11450)
* AppFwk: When clearing a tree selection, make sure all values are cleared
* Fix deprecated implicit lambda
* Add support for using the closest value in addition to exact match
* Add table data source object and add plot with multiple data sources
Delete the temporary RimVfpDeck class
Add RimVfpTable to represent a table in a data source
Add plot able to show data from multiple tables

* AppFwk: Make it possible to call resolveReferences multiple times
Use case: Vfp tables are stored in files. Multiple tables can be present in one file. Pdm table objects are created after resolve references is done as part of parsing file. When the Pdm object are created, resolveReferences can be called once more.

* Call resolveReferencesRecursively() after RimVfpTable objects are created
2024-05-29 12:55:45 +02:00
Magne Sjaastad 2fb54ac1ec Add qtnetworkauth to clang-tidy workflow 2024-05-29 10:14:41 +02:00
Magne Sjaastad c7fbb5374c #11437 Propagate detected date format to line based parsing
Add try/catch to avoid crash
Remove flag to avoid eternal loop
2024-05-28 12:54:40 +02:00
Magne Sjaastad 1b93347aea Fix unity build 2024-05-24 15:19:43 +02:00
Magne Sjaastad 11563666e6 #11358 Guard overwrite of already calculated statistics values
Statistics can be computed in two ways, precise using all available cell values and fast based on a histogram. A flag indicates if the P10/P90 values are calculated. Check this flag before assigning values using the fast histogram method.
2024-05-22 10:04:41 +02:00
Magne Sjaastad bbebdbba4c Bump to Python 3.11 2024-05-22 10:04:16 +02:00
Magne Sjaastad ff9b13163a Add RimVfpTableData used to represent connection to file and data
Extract data management from RimVfpPlot. Use pointer from RimVfpPlot to RimVfpTableData.
2024-05-13 15:45:55 +02:00
Magne Sjaastad b8391e6f92 Remove pure virtual from RimPlotCurve
Make it possible to use RimPlotCurve directly. Remove depnendencies on special implementation in derived classes.
2024-05-13 15:45:55 +02:00
Magne Sjaastad 2ad6c0fff2 Set artifact retention-days to 5
The delete artifact action is no longer working, set retention-days to 5
2024-05-10 09:09:46 +02:00
Magne Sjaastad 68e423f1b8 #11430 Add trimming of header words to identify CSV as line based 2024-05-08 15:20:21 +02:00
Magne Sjaastad 2862de63a6 Add GRUPTREE and WELSPECS to avoid parser error 2024-05-08 15:16:38 +02:00
Magne Sjaastad e98d839055 Bump version to dev.04 2024-05-08 07:29:18 +02:00
Magne Sjaastad 0ba11af5a4 Performance: Improve performance when adding a summary calculation
Rebuild and update of the project tree for summary objects in Data Sources can be time consuming for large cases. Make sure the update of UI only happens when required.
2024-05-08 07:29:18 +02:00
Magne Sjaastad aae5f55dc2 Rename to "Import VFP Data" 2024-05-07 17:06:41 +02:00
Magne Sjaastad b0e0bc5f14 Add more details to error messages during parsing of input files 2024-05-07 17:06:41 +02:00
Magne Sjaastad c685cff654 Bump to 2024.03.4-dev.03 2024-05-06 10:07:53 +02:00
Magne Sjaastad ae7f29c80f #11418 Fix calculation between multiple cases 2024-05-06 09:48:00 +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 a55b53c725 Add parsing of *.DATA and add zoom to VFP plots
Parse *.DATA and create VFP plots for all tables
Add zoom in VFP plots
2024-05-03 14:39:39 +02:00
Magne Sjaastad b7e5867430 Move qwt axis functions to RimPlotAxisTools 2024-05-03 14:39:39 +02:00
Magne Sjaastad 6d478ddb3c Use opm parser to find all VFP data based on a *.DATA file 2024-05-03 14:39:39 +02:00
Magne Sjaastad 24aa7fca3e Make sure onChildrenUpdated is called in RicToggleItemsOnOthersOffFeature 2024-05-03 14:39:39 +02:00
Magne Sjaastad aea804b161 Rename to improve readability 2024-05-03 14:39:39 +02:00
Magne Sjaastad 4617bcc673 11402 Save copy of project file to a backup database when saving project file 2024-05-01 09:46:22 +02:00
Magne Sjaastad 3cd80f0871 Always move views from obsolete fields into view collection
The original code caused ProjectFiles2024Tests\TestCase_GridCalculations to fail
2024-04-28 08:26:15 +02:00
Magne Sjaastad df7112e615 Add missing includes 2024-04-25 10:00:25 +02:00
Magne Sjaastad 26df3dda7d Prepare dev branch for new features 2024-04-25 09:37:27 +02:00
Magne Sjaastad ed5382af24 Merge branch 'main' into dev 2024-04-25 09:34:11 +02:00
Magne Sjaastad 15fe46cf1f Release 2024.03.3 2024-04-25 09:22:43 +02:00
Magne Sjaastad 2b25ac87e7 Show error message if no flow data is available 2024-04-25 09:22:43 +02:00
Magne Sjaastad a993841671 #11396 RelPerm: Remove display of KROG curve if no gas is present 2024-04-25 09:22:43 +02:00
Magne Sjaastad 6e74fa98c0 #11395 Grid Calculation: Make sure a generated result can be used 2024-04-25 09:22:43 +02:00
Magne Sjaastad d1e871eb69 #11393 Contour map: Make sure polygon cell filter works as expected
Add the polygonInViewCollection to display the polygon in tree view. This makes the polygon filter work, and interaction in contour map is also supported.

Polygon cell filters are not working due to different organization of the project tree for Eclipse view and contour map view. Manually assign pointers to polygon objects.
2024-04-25 09:22:43 +02:00
Magne Sjaastad ff12d48ff2 #11394 Make sure single click for source stepper selected item once 2024-04-25 09:22:43 +02:00
Magne Sjaastad f3cf849458 #11391 RFT plot: Check if formations are present before extracting data 2024-04-25 09:22:43 +02:00
Magne Sjaastad 3965041550 Set a max limit for number of categories sent to category mapper
It is not possible to use the category mapper for a large number of categories.
2024-04-25 09:22:43 +02:00
Magne Sjaastad 534348c1a0 #11385 Add exclude list used during identification of category results 2024-04-25 09:22:43 +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
Magne Sjaastad c17e5237ca Revert "Early return if data already is available"
This reverts commit 274d4fc0db.
2024-04-22 12:25:20 +02:00
Magne Sjaastad 16be653826 Updates after patch release 2024-04-22 10:33:45 +02:00
Magne Sjaastad b78cc23add Release 2024.03.2 2024-04-22 10:01:41 +02:00
Magne Sjaastad 1bee1d9bed Make sure we read data from file reader only when required
Use same pattern as for dynamic results.
2024-04-22 09:54:43 +02:00
Magne Sjaastad 91c82f0010 Revert "Early return if data already is available"
This reverts commit 274d4fc0db.
2024-04-22 09:07:22 +02:00
Magne Sjaastad 745f9883b5 GHA: Fix download-artifact version 2024-04-19 16:01:18 +02:00
e9ff3540ba Update dev branch after patch release
* Fix calculation for active cell values
Always allocate result data for active cells in destination case. Make sure that active cells is used for both population of expression variables and filtering of data. Improved naming to make it clear that we always work with active cell data.

* Check if scalar result index is valid
* Create the static scalar results once
addStaticScalarResult will clear already computed data, causing calculations to be triggered once more

* Early return if data already is available
If not checking if data is available, data is read from file and appended to result vector.

* Always check date for H5 files, and recreate if required

* Always recreate ESMRY if file exists and is older than SMSPEC

* #11355 Use category if result name starts with FIP or ends with NUM

* #11337 Summary import: Make sure ESMRY includes restart history

* #11334 Fix cvf::Viewport assert triggered for small contour map/2d intersection
Size of the overlay is could become negative, and would overflow for small views.

* #11310 Fix assert on single cell model.
Well pipe radius would become HUGE_VAL due to off-by-one error.
The assert could only happen on model with a single cell.

* Check equal grid size only when required
Equal grid size is required if there is more than one grid case in the expression. If a cell filter view is active, the visibility is based on one view and reused for all other grid models, and requires equal grid size.

* Remove obsolete log message

* Do not show dialog during regression tests

* Fix eclipse case contour map left click (#11378)

* Make sure we operate in the correct domain when picking points in the contour map

* Remove obsolete code causing grid to be loaded for all cases


* Bump version to 2024.03.1

---------

Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
Co-authored-by: jonjenssen <69144954+jonjenssen@users.noreply.github.com>
2024-04-19 15:09:15 +02:00
Magne Sjaastad 8b59849203 Bump version to 2024.03.1 2024-04-19 12:34:52 +02:00
Magne Sjaastad e71226dc8d Bump version to 2024.03.1-RC_02 2024-04-18 13:24:15 +02:00
Magne Sjaastad 8c5802c556 Remove obsolete code causing grid to be loaded for all cases 2024-04-18 13:17:58 +02:00
Magne Sjaastad c759a11888 Cmake cleanup and selected Qt6 adjustments
- Avoid warning using newer CMake by removing obsolete cmake requirements in sub projects
- Several adjustments preparing for Qt6
2024-04-17 15:06:51 +02:00
Magne Sjaastad 38e4cc364b Update qwt with optional Qt6 support 2024-04-16 15:32:55 +02:00
Magne Sjaastad 85136fb343 Make sure project tree is updated when view is deleted 2024-04-16 15:23:53 +02:00
Magne Sjaastad 030688cff6 Several adjustments related to Qt6
* Avoid ambiguous definition during unity build on Windows
* Add missing include
* Add Qt6 to expressionparser
* Add Qt6 to nightcharts
* Replace forward define of QStringList with include <QStringList>
* Use toMSecsSinceEpoch
* Use setContentsMargins
2024-04-16 14:22:15 +02:00
Magne Sjaastad 62e497f5fc Bump version to 2024.03.1-RC_01 2024-04-15 10:33:56 +02:00
Magne Sjaastad 16bdf6cd92 Do not show dialog during regression tests 2024-04-15 10:33:56 +02:00
Magne Sjaastad 2893a5deee Remove obsolete log message 2024-04-15 10:33:56 +02:00
Magne Sjaastad 07cc21587a Check equal grid size only when required
Equal grid size is required if there is more than one grid case in the expression. If a cell filter view is active, the visibility is based on one view and reused for all other grid models, and requires equal grid size.
2024-04-15 10:33:56 +02:00
Magne Sjaastad 3e2957bc12 #11337 Summary import: Make sure ESMRY includes restart history 2024-04-15 10:33:56 +02:00
Magne Sjaastad b9d9d53964 #11355 Use category if result name starts with FIP or ends with NUM 2024-04-15 10:33:56 +02:00
Magne Sjaastad 44e32fcff3 Always recreate ESMRY if file exists and is older than SMSPEC 2024-04-15 10:33:56 +02:00
Magne Sjaastad de4a5bba27 Always check date for H5 files, and recreate if required 2024-04-15 10:33:56 +02:00
Magne Sjaastad 274d4fc0db Early return if data already is available
If not checking if data is available, data is read from file and appended to result vector.
2024-04-15 10:33:56 +02:00
Magne Sjaastad d6a1db843f Create the static scalar results once
addStaticScalarResult will clear already computed data, causing calculations to be triggered once more
2024-04-15 10:33:56 +02:00
Magne Sjaastad caaba8b2af Check if scalar result index is valid 2024-04-15 10:33:56 +02:00
Magne Sjaastad 65a2d9e7b9 Fix calculation for active cell values
Always allocate result data for active cells in destination case. Make sure that active cells is used for both population of expression variables and filtering of data. Improved naming to make it clear that we always work with active cell data.
2024-04-15 10:33:56 +02:00
Magne Sjaastad 869a2430ae Revert "Pin cmake to 3.28.x due to build issues with 3.29"
This reverts commit df0a86f076.

Issue was fixed in 3.29.2
https://gitlab.kitware.com/cmake/cmake/-/issues/25873
2024-04-14 20:27:08 +02:00
Magne Sjaastad 8b1b9acd84 #11337 Summary import: Make sure ESMRY includes restart history 2024-04-08 15:57:10 +02:00
Magne Sjaastad df0a86f076 Pin cmake to 3.28.x due to build issues with 3.29 2024-04-07 14:16:12 +02:00
Magne Sjaastad ef637e3053 Move stream operator from AppEnum header
This PR will reduce the compile time of code using AppEnum. 

* AppEnum: Move QTextStream operator to avoid include of QTextStream
* Avoid use of iostream in cafAssert
rator to avoid include of QTextStream

Include file profiling shows that include of QTextStream is a performance issue. Create a non-templated base class for AppEnum. Implement the QTextStream operator for this interface.
2024-03-25 15:14:04 +01:00
Magne Sjaastad d72a45d3fe Bump version to 2024.03.1-dev.01 2024-03-25 12:59:48 +01:00
Magne Sjaastad 820fa561ba Fix deploy to pypi 2024-03-25 12:57:49 +01:00
Magne Sjaastad 2842f59db9 Merge tag 'v2024.03.0' into dev 2024-03-25 10:41:20 +01:00
Magne Sjaastad 4a0c2f2f4f Merge pull request #11316 from OPM/dev
Release 2024.03
2024-03-25 10:32:37 +01:00
Magne Sjaastad e069e13c86 Bump version to 2024.03.0 2024-03-25 10:21:31 +01:00
Magne Sjaastad b57767d895 Add feature to set parent well 2024-03-25 10:19:31 +01:00
Magne Sjaastad 7e60a4185b Merge pull request #11315 from OPM/main
Merge pull request #10940 from OPM/dev
2024-03-25 10:09:15 +01:00
Magne Sjaastad cf4cf562b0 Bump version to 2024.03.0-RC_04 2024-03-22 08:46:28 +01:00
Magne Sjaastad 5d2ac1f84d Add object and keywords for 2024.03 2024-03-22 08:46:28 +01:00
Magne Sjaastad eaa96a042b Fix detection of ROFF file type 2024-03-22 08:46:28 +01:00
Magne Sjaastad 61254ba1b2 Summary: Set default value true for display of sub nodes
Set display of summary nodes to true. This will ensure that the display of vectors in "Data Sources" for a single summary case will be updated when a calculated curve is added or removed.
2024-03-22 08:46:28 +01:00
Magne Sjaastad 78759feb15 Update GUI editor if a new summary vector is set created
Make sure the user interface is updated when summary data is set from Python using summary_case.set_summary_values
2024-03-22 08:46:28 +01:00