Commit Graph

1638 Commits

Author SHA1 Message Date
Magne Sjaastad
42d700ff7d Remove unused code 2024-10-16 14:32:36 +02:00
Magne Sjaastad
2619f1a33a #11771 Highlight all curves for a realization when picking
When selecting a single curve in an ensemble, select and highlight all curves connected to this realization.
2024-10-16 14:32:36 +02:00
jonjenssen
2fe432b43d Make sure launching external processes works after switch to qt6 2024-10-15 14:58:48 +02:00
Magne Sjaastad
0330c3cacd #11761 Add special parsing of SLAVES keyword as the default parsing fails 2024-10-10 11:41:40 +02: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
Kristian Bendiksen
c75990551a #11746 Simplify layout to silence warning from Qt.
Fixes #11746
2024-10-04 16:47:06 +02:00
Magne Sjaastad
f43ecd5e92 #11731 Remove creation of same groups twice in RimWellLogExtractionCurve 2024-10-02 15:20:27 +02:00
Kristian Bendiksen
b760fcebe2 #11689 Well Target Candidates: generate on well target clusters for single case. 2024-09-30 13:42:28 +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
Magne Sjaastad
360a635cda Guard null pointer access 2024-09-27 10:38:10 +02:00
Magne Sjaastad
67adab8ad3 Make sure curve type rate/acc is calculated for existing project files 2024-09-27 10:38:10 +02:00
Magne Sjaastad
a870fceb42 Intersection: Make sure property filtered geometry is visible
When an intersection geometry is filtered by property filters, make sure that the static geometry is hidden.
2024-09-24 14:49:10 +02:00
Magne Sjaastad
19354ac7b2 Revert "Make sure intersection calculations are done before legend update"
This reverts commit a0997821c6.
2024-09-24 14:49:10 +02:00
Magne Sjaastad
a0997821c6 Make sure intersection calculations are done before legend update
The legend categories can be filtered to only visible categories. This requires the geometry generators to do intersection calculations, as the legend is created based on intersected cells.
2024-09-24 07:45:10 +02:00
Magne Sjaastad
9b150ca38a Make sure statistics cases are displayed in an Eclipse view 2024-09-24 07:45:10 +02:00
Magne Sjaastad
c65e15fad1 #11693 Add enum to control zoom operation when case is changed 2024-09-19 13:54:23 +02:00
Magne Sjaastad
80b112f4ce #11713 Polygon filter: Use a ray from point in polygon both up and down
Make sure that a polygon defined below the grid can be used to filter grid cells
2024-09-19 12:47:19 +02:00
Magne Sjaastad
2c98438528 #11708 Summary: Improve robustness for statistics calculations
There can be incomplete realizations in an ensemble. Make sure that the calculation is robust for all variants of incomplete curves.

Use RiaTimeHistoryCurveMerger to ensure one definition of time steps and extraction of curve values to be used to compute ensemble statistics.

Remove unused function.
2024-09-19 10:23:02 +02:00
Magne Sjaastad
48070f6539 #11706 Use connection depths when plotting connection data
The plotting of curve values for connections to a segment fails in some cases. The current implementation finds the segment a connection is attached to, and use the depth (both MD and TVD) information from this segment. This method is not working in all cases.

Use the reported location of connections attached to segments based on CONLENST and CONLENEN. When measured depth is requested, use these values. There might be gaps in the reported segment sequence.

Use CONDEPTH when TVD depth is requested.

Use CONBRNO to find the branch number, and then use lookup table branchIdsAndOneBasedBranchIndices to find the branch index. Use the branch index to filter the results for requested branch.

