Commit Graph

748 Commits

Author SHA1 Message Date
Jacob Støren
97bb848b1d Fix of GH#43 Assertion Fail for localGridIndex
The grid number associated with an ert grid was an ID and not an index.
In addition: Fixed unrobustness handling wells with no data.
Now the /Troll/MSW_LGR/2BRANCHES-CCEWELLPATH-NEW-SCH-TUNED-AR3.EGRID file loads( Have tested only two timesteps ).
p4#: 22321
2013-09-05 13:03:53 +02:00
Magne Sjaastad
3cf18d91fd If authentication fails, redirect to first wizard page
Improved error handling
p4#: 22319
2013-09-05 08:45:24 +02:00
Magne Sjaastad
d494a0b9c0 Added tree view editor to test project
p4#: 22318
2013-09-05 07:34:04 +02:00
Magne Sjaastad
f9a40ad7ca Removed obsolete code and cleaned up interface
p4#: 22316
2013-09-05 07:29:22 +02:00
Magne Sjaastad
5f09fd0fa9 Added stretch to tree view
p4#: 22315
2013-09-05 07:14:39 +02:00
Magne Sjaastad
3150c1b231 Fixed invalid ordering of UI items in tree view model
p4#: 22312
2013-09-04 14:41:35 +02:00
Jacob Støren
e72318f348 Octave Interface: Added riGetWellCells
p4#: 22310
2013-09-04 12:57:36 +02:00
Magne Sjaastad
c396299810 Added testapplication
p4#: 22308
2013-09-04 12:20:41 +02:00
Magne Sjaastad
15efd2fbcc Added list view editor to Pdm
p4#: 22306
2013-09-04 12:08:39 +02:00
Jacob Støren
cac9d9d3f9 Octave Interface: Added riGetWellStatus
p4#: 22301
2013-09-04 08:03:11 +02:00
Magne Sjaastad
14ee999d7e Fixed wrong variable name
p4#: 22267
2013-09-02 09:20:26 +02:00
Magne Sjaastad
bc282106da Added data model for well import wizard
Updated test application
p4#: 22265
2013-09-02 08:39:29 +02:00
Magne Sjaastad
f260092d3c Added TreeView and TreeViewEditor using the same pattern as cafPdmUiDefaultObjectEditor
p4#: 22264
2013-09-02 08:14:29 +02:00
Jacob Støren
1e7c4a385a Buildsystem: Prefixed the resinsight vars to make them groupend and more accessible from the cmake gui.
Also introduced an option to turn openmp on and off
p4#: 22257
2013-08-30 15:37:29 +02:00
Jacob Støren
e0f5b15499 Octave interface: Added the path to ResInsight binary as search path for oct files in octave.
p4#: 22256
2013-08-30 15:35:28 +02:00
Jacob Støren
336eb56e3f Octave interface: Added riGetPropertyNames
Not yet included in build system
p4#: 22253
2013-08-30 15:26:35 +02:00
Jacob Støren
81aaf707de Ert: Fixed build settings to build static libs on linux
p4#: 22243
2013-08-29 11:50:03 +02:00
Magne Sjaastad
5638a11052 Updated to 0.9.24
p4#: 22242
2013-08-29 11:45:53 +02:00
Jacob Støren
79c016b6b6 Wells: Improved output in Result info window when picking a well-cell
p4#: 22241
2013-08-28 15:36:29 +02:00
Jacob Støren
5e629795e4 MSW: Now using a stable offset for the small branches start point.
Pulling the split point towards the first cell corner.
p4#: 22238
2013-08-28 10:22:30 +02:00
Jacob Støren
2c985a1c2b MSW: Now using a stable offset for the small branches start point.
Pulling the split point towards the first cell corner.
p4#: 22238
2013-08-28 10:21:33 +02:00
Magne Sjaastad
3e63ab705c Upped to internal version 0.9.23
p4#: 22234
2013-08-27 08:26:28 +02:00
Magne Sjaastad
38316c67ef Upped to 0.9.22
p4#: 22233
2013-08-27 08:03:21 +02:00
Magne Sjaastad
d6f9aa13a4 Fixed mixup of ijk variables
p4#: 22232
2013-08-27 08:02:47 +02:00
Jacob Støren
dbb72475e5 MswRollUp: Final commit: Reapplying changes and bugfixes from trunk in conflicting files.
The changes are from changelist numbers: 22190, 22189, 22154, 22151, 22141, 22124, 22010
Now It is supposed to compile again.
p4#: 22231
2013-08-26 21:56:40 +02:00
Jacob Støren
6ca3afa609 MswRollUp: Use only closest connection above and below
Added a lot of info to the positionContributions
Finally found a fairly ok method to calculate the positions, namely to
use only the closest connection above and below. Did also offset split
point positions somewhat, to make the small branches visible.

