Magne Sjaastad
81c92d2781
#1230 Added infrastructure for loadAndUpdate of StimPlan data
2017-02-17 09:29:46 +01:00
Magne Sjaastad
f9d8ab8bad
Merge remote-tracking branch 'refs/remotes/origin/dev'
...
Conflicts:
ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
ApplicationCode/Resources/ResInsight.qrc
2017-02-16 10:18:39 +01:00
Jacob Støren
4fc0839a33
#1211 Disabled tracer allocation for wells with inconsistent flow.
2017-02-15 12:29:58 +01:00
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
