Commit Graph

339 Commits

Author SHA1 Message Date
Kristian Bendiksen
ea4e46b400 #10743 Fault Reactivation: export temperature and void ratio per node.
Fixes #10743.
2023-10-30 16:09:10 +01:00
Kristian Bendiksen
d20af80b85 #10678 Fault Reactivation Model: export more materials. 2023-10-18 18:44:03 +02:00
jonjenssen
7494302275
Fault Reactivation updates (#10727)
* Generate reservoir element sets
* Add support for materials
* Add local coordinate system support for exported model
2023-10-18 09:10:08 +02:00
Magne Sjaastad
7b28a23668 Improve parsing of units in CSV column headers
Detect units enclosed by both () and []
Avoid duplicate vector name in UI
2023-10-13 16:31:14 +02:00
Magne Sjaastad
cdda7480f3
Show Plot Data missing for some plots
* Add plotContentAsText() to bar chart builder
* Add show plot data to analysis plot
* Refactor analysis plot
* Enable context menu in Analysis Plot
* Add show plot data for general RimPlots
* Show plot data for correlation report in three separate text dialogs
2023-10-11 08:54:52 +02:00
Magne Sjaastad
21843820e6
Update clang-tidy.yml
* Make sure clang-tidy action use .clang-tidy config file
Use add-paths to instruct create-pull-request to a sub folder to avoid diff from Qt and vcpkg

* Use empty() in macro to avoid clang-tidy warning
* Add NOLINT to CAF_ASSERT
* Add NOLINT to cvfAssert
2023-10-03 09:04:08 +02:00
Kristian Bendiksen
8df4dd42eb Refactor: rename RimWellLogFile to RimWellLogLasFile 2023-10-02 16:04:53 +02:00
Kristian Bendiksen
d177491843 #10648 Refactor summary reader: return std::vector<double> instead of taking ptr. 2023-10-02 09:16:52 +02:00
Magne Sjaastad
263e39b97b
Add regression curves to ensemble statistics curves
* Add statistics enum
* Support ensemble statistics curve as data source for regression curves
* Allow creation of regression curves from statistics curves
* Make sure regression curves are updated after source curves
* Add state to use full or user defined range for regression source data
* Add isRegressionCurve
* Make sure source stepping works when regression curves are present
2023-09-30 11:07:23 +02:00
Kristian Bendiksen
1b70eaabb4 Fault Reactivation Export: Remove front and back sets. 2023-09-29 14:43:48 +02:00
Kristian Bendiksen
78becc81ac Fault Reactivation Export: print pore pressure per step to file. 2023-09-29 14:43:48 +02:00
Kristian Bendiksen
ca89bc429f Fault Reactivation Export: Use transform instead of orientation. 2023-09-29 14:43:48 +02:00
Kristian Bendiksen
8022b4e5bb Fault Reactivation Export: handle steps selection in export. 2023-09-27 12:41:35 +02:00
Kristian Bendiksen
74a656f47c Fault reactivation export: improve error handling. 2023-09-27 12:41:35 +02:00
Kristian Bendiksen
959c9d48fa #10649 ApplicationLibCode: Use collection.empty() instead of comparing with size 2023-09-27 10:16:37 +02:00
Magne Sjaastad
fb288f602d
Support ensemble cross plot curves
* Remove use of RifEnsembleStatisticsReader
* Add RimSummaryAddressSelector and RimEnsembleCrossPlotStatisticsCase
* Remove RifEnsembleStatisticsReader
* Add support for cross plot x-axis selection
* Support source stepping on ensemble cross plot curves
* Add isXAxisSummaryVector
2023-09-25 12:45:47 +02:00
Kristian Bendiksen
8e5788bb24 Reveal: dump StimPlan XML for debugging thermal completions. 2023-09-25 09:33:37 +02:00
Kristian Bendiksen
b44eee2d18 Fault Reactivation: Fix part boundary conditions.
Disallows movement out of the plane (fixates the nodes in Y direction).
2023-09-22 10:15:31 +02:00
Kristian Bendiksen
816bb2df8f Revert "Fault Reactivation Model: Remove incorrect boundary conditions."
This reverts commit 06eb0fb724.
2023-09-22 10:15:31 +02:00
kriben
f22a013bc6 Fixes by clang-format 2023-09-20 19:55:39 +02:00
Kristian Bendiksen
06eb0fb724 Fault Reactivation Model: Remove incorrect boundary conditions. 2023-09-20 19:55:39 +02:00
Kristian Bendiksen
636535e720 Fault Reactivation Model: include local coord rotation in INP export. 2023-09-20 19:55:39 +02:00
Kristian Bendiksen
5fc5828d66 Fault Reactivation: Include application in INP export file. 2023-09-20 19:55:39 +02:00
Kristian Bendiksen
4f9e2dd2a3 Fault Reactivation Model: fix face definition in INP export. 2023-09-20 19:55:39 +02:00
Kristian Bendiksen
36f501ee92 Fault Reactivation Model: simplify export contents. 2023-09-20 19:55:39 +02:00
magnesj
0cd6cdd67e Fixes by clang-format 2023-09-20 09:58:48 +02:00
Magne Sjaastad
806f367566 Rename to SummaryCategory 2023-09-20 09:58:48 +02:00
Magne Sjaastad
c06cda3883 Add summary category time
To be able to represent the time in a RifEclipseSummaryAddress object we add time as a category
2023-09-20 09:58:48 +02:00
jonjenssen
5d3fb8ceb9
Fault reactivation (#10624)
Update result to generate well paths based on information from model generator. Store settings in JSON file.
Add method to access local coordinate system definition
2023-09-19 18:03:36 +02:00
Kristian Bendiksen
e8cbbf5d55 Fault Reactivation Model Export: fix problems after run. 2023-09-13 14:09:34 +02:00
Magne Sjaastad
13b4c19bbb
Import of AICD valve definition from text file
* Add readKeywordContentFromFile
* Add import of AICD values from Completor and Eclipse
2023-09-12 19:45:32 +02:00
Magne Sjaastad
453fca7ba4 Compute TVD when MD is extracted from well path 2023-09-08 08:38:46 +02:00
Kristian Bendiksen
406c208b33 Refactor: Split INP exporter into parts. 2023-09-06 13:51:59 +02:00
jonjenssen
a2632982b5 Code updates 2023-09-06 13:51:59 +02:00
Kristian Bendiksen
ddd7410730 Write more data to inp file. 2023-09-06 13:51:59 +02:00
Jon Jenssen
3817cea3cf Fix grid generation.
Add model thickness parameter.
Add support for reloading INP files from recent files
Add working directory field to fault reactivation model and put INP export there.
2023-09-06 13:51:59 +02:00
Kristian Bendiksen
d7bff0472e Add fault reactivation file export. 2023-09-06 13:51:59 +02:00
Kristian Bendiksen
bddabacc3e #10437 Add utility for exporting Abaqus INP files. 2023-09-06 13:51:59 +02:00
Magne Sjaastad
3e3812469a #10574 opm-common: Add support for map axes import 2023-09-04 14:11:47 +02:00
Magne Sjaastad
7a782cec66
RFT ensemble refactoring
* Compute average MD for intersections with a cell
* Create extractor for simulation well
* Remove rftReader from RifDataSourceForRftPlt
* Add function compute measured depth for RFT cells based on well path geometry
* Move statistics reader to well ensemble curve set
* Make sure both TVD and MD are cached if possible
* Add selection of grid case to use for estimation of measured depth (MD)
Add "Grid Model For MD" where the user can select a grid model. This grid model is propagated to a hidden field in EnsembleCurveSet. The grid model is then applied to RifReaderEnsembleStatisticsRft owned by EnsembleCurveSet
2023-09-04 10:08:30 +02:00
Magne Sjaastad
81809efee9 Add support for grid import using opm-common
Add support for import of geometry and results for main grid. Currently no support for LGR.

Add selection in Preferences to either use libecl or opm-common for grid import.

If RESINSIGHT_DEVEL flag is set, display reader in an Eclipse case to make it possible to compare Eclipse and opm-common in same project.

Add more includes to custom-opm-common to be able to support this functionality. opm-common is unchanged.
2023-08-28 13:46:50 +02:00
Magne Sjaastad
b1157436fe #10523 Export sector model: Support more result categories
Allow export of GENERATED and INPUT_PROPERTY in addition to STATIC.
2023-08-21 13:58:58 +02:00
Magne Sjaastad
96b3bef878
Reduce memory use for summary address object
* Use one common variable for object name, use three ints
* Move enums to separate file
* Refactor use of enums
* Move implementation to cpp
* Refactor includes
2023-08-21 07:12:08 +02:00
Magne Sjaastad
3030e9f4af
Refined grid export appears to give wrong number of cells
* #10503 Refined grid export appears to give wrong number of cells
Make sure size of exported grid is correct
Refactor computation of cell indices
2023-08-18 10:57:12 +02:00
Magne Sjaastad
ef2de3e5c6
Support well path geometry for summary RFT data
* Compare well path names when matching sim well names
* 10501 Make it possible to use well path geo when plotting summary RFT data
2023-08-15 13:37:23 +02:00
Magne Sjaastad
0bada502fb 9498 Add parsing of network name
Use merged commit
2023-08-14 11:20:01 +02:00
Kristian Bendiksen
5bf2c2a89d #10367 Janitor: Remove unneccessary 'this' pointers 2023-08-07 13:38:27 +02:00
Kristian Bendiksen
22e9e7aeb0 #10210 Reveal Summary Import: map reveal names to eclipse names.
This gives better behavior in summary plot (correct phase colors and better
default axis grouping).

Fixes #10210.
2023-06-19 21:22:27 +02:00
jonjenssen
803b67506a
Add basic support for calculating and showing seismic difference (#10377)
* Add basic support for calculating and showing seismic difference
2023-06-12 11:56:48 +02:00
Kristian Bendiksen
851cb69f8b #10331 Roff property import: Add support for BYTE data type
Fixes #10331.
2023-06-02 10:31:36 +02:00
Magne Sjaastad
f091a6237f
Support multiple RFT observation files
Add support for date on format yyyy-MM-dd
Support observations in multiple files
2023-06-02 09:32:47 +02:00
Magne Sjaastad
b7420ebc70
Use rock type colors when "Facies" is imported 2023-05-26 11:26:22 +02:00
Magne Sjaastad
451254bc84 #10273 Set default value for "Immport Advanced MSW Data" to true 2023-05-16 13:12:57 +02:00
Magne Sjaastad
0c90f67dcc
Change API for PdmObjectHandle and PdmFieldHandle
* Refactor interface to PdmObjectHandle and PdmFieldHandle
Return objects instead of passing in structures as parameters

* Add nodiscard to several functions
* Remove redundant this->
* Rename to ptrReferencedObjectsByType
2023-05-12 21:41:34 +02:00
Magne Sjaastad
5ee764af48
Refactor result definition 2023-05-11 08:37:58 +02:00
Magne Sjaastad
f70d2c4949
Add result type and create and use custom legend if possible
* Update submodule
* Use postfix functions and add custom color legend

* Add type to RigEclipseResultAddress
Read types from ROFF and create default legend based on type or custom created legend.

* Use caseId to connect legend configuration to result in a case
2023-05-09 11:41:56 +02:00
jonjenssen
f4cf143401
Import SEG-Y files by converting to VDS (#10175)
* Add seg-y import GUI
2023-04-27 01:32:59 +02:00
jonjenssen
d8def3d986
OpenVDS should always be used (#10166)
* OpenVDS should always be used, remove optional defines
2023-04-24 18:23:31 +02:00
Kristian Bendiksen
350db4d6a9 #10130 Reveal summary import: convert to Eclipse units. 2023-04-24 13:02:57 +02:00
Magne Sjaastad
10adcbc082 Disable warnings on MSVC when including HDF5 2023-04-24 12:40:25 +02:00
magnesj
88ef79c1a1 Fixes by clang-tidy 2023-04-23 08:10:28 +02:00
jonjenssen
0e7cf49b17
OpenVDS seismic access (#10145)
Add OpenVDS support for reading seismic data from VDS files
2023-04-21 16:38:04 +02:00
Jørgen Herje
0d8aee8995
GRDECL: Import multiple grid files from dialog (#10142)
Add import of N .GRDECL grid files - as done for roff-files
2023-04-21 10:34:29 +02:00
Kristian Bendiksen
ff209ad7c2
Refactor ensemble import dialog
* #9773 Refactor ensemble import dialog.
* #9773 Add support for ensemble import of StimPlan/Reveal summary data.
* #9773 Add method for finding min and max time steps.
* #9773 Add option for resampling to hour intervals.
* #9773 Add option for resampling to minute intervals.
* #9773 Ensemble statistics: determine sub-sampling period dynamically.
* Use RiaWeightedMeanCalculator for curve resampling.
* Add HOUR and MINUTE to date time app enum.
* #9773 Generate better ensembles for StimPlan summaries.
* #9773 Fix parameters.txt lookup for StimPlan summaries
* Refactor: Improve interface of RicImportSummaryCasesFreature::createSummaryCasesFromFiles

Co-authored-by: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
2023-04-20 10:16:43 +02:00
Jørgen Herje
67264da0a8
Roff: support import of N grid files and 1 grid file with N property files
* Add utility to check is roff file contains grid data

* Import of multiple grid files or 1 grid file with N property files

* Fix build errors for using RifRoffFileTools from Commands
- Move template implementation to cpp-file
- Add roffcpp to link libraries in CMake for Commands

* Improve/fix import of single grid file with N property files

* Fix missing add of roff case Id
2023-04-19 15:52:57 +02:00
Magne Sjaastad
b7f8d0e0f1
Increase warning level
* Set warning level to /W3 for MSVC to catch more warnings
* remove several excluded checks for clang
* removed several unused variables
* Hide warnings qwt
* add missing parentheses in logical expressions
* Remove double check on same logical expression
2023-04-17 15:57:39 +02:00
Jørgen Herje
c7b915c141
Replace RifRoffReader code to utilize roffcpp::reader (#10098)
- Replace current content if RifRoffReader to utilize roffcpp
- Remove unit tests not applicable for function (some previous tests now belongs to roffcpp)
2023-04-17 09:45:14 +02:00
Magne Sjaastad
6f6dc80bc6
Added more clang-tidy checks
Improved GitHub Action to run clang-format as part of clang-tidy

* Simplify clang-tidy workflow
* Added modernize-use-using, modernize-redundant-void-arg, readability-static-accessed-through-instance
* Add nolint for libecl typedefs
2023-04-14 14:07:45 +02:00
Jørgen Herje
457dc9080f
Refactor classes in RigWellResultPoint.h
* Move RigWellResultFrame implementation into separate file
Update/correct includes accordingly

* First step of moving attributes from public to private
- Move public members to private and create interface
- Single public member remains due to strong dependency on usage of reference and reference to its object public members

* Second step of moving attributes from public to privatee
- Remove usage of reference directly to attributes. Interface with copy and set.
- Moving attributes in RigWellResultFrame and RigWellResultBranch

* Move class RigWellResultBranch into separate file
2023-04-14 11:00:45 +02:00
Magne Sjaastad
952e766c2f
Update clang-format.yml (#10068)
* Update to clang-format-15
Removed two custom .clang-format files in subfolders of AppFwk

* Fixes by clang-format
2023-04-13 07:05:53 +02:00
jonjenssen
2e01f4a31d
Basic seismic support (#10010)
Add basic seismic section support to eclipse and geomech views.
2023-03-24 15:36:10 +01:00
Kristian Bendiksen
b541acdcb1 #9773 Import data from Reveal and StimPlan as summary case. 2023-03-20 08:58:42 +01:00
Kristian Bendiksen
245d483036
Summary observed data
* #9966 Summary calculations: add support for imported vectors.
* #9966 Summary Calculation: add support for imported and observed data.
* Summary Address: avoid extra level in tree for imported data.
* #9966 Update observed data when calculation is updated.
2023-03-15 13:39:57 +01:00
Magne Sjaastad
40c329f3ac Fix selection of multiple pressure/depth sources in plot
Use spaceship operator to fix issue for multiple pressure/depth curves

It was not possible to show two pressure/drop curves at the same time. This was caused by inconsistent implementation of operator< and operator==. Implement operator <=> to simplify the code.
2023-03-13 16:09:01 +01:00
Magne Sjaastad
07a4c13dd4 #9913 Fix import of RFT pressure/depth 2023-03-10 13:20:08 +01:00
Magne Sjaastad
527743a845
Adjustments for release
* Make sure text for multiple wells in same grid cell is displayed correctly
* Improve selection of result in Advanced Snapshot Export
* Restore the main window that was on top when project was saved
* Trim string to make sure '/' is exported with no space in front
* #9872 RFT-plot: Make colors stable for curves in RFT plots
* Set version to RC_02
2023-03-09 08:54:28 +01:00
Kristian Bendiksen
8a2d9ec83e #9887 Roff: fix freeze due combining omp and progress info. 2023-03-02 07:29:48 +01:00
Magne Sjaastad
d2f435c00a
Improved simulation well visualization
* Move members to private in RigWellResultPoint
* Create simulation well path geometry using well topology
* Add separate MSW well pipe centerline computations
* Review comments

---------

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
2023-02-28 16:06:37 +01:00
Magne Sjaastad
f8c5cf389f
clang-format: Set column width to 140
* Set column width to 140
* Use c++20
* Remove redundant virtual
2023-02-26 10:48:40 +01:00
Magne Sjaastad
8768e186d8
#9671 summary calculations for summary items
* Summary Calculation: use shorter name in title
* Sort summary addresses to group calculated results last.
* Summary Calculation: add option to distribute calculation to other items.
* Add support for summary calculation for RimGridSummaryCase.
* Use short name for calculations in plot titles.
* Update ensembles in Data Sources when calculation is added.
* Summary Calculation: allow drag-and-drop of ensembles
* Summary Plot: fix axis range aggregation for calculated ensemble addresses.

---------

Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
2023-02-26 08:08:06 +01:00
Kristian Bendiksen
69a668df50 Simplify RifSummaryReaderInterface timeSteps. 2023-02-24 10:03:16 +01:00
Magne Sjaastad
f0e78f32e8
Minor issues related to release
* Add shortcut for Plot Editor, and modify how command features are triggered
Use Ctrl-E to launch the Plot Editor.

* Add optional use of NOECHO and ECHO keywords in GRDECL files
* Add ECHO keywords to sector model export
* Add Help button to Preferences
2023-02-20 08:18:08 +01:00
Magne Sjaastad
edbeb4dfb1
Fix invalid parsing of line with keyword end tag and comment
* Add error text when size differs
* #9845: Remove invalid parsing of data in comment line
The line '/ -- 123 123' was parsed incorrectly, and values 123 123 was added to the list of valid values for the keyword.
2023-02-16 13:04:16 +01:00
Magne Sjaastad
70bb221162
Janitor issues
* Remove obsolete code
* Fix path modification of a relative folder
Replace start token '.' with file path to the project file to make sure that the path './wells/a-1h.dev' can be imported correctly.
* Add more logging when keywords are missing from import
2023-02-15 07:56:17 +01:00
Magne Sjaastad
613f4642eb Fix broken build 2023-02-13 15:41:56 +01:00
Magne Sjaastad
de118ddae2 #9833: Add extra check based on value/cells count
Some models do not have the dual porosity flag set correctly. Add additional check to set the dual porosity flag if the number of active cells is the double of main grid cell count.
2023-02-13 14:09:35 +01:00
Magne Sjaastad
b3a56a9353
Add support for radial grids
* Update radial grid operations in submodule
* Optionally display cell center and cell corners when clicking on cell
* Add support for import of radial grids
* Modify node coordinates to match host cell
2023-02-10 12:39:13 +01:00
Jon Jenssen
657cb4e82d Remove progress things that causes hang in data loading when omp is used. No need for progress feedback in here anyways. 2023-02-07 17:45:44 +01:00
Magne Sjaastad
8028444018
GitHub Actions: Add apt mirror to make package download more robust
- Download of Ubuntu packages from Azure is unstable. Add mirror sites to improve reliability.
- Improve use of clang-format and include source code changes
2023-02-07 07:22:57 +01:00
Magne Sjaastad
f919ba6749
Use <=> operator for RifEclipseSummaryAddress
* Use spaceship operator for RifEclipseSummaryAddress
* Set gcc-10 as compiler for Ubuntu 20.04
* Reorder declaration of members to get wanted sorting
2023-01-30 14:53:07 +01:00
Magne Sjaastad
234719aea3
Improve RftPlt data source objects (#9769)
Move AppEnum init to RifDataSourceForRftPlt
Simplify constructors for RifDataSourceForRftPlt
Rename enum names in RifDataSourceForRftPlt::SourceType
Add missing pressureDepthData in RimDataSourceForRftPlt
2023-01-30 11:12:26 +01:00
Magne Sjaastad
c8dbf3d125
Trim spaces and avoid spaces in generated address text
* Trim spaces and avoid spaces in generated address text
* Fix unit test
2023-01-24 11:26:34 +01:00
Kristian Bendiksen
1eac9f8a1f #9620 Pressure/depth data: add user interface. 2023-01-19 09:00:05 +01:00
Kristian Bendiksen
10187a934c #9620 Add reader for pressure depth text file. 2023-01-19 09:00:05 +01:00
Magne Sjaastad
128df2ada4
Fix invalid dates for data imported from ESMRY
Compute time_t based on the "TIME" values in summary file
2023-01-17 21:57:16 +01:00
Kristian Bendiksen
bfbe557c2d Roff: log less to message window. 2023-01-11 11:26:17 +01:00
Kristian Bendiksen
903dd34929 Roff: replace -999 values for inactive cells. 2023-01-11 11:26:17 +01:00
Kristian Bendiksen
1d4140e854 #9601 Roff: templatize method for converting to reservoir index order. 2023-01-11 10:10:51 +01:00
Kristian Bendiksen
7a79930ea6 Roff: add roff namespace. 2023-01-11 07:22:18 +01:00
Magne Sjaastad
8e161a5c89
Stabilization fixes related to regression testing
* Added fmtlib to LicenseInformation.txt
* Add license info for roffcpp
* Regression Tests: Guard use of invalid bounding box
* Regression Test: Check if file is present before opening
2023-01-10 11:45:37 +01:00