Commit Graph

277 Commits

Author SHA1 Message Date
Magne Sjaastad
cfb81a324b Fixed issue with missing well pipe geometry
p4#: 22151
2013-08-12 17:05:03 +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
a8b7662d2f Rename
p4#: 22138
2013-08-08 15:19:16 +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
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
524e8d8375 Added a left margin in the property window.
p4#: 22002
2013-06-26 09:02:37 +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
1ea5a49471 WellPaths: Added support for mulitple paths in one ascii file.
p4#: 21980
2013-06-24 22:04:52 +02:00
Magne Sjaastad
5ea531783a Missed file in last checkin
p4#: 21975
2013-06-24 14:07:49 +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
Jacob Støren
5db88f4e03 Ascii import of Well Paths
p4#: 21956
2013-06-18 11:56:51 +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
Jacob Støren
a2aa9f3e7d Grid Models: Used the "Cases" icon
p4#: 21855
2013-06-07 15:01:47 +02:00
Jacob Støren
6ac8c4365f Project tree: Fixed several issues after the reconfiguration
Missing Icon and text on the Grid Models folder
New cases and Grid Case Groups ended up outside the Grid Model Folder
Old Project files did not show up properly
p4#: 21854
2013-06-07 14:54:02 +02:00
Vidar Lundberg
cd08fc0356 Add temporary icon for Grid Models in PDM, should create proper icon later.
p4#: 21850
2013-06-07 09:32:06 +02:00
Vidar Lundberg
c3cd40d7eb Minor changes, changed logging to standard output when switching frame, e.g. fixed so that current frame number is shown correctly.
p4#: 21848
2013-06-06 16:37:35 +02:00
Vidar Lundberg
ceb5dd8470 Minor changes, adjusted so that well paths become thinner and clip well paths only 100 meters above reservoir.
p4#: 21847
2013-06-06 16:36:37 +02:00
Vidar Lundberg
6340c4a4a8 Established new PDM structure with RimProject owning RimOilFields owning RimAnalysisModels.
Moved wellPathCollection into new class RimOilFields.
Moved cases (previously called reservoirs) and caseGroups from RimProject into new class RimAnalysisGroups.
Added support for old project files, move cases and caseGroups from RimProject to RimAnalysisModels. (Do not handle WellPaths for old project files in a similar way, since almost no users have used this functionality yet.)
p4#: 21846
2013-06-06 15:07:31 +02:00
Vidar Lundberg
691f24e7a7 Added include files because of known include problems related to PDM.
p4#: 21845
2013-06-06 15:02:35 +02:00
Magne Sjaastad
0021e2f861 Improved logarithmic color legends for zero and negative values
p4#: 21804
2013-06-03 13:08:11 +02:00
Jacob Støren
1d3d13c927 Icons: New App icon based on picture sent from Statoil
Scaled vertically a bit to work better as an icon.
Still using the old AppIcon as Case Icon, and updated the InputCase icon to match the Case Icon.
p4#: 21793
2013-06-01 01:29:05 +02:00
Magne Sjaastad
ea4491e987 Added framework used to handle utm area of interest
p4#: 21775
2013-05-31 13:57:16 +02:00
Magne Sjaastad
fa161607a1 Added context menu used to execute a script for multiple cases
For all selected cases, set current case and launch an external Octave process using this current case
p4#: 21742
2013-05-27 15:38:03 +02:00
Vidar Lundberg
163ce74052 Added visualization of Well Paths in reservoir views.
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
Known problems:
- Well paths are not shown in some types of reservoir views, for instance reservoir views showing well pipes. Will look into this later.
p4#: 21658
2013-05-16 14:10:22 +02:00
Vidar Lundberg
704facc1c1 Added some includes to get well path changes to compile, this is related to PDM include problems.
p4#: 21657
2013-05-16 14:02:59 +02:00
Vidar Lundberg
939c6ad156 Added visualization of Well Paths in reservoir views.
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
p4#: 21651
2013-05-16 12:59:35 +02:00
Magne Sjaastad
97c3a330f6 Updated riGetSelectedCases to use a string as type name
Improved how to get currently selected cases
p4#: 21625
2013-05-15 12:03:36 +02:00
Magne Sjaastad
b3a15268f6 Added riGetCases
p4#: 21618
2013-05-15 10:51:41 +02:00
Jacob Støren
cad25bcd59 Caf:PdmUiTree: Rewrote rebuildUiSubTree to become updateUiSubTree
Now the UI state is preserved when refreshing the tree, making it suitable
to use this method more extensively. This paves the way to make changes to the Pdm data structure without considering the ui at all, until a  call to updateUiSubTree gets the ui gracefully into sync.
p4#: 21599
2013-05-13 12:00:52 +02:00
Magne Sjaastad
06d32ae97e Added groupId to case groups
p4#: 21594
2013-05-10 15:35:33 +02:00
CeetronResInsight
cb1c276e01 Fixed missing include (only needed for RHEL6)
p4#: 21591
2013-05-10 11:10:41 +02:00
Magne Sjaastad
eecd069b0a Introduced caseId to RimCase. Project keeps track of largest used ID, and is responsible for assigning ID to cases.
p4#: 21576
2013-05-08 10:41:56 +02:00
Jacob Støren
5c0e55e7c1 Linux compile fixes
p4#: 21550
2013-05-06 12:02:32 +02:00
Jacob Støren
cf664210bf Major cleanup/change in the way things are included.
Needs a Linux compile check.
p4#: 21545
2013-05-06 10:55:00 +02:00
Jacob Støren
e83fe8a471 CellEdge : Added options to turn off specific directions
p4#: 21510
2013-04-30 15:55:12 +02:00
Jacob Støren
1db5d3f03d Set default WellPipe visibility mode to "Visible Cells Filtered"
p4#: 21505
2013-04-30 14:55:59 +02:00
Jacob Støren
be0a2ec728 Legend: Added tick number formatting control
Auto, Fixed and Scientific. Fixed and Scientific respects the precision set.
p4#: 21504
2013-04-30 14:48:53 +02:00
Jacob Støren
60f86cfc3f Result Selection: Result is not changed before user actively selects in the list.
Changig type or porosity model only changes what variables are shown as accessible.
This is also applied to property filters.
Dual porosity support is also added to property filtered. Forgotten before.
p4#: 21499
2013-04-30 13:41:53 +02:00
Magne Sjaastad
445b6edfbd Fixed bug for missing result value during picking for static results
p4#: 21498
2013-04-30 13:34:49 +02:00