OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-14 17:44:20 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,012 Commits 26 Branches 61 Tags 309 MiB
7b0d1fbd2f
Commit Graph

489 Commits

Author SHA1 Message Date
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