OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-26 16:26:48 -06:00
Code Issues Packages Projects Releases Wiki Activity
847 Commits 31 Branches 61 Tags 287 MiB
2372cf86ca
Commit Graph

641 Commits

Author SHA1 Message Date
Magne Sjaastad
7edac904d3 Test application updates 
p4#: 22353
 2013-09-08 11:53:22 +02:00
Magne Sjaastad
f0777bb8ac Set text edit in summary page to read only 
p4#: 22352
 2013-09-08 10:54:29 +02:00
Magne Sjaastad
f9112c458c Store username/password in session cache 
Compute UTM region before import wizard is displayed
p4#: 22351
 2013-09-08 10:53:25 +02:00
Magne Sjaastad
00d9560885 Improved summary page 
p4#: 22350
 2013-09-08 10:05:24 +02:00
Magne Sjaastad
8bf263f1be Hide unselected regions on well selection page 
p4#: 22349
 2013-09-08 09:52:25 +02:00
Magne Sjaastad
8d1b5b7414 Moved parsing of well response from oil field object into wizard 
Fixed issue related to parsing of well plans
p4#: 22348
 2013-09-08 09:05:26 +02:00
Magne Sjaastad
e6386255e6 Use same pdm objects for field selection and well selection 
p4#: 22346
 2013-09-07 20:43:29 +02:00
Magne Sjaastad
76e2afb846 Remove regions/fields present on project file but not present on SSIHUB 
Set UTM input fields enabled/disabled based on UTM mode
p4#: 22344
 2013-09-07 19:38:52 +02:00
Jacob Støren
bb2af8269e Sceduled Update-display-model-And-Redraw system 
p4#: 22343
 2013-09-07 10:27:22 +02:00
Jacob Støren
c3c50ae62e Tree view Toggle Cmmands: Reimplemented to use PDM. Fixed missing update. 
p4#: 22342
 2013-09-07 10:18:28 +02:00
Magne Sjaastad
55337bd1b1 Updated link order to fix compile issues on Linuz 
p4#: 22339
 2013-09-06 16:07:09 +02:00
Magne Sjaastad
ca3fee6c34 Removed obsolete prototype code 
Cleaned up unused functions
p4#: 22338
 2013-09-06 15:59:25 +02:00
Jacob Støren
b0b24edeb9 Range/Property/Well Toggle fixes 
* Well cells are now toggled along with pipe geometry by the Well toggle in the tree view.
* TP# 4156 Range filter collection toggle does not work
This last one was really a huge error on several places in the overall logig of what is shown when.
p4#: 22337
 2013-09-06 15:45:21 +02:00
Jacob Støren
46f02f9384 Renaming and comments 
p4#: 22333
 2013-09-06 15:05:41 +02:00
Magne Sjaastad
86f5e6017d Integrated well import wizard in project file 
p4#: 22331
 2013-09-06 13:06:39 +02:00
Magne Sjaastad
3ee6d0838f Renamed to WellPathImportSsihub, and updated folder names 
p4#: 22329
 2013-09-06 11:34:24 +02:00
Magne Sjaastad
3208a74fbf Removed obsolete code to read data from ssihub 
p4#: 22328
 2013-09-06 11:25:55 +02:00
Jacob Støren
97bb848b1d Fix of GH#43 Assertion Fail for localGridIndex 
The grid number associated with an ert grid was an ID and not an index.
In addition: Fixed unrobustness handling wells with no data.
Now the /Troll/MSW_LGR/2BRANCHES-CCEWELLPATH-NEW-SCH-TUNED-AR3.EGRID file loads( Have tested only two timesteps ).
p4#: 22321
 2013-09-05 13:03:53 +02:00
Magne Sjaastad
3cf18d91fd If authentication fails, redirect to first wizard page 
Improved error handling
p4#: 22319
 2013-09-05 08:45:24 +02:00