This is an intermediate commit and does not compile
p4#: 22230
2013-08-26 15:28:34 +02:00
Jacob Støren
3f2037b783 MswRollUp: Handle previous well result points that is inside current cell
This is an intermediate commit and does not compile
p4#: 22229
2013-08-26 15:22:55 +02:00
Jacob Støren
14dc3def92 MswRollUp: Ert : Fix of missing MSW branches
This is an intermediate commit and does not compile
p4#: 22228
2013-08-26 15:17:20 +02:00
Jacob Støren
1a285cebe0 MswRollUp: Guarded the interpolation against undefined pos
This is an intermediate commit and does not compile
p4#: 22227
2013-08-26 15:16:20 +02:00
Jacob Støren
d5aa8e4f30 MswRollUp: Principal fixes to the MSW algorithms
Add point contributions even when it is undefined to store the segment below id, which is needed for the traversal.
The undefined positions comes from bottom end segments without connections.
Also cleaned up the the static well calculation
This is an intermediate commit and does not compile
p4#: 22226
2013-08-26 15:10:34 +02:00
Jacob Støren
6ecfbdb8ee MswRollUp: Finally implemented through all the interpolation and segment position calculation. Completely untested
This is an intermediate commit and does not compile
p4#: 22225
2013-08-26 14:56:34 +02:00
Jacob Støren
3151f99129 MswRollUp: Ert: Fix of wrongly named define: WINDOWS_LSF
This is an intermediate commit and does not compile
p4#: 22223
2013-08-26 14:50:27 +02:00
Jacob Støren
d7d5d2942b MswRollUp: Updated Ert to commit 1fea6b00f3 master Fixed an Api change
This is an intermediate commit and does not compile
p4#: 22222
2013-08-26 14:44:03 +02:00
Jacob Støren
441ac1e3d9 MswRollUp: Start of fix of static well calculation
This is an intermediate commit and does not compile
p4#: 22221
2013-08-26 14:34:22 +02:00
Jacob Støren
b807a0e0ee MswRollUp: Removed obsolete code
This is an intermediate commit and does not compile
p4#: 22220
2013-08-26 14:27:39 +02:00
Jacob Støren
9f2bc4f1d0 MswRollUp: Made neighbour calculations handle cells on edge
This is an intermediate commit and does not compile
p4#: 22219
2013-08-26 14:22:20 +02:00
Jacob Støren
42408eda74 MswRollUp: Added some guarding to get the Troll_MSW case through. Needs some assert disabling in RigGridBase as well, but it is not included yet
This is an intermediate commit and does not compile
p4#: 22218
2013-08-26 14:21:21 +02:00
Jacob Støren
544d98b37e MswRollUp: Adding Branch start cell to start of branch
This is an intermediate commit and does not compile
p4#: 22217
2013-08-26 14:16:07 +02:00
Jacob Støren
e6dce28fa3 MswRollUp: Started to clean up the MSW code.
This is an intermediate commit and does not compile
p4#: 22216
2013-08-26 14:15:27 +02:00
Jacob Støren
27cac28b74 MswRollUp: Centerline calculation restoring and improvement
This is an intermediate commit and does not compile
p4#: 22215
2013-08-26 14:09:25 +02:00
Jacob Støren
f392f4457d MswRollUp: Splitted normal well and MSW handling. Got the Normal path to work fairly well. Some strangeties at the end of the pipes though
This is an intermediate commit and does not compile
p4#: 22214
2013-08-26 14:03:01 +02:00
Jacob Støren
b63f51921d MswRollUp: Updated Ert to experimental MSW branch. Updated ResInsight code to handle API changes
067fa99faa
This is an intermediate commit and does not compile
p4#: 22212
2013-08-26 13:56:42 +02:00
Magne Sjaastad
64c234d988 Updated to internal version 0.9.21
p4#: 22200
2013-08-23 14:40:42 +02:00
Magne Sjaastad
5ab7e5426f Upped to version 0.9.20
p4#: 22199
2013-08-23 13:47:40 +02:00
Magne Sjaastad
b31953eb4c Hide console window on Windows using a workaround described here
http://public.kitware.com/Bug/view.php?id=14326
p4#: 22191
2013-08-22 08:03:27 +02:00
Magne Sjaastad
627211685d Wellcollection can control if well head label is positioned at top active cell for IJ column or top Z of active cells bounding box
p4#: 22190
2013-08-22 07:55:21 +02:00
Magne Sjaastad
cbbc5ae80b Added ACTNUM to static results for binary Eclipse files
p4#: 22189
2013-08-22 07:45:28 +02:00
Magne Sjaastad
5580145bf9 Add keyword Name as identifier for a well in addition to well name given in quotes
p4#: 22184
2013-08-19 09:46:31 +02:00
Magne Sjaastad
178dd88aa0 Use timeout period of 60 sec as timeout for large data transfer operations
p4#: 22182
2013-08-16 15:59:52 +02:00
Magne Sjaastad
b18e3274be Added missing variable init
p4#: 22163
2013-08-14 08:19:23 +02:00