Commit Graph

716 Commits

Author SHA1 Message Date
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
64c234d988 Updated to internal version 0.9.21
p4#: 22200
2013-08-23 14:40:42 +02:00
Magne Sjaastad
5ab7e5426f Upped to version 0.9.20
p4#: 22199
2013-08-23 13:47:40 +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
178dd88aa0 Use timeout period of 60 sec as timeout for large data transfer operations
p4#: 22182
2013-08-16 15:59:52 +02:00
Magne Sjaastad
b18e3274be Added missing variable init
p4#: 22163
2013-08-14 08:19:23 +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
5c5d53bcee Show wait cursor when progress dialog is visible
p4#: 22152
2013-08-13 09:03:40 +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
8c128aeb6e Added more detailed timeout for data transfer between ResInsight and Octave
p4#: 22148
2013-08-12 11:38:09 +02:00
Magne Sjaastad
494a5857dd Improved text output to Process Monitor and added grid index
p4#: 22145
2013-08-12 10:12:36 +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
b45c49104a Allow dataset to be received by ResInsight from Octave to have a dimension of 3, meaning 4D dataset with one time step
Fixed comments
p4#: 22143
2013-08-09 13:42:25 +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
31c18dd356 Fixed issue with progress info dialog
Use application modal instead of window modal
p4#: 22132
2013-08-08 14:24:12 +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
adff387d36 Improved animation control
Fixed double redraw related to update of the time step in the combo box called during use of the animation toolbar
p4#: 22098
2013-08-06 11:01:14 +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
Magne Sjaastad
3bef117e7d Upped to dev version 0.9.19
p4#: 22091
2013-08-01 19:53:36 +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
Magne Sjaastad
5be640daa2 Upped to 0.9.18
p4#: 22003
2013-06-26 09:24:34 +02:00