Commit Graph

465 Commits

Author SHA1 Message Date
Arne Morten Kvarving
61614b9c3c added: debian (ubuntu) packaging 2013-04-10 11:01:51 +02:00
Arne Morten Kvarving
00db8ea130 added: RHEL6 packaging 2013-04-09 18:49:26 +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
CeetronResInsight
1cfd103f30 Linux compile warning fixes
p4#: 21189
2013-04-09 07:59:41 +02:00
Magne Sjaastad
812aee9be4 Text changes
p4#: 21187
2013-04-09 07:52:34 +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
Magne Sjaastad
bd563df02e Use setter instead of overloaded constructor
p4#: 21177
2013-04-08 14:29:43 +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
Magne Sjaastad
64899f62c2 Detect when project path has changed, and do a explicit update of file path for RimCases.
Do not use initAfterRead
p4#: 21165
2013-04-08 12:01:40 +02:00
Magne Sjaastad
775b9e5bee Update file paths if project file is moved on disk
p4#: 21162
2013-04-08 09:57:40 +02:00
Magne Sjaastad
4ae9182fc6 Extract path from document file name in RimProject
p4#: 21160
2013-04-08 08:44:33 +02:00
Magne Sjaastad
b9ed45af2c If project is moved on disk, execute initAfterRead() to propagate project file name changes to underlying objects
p4#: 21159
2013-04-08 08:36:34 +02:00
Magne Sjaastad
e89b88e47e Added NULL pointer guarding
p4#: 21157
2013-04-08 08:23:06 +02:00
Magne Sjaastad
95d1c98bee Read grid dimensions and verify equality before adding a result case
Harmonized and refactored creation of RimResultCases
p4#: 21156
2013-04-07 17:27:45 +02:00
Magne Sjaastad
da8480a91b Added constructor with three parameters
Added reading of grid dimensions
p4#: 21155
2013-04-07 17:20:58 +02:00
Magne Sjaastad
6c9f5d1978 Added reading of grid dimensions
p4#: 21154
2013-04-07 16:33:45 +02:00
Magne Sjaastad
1b07630239 Fix for reading wells, verified to be working on case TestCase_LGR_Amalg
806a18a137
p4#: 21153
2013-04-07 16:22:39 +02:00
Magne Sjaastad
b0c3bc5fba Added code for reading out grid dimensions from
5c8ab75e76
p4#: 21150
2013-04-05 15:08:50 +02:00
Magne Sjaastad
c7d83893e0 Fixed bug causing function to always return true
p4#: 21149
2013-04-05 14:46:35 +02:00
Magne Sjaastad
ae812a2bbf Implemented check for any results of statistics cases
p4#: 21148
2013-04-05 14:39:34 +02:00
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
b5ad0b9170
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