Magne Sjaastad
d494a0b9c0 Added tree view editor to test project 
p4#: 22318
 2013-09-05 07:34:04 +02:00
Jacob Støren
e72318f348 Octave Interface: Added riGetWellCells 
p4#: 22310
 2013-09-04 12:57:36 +02:00
Magne Sjaastad
c396299810 Added testapplication 
p4#: 22308
 2013-09-04 12:20:41 +02:00
Jacob Støren
cac9d9d3f9 Octave Interface: Added riGetWellStatus 
p4#: 22301
 2013-09-04 08:03:11 +02:00
Magne Sjaastad
bc282106da Added data model for well import wizard 
Updated test application
p4#: 22265
 2013-09-02 08:39:29 +02:00
Jacob Støren
1e7c4a385a Buildsystem: Prefixed the resinsight vars to make them groupend and more accessible from the cmake gui. 
Also introduced an option to turn openmp on and off
p4#: 22257
 2013-08-30 15:37:29 +02:00
Jacob Støren
e0f5b15499 Octave interface: Added the path to ResInsight binary as search path for oct files in octave. 
p4#: 22256
 2013-08-30 15:35:28 +02:00
Jacob Støren
336eb56e3f Octave interface: Added riGetPropertyNames 
Not yet included in build system
p4#: 22253
 2013-08-30 15:26:35 +02:00
Jacob Støren
79c016b6b6 Wells: Improved output in Result info window when picking a well-cell 
p4#: 22241
 2013-08-28 15:36:29 +02:00
Jacob Støren
5e629795e4 MSW: Now using a stable offset for the small branches start point. 
Pulling the split point towards the first cell corner.
p4#: 22238
 2013-08-28 10:22:30 +02:00
Jacob Støren
2c985a1c2b MSW: Now using a stable offset for the small branches start point. 
Pulling the split point towards the first cell corner.
p4#: 22238
 2013-08-28 10:21:33 +02:00
Jacob Støren
dbb72475e5 MswRollUp: Final commit: Reapplying changes and bugfixes from trunk in conflicting files. 
The changes are from changelist numbers: 22190, 22189, 22154, 22151, 22141, 22124, 22010
Now It is supposed to compile again.
p4#: 22231
 2013-08-26 21:56:40 +02:00
Jacob Støren
6ca3afa609 MswRollUp: Use only closest connection above and below 
Added a lot of info to the positionContributions
Finally found a fairly ok method to calculate the positions, namely to
use only the closest connection above and below. Did also offset split
point positions somewhat, to make the small branches visible.

This is an intermediate commit and does not compile
p4#: 22230
 2013-08-26 15:28:34 +02:00
Jacob Støren
3f2037b783 MswRollUp: Handle previous well result points that is inside current cell 
This is an intermediate commit and does not compile
p4#: 22229
 2013-08-26 15:22:55 +02:00
Jacob Støren
1a285cebe0 MswRollUp: Guarded the interpolation against undefined pos 
This is an intermediate commit and does not compile
p4#: 22227
 2013-08-26 15:16:20 +02:00
Jacob Støren
d5aa8e4f30 MswRollUp: Principal fixes to the MSW algorithms 
Add point contributions even when it is undefined to store the segment below id, which is needed for the traversal.
The undefined positions comes from bottom end segments without connections.
Also cleaned up the the static well calculation
This is an intermediate commit and does not compile
p4#: 22226
 2013-08-26 15:10:34 +02:00
Jacob Støren
6ecfbdb8ee MswRollUp: Finally implemented through all the interpolation and segment position calculation. Completely untested 
This is an intermediate commit and does not compile
p4#: 22225
 2013-08-26 14:56:34 +02:00
Jacob Støren
d7d5d2942b MswRollUp: Updated Ert to commit 1fea6b00f3 master Fixed an Api change 
This is an intermediate commit and does not compile
p4#: 22222
 2013-08-26 14:44:03 +02:00
