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
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
Jacob Støren
b59ac41509
Test of fix of MSW assert
...
p4#: 21978
2013-06-24 15:15:46 +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
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
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
3cfbc9f25e
caf::Pdm: Now deleting all objects in a PointersField before reading anything into it.
...
Added documentation comments as well
p4#: 21883
2013-06-12 09:28:35 +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
Jacob Støren
080fc4c094
Fixed some compiler warnings.
...
p4#: 21853
2013-06-07 14:15:13 +02:00
Jacob Støren
f091629676
Octave Interface: Fixed two issues with setGridProperty
...
Missing argument check and wrong dimension check
p4#: 21828
2013-06-04 16:10:39 +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
Jacob Støren
fe8c155b44
Octave interface: Compiling complete, but completely untested GetGridProperty.
...
p4#: 21740
2013-05-27 12:22:05 +02:00
Jacob Støren
fbc02e79b0
Octave Interface: SetActiveCellProperty: Prettifying
...
p4#: 21724
2013-05-26 12:16:32 +02:00
Jacob Støren
1aa8857f4d
Octave interface: SetActiveCellProperty: Now working according to spec.
...
Not tested for Coarce Cells yet.
p4#: 21723
2013-05-26 12:07:42 +02:00
Jacob Støren
f509e1803f
Active CellInfo: Added concept of Cell Result Count
...
p4#: 21721
2013-05-26 11:59:59 +02:00
Jacob Støren
33bfb287d6
Octave Interface: Cleaned up code, and moved SetActiveCellProperties to the correct file
...
p4#: 21716
2013-05-24 12:02:52 +02:00
Jacob Støren
767c1d2409
Octave interface: Rebuilt the riSetActiveCellProperties command.
...
Accept the new arguments, refactored to new framework, improved error handling.
Still needs to support specified timesteps and Grid Coarsening
p4#: 21713
2013-05-24 11:36:59 +02:00
Jacob Støren
f0d315c55e
Octave Interface: GetActiveCellProperty: Made timestep indices 1-based. Renamed the GetActiveCellProperty command where it was not yet done
...
p4#: 21690
2013-05-22 09:26:12 +02:00
Jacob Støren
90e61c254b
Octave Interface: Rolled out use of common constant for DataStreamVersion
...
p4#: 21689
2013-05-22 09:18:57 +02:00
Jacob Støren
d947f68f83
Octave Interface: GetActiveCellProperty now handles coarsening
...
p4#: 21683
2013-05-21 14:35:47 +02:00
Jacob Støren
2009838b04
Octave: Updated GetActiveCellProperty to the new specification.
...
Still missing handling of coarse grids
p4#: 21677
2013-05-21 11:18:28 +02:00
Jacob Støren
bb0c4c37c1
SocketServer: Moved GetProperty command to new regime.
...
p4#: 21654
2013-05-16 13:29:38 +02:00
Jacob Støren
6173381652
SocketServer: GetActiveCellInfo moved to new regime
...
p4#: 21649
2013-05-16 12:44:43 +02:00
Jacob Støren
a63b2caae5
SocketServer: Converted GetMainGridDims to new regime
...
p4#: 21648
2013-05-16 11:47:42 +02:00
Jacob Støren
db168909d7
Fixed Windows compile issue
...
p4#: 21647
2013-05-16 11:27:34 +02:00
Jacob Støren
36d7c46e57
Socket Server: Rolled in separate command handler classes created by factory.
...
Translated several commands to the new regime.
p4#: 21645
2013-05-16 11:15:34 +02:00
Jacob Støren
739c530fcf
Socket Server: Rolled in separate command handler classes created by factory.
...
Translated several commands to the new regime.
p4#: 21645
2013-05-16 11:14:57 +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
Jacob Støren
6784a8e596
Fixed Well pipe "peaks". The centerline filtering tolerance was too small.
...
p4#: 21580
2013-05-08 13:14:33 +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
991cd7198e
Caf Pdm: Centered the labels vertically related to their editor widgets
...
Vertically streching widgets still have their label aligned with the top edge.
p4#: 21512
2013-04-30 17:08:52 +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
Jacob Støren
d84d69ffc2
Caf: Added the possibility of "nothing" selected in a field using option values
...
p4#: 21490
2013-04-30 11:04:51 +02:00
Jacob Støren
3806ff9baf
Well cell transparency: Turned off well cell transparency when no well pipe is visible.
...
For results visulaization, cell edge and faults faces.
Not yet done for visualization without result colors.
p4#: 21462
2013-04-26 16:46:38 +02:00
Jacob Støren
b14b138dae
Range Filter: Added option to not propagate rangefilter onto the subgrids
...
p4#: 21445
2013-04-26 08:53:40 +02:00
Jacob Støren
4ca363cde5
Fixed bug: Missing well cells in lgr when range filtering
...
p4#: 21442
2013-04-25 14:56:46 +02:00
Jacob Støren
10e6fbc5bd
Range filter: Add grid type drop-down list to enable LGR-grid range filtering
...
TP#3995
p4#: 21408
2013-04-24 12:00:45 +02:00
Jacob Støren
d034717460
Removed unused code
...
p4#: 21354
2013-04-22 10:11:37 +02:00
Jacob Støren
6cac031fff
Added well pipe visibility filter based on cell visibility.
...
Only show pipes with wells with open connections in visible cells
p4#: 21349
2013-04-22 09:13:37 +02:00
Jacob Støren
cd24e77557
Drawstyle and Faults control Toolbuttons
...
p4#: 21335
2013-04-18 15:10:57 +02:00
Jacob Støren
2280a8cbfa
Toolbar and menu refinements
...
Added Snapshot actions to a new toolbar.
Moved the snapshot file actions from debug menu to File->Export
Moved the Snapshot to Clip board to Edit menu.
Moved create new Project tree and Property editor action to Windows menu
Added a separator in the Windwsmenu after the "fixed Docks"
Set unique names on the additional Prop and Project doc windows
p4#: 21326
2013-04-17 10:59:34 +02:00
Jacob Støren
df533d0afe
Alligning
...
p4#: 21321
2013-04-17 07:41:48 +02:00
Jacob Støren
b38d4313d7
Octave Server: Fix on getting active cellinfo
...
p4#: 21318
2013-04-16 12:08:45 +02:00
Jacob Støren
427bf5a2dd
Linux compile warning fix
...
p4#: 21316
2013-04-16 10:46:29 +02:00
Jacob Støren
66f0310d55
Added new icons to resource file
...
p4#: 21306
2013-04-16 09:44:31 +02:00
Jacob Støren
99ad86b984
Added Z-Scale to the 3D overlay info text
...
p4#: 21303
2013-04-16 09:03:40 +02:00
Jacob Støren
d89ea1e385
Legend default number precision set to 2
...
p4#: 21301
2013-04-16 08:50:31 +02:00
Jacob Støren
9e588e38c3
Established new base images for regressiontest. Small models.
...
p4#: 21290
2013-04-16 07:34:50 +02:00
Jacob Støren
d65ce7957b
Added viewer background color to preferences
...
p4#: 21284
2013-04-15 13:13:41 +02:00
Jacob Støren
337e0c3226
Added mesh color as preference, and resetting of preferences before doing regression tests
...
p4#: 21263
2013-04-12 13:15:41 +02:00
Jacob Støren
432106c9c5
External file references: Fixed the relocation in the advanced cases
...
p4#: 21253
2013-04-12 09:43:40 +02:00
Jacob Støren
462bc16ace
Rewrite of the searchpath system for external file references
...
The Relocation code is not yet completely working for the advanced cases
p4#: 21251
2013-04-12 08:31:59 +02:00
Jacob Støren
ff1dcd8c8d
Overlay info: Adjusted colors and transparency
...
To reclaim the transparent feeling lost, and to increase readability
p4#: 21225
2013-04-10 14:24:35 +02:00
Jacob Støren
a246e288ba
Renamed some methods and variables in the eclipse result file access system
...
To make things more readable and understandable
p4#: 21218
2013-04-10 11:02:10 +02:00
Jacob Støren
09810bf586
Fixed error in path update logic
...
p4#: 21209
2013-04-09 15:38:37 +02:00
Jacob Støren
d0eebb92a8
Removed PERMY as default statistics property
...
p4#: 21204
2013-04-09 14:36:38 +02:00
Jacob Støren
2a6fce1d64
Added missing include (discovered on Ubuntu 12 build server)
...
p4#: 21186
2013-04-09 07:27:55 +02:00
Jacob Støren
12294ca853
Statistics Ui: Added default selected properties
...
p4#: 21185
2013-04-08 17:02:07 +02:00
Jacob Støren
fd67c9dc18
Statistics ui: Replaced status and unlock button with a Calculate/Edit button.
...
Made Summary description complete and more compact
p4#: 21176
2013-04-08 14:17:39 +02:00
Jacob Støren
474d00994a
Caf: Made groups become hidden if requested in the uiOrdering system
...
p4#: 21175
2013-04-08 14:10:49 +02:00
Jacob Støren
1c65fe7e2c
Statistics case User interface and behaviour working.
...
p4#: 21171
2013-04-08 12:16:38 +02:00
Jacob Støren
c6f2b52216
Caf: Removed the const constrain on defineUiOrdering
...
To make this be able to change visibility and names etc of fields, and generally be a "make sure you are updated" entry.
p4#: 21168
2013-04-08 12:09:43 +02:00
Jacob Støren
d07783ebaa
Start of calculation status/unlocking of Statistics results
...
p4#: 21143
2013-04-05 13:29:47 +02:00
Jacob Støren
0fed66deb2
Moved the statistical calculation algorithm code into a separate file.
...
Added unit test to these calculations, and fixed a calculation error.
p4#: 21140
2013-04-05 10:49:39 +02:00
Jacob Støren
db62f01e0a
Differenced the compiler options on Windows and Linux, making a ton of stupid MSVC compiler warnings go away.
...
p4#: 21138
2013-04-05 10:42:53 +02:00
Jacob Støren
75f089d0d4
Statistics UI is now functional, together with two percentile evaluation methods
...
Refurbished the calculation algorithm code somewhat
p4#: 21134
2013-04-04 16:53:34 +02:00
Jacob Støren
ef6ee4a26c
Statistics case now has a prototype datamodel and Ui.
...
The data is not yet used to control the calculations.
p4#: 21116
2013-04-03 16:13:49 +02:00
Jacob Støren
770a81648d
Added a new editor to work with text fields.
...
Supports multiline formatted text
p4#: 21114
2013-04-03 16:06:00 +02:00
Jacob Støren
51c4b6a38d
Start of the ui working for setting up statistics calculations
...
p4#: 21100
2013-04-02 16:59:55 +02:00
Jacob Støren
7da5520207
Reverted an accidental checkin regarding generating of test projects
...
p4#: 21098
2013-04-02 16:34:13 +02:00
Jacob Støren
c16db0640b
First start of statistics control data model
...
p4#: 21097
2013-04-02 15:20:55 +02:00
JacobStoren
3c08fd8abf
Merge pull request #20 from OPM/internal
...
Update dev branch to latest
2013-04-02 06:14:26 -07:00
Jacob Støren
e10bd73658
Renamed the final filenames for this time:
...
RICursors RiuCursors
RIMainWindow RiuMainWindow
RIPreferencesDialog RiuPreferencesDialog
RIProcessMonitor RiuProcessMonitor
RIResultInfoPanel RiuResultInfoPanel
RIViewer RiuViewer
p4#: 21072
2013-03-22 17:30:50 +01:00
Jacob Støren
c8da0f4179
Aligning prefix of class names with standard:
...
RICursors RiuCursors
RIMainWindow RiuMainWindow
RIPreferencesDialog RiuPreferencesDialog
RIProcessMonitor RiuProcessMonitor
RIResultInfoPanel RiuResultInfoPanel
RIViewer RiuViewer
p4#: 21071
2013-03-22 17:17:56 +01:00
Jacob Støren
f0174a02fa
More file renaming:
...
RigEclipseCase RigCaseData
RigReservoirCellResults RigCaseCellResultsData
RigWellResults RigSingleWellResultsData
RigGridCollection RigGridManager
p4#: 21070
2013-03-22 16:58:44 +01:00
Jacob Støren
6a2cbbcf07
Renamed files:
...
RimReservoir RimCase
RimResultReservoir RimResultCase
RimInputReservoir RimInputCase
p4#: 21069
2013-03-22 16:40:41 +01:00
Jacob Støren
b903c7f8c2
Renamed files:
...
RIApplication RiaApplication
RIPreferences RiaPreferences
p4#: 21068
2013-03-22 16:24:42 +01:00
Jacob Støren
27647248ea
Rename of files:
...
RIBaseDefs RiaBaseDefs
RIVersionInfo RiaVersionInfo
RIMain RiaMain
RIStdInclude RiaStdInclude
p4#: 21067
2013-03-22 16:12:00 +01:00
Jacob Støren
949084784e
More class renaming. File names not done yet.
...
RIApplication RiaApplication
RIPreferences RiaPreferences
p4#: 21065
2013-03-22 15:50:44 +01:00
Jacob Støren
e493db37d0
Major renaming of classes. Filenames not done yet.
...
RimReservoir RimCase
RimResultReservoir RimResultCase
RimInputReservoir RimInputCase
RigEclipseCase RigCaseData
RigReservoirCellResults RigCaseCellResultsData
RigWellResults RigSingleWellResultsData
RigGridCollection RigGridManager
p4#: 21064
2013-03-22 15:43:42 +01:00
Jacob Støren
bd33a64e84
Added a comment
...
p4#: 21063
2013-03-22 15:22:50 +01:00
Jacob Støren
6d24c6b541
Renamed files corresponding to the already renamed statistics related classes
...
p4#: 21060
2013-03-22 14:24:41 +01:00
Jacob Støren
0d2ad04c3e
Moved "internal" class to cpp file
...
p4#: 21057
2013-03-22 13:35:43 +01:00
Jacob Støren