Commit Graph
100 Commits
Author SHA1 Message Date
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
Magne Sjaastad c1b44e0d51 Add license info for spdlog 2024-03-22 08:46:28 +01:00
Magne Sjaastad c02f32d5d1 Bump version to 2024.03.0-RC_04 2024-03-21 09:32:09 +01:00
Magne Sjaastad d95c4c780c Fix regression causing hidden objects to be visible
Hide objects that by mistake was make visible in ce513be
2024-03-21 09:32:09 +01:00
Magne Sjaastad 672b7a2a65 Make sure all editors are updated after source stepping 2024-03-21 09:32:09 +01:00
Magne Sjaastad 7190d781d0 Grid Case Statistics: Show well data from first realization 2024-03-21 09:32:09 +01:00
Magne Sjaastad 2e456a6f9b Add font size to text content frame 2024-03-21 07:11:21 +01:00
Magne Sjaastad 785871cae3 Add realization filtering based on text string
Add unit tests and support min max range specifications. Example string "-5, 5, 8-10, 12-"
2024-03-21 07:11:21 +01:00
Magne Sjaastad 691b73d7f4 Bump version to 2024.03.0-RC_03 2024-03-19 14:33:29 +01:00
Magne Sjaastad 84875bef4f Fix source stepping on calculated vectors
Make sure the calculation ID is set when a calculated vector is selected in the toolbar
2024-03-19 14:33:29 +01:00
Magne Sjaastad a248be13cc Always rebuild meta data for summary cases
Rebuild the UI representation when needed
2024-03-19 14:33:29 +01:00
Magne Sjaastad d4f97d8415 Avoid hardcoded requirements for headers of RFT pressure files
Parsing "PSIA FEET" did not work, as "BARSA METRES" was the only supported unit. Keep special handling of header and date, and skip all other lines containing text or comment.
2024-03-19 14:22:45 +01:00
Magne Sjaastad d1d987f522 Bump version to 2024.03.0-RC_02 2024-03-18 17:58:45 +01:00
Magne Sjaastad 853d68df8b Bump version to 2024.03.0-RC_01 2024-03-18 11:49:07 +01:00
Magne Sjaastad a880a42752 Summary performance improvements
* Check flag before rebuilding summary address nodes
* Performance: Use vector instead of set and map locally in thread
* Performance: Skip looking for restart summary filenames for opm-common
* Move adding of case realization parameters to OpenMP loop
* Add unit test for file path operations
* Performance: Avoid using cdUp() function when splitting path into strings
2024-03-18 11:46:43 +01:00
Magne Sjaastad 63defd0f1a GHA: Update to peter-evans/create-pull-request@v6 2024-03-17 11:06:19 +01:00
Magne Sjaastad 76df7e8631 Remove unused function 2024-03-13 08:51:30 +01: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 9f96cb9694 #11258 Grid Calculation: Unintended release of result data memory
Avoid release of memory when working on a single case
2024-03-05 12:40:15 +01:00
Magne Sjaastad 1217236d73 #11248 Remove caching of simulation well coordinates to avoid state handling bugs 2024-03-04 12:27:56 +01:00
Magne Sjaastad 3689cccae7 Add operations on polygon : Duplicate, exportCsv, exportPol and simplify
SimplfyPolygon applies an operation on polygon to reduce the number of points in a way that the shape of the polygon is conserved.
2024-03-04 11:24:42 +01:00
Magne Sjaastad 5217ab5c8b Use signal to notify listeners when coordinates of a polygon changes 2024-03-04 11:24:42 +01:00
Magne Sjaastad 818c5c0f9c Add polygon file readers and make sure UI items are in sync
* Add polygon reader for POL file format
* Add CSV import
* Add helper function to create tag with color and text
* Show polygon color as tag, allow color edit by clicking on tag
* Support optional header in csv file
* Add Reload on polygon file
* Show warning icon if no polygons
* Improve logging text
* Do not show file polygon in view if no polygons are imported
* Use appendMenuItems
* Set default polygon color to orange
* Enter edit state when creating a new polygon
* Fix missing UI text in menu builder
2024-03-01 14:59:14 +01:00
Magne Sjaastad be1a274280 Use consistent scaling factor for gas rates in field units
Use fieldGasToOilEquivalent = 1000.0 / 5614.63;
2024-02-28 11:00:20 +01:00
Magne Sjaastad a0ecdf47a5 Show git SHA for command line parameter --version 2024-02-27 12:10:19 +01:00