Jacob Støren
441ac1e3d9 MswRollUp: Start of fix of static well calculation 
This is an intermediate commit and does not compile
p4#: 22221
 2013-08-26 14:34:22 +02:00
Jacob Støren
b807a0e0ee MswRollUp: Removed obsolete code 
This is an intermediate commit and does not compile
p4#: 22220
 2013-08-26 14:27:39 +02:00
Jacob Støren
9f2bc4f1d0 MswRollUp: Made neighbour calculations handle cells on edge 
This is an intermediate commit and does not compile
p4#: 22219
 2013-08-26 14:22:20 +02:00
Jacob Støren
42408eda74 MswRollUp: Added some guarding to get the Troll_MSW case through. Needs some assert disabling in RigGridBase as well, but it is not included yet 
This is an intermediate commit and does not compile
p4#: 22218
 2013-08-26 14:21:21 +02:00
Jacob Støren
544d98b37e MswRollUp: Adding Branch start cell to start of branch 
This is an intermediate commit and does not compile
p4#: 22217
 2013-08-26 14:16:07 +02:00
Jacob Støren
e6dce28fa3 MswRollUp: Started to clean up the MSW code. 
This is an intermediate commit and does not compile
p4#: 22216
 2013-08-26 14:15:27 +02:00
Jacob Støren
27cac28b74 MswRollUp: Centerline calculation restoring and improvement 
This is an intermediate commit and does not compile
p4#: 22215
 2013-08-26 14:09:25 +02:00
Jacob Støren
f392f4457d MswRollUp: Splitted normal well and MSW handling. Got the Normal path to work fairly well. Some strangeties at the end of the pipes though 
This is an intermediate commit and does not compile
p4#: 22214
 2013-08-26 14:03:01 +02:00
Jacob Støren
b63f51921d MswRollUp: Updated Ert to experimental MSW branch. Updated ResInsight code to handle API changes 
067fa99faa
This is an intermediate commit and does not compile
p4#: 22212
 2013-08-26 13:56:42 +02:00
Magne Sjaastad
b31953eb4c Hide console window on Windows using a workaround described here 
http://public.kitware.com/Bug/view.php?id=14326
p4#: 22191
 2013-08-22 08:03:27 +02:00
Magne Sjaastad
627211685d Wellcollection can control if well head label is positioned at top active cell for IJ column or top Z of active cells bounding box 
p4#: 22190
 2013-08-22 07:55:21 +02:00
Magne Sjaastad
cbbc5ae80b Added ACTNUM to static results for binary Eclipse files 
p4#: 22189
 2013-08-22 07:45:28 +02:00
Magne Sjaastad
5580145bf9 Add keyword Name as identifier for a well in addition to well name given in quotes 
p4#: 22184
 2013-08-19 09:46:31 +02:00
Magne Sjaastad
744bbe9c2c Disable use of ecl_grid_cell_invalid 
p4#: 22154
 2013-08-13 11:20:31 +02:00
Magne Sjaastad
7d3ca2fb25 Avoid modifying x and y when computing z-value for well head pipe 
p4#: 22153
 2013-08-13 10:02:19 +02:00
Magne Sjaastad
cfb81a324b Fixed issue with missing well pipe geometry 
p4#: 22151
 2013-08-12 17:05:03 +02:00
Magne Sjaastad
89c67df963 Fixed issue with missing well pipe geometry 
p4#: 22151
 2013-08-12 17:04:31 +02:00
Magne Sjaastad
ee4e6aeed4 Use data access object for access to data structures in ResInsight 
p4#: 22144
 2013-08-12 10:04:30 +02:00
Magne Sjaastad
ff45f6885e Simplified file selection filter for well path import 
p4#: 22142
 2013-08-08 17:23:31 +02:00
Magne Sjaastad
562dfb0135 Do not show well cells when wells are turned off 
Renaming
p4#: 22141
 2013-08-08 17:15:17 +02:00
