Commit Graph
100 Commits
Author SHA1 Message Date
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
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 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
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
Jacob Støren ad8cbfa651 Caf::Pdm: Added better Error messages and Recovery when encountering unknown field names and class types
p4#: 21001
2013-03-20 13:56:17 +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
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
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
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
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
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
Jacob Støren d4a28126d1 Added several new icons, including zoom all
p4#: 20823
2013-03-07 16:47:42 +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
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
Jacob Støren 77d5b810ca Fixed errror regarding LGC and missing results
p4#: 20794
2013-03-06 15:13:37 +01:00
Jacob Støren 5247d6687d Integrating Visualization Modules
from ChangeList 20718 Due to updates in the overlay image
p4#: 20781
2013-03-06 09:25:33 +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
Jacob Støren e0688008ca Added a multi case import dialog
p4#: 20758
2013-03-05 13:26:28 +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
Jacob Støren 5a84a12864 Integrated new version of the Visualization modules:
From change List number 20662.
p4#: 20667
2013-02-28 11:37:32 +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 dc02b1ae91 Well pipe size now is based on min characteristic I, J cell size
p4#: 20628
2013-02-26 14:07: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
Jacob Støren deae7520b9 Pipe generator: Added some asserts.
p4#: 20624
2013-02-26 11:48:41 +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
Jacob Støren 4155bd821f Regression test help text now uses the names in the RegTestNames namespace
p4#: 20441
2013-02-11 11:29:55 +01:00
Jacob Støren cdd5997f76 Updated regressiontest help text
p4#: 20435
2013-02-08 17:15:29 +01:00
Jacob Støren 9b00d3ce9f Linnux compile fixes
p4#: 20434
2013-02-08 17:08:37 +01:00
Jacob Støren 0c437a0121 Added a regression test system to ResInsight.
Based on image comparison. Command line invocation.
p4#: 20433
2013-02-08 17:04:35 +01:00
Jacob Støren baeba974bf Fixed compiler warning
p4#: 20432
2013-02-08 16:57:54 +01:00
Jacob Støren 09544f082b Guard against missing well results
When project file has settings for wells but there are no well results
p4#: 20416
2013-02-07 13:44:18 +01:00
Jacob Støren 9f8f39b80b Caf: Fixed missing redraw/update after zoom all
p4#: 20413
2013-02-07 13:37:39 +01:00
Jacob Støren e8bf853231 ERT: Temporary hack fix of crash on well reading with inordered timesteps.
p4#: 20408
2013-02-07 11:10:26 +01:00
Jacob Støren 6fef9994db Improved progress bar smoothness.
Particularily when having many result files
p4#: 20392
2013-02-06 13:44:27 +01:00
Jacob Støren de8a959ad5 caf: Fixed bug in progress calculation resulting in the progress neary standing still on sub sub levels
p4#: 20391
2013-02-06 13:36:25 +01:00
Jacob Støren 24e2c3dcbb Added include of typeinfo as it seems to be needed on ubuntu and rhe6
p4#: 20387
2013-02-06 12:16:37 +01:00
Jacob Støren 487ee03212 Rearranged members a bit in preparations to split out active info
p4#: 20381
2013-02-05 16:35:04 +01:00
Jacob Støren 1cab9a41a3 Now storing and restoring the camera viewpoint
p4#: 20380
2013-02-05 16:32:43 +01:00
Jacob Støren dc4ba13469 caf::Pdm: Added support for Fields of cvf::Mat4d to use for viewpoint storage
p4#: 20378
2013-02-05 16:31:28 +01:00
Jacob Støren 69d8739c6c Removed pyramid cells when members of a coarse cell
p4#: 20357
2013-02-04 13:46:28 +01:00
Jacob Støren 87a120dc39 Static results: Fixed crash when going to timestep > 0
p4#: 20356
2013-02-04 13:45:46 +01:00
Jacob Støren 561ea6a322 Cad Navigation: Fixed error regarding picking and new window coordinate system
p4#: 20353
2013-02-04 13:10:50 +01:00
Jacob Støren 9d9f8d45c0 Removed obsolete code regarding introduction of coarse cells
p4#: 20345
2013-02-01 15:34:27 +01:00
Jacob Støren 3c9ac23534 Results from a case with Coarse cells is now finally ok.
p4#: 20344
2013-02-01 15:33:21 +01:00
Jacob Støren 602c9f5535 Fixing the crash on retreiving the fractureActive index on none dual porosity again.
p4#: 20326
2013-02-01 09:50:17 +01:00
Jacob Støren df40d89fe9 Fixing the crash on retreiving the fractureActive index on none dual porosity again.
p4#: 20326
2013-02-01 09:26:43 +01:00
Jacob Støren 66f0bc03bd Undo an unintended checkin
p4#: 20323
2013-01-31 17:21:30 +01:00
Jacob Støren 4a52c5f7c1 Final rename to cmake with no capitals 2013-01-31 17:18:33 +01:00
Jacob Støren d48d7d50ff Starting to rename the CMake directory. Case change problem 2013-01-31 17:15:19 +01:00
Jacob Støren b33dd15372 Ert: Updated to 3f8166c4739fdfe654d3992920a36bf0a6981b4d
Had to remove a kræsj.txt file that caused trouble (again)
p4#: 20320
2013-01-31 15:55:49 +01:00
Jacob Støren 85238529ef Build system fixes to handle new Ert version
p4#: 20319
2013-01-31 15:39:40 +01:00
Jacob Støren 0ac6dc32a5 Long Pyramidish degenerated inactive cells are now sorted out as invalid TP#3345
p4#: 20306
2013-01-30 15:02:28 +01:00
Jacob Støren 32b5af2033 Added code to output cell corner coordinates when picking. Disabled by default.
p4#: 20305
2013-01-30 14:51:31 +01:00
Jacob Støren b610133117 Octave interface Spec: Added some considerations
p4#: 20260
2013-01-28 07:53:48 +01:00
Jacob Støren 78af79ef7a More Octave interface specification
p4#: 20259
2013-01-25 17:37:39 +01:00
Jacob Støren 0111681f10 First "Complete" Draft. Still questions, but all relevant suggestions are addressed
p4#: 20250
2013-01-25 13:46:29 +01:00
Jacob Støren 1d7984c305 Started to refine the draft octave interface specification
p4#: 20243
2013-01-25 09:49:54 +01:00
Jacob Støren 03a3ceb9c1 Start of a specification draft
p4#: 20242
2013-01-25 07:30:30 +01:00
Jacob Støren 288c8bda71 Removed compiler warnings on linux as well. Now there are (nearly)only ERT warnings left.
p4#: 20238
2013-01-24 14:26:51 +01:00
Jacob Støren 6465913e0d Fixed linux compile error. Missing include.
p4#: 20236
2013-01-24 14:08:56 +01:00
Jacob Støren 0807261123 Fix of missing well data from separate restart files.
p4#: 20234
2013-01-24 10:41:28 +01:00
Jacob Støren f5da271c17 Fix of missing well data from separate restart files.
p4#: 20234
2013-01-24 10:41:09 +01:00
Jacob Støren d7c542307d Now using size_t instead of int in progressInfo interface.
This is due to the fact that progress is positive only, and that the size and index of std::vectors often are used when setting progress.
It ultimatly reduces compiler warnings.
p4#: 20221
2013-01-23 11:03:33 +01:00
Jacob Støren 268b38aa65 Removed even more compiler warnings.
p4#: 20220
2013-01-23 10:56:09 +01:00
Jacob Støren b938b14b5b Removed a lot of size_t/uint/int related compiler warnings. Still more to go.
p4#: 20215
2013-01-22 11:34:47 +01:00
Jacob Støren 24ac7b819e Version number put into a separate file
p4#: 20214
2013-01-22 11:28:35 +01:00
Jacob Støren ebdf9ccdc3 Version number put into a separate file
p4#: 20214
2013-01-22 09:30:28 +01:00
Jacob Støren bbec410144 Consolidated the root CMakeLists.txt. Removed the .cmake and _install.txt
p4#: 20212
2013-01-22 09:04:42 +01:00
Jacob Støren 96e1b7db0d Removed compiler warning
p4#: 20205
2013-01-21 16:14:31 +01:00
Jacob Støren e88f62abcf Intermediate fix of bool size inconsistency between C and C++
p4#: 20200
2013-01-21 08:29:50 +01:00