OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
845 Commits 53 Branches 83 Tags
78aaa53b54051f3ff6efe71334fe5dfd621b90a4
Commit Graph
49 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
JacobStoren 78aaa53b54 Octave Interface: Corrected the returned dimensions of 
riGetGridDimensions to follow specification.
 2013-09-30 13:38:49 +02:00
Jacob Støren a5a1dfe701 Fixed Win Compile error. Missing include 2013-09-30 11:02:17 +02:00
Jacob Støren 07f7ad82de Merge remote-tracking branch 'origin/internal' into internal 2013-09-26 15:43:22 +02:00
Jacob Støren 3f2fb1aadc Fixed Empty Environment Bug for Subprocesses 
QProcessEnvironment was used wrong
 2013-09-26 15:34:40 +02:00
Jacob Støren a4bcbf6115 Merge from origin 2013-09-26 11:48:41 +02:00
Jacob Støren 6f37a731fc Merge remote-tracking branch 'origin/internal' into internal 2013-09-26 11:44:04 +02:00
Jacob Støren a283d6ac23 Legend: Now number format is really based on number of Significant 
digits.
Brushed up the labels and organized the ui into two groups. Added some
tooltips as well.
 2013-09-26 10:44:20 +02:00
Jacob Støren bef1d8ce7e caf: Enabled the Tooltips. Seems to have been forgotten. 2013-09-26 10:41:08 +02:00
Jacob Støren a3d964e4eb Legend: Made number of digits after point be adjusted to show the number 
of significant digits defined by the user.
Not quite complete the solutions is. There are cornercases not covered
well yet.
* Fixed rounding error.
 2013-09-26 01:05:09 +02:00
Jacob Støren 1dcca6a6ed Added Blue white red, Red whit blue legends 2013-09-25 15:43:06 +02:00
Jacob Støren 0c19d50582 ResInsight: Move cafUiTreeItem.h 
p4#: 22497
 2013-09-20 09:28:36 +02:00
Jacob Støren 39178578de Octave Interface: Setting LD_LIBRARY_PATH on the octave process to make the oct files find the (possibly) embedded Qt libraries 
This should be the final adjustment to get rid of the resinsight startupscript
p4#: 22415
 2013-09-15 10:53:36 +02:00
Jacob Støren 65d5c85eb2 Caf: New Draft of Ui tree creation system. 
p4#: 22414
 2013-09-15 09:27:55 +02:00
Jacob Støren ef5a331e07 caf::PdmFieldHandle: Added a hasChildObject convenience method 
p4#: 22413
 2013-09-15 00:59:58 +02:00
Jacob Støren dbeabc3240 TP #4177: Context Toggle commands now toggles children if one parent is selected. 
THe command names are renamed as well, to make it more clear what is going on.
p4#: 22360
 2013-09-09 11:16:36 +02:00
Jacob Støren f0ddf37301 Started to use Update-display-model-And-Redraw scheduling system. 
First mainly for object toggle fields on well related objects, to avoid recreating the displaymode for each object toggeled by a multiselect command.
p4#: 22355
 2013-09-08 22:59:46 +02:00
Jacob Støren bb2af8269e Sceduled Update-display-model-And-Redraw system 
p4#: 22343
 2013-09-07 10:27:22 +02:00
Jacob Støren c3c50ae62e Tree view Toggle Cmmands: Reimplemented to use PDM. Fixed missing update. 
p4#: 22342
 2013-09-07 10:18:28 +02:00
Jacob Støren b0b24edeb9 Range/Property/Well Toggle fixes 
* Well cells are now toggled along with pipe geometry by the Well toggle in the tree view.
* TP# 4156 Range filter collection toggle does not work
This last one was really a huge error on several places in the overall logig of what is shown when.
p4#: 22337
 2013-09-06 15:45:21 +02:00
Jacob Støren 46f02f9384 Renaming and comments 
p4#: 22333
 2013-09-06 15:05:41 +02:00
Jacob Støren a73b412235 Fix of Grayish problem. TP#4094 
Sigurd Pettersen pointed out that the legend texture has to be a power of two high, that is four, and not tree.
Some simpler OGL drivers will scale the texture to power of two behind the scenes, and the texture will not be clean anymore resulting in addressing it "between colors".
p4#: 22323
 2013-09-06 09:44:57 +02:00
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
Jacob Støren e72318f348 Octave Interface: Added riGetWellCells 
p4#: 22310
 2013-09-04 12:57:36 +02:00
Jacob Støren cac9d9d3f9 Octave Interface: Added riGetWellStatus 
p4#: 22301
 2013-09-04 08:03:11 +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
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
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 
https://github.com/joakim-hove/ert/commit/067fa99faa300815950d7c0147649754a578b71a
This is an intermediate commit and does not compile
p4#: 22212
 2013-08-26 13:56:42 +02:00