Magne Sjaastad
e747804ef4 Well head arrow is starting at well cell located at top of the K column the well head exists in. 
This way all well heads are visible all the time, even when inactive cells are visible
p4#: 22140
 2013-08-08 17:03:17 +02:00
Magne Sjaastad
a8b7662d2f Rename 
p4#: 22138
 2013-08-08 15:19:16 +02:00
Magne Sjaastad
8f4e6da98b Include well cells in cell range region evaluation 
p4#: 22131
 2013-08-08 11:26:00 +02:00
Magne Sjaastad
69f3f98f5a Hide console on Windows 
Show command line help text in dialog, accessible from About menu
Show command line help dialog instead of console output on Windows
p4#: 22130
 2013-08-08 11:09:18 +02:00
Magne Sjaastad
ffb3d3e235 Rebuild inactive geometry when invalid state changes 
Show inactive/invalid cells also when using property filter, relevant for exclude filters
p4#: 22124
 2013-08-08 08:57:23 +02:00
Magne Sjaastad
008842a1ee Renamed cell filter field from active to isActive 
Removed the special handling of range filters when only exclude filters are active
p4#: 22123
 2013-08-08 08:49:29 +02:00
Magne Sjaastad
fea95940bf Fixed missing min/max value range for property filters when loading from project file 
p4#: 22105
 2013-08-07 09:00:09 +02:00
Magne Sjaastad
9910480538 Added *.dev and *.* to file filter for well path import 
p4#: 22099
 2013-08-06 11:56:07 +02:00
Magne Sjaastad
3f61c26f0b Updated file paths in regression tests 
p4#: 22097
 2013-08-06 09:52:01 +02:00
Magne Sjaastad
f2be4dedaf Fix for range filter exclude behaviour 
Use active cells as range include filter when there are range exclude filters present and no include filters
p4#: 22095
 2013-08-05 12:48:11 +02:00
Magne Sjaastad
ffbb0b6a46 Use a special flag to indicate hidden children of a field. 
Added new method in PdmUiItem called isUiHideChildren()
p4#: 22093
 2013-08-02 13:49:16 +02:00
Magne Sjaastad
50777b3e3f Fixed issue related to missing legend config 
Must hide legend config collection. Revisit when a more robust tree building strategy is in place.
p4#: 22092
 2013-08-02 13:04:25 +02:00
Jacob Støren
7112589e33 Statistics calculation : Paralellized and avoided some memory reallocation 
p4#: 22012
 2013-06-27 00:45:50 +02:00
Jacob Støren
4f7b3e703c Fixed Memory bug regarding statistics calcualtion 
The results memory on each timestep was not freed resulting in all the data from all the cases for all timesteps in memory at the same time ...
In addition, the data was read accidentaly before the timeloop for all the source cases for all timesteps.
So, should perform better now, but there still are some memory allocated in the start, that i cant quite account for.
p4#: 22011
 2013-06-26 23:34:03 +02:00
Jacob Støren
cff0437343 Some comments and indentation 
p4#: 22010
 2013-06-26 23:26:01 +02:00
Magne Sjaastad
390abe0f81 Use compare() because endsWith() does not work as expected on Windows 
p4#: 22005
 2013-06-26 12:01:53 +02:00
Jacob Støren
b5688c5cd9 Hack: Well label now rendered "under" transparent cells to workaround random behaviour (on certain hw ?) 
p4#: 22004
 2013-06-26 10:30:48 +02:00
Jacob Støren
524e8d8375 Added a left margin in the property window. 
p4#: 22002
 2013-06-26 09:02:37 +02:00
Jacob Støren
094d4dc6c4 Made "Ceetron Navigation" the default navigation type 
p4#: 22000
 2013-06-26 09:01:43 +02:00
