OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
487 Commits 27 Branches 61 Tags 309 MiB
8c28e8ff6c
Commit Graph

367 Commits

Author SHA1 Message Date
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
Magne Sjaastad
d1cc482355 Use same collection type for source cases and statistics cases in RimIdenticalGridCaseGroup 
p4#: 21053
 2013-03-22 11:47:46 +01:00
Magne Sjaastad
d85b0d4619 More checking on null pointers 
p4#: 21052
 2013-03-22 11:46:54 +01:00
Magne Sjaastad
4101c3cd85 Removed obsolete file 
p4#: 21048
 2013-03-22 10:10:34 +01:00
Magne Sjaastad
6c8d5ff631 Rename of statistics related classes and method names 
p4#: 21047
 2013-03-22 10:03:51 +01:00
Magne Sjaastad
3cd92973af Missed one file in previous rename 
p4#: 21046
 2013-03-22 09:44:41 +01:00
Magne Sjaastad
21065176f2 Rename of functions in RigActiveCellInfo 
p4#: 21045
 2013-03-22 09:32:42 +01:00
Magne Sjaastad
0bb4d5ddc3 Set selected results to None and rebuild display geometry 
p4#: 21043
 2013-03-22 09:16:50 +01:00
Jacob Støren
326cd79754 Result Storage: Finally things have come together, and seems to behave. 
Refactored the loadProject system to make loading of statistical cases work as they should.
Got the update of references regarding grid and unionActive cells work
Introduced a bool to keep track of what cell results to store.
Introduced a clear method in ActiveCellInfo.
Renamed a bit
p4#: 21036
 2013-03-21 15:31:47 +01:00
Magne Sjaastad
d0d96ba145 Fixed layout 
p4#: 21031
 2013-03-21 14:03:37 +01:00
Magne Sjaastad
7548e9c1bb Do not add same case more than once in a grid case group 
p4#: 21030
 2013-03-21 13:56:50 +01:00
Magne Sjaastad
b0503cabba Added drag and drop support. 
Implemented our own insertRows/deleteRows to avoid bug caused by default drag and drop behaviour of Qt

https://bugreports.qt-project.org/browse/QTBUG-26229
https://bugreports.qt-project.org/browse/QTBUG-6679
p4#: 21028
 2013-03-21 13:41:44 +01:00
Magne Sjaastad
1e8d5236d1 Disable paste if no available clipboard data 
p4#: 21025
 2013-03-21 11:04:47 +01:00
Magne Sjaastad
359964092d Added new grid case group on case context menu 
p4#: 21024
 2013-03-21 10:48:46 +01:00
Magne Sjaastad
a5fb1e1764 One shared active cell info for all statistical cases 
Invalidate existing statisticsCases when adding/removing source cases
Moved computation of active cell union from RigStatistics to RimIdenticalGridCaseGroup
Recompute active cell union when opening project file
p4#: 21023
 2013-03-21 10:31:58 +01:00
Jacob Støren
92bd95d683 Added explicit load of data for StatisticsCases. 
Still trouble but this removed one obstacle
p4#: 21014
 2013-03-20 16:35:36 +01:00
Magne Sjaastad
53d7d62759 Made adding of objects more robust 
p4#: 21009
 2013-03-20 15:11:27 +01:00
Magne Sjaastad
1a113b83d3 As QModelIndex is stored on clipboard, clear after move/delete operations 
Added support for multiple delete of reservoir cases
p4#: 21007
 2013-03-20 15:04:28 +01:00
Magne Sjaastad
d5b056b078 Load and update views after copy 
p4#: 21000
 2013-03-20 13:49:32 +01:00
Magne Sjaastad
06a2f7e17f Added general function used to remove(and delete) pdmObject from pdmPointersField 
Used when closing a grid group
p4#: 20992
 2013-03-20 12:08:40 +01:00
Magne Sjaastad
9abe7a3b13 Improved handling when deleting all cases and adding new case to case group 
p4#: 20990
 2013-03-20 11:35:27 +01:00
