OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,520 Commits 27 Branches 61 Tags 309 MiB
47429b1c6b
Commit Graph

967 Commits

Author SHA1 Message Date
astridkbjorke
ff59429ad8 #1139 - pre-proto - Adjustments in reading of XML file to handle files with multiple time-steps and several parameters. 2017-02-15 10:32:34 +01:00
Jacob Støren
ed31dab152 #1172 Calculated a grouped tracer contribution value of the tracers below a certain threshold. 2017-02-15 08:46:55 +01:00
Jacob Støren
df35335744 #1172 Well Alloc plot: Sorted the tracers according to contribution. 2017-02-14 08:10:39 +01:00
Magne Sjaastad
2ee25c6cf5 Use triangleIndices instead of polygonIndices 2017-02-10 11:32:18 +01:00
astridkbjorke
517c53a069 (#1139) - pre-proto - Reading in stimplan XMLfile. Not tested for multiple properties / timesteps. (Also some code clean-up) 2017-02-10 10:03:46 +01:00
astridkbjorke
22ee6250bd (#1137) - pre-proto - Adding delete/new command for stimplan fracture templates. Removing RimStimPlanFractureDefinition, functionality moved into RimStimPlanFractureTemplate. Renaming RimFractureDefinitionCollection to RimFractureTemplateCollection. 2017-02-10 09:54:37 +01:00
astridkbjorke
d52cfc0f0b (#1136, #1137) - pre-proto - Adding base class RimFractureTemplte, and classes for stimPlan fractureTemplate and data structures. Also adding features for creating new stimPlan Fracture templates. 2017-02-10 09:52:18 +01:00
Jacob Støren
491e0bcb7c Fixed too much unit conversion... 2017-02-09 15:27:34 +01:00
Jacob Støren
65f36d6a3f #1168, #1171 Added new depth types to RimWellLogPlot, with handling of unit type "none" as well. Made Well Alloc Plots make only "Connection Number" available on its WellLogPlot 2017-02-09 13:31:25 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
 2017-02-08 07:35:20 +01:00
Jacob Støren
76bc449d1f #1161 and #1188 Fixed problems with last MSW segments. Two errors: missing last segment ID, and missing drawing the last pipe segment. 2017-02-07 10:53:48 +01:00
Jacob Støren
94a90c8796 Fixed #1188 The connection number calculation was wrong 2017-02-07 10:53:48 +01:00
astridkbjorke
093b998fcd #1167 - pre-proto - Calculating azimuth angle for well path and using this angle in setting azimuth angle for fracture. 2017-02-06 13:12:56 +01:00
astridkbjorke
10bb3a834d pre-proto - Rename 2017-02-06 11:45:50 +01:00
astridkbjorke
53e7d99652 #1167, #1143 Calculating angle for simulation well, and setting angle based on this for "along well" and "transverse well" orientation of frac template. Azimuth field for fracture read-only if orientation not "azimuth" for frac template. 2017-02-06 11:44:24 +01:00
Jacob Støren
4a3ffb9238 #1166 Added the reservoir part of the well allocation plot 2017-02-03 15:52:37 +01:00
astridkbjorke
5630df5c1c pre-proto - Deleting line segments shorter than tolerance used when connecting line segments to polygons. 2017-02-03 14:12:40 +01:00
Magne Sjaastad
6dc0a7ff59 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimContextCommandBuilder.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ResInsightVersion.cmake
 2017-02-03 10:51:46 +01:00
Magne Sjaastad
426d42935f Copy up from pre-proto 2017-02-03 10:23:07 +01:00
Magne Sjaastad
0633e6ca39 Fixed mix of signed and unsigned value compare 2017-02-03 10:14:02 +01:00
Magne Sjaastad
9493a1dfc0 Use hasWellResult instead of firstResultTimeStep 2017-02-02 12:52:32 +01:00
Jacob Støren
8e4e7f098f #1113, #1112 Made stacked curves. Now the accumulated well flow by connection graphs is up to speed. 2017-02-01 19:18:37 +01:00
Jacob Støren
3f091aa884 #1112 Guard against none-connection segments in accumulation calculation 2017-01-31 16:35:49 +01:00
Jacob Støren
d3f1c9d6fa #1112 Calculation of accumulated well flow is now implemented. Tracers are handled, as well as MSW's. 2017-01-31 15:29:22 +01:00
astridkbjorke
7d2ebd68bf #1092 - pre-proto - Reading in Dx, Dy, Dz and permeabilities before calculation of transmissibilities. 2017-01-31 12:26:30 +01:00
astridkbjorke
07f5ea45d2 #1141 - pre-proto - Adding intermediate values from transmissibility calculation to the top of the COMPDAT export file. 2017-01-31 09:56:48 +01:00
Magne Sjaastad
b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +01:00
astridkbjorke
395c80e35f #1041 - pre-proto - Reading permeability and cell sized from grid for use in transmissibility calculation. 2017-01-30 10:45:18 +01:00
astridkbjorke
035107b48b #1091, #1092 - pre-proto - Simplifying calulation of projected areas and updating export functionality to include intermediate results of transmissibility calculation 2017-01-27 12:12:08 +01:00
astridkbjorke
fccd7d9314 pre-proto - Fixing include 2017-01-27 12:12:08 +01:00
astridkbjorke
9c9592ccce #1091 - pre-proto - Adding function for calculating fracture length. 2017-01-27 12:12:08 +01:00
Magne Sjaastad
aedf184d14 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
 2017-01-26 14:30:13 +01:00
Jacob Støren
90c791a2da #1112 Finally the first iteration of the actual calculation of accumulated flow pr connection. No Flow Diagnostics yet, and we wait for the real flow rates. 2017-01-25 22:49:25 +01:00
Magne Sjaastad
e845ae1ed8 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/CMakeLists.txt
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/ReservoirDataModel/CMakeLists_files.cmake
 2017-01-24 15:23:02 +01:00
astridkbjorke
66e2bcd6d8 pre-proto - Fixing include error (and starting method to calculate fracture lenght) 2017-01-24 14:25:18 +01:00
Magne Sjaastad
1b517a8e5e Added helper class for measured depth 2017-01-24 13:46:35 +01:00
astridkbjorke
08da3e926a #1091 - pre-proto - Expanding the findCellAverageZdirection function to find local X, Y and Z for a cell. 2017-01-24 12:15:26 +01:00
astridkbjorke
030b405d7f #1091 - pre-proto - Adding function for finding an "average" z direction, as the vector normal to the vectors between face centers in i and j. 2017-01-24 11:03:07 +01:00
astridkbjorke
02f4b94ca1 #1091 - pre-proto - Moving functions planeHexCellIntersection and createPolygonFromLineSegments from RimFracture to RigCellGeometryTools 2017-01-24 09:16:51 +01:00
Jacob Støren
825c505443 #1112, #1106 Added and removed fields to make the allocation plot have the needed data to do its calculation. Refacord the CenterLine calculation interface yet again to make it usable. 2017-01-23 11:10:09 +01:00
Jacob Støren
0d7da9788a #1112 Made conveninece methods to calculate well pipe centerline, and added possibility to do it pr timestep. 2017-01-20 17:20:09 +01:00
Jacob Støren
94f94af325 #1112 Added a flowrate to the well results. Waiting for ERT to include the reading. 2017-01-20 16:12:12 +01:00
Jacob Støren
06b9f13e41 #1112 Well centerline with cell centers improved, and moved to centerline calculator 2017-01-20 15:57:04 +01:00
Jacob Støren
d7782c6ddf #1112 Refactored well centerline calculation a bit 2017-01-20 15:00:19 +01:00
Jacob Støren
51d6d21d77 Constified wellresultcell to cell 2017-01-20 14:56:08 +01:00
Magne Sjaastad
da371c099b Merged branch dev into pre-proto 2017-01-19 10:45:22 +01:00
Magne Sjaastad
2edc090c89 Restored previous behaviour related to result accessor creation 2017-01-19 10:39:08 +01:00
Magne Sjaastad
9b42f1ca8c Reverted 4ec7c97a77 
Access of RimEclipseCase was done by firstAncestorOf from, and in several cases RimEclipseCase is not parent of RimEclipseCellColors. RimEclipseCase must be explicitly specified.
 2017-01-19 10:37:59 +01:00
Magne Sjaastad
36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-01-18 12:19:07 +01:00
Magne Sjaastad
e0ba009e34 Cleaned up includes 
Removed includes to cvfLibCore and friends. Removed several includes from header files.
 2017-01-17 15:11:02 +01:00
Jacob Støren
96396eed10 #1122 Added a progress bar when calculating flowdiagnostics results 2017-01-12 16:39:12 +01:00
Magne Sjaastad
894b4468b4 #1125 Limit size of string in legend and info, reordered tracer combo 2017-01-12 15:00:23 +01:00
Jacob Støren
53400a1497 #1099 Not necessary with both Gas and Oil phases 2017-01-12 14:39:30 +01:00
Jacob Støren
bd31317000 #1099 Flow results only available when the case has fluxes 2017-01-12 14:16:39 +01:00
astridkbjorke
89bf71b664 #1041 - pre-proto - Adding new functions transformMatrix (for calculating transform Matrix for fracture) and getPotentiallyFracturedCells (finding all cells in bounding box for fracture geometry) in RimFracture. Relevant code is updated to use these functions. 2017-01-12 12:19:52 +01:00
Jacob Støren
3d7d3096eb #1123 Fixed missing timestep problem. Using Report Step Number, not timestep index. 2017-01-12 12:07:07 +01:00
Jacob Støren
b584590588 #1115 Fixed crash on norne due to missing handling of closed wells/inoperative wells 2017-01-12 12:07:07 +01:00
astridkbjorke
63e975f6ff pre-proto - Rename (and adding todo-s for further work) 2017-01-12 10:24:01 +01:00
Magne Sjaastad
c638def4d6 Fixed missing includes 2017-01-12 08:20:50 +01:00
Magne Sjaastad
b104b1a97c #1056 Simplified TimeHistoryResultAccessor 
#1056 Simplified TimeHistoryResultAccessor
 2017-01-12 07:22:19 +01:00
Magne Sjaastad
4ec7c97a77 #1056 Removed obsolete code 2017-01-11 21:41:22 +01:00
astridkbjorke
dc1e29c419 #1041 - pre-proto - started on function to calculate transmissibility. Not yet complete. 2017-01-11 14:32:42 +01:00
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
 2017-01-10 10:09:44 +01:00
Magne Sjaastad
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
36c008a12c #1068 Removed obsolute include 2017-01-10 09:20:03 +01:00
Magne Sjaastad
50b9fe0ece #1068 Removed obsolete include of RigCaseData 2017-01-10 09:20:03 +01:00
Magne Sjaastad
f70806e056 #1068 Avoid include of RigCell.h and RigSingleWellResultsData in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
93032a23eb #1068 Avoid include of RigActiveCellInfo.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
ccd4cb24c9 #1068 Avoid include of RigMainGrid.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Jacob Støren
396069ae28 Fixed Linux comiler warnings 2017-01-10 08:48:58 +01:00
astridkbjorke
3f052976f5 #1040 - pre-proto - Converting facture coordinates to display coordinates for visualization. Fractures not yet shown at correct possition. 2017-01-06 15:55:53 +01:00
Jacob Støren
c65c9b1c58 #1058 Convert time of flight to days 2017-01-06 15:12:13 +01:00
Jacob Støren
c19fc232c8 #1049 Reuse Opm::ECLGraph and Opm::Flowdiagnostics::Toolbox for each timestep. 2017-01-06 14:41:00 +01:00
astridkbjorke
7e0417b310 pre-proto - Updated handling of negative measured depth values in function for interpolating point along well path 2017-01-04 14:09:40 +01:00
astridkbjorke
996aebc7ac pre-proto - For WellPathFractures, position along well path is updated when setting a new value for measured depth 2017-01-04 13:29:25 +01:00
Jacob Støren
03cf09d90a System: Created a general basename cleanup function, and applied that when creating filenames from userdescription etc. Related to #1054 preparations 2017-01-04 10:45:04 +01:00
Magne Sjaastad
d1bf189154 #1040 Established basis for fracture visualization 2017-01-04 08:10:02 +01:00
Magne Sjaastad
f8ef9bddc7 #1069 Added ellipsis tesselator 2017-01-04 07:39:08 +01:00
Jacob Støren
6d498cce98 #1052 Improved the result variable text a bit for Flow Diag Results 2017-01-03 14:59:48 +01:00
Jacob Støren
5f6468898b #1052 3D info box: Added Flow Diag results statistics etc. 2017-01-03 13:15:27 +01:00
Magne Sjaastad
dc970edf7e Merged in changes from dev 2017-01-03 11:32:00 +01:00
Jacob Støren
22143969c1 #1048 Added derived result: Tracer with max fraction 2017-01-03 09:27:25 +01:00
Jacob Støren
7c24522478 #1048 Added derived result: Injector Producer communication 2017-01-02 14:46:12 +01:00
Magne Sjaastad
db3f7d6650 #1069 : pre-proto - Added empty files related to RigFracture 2017-01-02 14:13:34 +01:00
Jacob Støren
a9b1cb4849 #1048 Added derived result: Sum of tracer fractions 2017-01-02 13:34:51 +01:00
Jacob Støren
60cb1d4ce0 #1048 Added weighted average TOF calculation 2016-12-21 17:14:51 +01:00
Jacob Støren
bd30649a3c Fixed linux compile issues 2016-12-20 15:33:39 +01:00
Jacob Støren
003271ff54 #1035 Connected the Flow Diag solver, and added the statistics needed for legend. Now many things work . 2016-12-20 11:41:05 +01:00
Jacob Støren
3c55a86650 #1035 Adjusted the statistics calculators a bit. 2016-12-20 11:39:10 +01:00
Jacob Støren
8f145da725 #1035 Implemented Flow Diag access and caching system down to solver 2016-12-17 10:46:57 +01:00
Jacob Støren
342855df56 #1035 Work in progress: Added the skeleton for management FlowDiagnostics data 2016-12-16 14:17:56 +01:00
Jacob Støren
ec5ad417f3 #1035 Renamed overloaded methods in result accessor to make it easier to see where the flow interception must come. 2016-12-14 14:51:53 +01:00
Jacob Støren
2288e49c20 #890 Export faults feature created 2016-11-25 15:57:51 +01:00
Magne Sjaastad
4ed6076750 #993 Fixed use of wrong index for unnamed inactive fault 2016-11-18 14:40:42 +01:00
Jacob Støren
ca7bd5b2b0 #950 Some guarding and data update on changing the active formation names reference in case. More to do. 2016-11-02 17:05:11 +01:00
Jacob Støren
055158aeea Comment change 2016-11-01 09:28:29 +01:00
Magne Sjaastad
38921b593d #906 No export of TVDRKB if diff field is empty 2016-10-26 07:32:19 +02:00
Magne Sjaastad
bd69519795 #906 Las Export : Added datum elevation to geometry object 2016-10-26 07:32:18 +02:00
Jacob Støren
593fe93244 #930, #925, #914 
* Formation names format changed to allow no space around k-layer numbers. Also added possibility to use one number as k-layer count for the name. Based on  previous names last layer
* Deleted geomech cache of formation name result when updating the formation names
* Added TNH TNQV THQV to plane transformed stresses.
 2016-10-21 14:31:31 +02:00
Magne Sjaastad
7c69ae434e #760 Input Property rename does not update dependent fields 2016-10-21 13:57:15 +02:00
Jacob Støren
d82eb6a774 #914 Added method to create rotation mx from two inplane vectors 2016-10-20 10:50:29 +02:00
Magne Sjaastad
71f1966c1c #906 Las Export: Fixed issue with TVDRKB export and improved UI 2016-10-14 13:30:04 +02:00
Magne Sjaastad
ae1eea4ac6 #779 Added support for filtering of zero and negative values in setSamplesFromDateAndValues 2016-10-12 13:49:57 +02:00
Jacob Støren
c2eff1b733 Linux compile fixes 2016-09-28 15:07:19 +02:00
Magne Sjaastad
88e40aa2d9 #886 LAS Export: Set the STEP if the data is resampled 2016-09-23 10:20:05 +02:00
Magne Sjaastad
8514664d06 #880 LAS: Export of TVDRKB 2016-09-23 10:07:15 +02:00
Magne Sjaastad
531aaaa445 AppFwk : Fixed typo of firstAncestorOrThisOfType 2016-09-21 13:59:41 +02:00
Magne Sjaastad
1bcfc41542 #883 Las Export: Inconsistency in NULL value 2016-09-21 13:41:33 +02:00
Magne Sjaastad
ae6397c5c6 #821 Fixed missing include on Linux 2016-09-19 11:22:45 +02:00
Magne Sjaastad
7de4f8f175 #821 Added export dialog with resampling support 2016-09-19 11:17:36 +02:00
Magne Sjaastad
cb6d9d714b #821 Added RigLasFileExporter. Export one LAS file for same case, well and date. 2016-09-16 12:47:27 +02:00
Jacob Støren
5e9308f7b3 #821 Implemented a method to do resampling of the well log data. Untested. 2016-09-14 16:33:07 +02:00
Jacob Støren
ba0a3b53f5 #820 Use TVDMSL as channel name for TVD 2016-09-13 11:19:27 +02:00
Jacob Støren
2ea167337f #820 Export of TVD along with MD to LAS file 
Now the tvd data is always put into the RigWellLogCurveData
Existing tvd data is written to LAS file.
 2016-09-12 16:43:31 +02:00
Magne Sjaastad
2f5acc38ac Added debug output of grid name and size, added comments 2016-09-09 11:47:00 +02:00
Magne Sjaastad
45f56b9fab #829 Use HUGE_VAL for k-layers not covered by formation definitions 2016-09-07 13:31:49 +02:00
Magne Sjaastad
f1c214c1d7 (#829) Use std::vector instead of std::set for categories. Added categoryNames to RimLegendConfig 2016-09-07 11:12:31 +02:00
Magne Sjaastad
3ddec2c65a Allow grids with varying number of active cells to be part of same grid group 2016-09-06 15:11:39 +02:00
Magne Sjaastad
9281156d4d Fixed missing clear of statistics data cache 2016-09-06 15:11:39 +02:00
Jacob Støren
c903e87dfd #811, #812 WIP, Formation names coloring of cells. First shot. Works but needs refinment. 2016-09-06 10:27:30 +02:00
Jacob Støren
5260a3f870 #478 Allowed static results (INIT-file) to not have values for LGRs 2016-08-22 17:00:57 +02:00
Jacob Støren
b305202a35 #478 Made access function const in ActiveCellInfo 2016-08-22 16:59:22 +02:00
Jacob Støren
cf93a67b5e #273 Undefined grid faults between cells where one or both are inactive is now sorted into a seaparate predefined fault section. 2016-08-22 13:24:46 +02:00
Jacob Støren
37099929d6 #273 Added some comments 2016-08-22 10:48:40 +02:00
Magne Sjaastad
e031f89dcc Merged from maintenance branch 2016-08-05 12:13:13 +02:00
Magne Sjaastad
261ccd33e5 (#282) Added basic data structures to compute and cache unique integer values 2016-08-05 10:26:21 +02:00
Magne Sjaastad
24abb27674 #748 Added cell property sum to Info box statistics 2016-08-04 14:15:59 +02:00
Magne Sjaastad
4bfef4ead0 Merged in changes from maintenance branch 2016-08-04 11:12:53 +02:00
Magne Sjaastad
c3328003d0 #254 Avoid creation of cell face geometry if a fault is present at the face 2016-08-01 21:51:05 +02:00
Magne Sjaastad
97232fedd4 #752 Result Info reports "Grid cell" value to be Inf 2016-07-15 09:57:00 +02:00
Magne Sjaastad
cecd942989 Several Linux fixes 2016-06-02 09:57:25 +02:00
Magne Sjaastad
024b730803 Fixed typo 2016-06-02 09:38:22 +02:00
Jacob Støren
40388b308b #739 Added summary case classes. Use those from the summary curves. Made save/restore work again for the summary plots. File format for Summary stuff are changed. 2016-05-31 13:48:22 +02:00
Jacob Støren
d4ec42e9a2 (#712) Made a possible well cell connection in the wellhead control the connection color of the well pipe. 2016-01-10 21:33:50 +01:00
Jacob Støren
7737a713c5 Removed invalid cells from bbox search tree. 
Improving performance on startup and avoid possible stack exhaust error.
 2015-12-15 13:50:59 +01:00
Jacob Støren
cd4c9e6ee0 (#709) Invalid cells destroyed the intersection calculation for well log 
Omit the invalid cells from the calculation.
 2015-12-15 13:41:32 +01:00
Jacob Støren
4d6deef8ab (#708) Fixed simulation well geometry and color mapping. 
Had been sligtly off since 1.5.0.
 2015-12-14 11:25:55 +01:00
Jacob Støren
2a98f5b116 (#707) Renamed to make the use of resultWellIndex more clear 2015-12-11 17:45:09 +01:00
Magne Sjaastad
c0d08dd37f Fixed up regression introduced in 28a0e1107c 
Loading of result is supposed to happen only for
RimWellLogExtractionCurve
 2015-12-11 10:10:36 +01:00
Jacob Støren
856054666d Fixed error introduced in 28a0e1107c 2015-12-10 10:40:15 +01:00
Magne Sjaastad
4713014d26 (#700) Build bounding box search tree when grid is loaded 2015-12-09 15:36:37 +01:00
Magne Sjaastad
a31973e655 Made posNegClosestToZero a static function 2015-12-09 11:33:09 +01:00
Magne Sjaastad
28a0e1107c Improved result accessor factory 
Moved clamping of time step to zero for static results into factory
 2015-12-09 11:33:08 +01:00
Magne Sjaastad
b4e7e27f76 Fixed issued reported by CppDepends 2015-12-07 12:53:36 +01:00
Magne Sjaastad
6d60088a5b Added projection of point on line 2015-12-04 15:15:53 +01:00
Jacob Støren
1977578d90 Fixed error in Fem to Eclipse rangefilter mapping. 
The Fem elment was rotated again and again, bsed on previous rotation.
Need to use the original rotation each time.
 2015-12-03 16:23:41 +01:00
Magne Sjaastad
e03b6495e8 (#687) Moved ReservoirDataModelUnitTests into ApplicationCode/UnitTests 2015-12-03 10:57:10 +01:00
Magne Sjaastad
a215e080cc (#538) Display correct unit in curve name 2015-12-02 15:07:28 +01:00
Magne Sjaastad
de14b93f6b (#538) Support both meter and feet in LAS export 2015-12-02 15:07:28 +01:00
Magne Sjaastad
d18e8f7bd3 (#538) Added depth unit and conversion between meter and feet 2015-12-02 15:07:27 +01:00
Magne Sjaastad
fe261560bd (#538) Added DepthUnitType enum containing meter and feet 2015-12-02 15:07:27 +01:00
Jacob Støren
7b9f2b41ed CppCheck fixes, Errors Warnings and performance 2015-11-27 16:37:26 +01:00
Jacob Støren
9f0c9d13b9 Whitespace 2015-11-27 13:51:36 +01:00
Magne Sjaastad
3c4142fc52 (#678) Show context menu commands on intersection 
Added hide intersection
 2015-11-26 16:01:23 +01:00
Jacob Støren
faf35d32c6 (#633) Moved well centerline calculation to make it available for cross sections 2015-11-26 11:09:08 +01:00
Magne Sjaastad
9429458d32 Rename from cells to globalCellArray 2015-11-24 14:21:02 +01:00
Magne Sjaastad
85ca555163 Rename 2015-11-24 14:14:39 +01:00
Magne Sjaastad
369f3c65d8 Linux fix 2015-11-24 10:04:02 +01:00
Magne Sjaastad
60df95843c (#166) Improvements to ternary result visualization 
Show undefined in regions with no results
Always use time step zero for static results
Allow texture coordinate creation without using RigPipeInCellEvaluator
 2015-11-24 09:59:25 +01:00
Magne Sjaastad
6cd4e8a0b7 (#166) Added support for ternary result mapping 
Removed obsolete interface RigResultAccessor2d
 2015-11-23 15:24:22 +01:00
Jacob Støren
4b9312ff74 Adjusted comment 2015-11-18 11:52:08 +01:00
Magne Sjaastad
ff6ea6cf0b Fixed include Linux 2015-11-10 11:32:52 +01:00
Magne Sjaastad
e64f943e4c Fixed includes on Linux 2015-11-10 01:53:24 -08:00
Jacob Støren
4f05c0d6b9 (#606) (#607) Added eclipse stats for visible cells 2015-11-06 13:24:48 +01:00
Magne Sjaastad
ab3c5c029a Refactored RiuLineSegmnetQwtPlotCurve 
Removed domain specific code
Created RigCurveDataTools
Use symbol to draw single values
 2015-11-06 10:08:35 +01:00
Magne Sjaastad
b30604edd1 Rename 2015-11-05 13:48:09 +01:00
Magne Sjaastad
0011f090de (#612) Time history result accessor and display of curve from selection 2015-11-05 13:48:08 +01:00
Jacob Støren
4388f39175 Renamed files PlotCurve->Curve 2015-11-04 16:22:53 +01:00
Jacob Støren
7b7ecf2f26 Renamed PlotCurve -> Curve 2015-11-04 16:19:38 +01:00
Jacob Støren
b64d34c791 Rename of StatCalc classes 2015-11-04 15:53:21 +01:00
Jacob Støren
a4d7e369eb (#606)(#607) Added option to show 3D-info statistics pr. time step. 2015-11-04 15:44:09 +01:00
Jacob Støren
738af9c88e (#606)(#607) Added gui for the statistics control. Started refactoring 
Refactoring to access pr timestep data from the statistics calculation.
 2015-11-04 12:51:55 +01:00
Magne Sjaastad
07f369f2dd (#595) Fixed invalid behaviour introduced in 4a6e156a68 2015-10-29 14:36:56 +01:00
Magne Sjaastad
4a6e156a68 (#595) Do not perform value filtering for LAS curves 2015-10-28 15:18:53 +01:00
Jacob Støren
0a45354bd9 Tried to improve readability by renaming in the plot classes. 2015-10-28 10:08:28 +01:00
Magne Sjaastad
f3f2cf1590 System : Removed unused functions 2015-10-26 10:18:59 +01:00
Magne Sjaastad
930209f527 System : Added asserts and initialized pointer before calling firstAnchestorOrThisOfType() 2015-10-26 10:18:57 +01:00
Magne Sjaastad
01224dd5e6 System : Removed unused variables 2015-10-26 10:18:57 +01:00
Jacob Støren
658849eefc (#584) Linked Views: Use Range filter mapping only when ecl bbox is inside geom bbox 
Set range and propfilter linking default off
 2015-10-24 12:27:34 +02:00
Magne Sjaastad
0405584bb6 System : Replaced tab with four spaces in ApplicationCode and subfolders 2015-10-23 15:46:25 +02:00
Jacob Støren
44d1aaa3f1 (#540) Range filter matching: Prioritize cell matches with collapsed eclipse cells less. 
To make better matches when one or more corner of the range is in a
collapsed cells area
 2015-10-22 15:34:51 +02:00
Jacob Støren
9d106ec76b (#540) Improved handling range filter endpoints in none match cells 2015-10-22 15:34:46 +02:00
Magne Sjaastad
b046ca0769 Minor compilation issues cleanup 2015-10-21 14:49:20 +02:00
Jacob Støren
00b56b7440 (#540) Range filter mapping now works fem->ecl and opposite. 
We need to test more, but now it is getting there.
 2015-10-21 10:04:00 +02:00
Jacob Støren
53826f4966 (#540) Wip: Preparing to Extract range endpoint calculation 
We neeed to clamp fem range to the extents of the ecl grid within the
fem grid before trying to map fem to ecl. So we need to refactor a bit.
 2015-10-21 08:21:16 +02:00
Jacob Støren
58363dbcf9 (#540) Wip: Range filter mapping alive! Needs more adjustments. 
Fem to Ecl is not perfect.
 2015-10-20 17:41:36 +02:00
Jacob Storen
b5bb62ed0a Linux compile fixes 2015-10-20 02:48:07 -07:00
Jacob Støren
4fc0553451 (#540) Added interface for fem to ecl range filter mapping as well. 2015-10-20 11:15:26 +02:00
Jacob Støren
a5ef83a2ee (#540) WIP: Split the rangefilter mapping code into files 
Preparing for assembling it all.
 2015-10-20 11:15:21 +02:00
Jacob Støren
c023bc9b2a (#540) WIP: Implemented use of arbitrary exact match diagonal in range filter mapping. 
Now we are ready to start testing.
 2015-10-20 11:15:16 +02:00
Jacob Støren
db4e637e76 Constified some methods in FemPart. WIP range filter mapping first untested code. 2015-10-20 11:15:12 +02:00
Pål Hagen
8e682926c6 Removed comments 2015-10-16 14:05:12 +02:00
Pål Hagen
1dc0da7a37 (#541) Using common value for absent values (-999.25, -9999.25, etc.) 2015-10-16 13:57:34 +02:00
Pål Hagen
aa1493fcb9 (#541) Exporting date to LAS file 2015-10-16 13:37:31 +02:00
Pål Hagen
3ecd6d8da7 (#541) Exporting well name as part of well info to LAS file 2015-10-16 11:15:04 +02:00
Pål Hagen
7b14306b5b (#541) Use "Depth in meters" as parameter description for DEPTH 2015-10-16 10:07:56 +02:00
Jacob Støren
08d1031f7f Fixed Missing rename after merge 2015-10-15 23:29:30 +02:00
Jacob Støren
5d642719b7 (#557, #560, #561) WLP: Massive renaming in WellLogCurveData. Fixed undiscovered bug. 
Curves plotted by TVD was not correctly splitted where well path went out in free air.
 2015-10-15 23:21:31 +02:00
Pål Hagen
3683dc95cd (#541) Setting depth range for export from the curve's raw data, not the plot curve's data 2015-10-15 16:31:11 +02:00
Pål Hagen
2dd1e98f81 (#541) Setting version info, start and stop depths, and depth unit, when exporting to LAS 2015-10-15 16:12:22 +02:00
Pål Hagen
f8c725e2b8 (#541) Using result name as well log channel name when exporting to LAS 2015-10-15 14:37:57 +02:00
Jacob Støren
707ddf15d7 (#540) Started to make single-cell best-match 2015-10-15 13:41:51 +02:00
Pål Hagen
956beba118 Moved remaining code from RimWellLogCurveImpl to RigWellLogCurveData 
Removed class RimWellLogCurveImpl.
RigWellLogCurveData::calculateValidPointsIntervals() needs to be
harmonized with new way of extracting depths from well paths.
 2015-10-15 13:29:45 +02:00
Pål Hagen
c2577391c2 Linux compilation fix. 
friend -> friend class
 2015-10-15 12:53:20 +02:00
Pål Hagen
10c5b37122 Updated unit tests 
Using RigWellLogCurveData instead of RimWellLogCurveImpl. Added test
interface which has access to private methods in RigWellLogCurveData.
RimWellLogCurveImpl should probably be removed when correct filtering of
curve segments based on depths is up & running.
 2015-10-15 12:41:12 +02:00
Pål Hagen
d74b4333f2 (#541) Renamed some methods and variables 2015-10-15 12:01:47 +02:00
Pål Hagen
a173694542 Linux compilation fix. 2015-10-15 11:32:09 +02:00
Pål Hagen
08573be64b (#541) Added feature for export of well log plot curves to a LAS file 
Did some refactoring/improvements by introducing new class
RigWellLogCurveData.
 2015-10-15 11:27:12 +02:00
Jacob Storen
021de1444d Linux compile fix 2015-10-14 06:57:11 -07:00
Jacob Støren
b2f4f64aca Well Log extraction: Cleaning up a bit 2015-10-14 15:20:50 +02:00
Jacob Støren
21b313f945 (#557, #560, #561) WLP: Guaranteed Pairwise ordering of intersections 
and endpoint handling.  Now discarding out-of-pair points.
Added well name and case in error message.
 2015-10-14 15:20:46 +02:00
Jacob Støren
d004d14acc (#557, #560, #561) WLP: Rename of map keys 2015-10-14 15:20:42 +02:00
Jacob Støren
a0cccc93cb (#557, #560, #561) WLP: POR results are now undefined in C3D8 elements 2015-10-14 15:20:38 +02:00
Jacob Støren
33aed754d9 (#557, #560, #561) WLP: White space cleanup 2015-10-14 15:20:34 +02:00
Jacob Støren
9fa2395fdc (#557, #560, #561) WLP: Aligned intresection map insertion code Geom/Eclipse 2015-10-14 15:20:31 +02:00
Jacob Støren
8d2fee9bf4 #557, #560, #561) WLP: Allign WL-extraction code Geom-Eclipse 2015-10-14 15:20:27 +02:00
Jacob Støren
4c73b31919 (#557, #560, #561) WLP: Using same code in Geomech WL-extraction 2015-10-14 15:20:23 +02:00
Jacob Støren
0bc4ed9b06 (#557, #560, #561) WLP: Moved intersection cleanup code to baseclass 2015-10-14 15:20:19 +02:00
Jacob Støren
fdaa25a286 (#557, #560, #561) WLP: Added scoping to make ready for a separate function 2015-10-14 15:20:16 +02:00
Jacob Støren
6014312056 (#557, #560, #561) WLP: Started to return a cleaner intersection list from the extractor. 
Created a common baseclass to be able to use same intersection cleanup code.
 2015-10-14 15:20:12 +02:00
Pål Hagen
507c30b93f (#545) Handling "NULL"/absent values in LAS files 
Converting to absent values to HUGE_VAL when reading from LAS file.
Splitting into multiple curves when plotting.
 2015-10-12 14:50:32 +02:00
Pål Hagen
6b8e51ca87 (#558) Made sure that TVD values are positive for geo mech models 2015-10-12 10:33:36 +02:00
Jacob Støren
5619e14cbe Adjusted VisibleCells Calculation Tolerance 
Now better matching the synt_small_c2 case
 2015-09-28 21:09:28 +02:00
Jacob Støren
5097082f09 (#513) Added a HEX8P element type to distinguish C3D8 and C3D8P 2015-09-25 19:33:34 +02:00
Magne Sjaastad
061288f1c3 (#495) Removed use of StdInclude 2015-09-25 15:57:50 +02:00
Pål Hagen
d7a1094893 (#489) Handling both "F" and "FT" as unit names for foot 
Converting to meter if depth unit is "F" or "FT". Can be both, according
to comments in NRLib code.
 2015-09-24 11:14:34 +02:00
Pål Hagen
c78fdffeaf (#544) Allowing "DEPT" and "DEPTH" as depth values from LAS files 2015-09-24 11:02:39 +02:00
Pål Hagen
f15c9973c9 (#515) Handling exceptions from NRLib 
Returning error message string picked from exception when trying to read
a file, if any.
 2015-09-24 10:06:57 +02:00
Pål Hagen
5e8a6d90cd (#498) Picking and displaying well log channel unit from LAS files 2015-09-21 10:10:25 +02:00
Jacob Støren
95047ae89e (#401) Sync visible cells GeoMech to Eclipse grid now works 
But there are bugs regarding faults and cell result color.
 2015-09-18 17:08:58 +02:00
Jacob Støren
8ca874006c (#401) Changed main mapping to loop over Eclipse grid 
To avoid creating the geomech version of the eclipse cell many times
 2015-09-18 15:01:20 +02:00
Jacob Støren
a3cbe99dd4 (#401) Cell comparison now simplified. Assumes topological rotation is equal 2015-09-18 15:00:42 +02:00
Jacob Støren
13d1876a16 (#401) Cell Topol. rotation separated 2015-09-18 15:00:41 +02:00
Jacob Støren
a9a8c94625 (#491) Continue insolation of topol. rotation code for elm 2015-09-18 15:00:39 +02:00
Jacob Støren
3d2a64b3d6 (#401) Starting to insolate topological rotation code for elm 2015-09-18 15:00:38 +02:00
Jacob Støren
39a9677a44 Comments and whitespace 2015-09-18 15:00:36 +02:00
Jacob Støren
eea05e7820 (#401) More Simlification of topological rotation of elements 2015-09-18 15:00:35 +02:00
Jacob Støren
7ee1d2eb95 (#401) Simplified code of topological rotation 2015-09-18 15:00:33 +02:00
Jacob Støren
66172ea852 (#401) Sync Visible Cells: Preparing to rewrite the main loop 2015-09-18 15:00:30 +02:00
Jacob Støren
35c6316d9c (#401) Sync Visible Cells: More refactoring 2015-09-18 15:00:28 +02:00
Jacob Støren
577c0c4578 (#401) Cleaning up code in the sync visual cells code 2015-09-18 15:00:27 +02:00
Pål Hagen
d7128efe0f (#489) Converting from foot to meter if needed 2015-09-18 14:03:13 +02:00
Pål Hagen
39193396ae (#489) Added interface to get access to depth unit 2015-09-18 13:43:56 +02:00
Jacob Støren
acb4717e9c Linux compile fix 2015-09-18 10:10:33 +02:00
Magne Sjaastad
b3620355de Handle no data gracefully 2015-09-18 09:07:37 +02:00
Jacob Støren
3d09ceb92b (#401) Finally got the basic comparison to work and thus Ecl->geomech mapping 
Now weed to clean up, make it fast, include other mappings
Geom/geom Ecl/ecl etc..
and handle inserted/removed layers
 2015-09-17 16:13:27 +02:00
Jacob Støren
bf84d7d261 Fixed error in geomCell geometry calculation + Quad rotation 
Also renamed a bit
 2015-09-17 16:13:26 +02:00
Jacob Støren
b0caa7f952 (#401) WIP: Implemented averaging to create a geomech equivalent cell 
to compare with the real geomech cells.
Creating mapping based on this, but there are bugs or weaknesses yet,
so it does not work properly.
 2015-09-17 16:13:25 +02:00
Jacob Støren
7a6c7149e1 (#401) WIP: First cell filtering Eclipse Geomec grid visible. 
Not working very well. BB matching is not good enough.
 2015-09-17 16:13:22 +02:00
Jacob Støren
36bc2f8f69 (#401) WIP: Activated the visibility calculation code. 
Started on mapping calculation.
 2015-09-17 16:13:21 +02:00
Jacob Støren
f092c4daef (#401) WIP: CaseToCase mapper creation. 
Now only the mapping generation is missing
 2015-09-17 16:13:20 +02:00
Jacob Støren
57ff5becbc (#401) WIP: Added skeleton class for cell mapping 2015-09-17 16:13:19 +02:00
Pål Hagen
6b5aaecc80 (#433) Geo mech well log extractor now uses measured depth 2015-09-17 10:26:06 +02:00
Pål Hagen
713ccf09be (#482) Got rid of cause of crash 
Removed an assertion in the case where one would extract a well path
between two cells.
 2015-09-17 10:15:46 +02:00
Pål Hagen
1dc7bbe667 (#436) Renamed a method and a member variable 2015-09-16 16:20:07 +02:00
Pål Hagen
a79bce6ea4 (#436) Moved LAS file related code to new class RigWellLogFile 2015-09-15 18:07:53 +02:00
Pål Hagen
b841af62bb (#438) Made sure that the well log extractor returns positive values for TVD 2015-09-10 16:19:00 +02:00
Pål Hagen
03aa8cc071 (#433) Using measured depth read from from well path files 2015-09-10 15:11:31 +02:00
Pål Hagen
5e4f3cfbb9 (#433) Reading measured depth from ascii well path files 2015-09-10 14:21:08 +02:00
Jacob Støren
3c87243dd5 Fixed bug in Eclipse well log extractor. Missing intersections. 2015-09-07 18:18:15 +02:00
Jacob Støren
1b9977239d (#415) Used AABB tree to search for elements 
to find close elements to the wellpath for Geom Well Log extraction
 2015-09-07 16:47:40 +02:00
Jacob Støren
3468160d8f (#415) Use AABB tree for searching after cells 
close to line segment for Eclipse cases
Fixed crash when well path geometry is empty
 2015-09-07 16:24:45 +02:00
Jacob Støren
6440215d21 (#399) WellLog extraction from GeoMech cases works. 
Needs more testing, and performance must be fixed see (#415)
 2015-09-07 16:24:40 +02:00
Jacob Støren
8d57bbe77b (#399) WIP: First commit of experimental geomech WellLog extractor 
Not yet enabled in any way
 2015-09-04 15:35:20 +02:00
Jacob Støren
ef4b0fa0d3 Reorganized wellLogExtraction code, preparing for GeoMech variant. 2015-09-04 15:35:15 +02:00
Jacob Støren
1e6baed1dc Placed WellLogExtractors in the RimWellLogPlotCollection and cached them 2015-09-03 20:13:08 +02:00
Jacob Støren
5a265b66a6 (#396)(#397)(#398) WIP: First real Well Log extracted data visible 2015-09-02 12:08:38 +02:00
Jacob Støren
3a7959ff13 (#397) Implemented line - Hex intersection 2015-09-01 08:53:29 +02:00
Jacob Støren
75a0035fe5 (#398) WIP: First outline of well log result extractor 2015-09-01 08:53:25 +02:00
Jacob Støren
ba467ac52d Forgot some resultAccessor updates 2015-09-01 08:53:21 +02:00
Jacob Støren
62bc5963ff (#397) Added line triangle intersection direction to intersection method 
Preparing for Well Log Extraction
 2015-09-01 08:53:18 +02:00
Jacob Støren
7794a66b04 (#397) (#398) Added globalGridCellIndex access to the ResultAccessors 
To prepare for well log extraction
 2015-09-01 08:53:14 +02:00
Jacob Støren
371902378e (#397) Added geometry methods to be used for well log data extraction 2015-09-01 08:53:10 +02:00
Magne Sjaastad
0ca0f1a0e8 Fixed includes for unit tests 2015-08-04 09:19:52 +02:00
Jacob Støren
e33caeab36 Fix of #301 Missing riTRANS/MULTXYZ when NTG is missing 2015-06-29 14:45:30 +02:00
Stein Dale
85f62ec1d4 Moved code to new library: ResultStatisticsCache 
Moved  RigStatisticsCalculator.h/.cpp, RigStatisticsDataCache.h/.cpp,
RigStatisticsMath.h/.cpp to new library ResultStatisticsCache.
ResInsight and some unit tests now link with this new library.
 2015-05-11 13:25:05 +02:00
Stein Dale
ca17645499 Split classes in RigStatisticsCalculator.h/.cpp into separate files 
New files:RigNativeStatCalc.h./cpp, RigMultipleDatasetStatCalc.h/.cpp.,
in addition to RigStatisticsCalculator.h/.cpp.
 2015-05-11 10:56:33 +02:00
Jacob Støren
4a21bb4a30 Added RimView, and sorted the libs in folders 2015-04-29 10:50:25 +02:00
Roland Kaufmann
eac27f149a Enable in-package substitute of tr1/tuple 
In clang 6.0 the tr1/tuple header is not present, and this cause a
compilation error inside of the gtest framework. However, if we set a
define, it will use its own substitute of tr1/tuple, which is sufficient
for the unit tests.
 2015-01-01 19:46:25 +01:00
Roland Kaufmann
b25290bebd Complete instantiated types 
RivReservoirPartMgr uses a Collection of RivGridPartMgr. The Collection
indirectly causes the release() method of the Object base class of
RivGridPartMgr to be called as part of its destructor, but this is not
allowed for incomplete types and RivGridPartMgr is only forward-declared
at the time of the instantiation (in RivReservoirPartMgr).

A similar problem occurs in the use of RigStatisticsDataCache in the
type RigCaseCellResultsData.
 2015-01-01 19:46:24 +01:00
Magne Sjaastad
babe812ebc Fixed memory leak 2014-10-27 12:25:52 +01:00
Magne Sjaastad
a8ce90e404 Always compute grid faults 2014-09-26 08:15:22 +02:00
Magne Sjaastad
b046a0354d Converted assert to if statement when no NNC data is present 2014-09-24 13:28:08 +02:00
Magne Sjaastad
2d36af4f06 Updated file header for new files 2014-09-24 07:14:52 +02:00
Magne Sjaastad
b4df5419b1 Updated file header for modified files 2014-09-23 15:04:57 +02:00
Jacob Støren
6e55ca82e2 Fixed Problem regarding negative riTrans values 
The reason was a bit sloppy detection of whether the surface normals was
pointing outwards or inwards in a cell.
The cells can be turned inside out due to depth/Z or mapaxis conditions.
 2014-09-23 12:26:08 +02:00
Jacob Støren
c9065eeed9 Made mean calculation handle inf and nan 2014-09-09 15:20:16 +02:00
Jacob Støren
ed202cc7cf Combined TRAN results: Now set to 0.0 on border to inactive cells / grid border 2014-09-09 14:02:03 +02:00
Magne Sjaastad
980207f4a7 Rename : Removed s from TRANS to TRAN to be in line with Eclipse naming 2014-09-09 07:12:43 +02:00
Magne Sjaastad
4fdb06e0e0 Moved code from header to source 2014-09-04 09:28:39 +02:00
Jacob Støren
5377742bbc riTRANSXYZ: Fixed negative values due to bug in polygon calculations 2014-08-28 11:25:20 +02:00
Magne Sjaastad
b7bc732b32 Bugfix : Do not compute SOIL if present on disk 2014-08-28 10:35:05 +02:00
Magne Sjaastad
ffbfb8bdf0 Read units type from file and set CDARCHY value based on units type 2014-08-27 14:05:35 +02:00
Jacob Støren
d76dd6a588 Added riTRANSXYZbyArea (and X, Y, Z ) 2014-08-27 11:41:40 +02:00
Magne Sjaastad
e40e3c40f1 Bugfix MULTXYZ : Clamp HUGE_VAL to 1.0 2014-08-27 09:54:12 +02:00
Jacob Støren
03a9bf459d Added riMULTXYZ and X,Y,Z 2014-08-26 15:39:21 +02:00
Magne Sjaastad
0bd0d6d7a7 Linux fix: Added include of cmath and reorganized includes 2014-08-26 14:46:48 +02:00
Jacob Støren
28f5639607 riTRANSXYZ: Removed unused code 2014-08-26 13:36:38 +02:00
Jacob Støren
27571a839a Linux compile fix 2014-08-26 13:35:49 +02:00
Jacob Støren
670ca4ced5 riTRANSXYZ: nnc calculations in place 
Making this feaure complete.
Had to add the concept of several results sets to the nnc data
 2014-08-26 12:16:22 +02:00
Jacob Støren
11c01af61a riTRANSXYZ: First version working 
Not yet extensively tested, but seems ok for complete match faces
 2014-08-22 13:39:24 +02:00
Jacob Støren
57a049d39f riTRANSXYZ: Moving the calculation to ReservoirCellResultsStorage 
Create stored native riTRANX,Y,Z results instead of doing everyting in
one go.
This makes the statistics calculation work automatically instead of
beeing custoized and require a compplete calculation of its own.
 2014-08-22 13:39:23 +02:00
Jacob Støren
9e22c90a4a Renamed cellindex to gridLocalCellIndex 2014-08-22 13:39:21 +02:00
Magne Sjaastad
03df28282c Show NNCs with no common area in folder below Faults 2014-08-22 09:28:25 +02:00
Magne Sjaastad
e4e3cca05f Moved creation of placeholder results to to RimCase 2014-08-21 08:39:19 +02:00
Magne Sjaastad
f61f7f1fd1 Result statistics: Fixed computation of scalar values close to zero 2014-08-20 11:55:11 +02:00
Jacob Støren
b7693f449b Fixed missing result names when auto SOIL is off 2014-08-20 11:32:50 +02:00
Jacob Støren
83965a4f7b riTRANXYZ: Started to add it to the rest of the system 2014-08-20 09:51:55 +02:00
Jacob Støren
a3af100189 riTRANXYZ: Added to build system. First implementation. 2014-08-20 08:12:19 +02:00
Magne Sjaastad
cdf2b07118 Removed use of cvfStructGridScalarDataAccess 2014-08-19 14:56:20 +02:00
Magne Sjaastad
f98a909e51 Removed obsolete code and renamed functions 2014-08-19 14:02:21 +02:00
Magne Sjaastad
a2f4887d56 Added riMULTXYZ to statistics and result factory 2014-08-19 13:20:44 +02:00
Magne Sjaastad
e6358a1289 Added MULTXYZ result accessor 2014-08-19 11:57:31 +02:00
Magne Sjaastad
d5e911d01b Added RigStatisticsDataCache and RigStatisticsCalculator 
Moved cache from RigCaseCellResultsData to RigStatisticsDataCache
Moved statistics computations from RigCaseCellResultsData to RigStatisticsCalculator
 2014-08-19 08:14:03 +02:00
Jacob Støren
06df5ba1da riTRANXYZ: removed strange character 2014-08-18 18:32:55 +02:00
Jacob Støren
147fbffe55 riTRANXYZ: Paving the way: Renaming, Removing obsolete code, Store fault index for each cell face, Added prototype code for the calculation 2014-08-18 18:30:52 +02:00
Magne Sjaastad
ab483fee81 Made ternary result accessor more robust 2014-08-14 12:12:07 +02:00
Magne Sjaastad
245573e03c Cell edge visualization can now handle individual per face center values 2014-08-14 10:56:44 +02:00
Magne Sjaastad
0941834da9 Added RigHugeValResultAccessor 
Linux: Added include of cmath for define of HUGE_VAL
 2014-08-14 10:56:43 +02:00
Magne Sjaastad
24a464ecf9 Use texture based ternary visualization 2014-08-14 10:56:38 +02:00
Magne Sjaastad
68bc378abe Minor fixes for result accessors 2014-08-14 10:56:36 +02:00
Magne Sjaastad
85d4de6746 Added RigResultAccessor2d 2014-08-14 10:56:35 +02:00
Magne Sjaastad
1b3be87074 Moved include from header to cpp 2014-08-14 10:56:33 +02:00
Magne Sjaastad
8451ffc2fb Added include to RigResultAccessor in factory 2014-08-14 10:56:32 +02:00
Magne Sjaastad
ca7f61d3ff Added overload to result accessor factory 2014-08-14 10:56:31 +02:00
Magne Sjaastad
24ff71d23e Prefix function to be deleted to easily spot the function in code 2014-08-14 10:56:30 +02:00
Magne Sjaastad
e2f2cf4f24 Removed asserts and simplified code 2014-08-14 10:56:28 +02:00
Jacob Støren
38d2000e29 Wip: New generalized texturing in play 
Only on GridParts
 2014-08-14 10:56:27 +02:00
Jacob Støren
33ab16f7d7 New classes for the generalized texturing 2014-08-14 10:56:27 +02:00
Jacob Støren
e1b67b15e0 Rename of GlobalCell to ReservoirCell 2014-08-14 10:56:26 +02:00
Jacob Støren
09313c6caa More Rename of globalCell to reservoirCell 2014-08-14 10:56:25 +02:00
Jacob Støren
3022a40204 Renamed globalCell to reservoirCell etc. 2014-08-14 10:56:25 +02:00
Jacob Støren
6cdd9cfdc5 Renamed globalGridCellIndex to reservoirCellIndex 2014-08-14 10:56:24 +02:00
Jacob Støren
16f762984e Renamed more stuff to gridLocalCellIndex 2014-08-14 10:56:24 +02:00
Jacob Støren
37ef1cf71c Renamed globalCellIndex to reservoirCellIndex 2014-08-14 10:56:23 +02:00
Jacob Støren
0ea794a1a8 Renamed localCellIndex to gridLocalCellIndex 2014-08-14 10:56:23 +02:00
Jacob Støren
6fcc50de20 cellEdgeAccessor : Use FixedArray instead of collection 2014-08-14 10:56:22 +02:00
Magne Sjaastad
d9e9a173e4 Added RigResultModifier and use this object for result modifications 2014-08-14 10:56:22 +02:00
Jacob Støren
7a3d90daa4 Removed fvector and replaced with FixedArray. 
Needs replacing with std::array when we get to c++11
 2014-08-14 10:56:21 +02:00
Jacob Støren
0f26b6e22f Trimmed CombTransResultAccessor interface 
setTransResultAccessors
 2014-08-14 10:56:21 +02:00
Magne Sjaastad
b4d8067a74 Removed setCellScalar and resultName from Resultaccessor 2014-08-14 10:56:20 +02:00
Jacob Støren
322823754b Replaced dataAccessObject with resultAccessor 2014-08-14 10:56:20 +02:00
Magne Sjaastad
824ea81b99 Added RigResultModifier 2014-08-14 10:56:19 +02:00
Jacob Støren
7ebe9b17b9 Renamed files to reflect new classnames 2014-08-14 10:56:18 +02:00
Jacob Støren
1514b98c7a More renaming : AccessObject-Accessor 
And CellFaceAccessor to CellEdgeAccessor
 2014-08-14 10:56:17 +02:00
Jacob Støren
2bfcfc16b1 Class Rename: ResultAccessObject to ResultAccessor 2014-08-14 10:56:17 +02:00
Jacob Støren
cac1cc8040 Prototyping of new resultAccessor/texture system 
To make it simlier to add all the combined results MULTXYZ/riMULTXYZ etc
 2014-08-14 10:56:16 +02:00
Magne Sjaastad
70a98ab8fd Linux fix: No default cast from QString to QString& 2014-08-14 10:56:16 +02:00
Jacob Støren
e31d3c8807 Added comments and asserts related to neg. faces 
Negative face results is not applicable for this result access object,
as they are never used (by intention)
 2014-08-14 10:56:15 +02:00
Jacob Støren
aff8d8fd2a Moved needed code to above "delete" mark 2014-08-14 10:56:14 +02:00
Magne Sjaastad
57494c4bfe Added ResultAccessObject for combined transmissibility 2014-08-14 10:56:13 +02:00
Magne Sjaastad
cba742d44c Linux: Added include of cmath for define of HUGE_VAL 2014-08-14 10:56:12 +02:00
Magne Sjaastad
1d3ba4637d Added RigCellFaceResultAccessObject 2014-08-14 10:56:11 +02:00
Magne Sjaastad
cb8edaffde Added data access objects for native results 2014-08-14 10:56:11 +02:00
Magne Sjaastad
fa7e505262 Added RigResultAccessObject 2014-08-14 10:56:10 +02:00
Magne Sjaastad
75541e92fb Renamed to RigResultAccessObjectFactory 2014-08-14 10:56:10 +02:00
Magne Sjaastad
eec7f59c49 Rename 2014-08-14 10:56:09 +02:00
Magne Sjaastad
9925556579 Added hide fault to context menu in 3D view 2014-08-14 10:55:54 +02:00
Magne Sjaastad
b13c2621da Linux fixes: Added missing includes 2014-08-14 10:55:50 +02:00
Jacob Støren
e1c55e4452 Comb Trans: Fixed max/min and close to zero calc 2014-06-20 14:05:28 +02:00
Magne Sjaastad
3608c36291 Added test to guard for invalid cell index 2014-04-25 12:13:09 +02:00
Magne Sjaastad
dbe54ff9bf Performance: Reverted OpenMP, as the function needs rewrite 2014-04-24 10:25:22 +02:00
Magne Sjaastad
d3456ffcc9 Performance: Use OpenMP for fault calculations 2014-04-24 09:53:40 +02:00
Magne Sjaastad
366c3cd2e8 Performance: Use OpenMP for static data 2014-04-24 09:52:46 +02:00
Magne Sjaastad
62a2c9e3ce Fixed mock models 2014-04-24 08:32:43 +02:00
Magne Sjaastad
7b68c3cb6b Fix after merge conflicts take two 2014-04-14 10:24:15 +02:00
Magne Sjaastad
ce33c00219 Files fixed after merge conflicts 2014-04-14 09:25:27 +02:00
Magne Sjaastad
874b05b119 Added isCoarseningActive 2014-04-14 09:18:25 +02:00
Magne Sjaastad
60ff9c5a2b Performance: Added OpenMP to mock models 2014-04-14 09:16:06 +02:00
Magne Sjaastad
7ffe48bff9 Added flag to control adding of well data 2014-04-14 09:14:39 +02:00
Magne Sjaastad
9aa32e4a88 Added isCoarseningActive 2014-04-03 10:58:29 +02:00
Magne Sjaastad
b12e09c86d Updated defaults and modified GUI labels 2014-01-22 14:05:20 +01:00
Magne Sjaastad
4f079549f3 Removed trace output 2014-01-08 13:33:57 +01:00
Jacob Støren
909831ad34 NNC: Removed some debug output 2013-12-19 10:50:51 +01:00
Jacob Støren
cf7de9d588 Removed Geometry faults toggle, and disabled calculation 2013-12-19 10:50:45 +01:00
Jacob Støren
b7f305b142 Faults: Face culling handles flipaxis 2013-12-19 08:48:36 +01:00
Jacob Støren
8b52a43360 NNC: Typo in message 2013-12-18 09:20:53 +01:00
Jacob Støren
1639240240 Faults: Readded geometry fault generation 2013-12-17 13:28:13 +01:00
Jacob Støren
344ac7a146 Faults Guarded Fault neighbour calculation 2013-12-17 13:28:10 +01:00
Magne Sjaastad
f6510210b0 Fix for null pointer 2013-12-17 11:52:53 +01:00
Magne Sjaastad
3cf1a0f32a Use helper function to get transmissibility scalar results 2013-12-17 11:52:44 +01:00
Magne Sjaastad
e824b8f7b0 Added special handling of combined transmissibility 2013-12-17 11:52:40 +01:00
Jacob Støren
a39fe493f2 NNC: Fixed assert oposite face of NO_FACE 2013-12-16 15:56:57 +01:00
Jacob Støren
2a31035fb4 NNC: Added som diagnostics output 2013-12-16 14:26:07 +01:00
JacobStoren
880ab554f9 Linux compile fixes. Had to pull out the unused NNC search map. 2013-12-16 13:48:51 +01:00
Jacob Støren
7e2d860bba NNC: Tried to fix Linux typename compile issue 2013-12-16 11:40:50 +01:00
Jacob Støren
440499fbfd NNC: Add connection to both faults if different 2013-12-16 11:26:29 +01:00
Jacob Støren
e75bd8adfb NNC: Distribute the NNC on the correct faults 
Making the NNC search map obsolete
 2013-12-14 09:48:10 +01:00
JacobStoren
d4f5dd6803 Fix of linux Compile warnings 2013-12-14 09:38:55 +01:00
Jacob Støren
bf6fba191e Moved Faluts to MainGrid. New fault calculation 
Now finding the uncovered geometrical faults and adds them to a separate
generated fault.
 2013-12-12 22:18:20 +01:00
Jacob Støren
e175a5c96f Refactored to use Cell::faceIndices 2013-12-12 22:18:14 +01:00
Jacob Støren
e171aa66ac NNC processing first cut 2013-12-12 22:18:11 +01:00
Jacob Støren
1be9f1996f Moved GeometryTools w tests to ReservoirDataModel 2013-12-12 22:18:06 +01:00
Jacob Støren
04ccadd2f1 NNC import started 2013-12-12 22:18:03 +01:00
Jacob Støren
81176258bc RigCell: Added faceIndices and faceNormal methods 2013-12-12 22:18:00 +01:00
Magne Sjaastad
d53e9aa9c1 Added global cell indices to faults and added optimalizations 2013-12-10 07:44:49 +01:00
Magne Sjaastad
c8a4db6571 Added faults to mock models 2013-12-10 07:44:48 +01:00
Magne Sjaastad
6179d84b87 Use cell indices in RigBase 2013-12-10 07:44:45 +01:00
Jacob Støren
776ed7755e Improved FixedArray 2013-12-06 14:22:01 +01:00
Magne Sjaastad
19737aa99a Use const access for FixedArray. Added sorting of faults 2013-12-05 09:59:05 +01:00
Magne Sjaastad
f85b8aad08 Updated header 2013-12-04 09:39:50 +01:00
Magne Sjaastad
12918ec107 Faults: Reading from Eclipse text files and basic visualization 
Added reading of faults directly from Eclipse text files
Added named faults in project tree
Added fault geompetry parts
Added test data
 2013-12-03 20:30:32 +01:00
Magne Sjaastad
e47f2e6317 Performance: Added OpenMP to mock models 2013-11-08 10:34:05 +01:00
sigurdp
fbfbdfca84 Integrate Fwk updates from ResInsight/Perforce 
Integrated Fwk updates in Resinsight branch up to changelist 173.
Summary of changes:
* Rewrite of cvf::OverlayItem to allow fixed user controlled positioning
of the items.
* Removed pure virtual functions OverlayItem::maximumSize() and
OverlayItem::minimumSize().
* Use caf::AboutDialog instead of modified cvfqt::BasicAboutDialog.
* Removed lapack from link line due to fail on Ubuntu 12.04 when lapack
isn't installed.
* Fix in OpenGLContext::saveOpenGLState() to avoid application
corruption when running on RedHat with VMWare.
* Removed unused font manager.
* Console assert handler only calls __debugbreak() if debugger is
present. Otherwise, calls abort(). Done after trouble running gtest
death tests.
* Made component access functions in Color3f, Color3ub, Color4f,
Color4ub inline.
* Added conversion functions between TextureImage and QImage to
cvfqt::Utils class.
* Optimized TextureImage::setPixel() - relies on new inlined
component-wise access functions for Color4ub.
* Added TextureImage::clear() and non-const version of
TextureImage::ptr().
 2013-10-31 14:57:52 +01:00
Magne Sjaastad
2315ab9014 Added flag to control adding of well data 2013-10-28 10:31:46 +01:00
Jacob Støren
567f16ad43 Removed Wellhead cell visualization if cell is not active 
Issue #63
 2013-09-30 15:22:48 +02:00
Jacob Støren
a5a1dfe701 Fixed Win Compile error. Missing include 2013-09-30 11:02:17 +02:00
Ceetron
26d5a7c5b0 Legend: Fixed legend numbers being completely wrong. 
The abs() function is only integer on linux RH5.
Caused legend numbers to be truncated (0 typically)
 2013-09-27 14:43:11 +02:00
sigurdp
bcc33397a3 Adapted cmake files to new directory structure 2013-09-20 16:21:46 +02:00
Jacob Støren
0c19d50582 ResInsight: Move cafUiTreeItem.h 
p4#: 22497
 2013-09-20 09:28:36 +02:00
Magne Sjaastad
18a05b7bff Fixed compiler warning 
p4#: 22392
 2013-09-12 13:56:01 +02:00
Magne Sjaastad
5dbc15998f Fixed several compiler warning on Linux 
p4#: 22370
 2013-09-10 08:47:28 +02:00
Magne Sjaastad
7a9c488cdc Added Id to mock model 
p4#: 22367
 2013-09-10 07:15:45 +02:00
Magne Sjaastad
1a8f3d2555 Fixed segmentation fault for SetGridProperty with selected timestep 
See TP#4179
p4#: 22364
 2013-09-09 14:33:37 +02:00
Magne Sjaastad
303f832fac Fixed duplicate use of variable i 
p4#: 22361
 2013-09-09 11:48:23 +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
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
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
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
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
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
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
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
Jacob Støren
4f7b3e703c Fixed Memory bug regarding statistics calcualtion 
The results memory on each timestep was not freed resulting in all the data from all the cases for all timesteps in memory at the same time ...
In addition, the data was read accidentaly before the timeloop for all the source cases for all timesteps.
So, should perform better now, but there still are some memory allocated in the start, that i cant quite account for.
p4#: 22011
 2013-06-26 23:34:03 +02:00
Jacob Støren
4be58edf78 MSW code reverted. Regrettfully the work has to be reconsidered. 
Both ERT and the resinsight code is rolled back to before MSW was introduced as refined.
p4#: 21999
 2013-06-25 15:53:19 +02:00
Magne Sjaastad
f02d4b160e Use branch index and branch cell index to identify branch head 
Removed obsolete code
p4#: 21974
 2013-06-24 14:02:01 +02:00
Magne Sjaastad
12a0040473 Added well branch number and segment number to result info view 
p4#: 21968
 2013-06-21 16:20:11 +02:00
Magne Sjaastad
c8a537e180 Check for valid index before accessing data 
p4#: 21957
 2013-06-18 12:55:49 +02:00
Magne Sjaastad
16cd7a04ae Multi Segment Wells: Read in connection between a well branch and the branch head. 
Compute intersection point between branch top well cell and branch head in the main branch.
p4#: 21954
 2013-06-18 09:41:02 +02:00
Magne Sjaastad
7a24b2664e Updated ERT to handle multi segment wells 
Updated input code in ResInsight accordingly

ERT version on GitHub
067fa99faa
p4#: 21920
 2013-06-13 22:12:02 +02:00
Magne Sjaastad
0021e2f861 Improved logarithmic color legends for zero and negative values 
p4#: 21804
 2013-06-03 13:08:11 +02:00
Magne Sjaastad
ea4491e987 Added framework used to handle utm area of interest 
p4#: 21775
 2013-05-31 13:57:16 +02:00
Jacob Støren
1aa8857f4d Octave interface: SetActiveCellProperty: Now working according to spec. 
Not tested for Coarce Cells yet.
p4#: 21723
 2013-05-26 12:07:42 +02:00
Jacob Støren
f509e1803f Active CellInfo: Added concept of Cell Result Count 
p4#: 21721
 2013-05-26 11:59:59 +02:00
Magne Sjaastad
5d2249aaea Produce geometry for all cells, not per grid 
p4#: 21710
 2013-05-24 09:54:00 +02:00
Magne Sjaastad
4b7ff209f6 Added getCellCenters 
p4#: 21688
 2013-05-22 08:11:39 +02:00
Magne Sjaastad
8a6234690c Added GetCoarseningInfo 
Added coarse cells to mock model with results
p4#: 21686
 2013-05-21 21:03:05 +02:00
Magne Sjaastad
9df895ddc7 FIxed missing return statement 
p4#: 21685
 2013-05-21 20:43:03 +02:00
Jacob Støren
d947f68f83 Octave Interface: GetActiveCellProperty now handles coarsening 
p4#: 21683
 2013-05-21 14:35:47 +02:00
Magne Sjaastad
eff924c630 Store coarsening boxes in RigGridBase 
Assign index to coarse cells back to coarse box they are a part of
p4#: 21675
 2013-05-21 11:10:59 +02:00
Vidar Lundberg
163ce74052 Added visualization of Well Paths in reservoir views. 
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
Known problems:
- Well paths are not shown in some types of reservoir views, for instance reservoir views showing well pipes. Will look into this later.
p4#: 21658
 2013-05-16 14:10:22 +02:00
Vidar Lundberg
86a53980a4 Added visualization of Well Paths in reservoir views. 
Added PDM objects for a list of well paths (RimWellPathCollection) and for individual well paths (RimWellPath).
RimWellPathCollection uses RivWellPathCollectionPartMgr to generate visualization parts for each well path in the collection.
RimWellPath handles geometry defined in RigWellPath, and RivWellPathPartMgr is used to generate visualization parts. The well path visualization parts are generated by reusing RivPipeGeometryGenerator (also used for well pipes).
Added features:
- Select Open Well Paths in File menu to open one or more well path files, file format supported is Statoil JSON format.
- Each well path has a label showing the name, and the PDM window will show additional info (Id, Source System, UTM Zone, Update Date and User, Survey Type, File Path).
- Possible to turn on / off visibility, set thickness, set color for individual well paths.
- List of well paths including specified parameters/settings will be stored in project file.
- Possible to clip all well paths at a specified distance to the reservoir as this is the relevant area to see, and if showing whole well path it may be problematic for auto zoom etc.
p4#: 21652
 2013-05-16 13:06:00 +02:00
Magne Sjaastad
269f66b0bd Removed obsolete function 
p4#: 21551
 2013-05-06 13:09:47 +02:00
Magne Sjaastad
71187d5bbc Unit test for interpolation 
p4#: 21496
 2013-04-30 13:08:04 +02:00
Magne Sjaastad
6ef5205343 Added interpolation of observed values to statistics computation 
p4#: 21492
 2013-04-30 11:36:50 +02:00
Magne Sjaastad
ca856f7603 Updated ERT to 315ceeee250808ea6a6530233dd5125f9f76f06c 
Support of reading LGR dimensions
Close file handles between access to files, keep ERT file-related cache to speed up reading of many files multiple times
p4#: 21477
 2013-04-29 13:13:42 +02:00