Jacob Støren
4be58edf78 MSW code reverted. Regrettfully the work has to be reconsidered. 
Both ERT and the resinsight code is rolled back to before MSW was introduced as refined.
p4#: 21999
 2013-06-25 15:53:19 +02:00
Jacob Støren
172c2d8b21 Fixed context menu blocking Ceetron navigation on linux. 
p4#: 21981
 2013-06-24 22:23:33 +02:00
Jacob Støren
1ea5a49471 WellPaths: Added support for mulitple paths in one ascii file. 
p4#: 21980
 2013-06-24 22:04:52 +02:00
Magne Sjaastad
636fd39c2f Use branch ID to identify a branch on import 
p4#: 21979
 2013-06-24 16:41:01 +02:00
Jacob Støren
b59ac41509 Test of fix of MSW assert 
p4#: 21978
 2013-06-24 15:15:46 +02:00
Magne Sjaastad
5ea531783a Missed file in last checkin 
p4#: 21975
 2013-06-24 14:07:49 +02:00
Magne Sjaastad
f02d4b160e Use branch index and branch cell index to identify branch head 
Removed obsolete code
p4#: 21974
 2013-06-24 14:02:01 +02:00
Magne Sjaastad
12a0040473 Added well branch number and segment number to result info view 
p4#: 21968
 2013-06-21 16:20:11 +02:00
Jacob Støren
cd6d60d896 Ascii Well path import: Works for one path in one file 
p4#: 21966
 2013-06-21 15:59:04 +02:00
CeetronResInsight
139c80dfa0 Fixed missing newline at end of file 
p4#: 21958
 2013-06-18 13:26:38 +02:00
Magne Sjaastad
c8a537e180 Check for valid index before accessing data 
p4#: 21957
 2013-06-18 12:55:49 +02:00
Jacob Støren
5db88f4e03 Ascii import of Well Paths 
p4#: 21956
 2013-06-18 11:56:51 +02:00
Magne Sjaastad
2a2102837a Fixed missing last coordinate for filetered coords 
p4#: 21955
 2013-06-18 11:26:52 +02:00
Magne Sjaastad
16cd7a04ae Multi Segment Wells: Read in connection between a well branch and the branch head. 
Compute intersection point between branch top well cell and branch head in the main branch.
p4#: 21954
 2013-06-18 09:41:02 +02:00
Jacob Støren
fa410ba8a5 Fixed Animation Control problem on project open 
TP#4088
p4#: 21934
 2013-06-14 13:53:52 +02:00
Jacob Støren
29afd9cc8a Cleaned up a bit 
p4#: 21924
 2013-06-14 12:08:05 +02:00
Jacob Støren
edcba5a471 Animation (and other commands) refreshed on selection in the tree view 
p4#: 21923
 2013-06-14 11:59:56 +02:00
Magne Sjaastad
7a24b2664e Updated ERT to handle multi segment wells 
Updated input code in ResInsight accordingly

ERT version on GitHub
067fa99faa
p4#: 21920
 2013-06-13 22:12:02 +02:00
Jacob Støren
6f04f70ade Fixed missing update of the 3D view after deleting statistic results 
p4#: 21894
 2013-06-12 13:42:36 +02:00
Jacob Støren
03ad142261 Removed debug output 
p4#: 21887
 2013-06-12 10:52:46 +02:00
Jacob Støren
a9d2baf117 Project/OilField: Made sure one and always one oilfield exists in a project. 
p4#: 21884
 2013-06-12 09:36:50 +02:00
Magne Sjaastad
12f1400733 Added missing Qt dependencies 
p4#: 21882
 2013-06-12 09:10:42 +02:00
Magne Sjaastad
68edafe5f4 Added checkbox to control import of survey and plan 
p4#: 21863
 2013-06-10 10:10:56 +02:00
Jacob Støren
a2aa9f3e7d Grid Models: Used the "Cases" icon 
p4#: 21855
 2013-06-07 15:01:47 +02:00