Magne Sjaastad
22aee27333 Improved paste of pdm objects 
p4#: 20980
 2013-03-20 07:42:26 +01:00
Magne Sjaastad
45ce4097e1 Use buildViewItems instead of rebuildUiSubTree 
p4#: 20979
 2013-03-20 07:14:27 +01:00
Magne Sjaastad
50206b9dc4 Various linux fixes and missing includes 
p4#: 20976
 2013-03-20 06:11:45 +01:00
Magne Sjaastad
27dee4d4e2 Added paste on gridcollection, case collection and cases 
Moved creation of objects into rimUiTreeModelPdm
p4#: 20968
 2013-03-19 12:47:38 +01:00
Magne Sjaastad
414172cf78 Insert new case group before script item 
p4#: 20964
 2013-03-19 11:14:32 +01:00
Jacob Støren
75fc89e67a Rename of ...ResultsCacher to ...ResultsStorage. Hide Cacher from UI tree 
p4#: 20963
 2013-03-19 10:29:34 +01:00
Magne Sjaastad
051710b82f Prototype of copy/paste of reservoir case 
p4#: 20962
 2013-03-19 09:55:17 +01:00
Jacob Støren
5860cb2e49 Results Storage: Removed obsolete field. Stored the filename. 
p4#: 20959
 2013-03-19 09:48:30 +01:00
Jacob Støren
516c642cc4 Results Storage: Refined the output format. Think it is ok now 
p4#: 20956
 2013-03-19 09:08:37 +01:00
Magne Sjaastad
f0fa445f7a Set main grid on eclipse case and cell results 
p4#: 20955
 2013-03-19 08:28:25 +01:00
Magne Sjaastad
a411a8ae59 Removed obsolete code from interface 
Use time steps from source case with largest time step count
p4#: 20954
 2013-03-19 08:21:55 +01:00
Magne Sjaastad
da3486f881 Use size_t instead of int 
p4#: 20953
 2013-03-19 08:15:27 +01:00
Magne Sjaastad
5db5c14230 Added possibility to read out scalar result index having most time steps 
p4#: 20952
 2013-03-19 08:14:35 +01:00
Jacob Støren
9da6b0a10b Results Storage: Fixed the Previous build error by moving the RigStatistics class. 
Cleaned up a bit in the ApplicationCode/CMakeList.txt
p4#: 20946
 2013-03-18 14:51:31 +01:00
Jacob Støren
f7248f3999 Results Storage: A huge refactorisation to make way for storing generated properties to an internal file. 
This does not yet compile due to a unfortunate mix of perforce, cmake setup and unit_test project shortcomings.
Need to move RigStatistics into ProjectDataModel and rename it before this is running again.
p4#: 20945
 2013-03-18 14:34:29 +01:00
Magne Sjaastad
62e4cac4b0 Added inherited object of MimeData to carry model index list 
p4#: 20926
 2013-03-18 11:40:39 +01:00
Magne Sjaastad
e92ed43fc3 Added context menu for adding new case group 
p4#: 20905
 2013-03-14 09:50:40 +01:00
Magne Sjaastad
469c5a9657 Added initAfterRead for case group 
p4#: 20904
 2013-03-14 09:28:49 +01:00
Magne Sjaastad
99159cb12d Fixed missing initialization 
p4#: 20903
 2013-03-14 08:47:42 +01:00
Magne Sjaastad
422c4ca54b Use raw pointer instead of smart pointer 
p4#: 20892
 2013-03-13 14:58:36 +01:00
Magne Sjaastad
160456106a Use raw pointers instead of ref count 
Added more asserts and cleanup
p4#: 20891
 2013-03-13 14:43:27 +01:00
Magne Sjaastad
d33a27a082 Fixed ref counts 
p4#: 20890
 2013-03-13 14:41:54 +01:00
Magne Sjaastad
973eb5c8f7 Use concept of parentObjectsOfType to avoid dynamic cast in application code. 
p4#: 20887
 2013-03-13 13:51:26 +01:00
Jacob Støren
3c446c4018 Removed out-commented code from the ActiveCellInfo refactoring 
p4#: 20886
 2013-03-13 13:42:27 +01:00