The number of values in CON* result values is different to result values for SEG* results.
2024-09-19 10:21:58 +02:00
jonjenssen
e006fe52c9
2d intersection view filter support (#11711)
Enable filters in 2d intersection view. Controlled by "Use Cell Filters for Intersections" setting in Intersection Collection properties
2024-09-19 08:41:57 +02:00
Magne Sjaastad
89bd3a8c90 #11357 Reorganize menu in 3D view
Simplify menu text for range filter
Reorganize to improve readability
Simplify cell filter menu in Project Tree
2024-09-16 09:53:23 +02:00
Magne Sjaastad
9d66e6195e
Release adjustments
* Use appendMenuItems instead of ContextCommandBuilder
* Specify RimEclipseCaseCollection menu features once
* Add function to enable up/down arrows for combo box
* Guard crash when closing project
* Improve UI for grid case ensemble
- Create a view for the first case in the ensemble
- Show case name in view title
- Enable up/down buttons to Eclipse case
* Make sure 3D views in grid ensemble are created on project load
2024-09-16 09:49:22 +02:00
Magne Sjaastad
1f80503f01 #9405 Update window title when required 2024-09-14 17:28:04 +02:00
Magne Sjaastad
d8b8c86b8f SUMO: Improve user interface
- set fields read only
- make sure custom case name is used in other UI items
- use two buttons to create data source and ensemble for selected cloud ensembles
2024-09-14 15:08:15 +02:00
Magne Sjaastad
a4159cd11e Set fields read-only and make sure custom name is propagated 2024-09-14 15:08:15 +02:00
Magne Sjaastad
f4da2d748f #11693 Store camera position for each associated case
A top level view can change the connected grid case. Add option to store the camera position for each grid case. Add option Store View Settings for Case , default off.
2024-09-13 15:06:32 +02:00
Kristian Bendiksen
281706e2eb Fix missing grid ensemble cases in RimProject::allGridCases. 2024-09-13 15:06:14 +02:00
Magne Sjaastad
9e41db33f5 Progress: optionally call QApplication::processEvents on progress updates
Add ProgressInfoEventProcessingBlocker

Co-authored-by: Kristian Bendiksen kristian.bendiksen@gmail.com
2024-09-11 12:48:54 +02:00
Magne Sjaastad
cfc97bb615 Revert "Progress: optionally call QApplication::processEvents on progress updates."
This reverts commit eb762fd122.
2024-09-10 08:18:37 +02:00
Kristian Bendiksen
58c73debe0 Add project tree for cloud data. 2024-09-09 14:32:32 +02:00
Kristian Bendiksen
eb762fd122 Progress: optionally call QApplication::processEvents on progress updates.
Fixes the missing updates of UI when running long tasks in main thread.
2024-09-09 14:15:28 +02:00
Magne Sjaastad
a00bfea40b #11663 Make sure non-Darcy data is computed
The computation of non-Darcy properties is expensive, so we cache the results. Make sure that the calling function calls this function before using the properties.
2024-09-05 08:41:06 +02:00
magnesj
fc2106edb0 Fixes by clang-tidy 2024-09-02 15:26:44 +02:00
Kristian Bendiksen
d8eb34c00d Janitor: fix memory leaks. 2024-09-02 13:58:00 +02:00
Magne Sjaastad
33188f3d6e Improve robustness when importing incomplete project file
Avoid assert, and return empty curve definition if both summary case and ensemble is undefined.
2024-09-02 13:57:41 +02:00
jonjenssen
0572069511
Support for loading only active cell geometry (#11624)
* Only load active cells for main grid, skip LGRs for now
* Handle wells with inactive cells
* Validate mapaxes transform before using it.
* Add log message
* Additional guarding when trying to find the geometrical location of a simulation cell
* Add extra safeguarding for init/restart file access in opm common. Only support unified restart files.
2024-08-28 18:22:57 +02:00
Magne Sjaastad
27c46a65fd
Improve user control on resampling operations
Allow user to specify Accumulated or Rate for a summary curve. Default setting is Auto, and summary address is used to derive Accumulated/Rate. User can set curve type explicitly.
2024-08-28 15:23:07 +02:00
Magne Sjaastad
64a559756f Improve visual appearance for depth surface
- disable intersection geometry with cell property colors
- allow opacity
- set default color to blue, as most user use this plane for oil-water contact
2024-08-28 09:22:55 +02:00
Magne Sjaastad
0fd27a3a8d Add [BETA] as postfix to user interface
Add postfix to SUMO and OSDU cloud import features.
2024-08-28 09:22:55 +02:00
Magne Sjaastad
a89fe80de3 Use sliders to manipulate surface plane extent 2024-08-28 09:22:55 +02:00
Kristian Bendiksen
0518e594ce Improve caching. 2024-08-28 08:33:44 +02:00
Kristian Bendiksen
48e32668ec Sumo ensemble parameters: handle string properties. 2024-08-28 08:33:44 +02:00
Kristian Bendiksen
44076f4911 Sumo: load parameter sensitivities (i.e. "parameters.txt") for ensembles. 2024-08-28 08:33:44 +02:00
Magne Sjaastad
bc9db44fe0 Use 1 as default size for fault mesh lines 2024-08-23 17:07:48 +02:00
Kristian Bendiksen
c322ba62bb #11636 Fix missing well path creation when importing LAS file without a well path file
Fixes #11636.
2024-08-23 17:07:48 +02:00
Magne Sjaastad
1b509c0384 Use mutex when import well paths
A shared data structure (RifWellPathImporter) is used when importing well paths. Add mutex to ensure single use of shared data structure.
2024-08-23 17:07:48 +02:00
Kristian Bendiksen
ef9a397188 Sumo: improve logging and remove some unused code. 2024-08-23 12:18:05 +02:00
Magne Sjaastad
141484f8a7 Improve error handling when trying to access OSDU data
Show more details when support for SSL is missing.

Move connection of signal/slot away from constructor. This makes it possible to use ResInsight even if SSL is not available.
2024-08-19 16:33:19 +02:00
Kristian Bendiksen
b324fdb26b Close project if cancelling well path loading. 2024-08-16 15:46:22 +02:00
Kristian Bendiksen
9bea739252 Parallelize initial import of OSDU well path. 2024-08-16 15:46:22 +02:00
Kristian Bendiksen
bf2a852b4d Add cancellation of well path collection loading. 2024-08-16 15:46:22 +02:00
Magne Sjaastad
f561973319 #11618 Add menu to create filter from existing polygons 2024-08-16 14:17:33 +02:00
Magne Sjaastad
bf471b6c73 #11595 Always return the pick event handler
Always return the pick event handler to make it possible to deactivate handler. Move the activation logic to pickingEnabled.
2024-08-16 14:17:33 +02:00
Kristian Bendiksen
76a1d43b0e Osdu: make sure token is valid before background loading. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
2651ca91b6 Add well log loaders. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
694d2eda66 Add background data loader framework and well path loaders. 2024-08-14 11:32:07 +02:00
Kristian Bendiksen
e9c46c5cec Rename RimSummaryCaseCollection to RimSummaryEnsemble. 2024-07-30 08:55:12 +02:00
Kristian Bendiksen
1d7b40fbdd Remove SSIHUB-related classes. 2024-07-29 12:24:58 +02:00
Kristian Bendiksen
4aadf6e801 Correct or remove ssihub references. 2024-07-29 12:24:58 +02:00
Magne Sjaastad
6fb74654a1 Improve interface for string operations
Trim incoming string before converting to number
Remove use of std::strtod and std::stoi
Use std::string_view instead of std::string when possible
2024-07-25 21:21:53 +02:00
Magne Sjaastad
33ffa10ec9
Janitor: Remove obsolete deleteChildren
Remove obsolete deleteChildren() in destructors. deleteChildren() is called in the destructor of PdmChildArrayField
2024-07-25 13:58:31 +02:00
Magne Sjaastad
34e30b38d3 #11372 Make sure regression curves can be resampled
Make sure a regression curve based on observed data can be resampled. Split display of curves, one section for resampled curves and one section for observed curves without resampling.
2024-07-25 10:29:16 +02:00
Magne Sjaastad
3164b39225 Allow hiding of category name in color legend item 2024-07-25 10:29:16 +02:00
Magne Sjaastad
736bfd9a96 Add Depth Surface
Add Depth surface and initialize the location of the surface based on the first available grid model. Add feature to create Depth surface.
2024-07-24 15:42:25 +02:00
Magne Sjaastad
337584025c Add convenience function to set number format to fixed with two decimals 2024-07-24 15:42:25 +02:00
Magne Sjaastad
a77f50e3a8
SUMO connector adjustments
Disable SUMO connector object when running regression tests to avoid request for credentials
2024-07-22 11:33:38 +02:00
Kristian Bendiksen
734a84956e Osdu Well Log: use channel "CurveId" instead of "Mnemonic". 2024-07-12 19:18:09 +02:00
Kristian Bendiksen
9316715063 Osdu Well Log: Save well log channels and names to xml. 2024-07-10 20:24:58 +02:00
Kristian Bendiksen
44daecac9a Refactor: move RiaOsduConnector to Tools/Cloud. 2024-07-10 18:57:15 +02:00
Kristian Bendiksen
ed7a3e98da Osdu Well Log: cache channel meta data from Osdu. 2024-07-10 18:57:15 +02:00
Kristian Bendiksen
0d845938b6 Osdu Well Log: show more values in filter. 2024-07-10 18:57:15 +02:00
Kristian Bendiksen
122b724a83 Osdu: Split blocking and non-blocking api, and fix race condition on parquet data. 2024-07-10 18:57:15 +02:00
Magne Sjaastad
1c2b8f4118 Updated icons 2024-07-05 15:55:24 +02:00
Magne Sjaastad
31d653bce7 Add Sumo summary ensemble and summary case
Add feature to create ensemble from a sumo data source
2024-07-05 12:47:54 +02:00
jonjenssen
868e9916bc
Grid preferences update (#11547)
* Refactor RifReaderSettings and grid preferences tab
2024-07-04 12:38:41 +02:00
Magne Sjaastad
16215585be Refactoring to prepare for renaming of RimSummaryCaseCollection
Move functions into RimSummaryEnsembleTools
Use enum class instead of plain enum
2024-06-24 15:33:38 +02:00
Magne Sjaastad
2724f80e8e #11516 Disable selection of cell result from intersection view
Selection of the cell result in the 3D view causes changes in active view and is very confusing for the user. Use "Activate Result in Project Tree" from right-click menu in the intersection view.
2024-06-19 07:45:51 +02:00
Magne Sjaastad
0d48c7d5b7 #11515 Show Eclipse data source on top in Property Editor 2024-06-19 07:45:51 +02:00
Kristian Bendiksen
d0a870bb38 #11514 OSDU: parse and add datum elevation to well paths. 2024-06-18 15:47:47 +02:00
jonjenssen
4365b0dfb9
Grid import using opm-common improvements (#11438)
* Update opm-common EGRID reader to support LGRs, NNCs, dual porosity, unit system info and time step filters
* Rearrange well reading code into separate class
* Update resdata library to not require an ecl_grid when reading well information. Only lgr names are needed, allows reused by opm_common reader
2024-06-18 13:03:48 +02:00
Magne Sjaastad
ccda815bde Mark single table VFP plot as obsolete
Remove features to create obsoleted plot. Remove plot creation functions. Rename to RimVfpPlot_deprecated
2024-06-18 11:49:22 +02:00
Magne Sjaastad
82dea49ac6 Add color legend to show curve set colors 2024-06-18 11:49:22 +02:00
Kristian Bendiksen
80f269715b Refactor: register keyword aliases for WellLogFile. 2024-06-17 22:22:35 +02:00
Kristian Bendiksen
81eca2c893 #11497 3D Well Log: show 3d well logs for OSDU log too. 2024-06-17 22:22:35 +02:00
Kristian Bendiksen
7125670d8c Review fixes. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
e77ecb7f7f Janitor: remove unused field. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
8854abe482 Osdu: get well paths from ddms instead of Osdu Storage api. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
10ad053c30 Osdu Well Log: make it possible to add Osdu well logs to plot. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
23d716754e Add action for downloading and parsing well log from OSDU Wellbore DDMS. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
5be47b3d2c Refactor: Use more generic base class. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
0477371e0d Refactor: use new base class WellLog where possible. 2024-06-14 17:31:22 +02:00
Magne Sjaastad
a0ebb6e496
Add copyObject to PdmObjectHandle
New syntax to copy an object

    auto curveCopy = curve->copyObject<RimSummaryCurve>();

Previous deprecated syntax

    RimColorLegend* customLegend = dynamic_cast<RimColorLegend*>(
            standardLegend->xmlCapability()->copyByXmlSerialization( caf::PdmDefaultObjectFactory::instance() ) );
2024-06-14 17:18:28 +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
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
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
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
c79f7939b4 Refactor: move method implementation to cpp file. 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
6144c1f3a6 Add Well Log root object. 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
74ba0c8b8c Refactor: Rename method name. 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
6e1289507f Refactor: Rename WellLogFile to WellLogData. 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
11128073f7 Refactor: Use NamedObject for WellLogChannel. 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
c1aba471f2 Refactor: rename WellLogFileChannel to WellLogChannel. 2024-05-28 10:44:44 +02:00
Kristian Bendiksen
577ef1e154 Add support for well paths from OSDU. 2024-05-24 15:19:43 +02:00
Kristian Bendiksen
13ec3b7f62 Rename SSIHUB to Osdu. 2024-05-24 15:19:43 +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
2862de63a6 Add GRUPTREE and WELSPECS to avoid parser error 2024-05-08 15:16:38 +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
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
aea804b161 Rename to improve readability 2024-05-03 14:39:39 +02:00
Kristian Bendiksen
03e1d4e762 #11405 Fault reactivation: fix unexpected temperature change outside reservoir.
No change in temperature is expected outside of reservoir between
first (geostatic) and other time steps when exporting reactivation model.
I.e. the temperature gradient and "top of reservoir" temperature from the
geostatic step should be used on all time steps.

Fixes #11405.
2024-05-02 11:54:21 +02:00
jonjenssen
2e4ca390c7
Remove old polygon annotations. (#11404)
* Remove old polygon annotations from GUI. 
* Upgrade old annotation objects to new polygon objects on load.
2024-05-01 10:50:19 +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
ed5382af24 Merge branch 'main' into dev 2024-04-25 09:34:11 +02:00
Magne Sjaastad
2b25ac87e7 Show error message if no flow data is available 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
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
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
8c5802c556 Remove obsolete code causing grid to be loaded for all cases 2024-04-18 13:17:58 +02:00
magnesj
932464ea55 Fixes by clang-tidy 2024-04-18 07:26:55 +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
Kristian Bendiksen
174123f8b5 Refactor: rename confusing push_back method on view collections. 2024-04-17 14:34:36 +02:00
Kristian Bendiksen
ade044adbf Grid Ensemble: add methods to add view 2024-04-17 14:34:36 +02:00
Kristian Bendiksen
b84362dfc0 Grid Ensemble: add menu item for importing grid ensemble. 2024-04-17 14:34:36 +02:00
Kristian Bendiksen
acb06b1f53 Grid Ensemble: add pdm object. 2024-04-17 14:34:36 +02:00
jonjenssen
74f55c885b Fix eclipse case contour map left click (#11378)
* Make sure we operate in the correct domain when picking points in the contour map
2024-04-17 11:54:41 +02:00
jonjenssen
5b4da82844
Fix eclipse case contour map left click (#11378)
* Make sure we operate in the correct domain when picking points in the contour map
2024-04-17 11:53:29 +02:00
Magne Sjaastad
85136fb343 Make sure project tree is updated when view is deleted 2024-04-16 15:23:53 +02:00
Kristian Bendiksen
2d688b1c8b Eclipse case: avoid invalidating vector while iterating over it. 2024-04-16 15:23:53 +02:00
Kristian Bendiksen
abf61090cc Fix intersection view regression. 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
Kristian Bendiksen
39b9a25faa Fix update of grid nodes. 2024-04-15 16:10:43 +02:00
Kristian Bendiksen
ce6199289f Show case option when not in the tree. 2024-04-15 16:10:43 +02:00
Kristian Bendiksen
21041c476d Show case option in contour map view. 2024-04-15 16:10:43 +02:00