OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 16:32:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
14,679 Commits 59 Branches 85 Tags
e6043fa329c697f02c98638dd348fac1f2a457b3
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad 3af8d32928 #7829 AppEnum : Make sure text used in XML serialization is trimmed 
If the AppEnum text used to serialize the AppEnum contains whitespace at start or end, the serialization will fail and the AppEnum value will end up with a default value. 

This commit will make sure that this field is always trimmed ( text coming from the application, from xml parsing, text from scripting).
 2021-06-29 20:54:40 +02:00
Magne Sjaastad 4e45f397e8 Fix missing includes 2021-06-29 19:09:12 +02:00
Magne Sjaastad a3d5847733 #7824 Modeled Well Path : Optional support for linking of wells 
#7824 Modeled Well Path : Add to context menu in 3D view
 2021-06-29 19:04:27 +02:00
Magne Sjaastad 3a1f2c8a05 Janitor : Encapsulate dynamic cast to selection item type 2021-06-29 19:04:27 +02:00
Magne Sjaastad 96ac51c011 Fix missing includes 2021-06-29 19:04:00 +02:00
Magne Sjaastad e06e0116d8 #7818 Modeled Well Path : Update location of completions 2021-06-29 15:33:03 +02:00
Magne Sjaastad 73f8046353 #7818 Modeled Well Path : Add support for creation of N laterals based on a template 2021-06-29 15:33:03 +02:00
Magne Sjaastad 95463c6521 #7811 Modeled Well Path : Add copy/paste of a modeled well path 2021-06-29 15:33:03 +02:00
Magne Sjaastad 5e5d5cb0a6 Add dev-postfix to version text 2021-06-29 11:25:50 +02:00
Magne Sjaastad d818a01b79 #7811 Modeled Well Path : Optionally use refpoint from top level well path 2021-06-28 14:44:45 +02:00
Magne Sjaastad 62d67a52c7 #7811 Modeled Well Path : Optionally show absolute coordinates 2021-06-28 14:44:45 +02:00
Magne SjaastadmagnesjKristian Bendiksen
 		eb3c52aeb1 Python adjustments (#7809) 
* #7797 Well Targets: Add scripting capability
* #7794 Python : Do not update childField or childFieldArray
* #7797: Python - Add scripting to well path collection
- Extend the pdmobject.py with method add_object()
- allow objects to be created from Python in well path collections
- add well targets to modelled well path

* #7795 Python : Make sure referenced generated classes are defined
* #7810 StimPlanModel: clean-up python generation
* Python : Always use empty string as default value for ptrFieldValue
It can happen that a ptrField is assigned to a pointer on object construction. (FaciesProperties) Make sure that constructor always assigns an empty string.

Co-authored-by: magnesj <magnesj@users.noreply.github.com>
Co-authored-by: Kristian Bendiksen <kristian.bendiksen@gmail.com>
 2021-06-25 14:44:52 +02:00
Magne Sjaastad d7113a528c #7786 Get version from command line 2021-06-16 13:14:07 +02:00
Magne Sjaastad 8a2def774a Merge pull request #7785 from OPM/octave-fix 
Octave : Always execute command objects in queue before return
 2021-06-16 07:16:38 +02:00
Magne Sjaastad 216126033e Octave : Always execute command objects in queue before return 2021-06-15 16:00:47 +02:00
Magne Sjaastad 7dfe35a9e0 #7780 Polyline Cell Filter : Make sure event handler is unregistered 2021-06-15 12:17:50 +02:00
Magne Sjaastad 2383cd1088 Added object and field keywords for 2021.06 2021-06-14 11:44:06 +02:00
Magne Sjaastad 47ad2fc21b Python : Adjustment to setup.py.cmake 2021-06-14 11:37:20 +02:00
Magne Sjaastad 01c137c2c8 Add missing include 2021-06-14 10:00:28 +02:00
Magne Sjaastad 516d1c0084 Merge pull request #7767 from OPM/faultra_updates4 
Fault RA: minor parameter changes
 2021-06-14 09:49:46 +02:00
Magne Sjaastad 1350c56eaf Guard nullpointer access and catch exceptions 2021-06-14 08:01:28 +02:00
Magne Sjaastad 60dbb8a715 #7774 Ensemble Statistics : Remove test for match on first reported simulation time step 
When computing statistics curves for an ensemble, we computed these values based on curves having identical same timestamp as the first summary case in the ensemble. If the simulator had numerical issues, this first time step can be slightly different from case to case.

Remove this test on first time step, but keep the optional test on last time step.
 2021-06-11 18:16:56 +02:00
Magne Sjaastad 2885f829b8 Merge changes from master into dev 
No files changed by this commit
 2021-06-11 16:54:48 +02:00
Magne Sjaastad c8e37f4d59 Merge remote-tracking branch 'origin/master' into dev 2021-06-11 16:46:52 +02:00
Magne Sjaastad 92cce5612d Merge master into dev (no files changed) 2021-06-11 15:07:07 +02:00
Magne Sjaastad 4b7744af26 #7771 Summary Plot Resampling: Crash for identical case names but different size 
Avoid mix of curve values of different size
 2021-06-11 14:48:36 +02:00
Magne Sjaastad 85b333d06d Janitor: Do not search for visible categories if view is closed 2021-06-11 09:37:26 +02:00
Magne Sjaastad fb28f7e6c8 Set version to 2021.06.0 2021-06-11 09:00:50 +02:00
Magne Sjaastad 2e5953216f #7438 Project File: Simulation name is hard coded in plots 2021-06-11 08:06:46 +02:00
Magne Sjaastad 5d701dd12a #7308 Project file: Avoid storing Eclipse Faults file list 2021-06-11 08:06:46 +02:00
Magne Sjaastad fc8823d62f Set version to 2021.06-RC_03 2021-06-11 08:06:46 +02:00
Magne Sjaastad 33411b9e79 Janitor : Fix missing formation category 2021-06-11 08:06:46 +02:00
Magne Sjaastad 889231755d Janitor : Move geomech tab to the right of scripting tab 2021-06-10 14:09:52 +02:00
Magne Sjaastad ea9e3f7a52 Janitor : Hide undo stack behind environmentvariable DEVEL 
Move geomech tab after scripting
 2021-06-10 14:04:55 +02:00
Magne Sjaastad 40c44983f4 #7761 Objective Function : Fix typo for history vector 2021-06-10 11:31:26 +02:00
Magne Sjaastad c6be89b61c Janitor : Adjust default font size 2021-06-10 11:06:36 +02:00
Magne Sjaastad 9f85975f2c Janitor : Improve icons and availability for new statistics 2021-06-10 09:33:22 +02:00
Magne Sjaastad 0b724da685 #7746 Plot window Messages: Simplify comments related to h5-files 2021-06-10 08:09:48 +02:00
Magne Sjaastad 2689cd560f Set version to 2021.06-RC_02 2021-06-10 07:10:19 +02:00
Magne Sjaastad 4de91e885b #7761 Objective Function : Change formula and add several options 2021-06-09 21:22:37 +02:00
Magne Sjaastad c89e00b966 Janitor : Remove confusing defaultExtent for an intersection 2021-06-09 21:18:42 +02:00
Magne Sjaastad 8259220abd #7765 Well Log Curves : Improve handling of units 2021-06-09 21:18:42 +02:00
Magne Sjaastad be160a9fe6 #3693 Intersect : Use active state of LGR cell to define visibility 
Eclipse reports parent cell to LGR cells as active, and this property has been tested for in code.

Intersect reports inactive cell in the parent grid cell. Then we have to only check the active state of the LGR cell, not the parent cell.
 2021-06-09 21:18:42 +02:00
Magne Sjaastad b9362386bc #7450 Well Completion: Allocation of User defined D-factor to perforation connection factors 
If the user defined a D-factor for the perforation interval, distribute the D-factor based on

D_cell = D_well * Sum_Tran_cells / Tran_cell
 2021-06-07 09:28:57 +02:00
Magne Sjaastad 67a8567cbc GHA : Skip upload of duplicate artifacts (#7749) 
Ubuntu using clang is created to make sure the clang compiler works. The artifact name is identical and break the build if two processes upload at the same time.

This commit will disable upload of artifact for Ubuntu clang build
 2021-06-04 12:22:10 +02:00
Magne Sjaastad 7ecd9b462a #7660 Imported Input Properties should be time step independent 2021-06-04 12:12:50 +02:00
Magne Sjaastad e1e7201b9b #7742 Contour map : Fix mix of global grid and result index 
Always use globalGridCellIndex for grid cells
Always use resultGridIndex for result property vectors
 2021-06-04 08:30:15 +02:00
Magne Sjaastad 33a1bbb6d6 #7742 Contour map : Do not use activeCellInfo for all results 
Some results have values for each global grid cell. Do not use the active cell index when computing contour maps.
 2021-06-04 08:30:15 +02:00
Magne Sjaastad b3467a2fca #7739 Show only visible categories in legend 
For the main Cell Result Legend, add an option to only show visible categories
 2021-06-01 08:09:47 +02:00
Magne Sjaastad 6e0dadbdaa #7739 Preparations : Expose reservoir cell IDs used to generate geometry 2021-06-01 08:09:47 +02:00
Magne Sjaastad d132accd1d Janitor : Clamp time step index 2021-06-01 08:09:47 +02:00
Magne Sjaastad e5efcfa4e6 Added license info for application icons based on VS Code 2021-05-28 13:23:07 +02:00
Magne Sjaastad 76207ee59d Set version to 2021.06-RC_01 2021-05-28 12:53:42 +02:00
Magne Sjaastad 0097e9dfb2 MSW : Fix length for the WELSWGS incremental depth 2021-05-28 07:27:53 +02:00
Magne Sjaastad 8749deb76a #7731 MSW Fishbones : Adjust diameter for fishbone lateral segments in main bore cells 2021-05-28 07:27:53 +02:00
Magne Sjaastad 1f85adecab #7729 MSW : Compute initial measured depth once 
Avoid computing value of initial MD multiple times
 2021-05-28 07:27:53 +02:00
Magne Sjaastad eba78b2660 #7729 MSW : Fix wrong segment for lateral 
A lateral is connected to wrong segment for user defined reference MD
 2021-05-28 07:27:53 +02:00
Magne Sjaastad 33ac79d856 #7727 Performance : Reduce amount of work 
Use objectsWithReferringPtrFields to find tieIn wells
Avoid using descendantsOfType
 2021-05-27 12:52:57 +02:00
Magne Sjaastad afb293db52 #7727 Well Path : Simplify access to all well paths 2021-05-27 12:52:57 +02:00
Magne Sjaastad 087cf41773 Janitor : Avoid includes in header files 2021-05-27 12:52:57 +02:00
Magne Sjaastad 59c14b2a53 Well Path Completion Type : Make sure all completions are visible 
For MLT wells, make sure the previous defined completion types are not overwritten by laterals
 2021-05-27 12:52:57 +02:00
Magne Sjaastad 73551b0ec8 Janitor: Check if bounding box is valid before use 2021-05-27 12:52:57 +02:00
Magne Sjaastad 57cd46c4e2 #7727 Well Path : Select modified well path when tie-in changes 2021-05-27 12:52:57 +02:00
Magne Sjaastad f9ffd248f1 #7727 Well Path : Do not show context menu for tree nodes 2021-05-27 12:52:57 +02:00
Magne Sjaastad 098fda9816 Janitor : Remove duplicated code 2021-05-26 13:28:45 +02:00
Magne Sjaastad 9d58769f89 Janitor : Avoid include of header file in header 2021-05-26 13:28:45 +02:00
Magne Sjaastad 3fca5f15ae Janitor : Use enum class 2021-05-26 13:28:45 +02:00
Magne Sjaastad 19d650f619 #7655 Well Allocation Plot: Avoid duplicated flow in tie-in cells 
Make sure the tie-in cell is not duplicated
 2021-05-26 13:28:45 +02:00
Magne Sjaastad f9fc7cff3a #7655 Well Allocation Plot: Use branch ID of parent branch 2021-05-25 22:36:01 +02:00
Magne Sjaastad 03917f2e1c #7655 Well Allocation Plot: Make sure all branches are computed 
fix
 2021-05-25 22:36:01 +02:00
Magne Sjaastad b8f7490311 #7655 Well Allocation Plot: Add more guarding for empty vectors 
wip
 2021-05-25 22:36:01 +02:00
Magne Sjaastad a4a6c30370 Fwk : Add function to get all referenced PdmObjects 2021-05-25 11:50:18 +02:00
Magne Sjaastad 86bdf5722a Guard nullpointer access 2021-05-25 11:50:18 +02:00
Magne Sjaastad 805df93aed #7720 Export of MSW : Export data from imported well paths 
The tie-in concept was only available for modeled well paths. Make sure both modeled and file well paths produce MSW output
 2021-05-25 11:50:18 +02:00
Magne Sjaastad e33a03b379 #7719 Multi-lateral wells : Include well laterals in visible wells 2021-05-25 11:50:18 +02:00
Magne Sjaastad 3d44ad37db #7719 Multi-lateral wells : Use top level well path to get air gap 
Get airgap/md at first target from top level well path
 2021-05-25 11:50:18 +02:00
Magne Sjaastad 9ccc650513 Fix missing includes 2021-05-20 10:59:53 +02:00
Magne Sjaastad af22b7f707 Fix missing include 
Detected by https://github.com/OPM/ResInsight/actions/runs/858894448
This action do not use unity_build, and the missing include is seen
 2021-05-20 07:37:55 +02:00
Magne Sjaastad 78e4e1cd5c Janitor : Use enum class 2021-05-18 16:22:05 +02:00
Magne Sjaastad d4f4f20e6e MSW : Do not export completions if well path lateral is unchecked 2021-05-18 16:22:05 +02:00
Magne Sjaastad e8e3dc39b4 #7049 AICD : Accumulate flow scaling factor for multiple valves in cell 
Add multi lateral support
 2021-05-18 16:22:05 +02:00
Magne Sjaastad 3bfeb194a9 #7049 Accumulate flow area for multiple valves in same grid cell 2021-05-18 16:22:05 +02:00
Magne Sjaastad f4c11e2ef2 #7049 Add toolbar button for export completions 2021-05-18 16:22:05 +02:00
Magne Sjaastad b518acada6 Janitor : Use enum class 2021-05-18 16:22:05 +02:00
Magne Sjaastad 827cf75207 #7049 MLW: Improve calculations of diameter, skin factor and direction 
Diameter and skin factor : Compute weighted average based on transmissibility
Use the direction of the completion with the highest transmissibility
 2021-05-18 16:22:05 +02:00
Magne Sjaastad 226876dc0a #7049 MLW: Aggregate of completion data for all laterals 
Simplify the progress bar
 2021-05-18 16:22:05 +02:00
Magne Sjaastad 33c9b47e9e Set default bin count to 50 2021-05-18 08:58:40 +02:00
Magne Sjaastad 4b75dd4d6a Fix build issue on Linux 2021-05-14 14:35:54 +02:00
Magne Sjaastad dbc191ed40 #7687 MSW Fishbones : Compute sum of area for multiple ICDs in same cell 2021-05-14 14:19:09 +02:00
Magne Sjaastad fcb0bd391b #7686 MSW Fishbones : Compute effective diameter for multiple laterals in same cell 2021-05-14 14:19:09 +02:00
Magne Sjaastad 9a6073eb7b #7678 Fishbones MSW : Always create an intersection for an ICD segment 2021-05-14 14:19:09 +02:00
Magne Sjaastad 460a387021 #7678 Fishbones MSW : Make sure COMPSEGS is connected to ICD branch 
Always connect open hole flow to an ICD, not the WELSEGS representing a well path lateral.
 2021-05-14 14:19:09 +02:00
Magne Sjaastad 5f44c994bf #7655 Well Allocation Plot: Remove assert causing crash 2021-05-11 15:03:05 +02:00
Magne Sjaastad c430e7343a #7678 Fishbones MSW : Include WSEGVALV in MSW-file for LGR section 2021-05-11 14:02:22 +02:00
Magne Sjaastad 466b2cbcd9 #7678 Fishbones MSW : Fix TVD depth for laterals for WELSEGS keyword 2021-05-11 13:35:06 +02:00
Magne Sjaastad 1a6c5bc895 Add static cast to avoid warnings 2021-05-11 09:42:33 +02:00
Magne Sjaastad 2eced13e28 Well Lateral : Connect new lateral close to total depth 2021-05-11 09:27:55 +02:00
Magne Sjaastad 282c6f3586 Remove obsolete code 2021-05-11 09:27:55 +02:00
Magne Sjaastad 1daa598770 #7656 Well Group: Simplify organization of well groups 2021-05-11 09:27:55 +02:00
Magne Sjaastad 5c1b08a05b #7656 AppFwk : Make it possible to create a custom uiTreeOrdering 2021-05-11 09:27:55 +02:00