Jacob Støren
ec889920d5 Removed out-commented code from the ActiveCellInfo refactoring 
p4#: 20886
 2013-03-13 13:41:35 +01:00
Jacob Støren
3013992518 Fixed error regarding missing well cells in property filtered views 
p4#: 20882
 2013-03-13 13:06:37 +01:00
Jacob Støren
8a604aca24 Refactored RigActiveCellinfo to only have one set of information. 
Fracture and Matrix separated information thus needs two such obejcts.
There still needs to remove some out-commented code
p4#: 20877
 2013-03-13 11:50:31 +01:00
Magne Sjaastad
4358d87c09 If no views are created for RimReservoird, delete the current RigEclipseCase. 
Then all data will be read from file as if the case was opened as a stand alone case.
p4#: 20876
 2013-03-13 11:42:26 +01:00
Magne Sjaastad
449b22c681 Do not use smart pointer in this class 
p4#: 20875
 2013-03-13 11:39:27 +01:00
Magne Sjaastad
99917c60ad Compute SOIL for each time step 
Added support for computing statistics for derived SOIL
p4#: 20873
 2013-03-13 10:29:47 +01:00
Magne Sjaastad
06460424af Check for empty source cases 
p4#: 20871
 2013-03-13 08:03:26 +01:00
Magne Sjaastad
766996a9fd Include static properties when computing statistics 
p4#: 20870
 2013-03-13 07:58:49 +01:00
Jacob Støren
9ab0a397ef Removed the m_isWellCell member from RigCell, to make the grid data completely independent of case / result data 
p4#: 20859
 2013-03-12 10:03:25 +01:00
Magne Sjaastad
94065f29ed Removed obsolete code 
p4#: 20857
 2013-03-12 09:59:33 +01:00
Magne Sjaastad
61e8115141 Fixed indentation issues 
Renamed and added asserts
p4#: 20846
 2013-03-11 14:04:48 +01:00
Magne Sjaastad
086262a4b6 Fixed how to compute number of views in a collection 
p4#: 20842
 2013-03-11 08:24:45 +01:00
Jacob Støren
85f0d8b195 Fixed "New View" command tree refresh behaviour. Still the expand icon is missing sometimes... 
p4#: 20833
 2013-03-08 11:14:27 +01:00
Jacob Støren
0a5102894b Calculate statistics for all available properties in main case by default 
p4#: 20832
 2013-03-08 10:49:33 +01:00
Magne Sjaastad
9605a1eec9 Added clear method to make sure all objects are destroyed. 
p4#: 20828
 2013-03-08 08:36:30 +01:00
Magne Sjaastad
0a02805a8f Added assert on ref count of referenced object, as this object is assumed to be released in the destructor 
p4#: 20827
 2013-03-08 08:35:27 +01:00
Magne Sjaastad
f6fa801607 Use raw pointers in file readers to avoid circular references 
p4#: 20826
 2013-03-08 08:24:40 +01:00
Jacob Støren
d4a28126d1 Added several new icons, including zoom all 
p4#: 20823
 2013-03-07 16:47:42 +01:00
Magne Sjaastad
208e904f57 Rebuild geometry after computing new active cell info, and update views 
p4#: 20821
 2013-03-07 14:57:28 +01:00
Magne Sjaastad
1bf1d5a7cf Rebuild geometry after computing new active cell info, and update views 
p4#: 20821
 2013-03-07 14:56:52 +01:00
Magne Sjaastad
05b6c1ad18 Compute active cell info grid by grid 
p4#: 20817
 2013-03-07 13:20:15 +01:00
Magne Sjaastad
ec825145df Fixed invalid active global index 
p4#: 20816
 2013-03-07 13:13:34 +01:00
Jacob Støren
78f2c359cb Renamed the multicase command to "Create Grid Case Group From Files" 
p4#: 20814
 2013-03-07 12:32:19 +01:00
Jacob Støren
aab18ba0a0 Set root as default start directory for grid case group import 
p4#: 20811
 2013-03-07 12:25:27 +01:00
