OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,603 Commits 27 Branches 61 Tags 309 MiB
8423b17832
Commit Graph

2536 Commits

Author SHA1 Message Date
Kristian Bendiksen
f777dfa4ba Sumo: Increase request timeout. 2024-08-23 12:18:05 +02:00
Magne Sjaastad
1a3a005c1c
Add optional import of SUMO/OSDU settings from JSON (#11630) 
Add optionally import of SUMO/OSDU settings from JSON. Check for sumo_config.json and osdu_config.json. If present, import settings to preferences and set fields read only.
 2024-08-22 07:18:06 +02:00
Jon Jenssen
7651952c89 Fix regression test crash 2024-08-21 16:59:32 +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
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
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
6e3e0ad538 Use unique_ptr for data loaders. 2024-08-14 11:32:07 +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
d8bd7bc81a
Cloud connector cleanup 
* Rename to RiaOAuthHttpServerReplyHandler
* Add comment header
* SUMO: Use function pointer to simplify network request
 2024-07-23 11:49:07 +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
773d9b08c9 Janitor: remove unused code. 2024-07-13 12:07:49 +02:00
Kristian Bendiksen
2aa1bfe940 Cloud: save expiration timestamp for access token. 
Expired access tokens are ignored when reading from file.
 2024-07-13 12:07:49 +02:00
Kristian Bendiksen
3e2af38c90 Cloud: Use separate files for Osdu and Sumo tokens. 2024-07-13 12:07:49 +02:00
Kristian Bendiksen
896e4979bf Cloud: Handle refresh of access token. 2024-07-12 19:18:09 +02:00
Kristian Bendiksen
a8004870d4 Well Log Track: show "New LAS file curve" menu item for Osdu well logs. 2024-07-12 19:18:09 +02:00
Kristian Bendiksen
151f433124 Cloud: create directory if missing when saving access token. 2024-07-12 19:18:09 +02:00
Kristian Bendiksen
734a84956e Osdu Well Log: use channel "CurveId" instead of "Mnemonic". 2024-07-12 19:18:09 +02:00
Kristian Bendiksen
eda26bcc25 Cloud: Extract common oauth2 parts of Sumo and Osdu connector. 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
Kristian Bendiksen
56e139b9d6 #11556 StimPlan Model: export deviation with less precision. 
Fixes #11556.
 2024-07-10 17:51:57 +02:00
Kristian Bendiksen
c780c948ea Fix unsigned comparisons 2024-07-08 22:34:35 +02:00
Kristian Bendiksen
09565744c7 Osdu: Allow user to filter well logs before import. 2024-07-08 22:34:35 +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
Magne Sjaastad
e63005348c Create a compact string representation of a list of integers 2024-07-05 12:47:54 +02:00
Magne Sjaastad
ffc1687cc7
Add Sumo connector and related cloud tools 
* Add cloud data icon
* Add Sumo connector and related helper tools
* Reorganize preferences and remove ssihub
* Use timeout defined for Sumo
 2024-07-05 09:31:16 +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
Magne Sjaastad
e0b84ae36a #11536 Add library to support strong typing of objects 2024-07-01 14:09:26 +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
0974ee7f36 Osdu: add more error logging. 2024-06-26 13:20:04 +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
Kristian Bendiksen
c7b1fdc134 Osdu: Add more logging. 2024-06-24 11:09:19 +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
acb76061ee #11496 OSDU well path import: add sorting and filter of wells. 2024-06-18 10:52:47 +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
33466f5d84
11498 osdu well multiselect (#11505) 
* #11498 OSDU well path multi-select.

* Janitor: modernize foreach loops
 2024-06-17 22:21:32 +02:00
Kristian Bendiksen
71929a234a Refactor: Extract arrow tools. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
7125670d8c Review fixes. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
44ca21636a Osdu: extract constants to separate namespace. 2024-06-14 17:31:22 +02:00
Magne Sjaastad
a85fd12989 Add arrow/util/cancel.h to PCH builds 
Qt has special treatment of  the word 'signals', and  the function RegisterCancellingSignalHandler(const std::vector<int>& signals) causes compiler issues using PCH
 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
db96589e0f Osdu import: avoid data race condition on well data. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
a6323471e7 Osdu import: update connection label. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
2d76775ff6 Osdu Import: improve table layout. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
3e8a8af857 Osdu Wizard: make server and data partition id read-only. 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
88d88992d6 Janitor: Remove unused method. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
1dce537308 Osdu: skip auth when token is available. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
61f59e72f6 Osdu Well Paths: add search field. 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
ea2bf3887f Osdu: exclude arrow files from unity build 2024-06-14 17:31:22 +02:00
Kristian Bendiksen
c5da22223b Osdu wellpath import: improve error handling. 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
dd6c41b84e Osdu: Allow any version of well kinds. 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
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
015f248dd9 Show properties for selected object in main project tree 
There can be several project trees in a project. Ensure that the selected object in the main project tree is displayed in the property editor.
 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
Kristian Bendiksen
3b5621a6aa Messages Display: show left part of long log lines. 2024-06-04 08:38:37 +02:00
Magne Sjaastad
1c899df063 Octave: Change default port number and add custom port number to Preferences 2024-06-03 10:17:21 +02:00
Magne Sjaastad
1e07b239d1
Simplify configuration and use of vcpkg 
* Simplify configuration and use of vcpkg
* Use 22.04
* Set and use BUILD_TYPE = Release
* Use -DVCPKG_BUILD_TYPE=release
 2024-05-31 08:56:29 +02:00
magnesj
4f5a0d8bdf Fixes by clang-tidy 2024-05-30 07:16:44 +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
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
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
Jon Jenssen
9858d09a33 Add support for overriding egrid reader type on command line. Override disables GUI in preferences. 2024-05-27 15:26:48 +02:00
Magne Sjaastad
1b93347aea Fix unity build 2024-05-24 15:19:43 +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
Kristian Bendiksen
809f559792 Add test for reading Parquet files using Apache Arrow. 2024-05-22 15:24:22 +02:00
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
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
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
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
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
Kristian Bendiksen
3dcca744e1 #11405 Fault Reactivation: add temperature initial conditions. 2024-05-02 11:54:21 +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
df7112e615 Add missing includes 2024-04-25 10:00:25 +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
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
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
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
Kristian Bendiksen
9c0f601ba6 Fix crash when creating contour map from 3d view. 2024-04-15 16:10:43 +02:00
Kristian Bendiksen
4f8c081669 Support global and local views. 2024-04-15 16:10:43 +02:00
Kristian Bendiksen
b5666c333a Refactor connection between cases and views. 
Eclipse grid views and contour maps are not longer a child of the case.
The views are not separate collections (one for grid and one for contour maps)
on root level.
 2024-04-15 16:10:43 +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
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
Kristian Bendiksen
3f9979823e #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.

Fixes #11334.
 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
Kristian Bendiksen
eeecc41ad1 Fix typo. 2024-04-10 13:34:41 +02:00
Kristian Bendiksen
c402142e58 Refactor: extract duplicated code. 2024-04-10 13:34:41 +02:00
Kristian Bendiksen
eb02e9e0a5 #11332 2D Intersection Views: Improve automatic depth resolution. 2024-04-10 13:34:41 +02:00
Kristian Bendiksen
7836181ad1 Refactor: use lambda instead of define. 2024-04-10 13:34:41 +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
jonjenssen
bbc279d587 Improve cell filter collection menu 2024-04-10 10:43:49 +02:00
Magne Sjaastad
8b1b9acd84 #11337 Summary import: Make sure ESMRY includes restart history 2024-04-08 15:57:10 +02:00
Kristian Bendiksen
3f3b5a621d #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.

Fixes #11334.
 2024-04-08 14:41:46 +02:00
Kristian Bendiksen
85b6ea397a Interpolation: Add check for array size for extrapolation. 2024-04-05 14:39:46 +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
Kristian Bendiksen
bebf59c309 Interpolation: Fix "trend" extrapolation for value outside of range on high end. 2024-04-05 14:39:46 +02:00
Kristian Bendiksen
c074033dc2 Refactor: Fix misspelling of "synchronize". 2024-04-05 13:55:09 +02:00
Kristian Bendiksen
873282b339 Refactor: avoid local variable only used in range-based for loops 2024-04-04 10:24:21 +02:00
Kristian Bendiksen
e862bd259f Refactor: modernize for loops. 2024-04-04 10:24:21 +02:00
Kristian Bendiksen
be3d06c549 Refactor: improve api for views and oil fields. 2024-04-04 10:24:21 +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
b57767d895
Add feature to set parent well 2024-03-25 10:19:31 +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
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
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
jonjenssen
1a21d2e5de Fix incorrect position for data nodes. 2024-03-18 17:42:03 +01:00
jonjenssen
2001c94a39
Polygon updates (#11298) 
* Make menus similar for polygon and polygonInView
* Crash fix: Iterator might be invalidated by erase, reorder operations.
* Update pick editor after reload
* Do not enable edit if polygon is read only
* Make sure filter and intersection geometry is updated after a reload
* Make sure other pick editors are updated when polygon in view is changed
 2024-03-18 14:31:06 +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
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
Kristian Bendiksen
e014bfd283 Fix incorrect line breaks. 2024-03-15 12:33:57 +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
fb5758a363
Support both AND and OR operations when combining range and index filters (#11275) 
Support both AND and OR operations when combining range and index filters
 2024-03-11 20:02:47 +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
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
Jon Jenssen
406cd087e9 Use local coordinates in generated model by default 2024-03-05 11:47:16 +01:00
jonjenssen
bcc4f7c901 Add more decimals to node coordinates to improve accuracy 2024-03-04 23:47:27 +01:00
Kristian Bendiksen
a2fa2a0e77 WBS: Avoid empty text in legends on reload. 2024-03-04 23:47:14 +01:00
Kristian Bendiksen
b8f9beab91 WBS: Compute and show FG_MK_* only in reservoir (not shale). 2024-03-04 23:47:14 +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
magnesj
5d640b91d2 Fixes by clang-tidy 2024-03-02 09:10:54 +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
Kristian Bendiksen
04b14cf52a WBS: Compute and show SH_MK_* only in reservoir (not shale). 2024-02-29 10:47:12 +01:00
Kristian Bendiksen
b0ade5d318 WBS Plot: Fix disappearing curve names for disabled curves. 2024-02-29 10:47:12 +01:00
Kristian Bendiksen
8ea017da3c WBS: Make PP data from CSV more pink. 
Goal is to differentiate from existing PP results.
 2024-02-29 10:47:12 +01:00
Kristian Bendiksen
2f3a20c73c WBS: Fix crash when importing CSV into existing WBS. 2024-02-29 10:47:12 +01:00
Jon Jenssen
b33d117784 Show measurement in static geomech view, too 2024-02-28 14:51:27 +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
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
a0ecdf47a5
Show git SHA for command line parameter --version 2024-02-27 12:10:19 +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
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
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
Magne Sjaastad
6fe997b3c9 Add and use caf::PdmUiPushButtonEditor::configureEditorLabelHidden 2024-02-23 08:47:52 +01:00
Magne Sjaastad
a3d520e26e
Use project polygons from polygon cell filter 
* Use RimPolygonInView to edit locally defined polygon
* Add scaling to polygon in view
* Move polygon line visualization to RimGridView
* Rename to polygonInViewCollection
* Show appearance for local polygon
 2024-02-22 15:13:29 +01:00
Kristian Bendiksen
055c0d4c8c #11198 Fix result info for POR-Bar normalized by hydrostatic pressure. 
Fixes #11198.
Fixes #10565.
 2024-02-19 19:00:42 +01:00