OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-08-27 05:37:21 -05:00
Code Issues Packages Projects Releases Wiki Activity
590 Commits 56 Branches 82 Tags
e4bc6c9339c3db4dc85e71a707e0aaf8c79766ea
Commit Graph
590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad 5911e2bf32 Do not use same name on a variable and a function 
p4#: 21147
 2013-04-05 14:32:33 +02:00
Magne Sjaastad 2f14dbc411 Rename 
p4#: 21145
 2013-04-05 14:25:33 +02:00
Magne Sjaastad 593a53a5a6 Added delete of a case not part of a case group 
p4#: 21144
 2013-04-05 14:18:34 +02:00
Jacob Støren d07783ebaa Start of calculation status/unlocking of Statistics results 
p4#: 21143
 2013-04-05 13:29:47 +02:00
Magne Sjaastad 700f18391b Added GUI for asking user to confirm change for grid case group 
p4#: 21142
 2013-04-05 13:22:36 +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
Magne Sjaastad ca63b9163a Set the variable to override in the CMake cache, then the default value for the option in the sub project will have no effect. 
p4#: 21136
 2013-04-05 09:43:49 +02:00
CeetronResInsight 2d5ed03b9b When ERT is configured to be not installed, do static linking of the Ert modules 
p4#: 21135
 2013-04-05 08:15:03 +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
Magne Sjaastad cc8568cca6 Fixed inverted test for null pointer 
p4#: 21127
 2013-04-04 12:08:36 +02:00
Magne Sjaastad 4a8a24c433 Disable install of ERT libs and headers 
p4#: 21126
 2013-04-04 11:27:38 +02:00
Magne Sjaastad 32d67d9978 Updated ERT from https://github.com/Ensembles/ert/commits/master to version 
4a78d88f1dc7bbc86f173c5adb825bbca29fa116
p4#: 21120
 2013-04-04 08:24:40 +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
Magne Sjaastad 70347c281f Do not use deprecated Octave functions 
https://github.com/OPM/ResInsight/commit/b5ad0b9170f14b1c0f90c9e9292c93fabc744e35
p4#: 21106
 2013-04-03 09:24:33 +02:00
Magne Sjaastad 99fcb435ed Merge pull request #17 from hegge/build-system-fixes 
Minor build system fixes, gitignore and compiler warning
 2013-04-03 00:17:39 -07:00
Magne Sjaastad e49895ea65 Updated file headers 
p4#: 21104
 2013-04-03 09:09:53 +02:00
Magne Sjaastad 83d23fb7c0 Merge pull request #18 from alfbr/master 
Updated README
 2013-04-02 23:46:02 -07:00
Torstein Hegge b5ad0b9170 octave: Avoid deprecated single argument dim_vector constructor 
The single argument constructor to dim_vector was deprecated in liboctave 3.4
[1], and gives a compile time warning when compiling with gcc and using a
recent version of liboctave. The two argument constructor is safe to use with
older versions of liboctave.

[1] http://hg.savannah.gnu.org/hgweb/octave/rev/12884915a8e4
 2013-04-02 19:01:09 +02:00
Torstein Hegge 7b0b923d80 gitignore: Ignore more build system products 
Ignore static libraries, cmake products, generated code and unit test
binaries.

Some extra care must be taken not to ignore more than intended when ignoring
the *_UnitTests. There is no way to directly express a path-neutral "only
ignore files with this pattern, not directories" in a single gitignore
pattern, but it can be expressed as "ignore everything containing this pattern
except directories".
 2013-04-02 19:01:09 +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
alfbr f22042c5d3 Updated Ubuntu 12.10 dependencies and standardized build directory. 2013-03-31 12:34:48 +02:00
Alf Birger Rustad 74a1cdd889 Merge pull request #15 from rolk/instdir 
Enable installation of ResInsight with a package manager through an option
 2013-03-31 03:04:30 -07:00
Roland Kaufmann 20f00f4a3a Put launcher for ResInsight in desktop environment 2013-03-27 00:43:13 +01:00
Roland Kaufmann f6dd430b87 Path to Octave plugins is taken from conf. program 2013-03-27 00:43:13 +01:00
Roland Kaufmann e7613fe9ee Optionally enable system installation of binaries 
If the option PRIVATE_INSTALL is set to OFF, LSB-compliant paths are
used for the `install' target.
 2013-03-27 00:43:01 +01:00
Roland Kaufmann 3fcd05e838 Refactor variable containing filenames for license 
These will be used in several scenarios later.
 2013-03-27 00:39:06 +01:00
Roland Kaufmann e63c609111 Use $ORIGIN to load libs from program directory 
The RPATH attribute won't expand relative directories (such as ".")
neither can it be a semi-colon separated list; the old way of setting
it was wrong and would lead to libraries being loaded from system
directories instead.
 2013-03-27 00:38:59 +01: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
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