Magne Sjaastad
6bf3776a5d Add one statistical case object when creating a case group 
p4#: 20808
 2013-03-07 10:06:31 +01:00
Magne Sjaastad
868c90dd03 Removed checkbox selections for statistical configuration 
p4#: 20805
 2013-03-07 09:49:33 +01:00
Jacob Støren
fcdf14c0fa Improved progress information when reading large projects 
p4#: 20803
 2013-03-07 09:43:25 +01:00
Jacob Støren
705bb185e0 Fixed assert regarding wrong clamping of current timestep 
p4#: 20802
 2013-03-07 09:42:34 +01:00
Magne Sjaastad
86696d85e5 Delete child objects when object is deleted 
p4#: 20799
 2013-03-07 09:21:29 +01:00
Jacob Støren
77d5b810ca Fixed errror regarding LGC and missing results 
p4#: 20794
 2013-03-06 15:13:37 +01:00
Jacob Støren
466eb906aa Multi Case Dialog now remebers the Add Search Folder path 
p4#: 20770
 2013-03-05 15:22:19 +01:00
Jacob Støren
2c19c8010c MultiCase import dialog: Fixed errors in remove search folders and cases 
p4#: 20765
 2013-03-05 14:45:29 +01:00
Magne Sjaastad
02c7cc2b06 Fixed filenames for dynamic result access 
p4#: 20762
 2013-03-05 13:49:34 +01:00
Jacob Støren
e0688008ca Added a multi case import dialog 
p4#: 20758
 2013-03-05 13:26:28 +01:00
Magne Sjaastad
e94264a39f Added support for building of metadata from existing time steps 
Improved statistics calculation for opening single time step files
Close all dynamic access files when a time step statistics is complete
p4#: 20756
 2013-03-05 13:10:26 +01:00
Magne Sjaastad
452b08db3a Added progress info 
p4#: 20755
 2013-03-05 13:03:52 +01:00
Magne Sjaastad
debb8e132f Linux fix 
p4#: 20715
 2013-03-05 08:39:50 +01:00
Magne Sjaastad
7174049aed Use time step dates from first source case when creating a statistical result 
p4#: 20713
 2013-03-05 08:34:45 +01:00
Magne Sjaastad
a6c9d9d0f0 Linux fix 
p4#: 20696
 2013-03-02 15:39:33 +01:00
Magne Sjaastad
a63c656a48 Added RigStatistics 
p4#: 20695
 2013-03-02 15:33:27 +01:00
Magne Sjaastad
4c955ece4a Improved statistical data infrastructure 
p4#: 20694
 2013-03-02 15:32:38 +01:00
Magne Sjaastad
42f3f0b2d2 Fixed invalid check 
p4#: 20692
 2013-03-02 15:10:10 +01:00
Magne Sjaastad
5ed0e5a725 Linux fixes 
p4#: 20691
 2013-03-02 10:18:27 +01:00
Magne Sjaastad
27a8088421 Compute global count based on active cell vectors 
p4#: 20688
 2013-03-01 16:13:37 +01:00
Jacob Støren
1181d62b75 Reviewed and simplified DataAccess classes. 
Includes some const changes and some renaming
p4#: 20687
 2013-03-01 16:00:34 +01:00
Jacob Støren
cd0b40ef20 3D info is now using a different rendereing method more compatible with software rendering 
p4#: 20669
 2013-02-28 11:58:31 +01:00
Magne Sjaastad
1a05676551 Fixed missing open of INIT file 
p4#: 20666
 2013-02-28 11:27:37 +01:00
Magne Sjaastad
839a617916 Do not store scripts in project file 
p4#: 20665
 2013-02-28 10:15:28 +01:00
CeetronResInsight
c0a578678d Linux compile fixes 
p4#: 20663
 2013-02-28 09:59:36 +01:00
Magne Sjaastad
0993a8984d Fixed unit tests 
p4#: 20659
 2013-02-28 08:04:43 +01:00
