Commit Graph

375 Commits

Author SHA1 Message Date
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
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
d2a160f793 Make RFT pressure data more robust
Replace tab with space, and fix an out of bounds bug.
2024-09-24 14:49:10 +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
fd2989972d
Add option to skip/invalidate long, thin cells. (#11691)
* Add option to choose if the user wants to skip/invalidate long, thin cells.
2024-09-13 07:34:14 +02:00
Magne Sjaastad
a3a740b722 PFLOTRAN: Make parsing of faults more robust
Remove logging text causing noise, write out message only when PFLOTRAN file is found.
2024-09-11 10:28:07 +02:00
Magne Sjaastad
e9509f026a Improve robustness when parsing PFLOTRAN files
The include statements can optionally have a / at the end of the line. Make sure the parsing handles this correctly.
2024-09-06 17:22:09 +02:00
magnesj
fc2106edb0 Fixes by clang-tidy 2024-09-02 15:26:44 +02:00
Kristian Bendiksen
1736c01dfa Janitor: fix warning on clang 14. 2024-09-02 13:58:00 +02:00
Magne Sjaastad
24fcec79ab
Look for fault definition in Pflotran input files
Look for fault definition in Pflotran input files If no *.DATA file is found, look for *.IN file and search for fault definitions.
2024-08-30 10:03:03 +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
Kristian Bendiksen
48e32668ec Sumo ensemble parameters: handle string properties. 2024-08-28 08:33:44 +02:00
Magne Sjaastad
392a794393 #11562 RFT plots with nonproducing segments
Identify when we have a tubing segments that do not have a device segment connected. Mark the downstream device segment as non-continuous. When MD for device curve is created, add an extra MD for noncontinuous segments. Use inf as data value for this MD. This will ensure that no curve is displayed in this section of the device curve.
2024-08-20 14:46:04 +02:00
magnesj
3a54045c28 Fixes by clang-tidy 2024-08-15 07:11:40 +02:00
Magne Sjaastad
f0e19b0fb5 Use vcpkg for fast-float and spdlog 2024-08-14 13:58:11 +02:00
Kristian Bendiksen
e9c46c5cec Rename RimSummaryCaseCollection to RimSummaryEnsemble. 2024-07-30 08:55:12 +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
Kristian Bendiksen
56e139b9d6 #11556 StimPlan Model: export deviation with less precision.
Fixes #11556.
2024-07-10 17:51:57 +02:00
jonjenssen
868e9916bc
Grid preferences update (#11547)
* Refactor RifReaderSettings and grid preferences tab
2024-07-04 12:38:41 +02:00
Magne Sjaastad
f2d79da8be Use template to convert arrow::ChunkedArray 2024-07-01 16:19:36 +02:00
Magne Sjaastad
58b3f0b928 Fix compiler issue when importing arrow
The arrow library has a function parameter called signals that causes trouble when compiled using Qt. Add undef signals to avoid this issue.
2024-07-01 14:09:56 +02:00
jonjenssen
2f5f83b959
opm_common reader updates (#11535)
* Read NNC info from init file, if needed
* Read active cell information before geometry
2024-07-01 12:44:41 +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
Kristian Bendiksen
71929a234a Refactor: Extract arrow tools. 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
35a2623a36 Arrow: remove unused header file. 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
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
Kristian Bendiksen
d1d3ee129f Refactor: Extract parser options from RicPasteAsciiDataToSummaryPlotFeatureUi 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
577ef1e154 Add support for well paths from OSDU. 2024-05-24 15:19:43 +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
Kristian Bendiksen
3dcca744e1 #11405 Fault Reactivation: add temperature initial conditions. 2024-05-02 11:54:21 +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
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
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
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
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
magnesj
b9c5ff816a Fixes by clang-tidy 2024-03-13 08:51:01 +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
Jon Jenssen
f411b5fabe Do not crash if no valid points are found when importing a surface .dat file due to i.e. incorrect file format (comma separated, not space separated) 2024-03-12 13:01:35 +01:00
jonjenssen
bcc4f7c901 Add more decimals to node coordinates to improve accuracy 2024-03-04 23:47:27 +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
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
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
672fbe177b
Improve summary calculation performance
* Only reload calculation data
* Make sure performance is good when a calculated object is added or changed
- avoid recreation of summary file readers
- delete all nodes in address tree representing calculated curves
- build address nodes for calculated curves
2024-02-26 13:55:41 +01:00
jonjenssen
09151ec6af Use S5 for top, fault and base surfaces.
Add expansion material parameter (requires updated XML)
2024-02-24 02:53:14 +01:00