Commit Graph

315 Commits

Author SHA1 Message Date
Kristian Bendiksen
23d716754e Add action for downloading and parsing well log from OSDU Wellbore DDMS. 2024-06-14 17:31:22 +02:00
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
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
Kristian Bendiksen
d1d3ee129f Refactor: Extract parser options from RicPasteAsciiDataToSummaryPlotFeatureUi 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
6e1289507f Refactor: Rename WellLogFile to WellLogData. 2024-05-28 10:44:44 +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
ed5382af24 Merge branch 'main' into dev 2024-04-25 09:34:11 +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
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
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
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
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
Kristian Bendiksen
b181c55db8 WBS Plot: use PP (from any source) for shale for SFG. 2024-04-15 13:26:08 +02:00
Kristian Bendiksen
9dc5e99be0 #11354 Fix FG_MK_MIN/FG_MK_EXP calculations
Was not using Kirsch at all due to misunderstanding.

Fixes #11354.
2024-04-15 13:26:08 +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
Kristian Bendiksen
67a9e14417 CSV Well Log: change sampling rate from 1.0 meter to 0.1 meter. 2024-04-10 13:05:34 +02:00
jonjenssen
25361ad796 Allow polygon line filter with only one point (#11345)
Allow polygon line filter with only one point, for both eclipse and geomech
2024-04-10 10:47:06 +02:00
Kristian Bendiksen
efe37bb063 Well Log CSV: fix interpolation of CSV data.
The TVD measurements from the well path were used to interpolate the CSV data.
The typically well path is too coarsely sampled which would lead unwanted
smoothing of the data.

Fixed by resampling the well path to a one meter sampling interval.
2024-04-05 14:39:46 +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
jonjenssen
1a21d2e5de Fix incorrect position for data nodes. 2024-03-18 17:42:03 +01:00
Kristian Bendiksen
6a5c6ee545 Transmissibility equations: guard against NaN in very small intersections. 2024-03-15 15:11:53 +01:00
Kristian Bendiksen
515213694c Refactor: better isnan in assert, and reduce variable lifetime. 2024-03-15 15:11:53 +01:00
jonjenssen
cb1e062e99 Exported coordinate fix (#11283)
Make sure exported well path coordinates use local coord system when needed.
2024-03-12 16:57:16 +01:00
jonjenssen
2386ad8985 Generate model based on an origin in the fault to improve calculation accuracy (#11267)
Generate model based on an origin in the fault to improve calculation accuracy.
2024-03-08 15:50:05 +01:00
Kristian Bendiksen
b8f9beab91 WBS: Compute and show FG_MK_* only in reservoir (not shale). 2024-03-04 23:47:14 +01:00
Kristian Bendiksen
04b14cf52a WBS: Compute and show SH_MK_* only in reservoir (not shale). 2024-02-29 10:47:12 +01:00
jonjenssen
86c33c1b46 Fault activation: node adjustments along fault (#11235)
Make sure same thickness vectors and fault lines are used for both parts.
2024-02-27 17:05:48 +01:00
Magne Sjaastad
28d281e1d6 Use polygon as data source for intersection
- Use polygon as data source for intersection
- Add padlock icon
- Show padlock icon on read only polygons
- Add Fwk function appendMenuItems() to make it possible to define context menu content in a PdmObject
- Context menu "Create Polygon Intersection"
- Updates to make visualization consistent with object and object collection enabled state
2024-02-25 09:21:48 +01:00
Jon Jenssen
5162ae467c Fix data access crash when no temp is available
Change element node order
2024-02-15 17:54:08 +01:00
Jon Jenssen
a4c75bab1f Merge branch 'dev' of https://github.com/OPM/ResInsight into dev 2024-02-14 18:11:42 +01:00
Jon Jenssen
fc2df17380 Fix variable name 2024-02-14 18:11:35 +01:00
Kristian Bendiksen
85753568b6 WBS Plot: Improve initial placement of curve, and add better default colors. 2024-02-14 15:16:47 +01:00
jonjenssen
0fd4ec6d0d Add option to flip node order for both parts
Use data node coordinates to decide element sets
2024-02-13 02:29:29 +01:00
jonjenssen
336dc575db Fault Reactivation: Update element sets (#11191)
* Update element sets based on active cells
* Bonus: Fix viewer crash
2024-02-12 14:52:15 +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
883622c71d #11148: Set default name to Accumulated Flow Chart 2024-02-02 10:27:20 +01:00
Magne Sjaastad
e2e441c1a0 Add RigEclipseCaseDataTools 2024-02-02 10:27:20 +01:00
Magne Sjaastad
5c92cf1511 #11077 Create result values for formations only when required 2024-02-02 10:27:20 +01:00
jonjenssen
4ce449e155 Fix fault reactivation grid generation crash 2024-02-02 01:27:11 +01:00
Magne Sjaastad
661840f425 Always compute bounding box of main grid and use OpenMP 2024-01-31 14:10:15 +01:00
Magne Sjaastad
5151717743 #11088 Use non-optimized version for old projects to compute active cells BB
The performance to compute geometry BB for active cells has improved. The original code also set displayModelOffset based on the BB of active cells. To make sure that existing project files produce identically the the same, the non-optimized version is used in this case.
2024-01-31 12:43:55 +01:00
Kristian Bendiksen
a8c719b289 #10663 WBS Plot: Import well log from CSV file.
Also compute SH_MK_MIN/EXP/MAX and FG_MK_MIN/EXP results.
2024-01-29 15:05:08 +01:00
jonjenssen
2c0ebfdbfe Add node set for fault zone boundary nodes 2024-01-27 00:38:48 +01:00
jonjenssen
2864ac7466 Extend reservoir element set to active cells in under/overburden
Fix fault extension if both sides start or end at same depth
2024-01-27 00:38:48 +01:00
Magne Sjaastad
7d601ac067 #11109 Improve visualization of MSW with valve branches
Increase default segment threshold to 4
Add an optional setting to override the default value
Use this threshold to merge short branches into parent branch
2024-01-26 09:32:42 +01:00
jonjenssen
cd0a56c924 Fault Reactivation: grid improvements (#11105)
Grid generator cleanup
2024-01-24 18:28:32 +01:00