Magne Sjaastad
3dbc8a9d57 Improved multi case initial reading 
When creating a multi case group from multiple files, read grid from first file.
The main grid from the first case is reused for the other cases.
NOTE: Metadata and well information is not read for the other cases
p4#: 20655
 2013-02-27 15:27:33 +01:00
Magne Sjaastad
3dc027e29e Fixed issue related to reading data after close 
p4#: 20647
 2013-02-27 14:30:32 +01:00
Magne Sjaastad
d628973f56 Rename and improvements related to close 
p4#: 20645
 2013-02-27 14:13:37 +01:00
Magne Sjaastad
7694c5d02d Added support for lazy file parsing and improved closing of files 
p4#: 20644
 2013-02-27 14:01:36 +01:00
Magne Sjaastad
092974a7fa Rename, reject update of active cell data if number of cells is not matching 
p4#: 20641
 2013-02-27 11:54:32 +01:00
Magne Sjaastad
df281ccb2b Added reading of active cell data from EGRID file directly 
p4#: 20640
 2013-02-27 11:27:02 +01:00
Jacob Støren
ad082254af Well pipe size now is based on min characteristic I, J cell size 
p4#: 20628
 2013-02-26 14:08:30 +01:00
Jacob Støren
ab02afabcf Legend config: Removed obsolete min value threshold 
p4#: 20626
 2013-02-26 12:45:41 +01:00
Jacob Støren
39ac12f2f3 Pipe generator: Added some asserts. 
p4#: 20624
 2013-02-26 11:49:28 +01:00
Magne Sjaastad
2b5bea7a4a Cleaned up and improved how files are included from CMakeLists_files.cmake 
p4#: 20616
 2013-02-26 09:38:33 +01:00
Magne Sjaastad
1a235529ac Removed active cell info from RigCell 
Set all cells active for mock models
p4#: 20614
 2013-02-25 14:07:59 +01:00
Magne Sjaastad
edda92182b Use active cell info struct instead of RigCell member function 
p4#: 20613
 2013-02-25 14:01:40 +01:00
Magne Sjaastad
d8000be32a Use isActiveInMatrixModel instead of activeInMatrixModel 
p4#: 20612
 2013-02-25 13:27:38 +01:00
Jacob Støren
459f2a033b Added background color setting to a view. 
Requested by Statoil at 19.02.2013
p4#: 20611
 2013-02-25 11:52:28 +01:00
Jacob Støren
7f01481393 Refurbished the RimReservoirView header file, to make it more readable 
p4#: 20610
 2013-02-25 09:44:26 +01:00
Jacob Støren
49f2c42c3e Renamed to Grid Case Group in the UI 
p4#: 20609
 2013-02-25 09:43:42 +01:00
Magne Sjaastad
f00152823f Consolidated cache data computations 
Removed automatic insertion of grids into identical grid groups
p4#: 20607
 2013-02-22 10:12:06 +01:00
Magne Sjaastad
49236839a3 Added menu item for multiple case import 
Find EGRID files recursively in subfolders
p4#: 20603
 2013-02-21 16:46:34 +01:00
Magne Sjaastad
0dc492da75 Added casecollection in grid case group 
p4#: 20602
 2013-02-21 15:37:51 +01:00
Magne Sjaastad
4a3bde5baa Moved statistical cases into statistics case collection 
p4#: 20599
 2013-02-21 12:00:49 +01:00
Magne Sjaastad
f45c581dbc Added name to group case 
p4#: 20595
 2013-02-21 10:38:28 +01:00
Magne Sjaastad
a0b2be3dee Added framework for statistical calculation reader 
p4#: 20591
 2013-02-21 08:48:26 +01:00
Magne Sjaastad
b6abc0c6ea Added CMakeLists_files.cmake in FileInterface folder 
p4#: 20590
 2013-02-21 08:46:09 +01:00
Magne Sjaastad
9ad5ec5449 Add view from context menu of case 
p4#: 20589
 2013-02-21 08:39:50 +01:00
Magne Sjaastad
e82aef5850 Imroved lifespan handling for reservoirs 
p4#: 20526
 2013-02-15 10:01:41 +01:00
Magne Sjaastad
73c9459276 Simplified adding of view 
p4#: 20524
 2013-02-15 09:21:28 +01:00
Magne Sjaastad
c92e822f3f Added context menu items for adding new statistical case 
p4#: 20523
 2013-02-15 08:44:45 +01:00
Magne Sjaastad
67cab9448e Added statistical calculation framework 
p4#: 20521
 2013-02-14 15:27:35 +01:00
Magne Sjaastad
3490d07dd1 Added IdenticalGridCaseGroup, now displayed in tree view 
p4#: 20518
 2013-02-14 14:30:01 +01:00
Magne Sjaastad
8f50b90216 Added grid collection and reuse of MainGrid if the grids are equal 
p4#: 20517
 2013-02-14 13:16:56 +01:00
Magne Sjaastad
46cb61e859 Rename 
p4#: 20515
 2013-02-14 10:19:27 +01:00
Magne Sjaastad
b1531c5454 Initial version of RigGridCollection 
p4#: 20514
 2013-02-14 10:08:56 +01:00
Magne Sjaastad
f344466037 Always use smart pointers 
p4#: 20513
 2013-02-14 10:02:49 +01:00
Magne Sjaastad
b4a6cccfb0 Added include of math.h 
p4#: 20508
 2013-02-13 14:59:30 +01:00
Magne Sjaastad
b8e663da03 Added list of files in CMakeLists_files.cmake 
Do not use precompiled headers for ReservoirDataModel files
p4#: 20506
 2013-02-13 14:50:37 +01:00
Magne Sjaastad
33a6157906 Cleanup of comments 
p4#: 20504
 2013-02-13 13:50:37 +01:00
Magne Sjaastad
a09dba2670 File rename from RigReservoir to RigEclipseCase 
p4#: 20503
 2013-02-13 13:33:35 +01:00
Magne Sjaastad
ec8817e207 Renamed RigReservoir to RigEclipseCase 
p4#: 20500
 2013-02-13 13:24:39 +01:00
Magne Sjaastad
b1cb8a6716 Moved result value vectors from MainGrid to Reservoir 
p4#: 20499
 2013-02-13 13:10:54 +01:00
Magne Sjaastad
f14c03f172 Fixed index bug in data access 
p4#: 20498
 2013-02-13 11:47:29 +01:00
Magne Sjaastad
a0d6890aa3 Removed obsolete code 
p4#: 20492
 2013-02-13 11:24:36 +01:00
Magne Sjaastad
e99c1cbfb1 Moved computation of geometry bounding box from main grid to reservoir 
p4#: 20490
 2013-02-13 11:04:45 +01:00
Magne Sjaastad
f04b4b0258 Use data access objects for cell edge visualization 
p4#: 20489
 2013-02-13 10:27:33 +01:00
Magne Sjaastad
1a17875dc1 Restructured data access objects, added factory method 
p4#: 20471
 2013-02-12 14:46:45 +01:00
Magne Sjaastad
d45aded7f7 Removed more functions from MainGrid 
p4#: 20468
 2013-02-12 14:00:39 +01:00
Magne Sjaastad
6c7dc10791 Removed functions from MainGrid 
p4#: 20459
 2013-02-12 12:55:58 +01:00
Magne Sjaastad
ea2c890b95 Moved active cell computation from main grid to socket server 
p4#: 20458
 2013-02-12 12:05:41 +01:00
Magne Sjaastad
6101209d40 Moved functionality from main grid to active cell info 
p4#: 20457
 2013-02-12 11:50:23 +01:00
Magne Sjaastad
996f2fc7eb Release active cell info if no fracture cells is present. 
p4#: 20456
 2013-02-12 11:43:36 +01:00
Magne Sjaastad
99f5299030 Release active cell info if no fracture cells is present. 
p4#: 20456
 2013-02-12 11:26:33 +01:00
Magne Sjaastad
2b4edf39d1 Use active cell info structure 
p4#: 20455
 2013-02-12 11:15:36 +01:00