Commit Graph
63 Commits
Author SHA1 Message Date
Magne Sjaastad 04243dfa64 NNC : Add settings to preferences and compute on demand
Ported several commits from dev

#5913 Import NNC : Do not compute NNCs if importNNCs is disabled in preferences
#5914 Import faults : Avoid computation of faults if turned off in preferences 
#5925 NNC computations : Add flag in preferences to include inactive cells
Allan : Do not test for cached data in pytest
#5925 Simplify computation of fault data
#5932 NNC data : Compute geometry when NNC data is asked for
Remove obsolete parameters
2020-05-15 12:51:19 +02:00
Gaute Lindkvist 72436f0a72 Improve NNC memory use 2020-05-15 09:56:24 +02:00
Gaute Lindkvist 4b3d41d53e Reduce NNC memory use 2020-05-15 09:56:24 +02:00
Gaute Lindkvist ec2a924767 #5915 improve performance of NNC computation and limit to active cells 2020-05-15 09:56:24 +02:00
Magne Sjaastad c82df63e10 #5101 clang-format: Adjusted penalties
Use lower absolute values to improve control of behavior
2020-02-12 13:35:31 +01:00
Magne Sjaastad 0abd839669 #5273 Allen Diagrams: Use const access to Nnc connections 2020-01-17 08:41:16 +01:00
Magne Sjaastad 6761a71798 #5273 Allen Diagrams: Move result names to RiaNccDefines 2020-01-17 08:41:15 +01:00
Magne Sjaastad fe9e567825 #4683 clang-format on all files in ApplicationCode 2019-09-06 10:57:22 +02:00
Magne Sjaastad d460d3d77d #3944 clang-tidy : Apply modernize-deprecated-headers 2019-01-11 08:14:53 +01:00
Bjørn Erik Jensen 676d14e65c Mock model. Set LGR name 2018-10-10 11:46:32 +02:00
Magne Sjaastad 4009d4d63b System : Introduce compiler warning C4457 with fixes 2018-09-24 21:20:35 +02:00
Magne Sjaastad aeae19c748 #3185 Use std::array instead of FixedArray 2018-08-07 10:07:42 +02:00
Magne Sjaastad 43e5fb00f4 Testing : Fix invalid index in small mock model 2018-04-17 07:55:52 +02:00
Magne Sjaastad 1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Rebecca Cox 44be1bfd6b #1996 Rename RigSingleWellResultsData -> RigSimWellData 2017-10-17 09:52:31 +02:00
Magne Sjaastad 5eb4eafb6e Merge branch 'dev' into hdf-prototype 2017-08-14 10:47:44 +02:00
Magne Sjaastad 89684c243f #1755 Use namespace RiaDefines instead of class 2017-08-11 14:28:42 +02:00
Magne Sjaastad c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Magne Sjaastad 88bbea6339 #1755 Remove porosity enum from RifReaderInterface 2017-08-11 14:27:22 +02:00
Bjørnar Grip Fjær 44f0234096 #1661 Octave interface for getting static and dynamic NNC result values from ResInsight 2017-06-29 11:19:07 +02:00
Bjørnar Grip Fjær de414c4277 #1645 Load dynamic NNC results from restart file 2017-06-26 10:25:08 +02:00
Magne Sjaastad 0bccc883ff #1292 Fixed CppCheck Issues in ReservoirDataModel 2017-03-06 11:58:07 +01:00
Magne Sjaastad 8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +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 9429458d32 Rename from cells to globalCellArray 2015-11-24 14:21:02 +01:00
Magne Sjaastad 01224dd5e6 System : Removed unused variables 2015-10-26 10:18:57 +01:00
Magne Sjaastad b4df5419b1 Updated file header for modified files 2014-09-23 15:04:57 +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 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
Jacob Støren 3022a40204 Renamed globalCell to reservoirCell etc. 2014-08-14 10:56:25 +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 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 c8a4db6571 Added faults to mock models 2013-12-10 07:44:48 +01:00
Magne Sjaastad e47f2e6317 Performance: Added OpenMP to mock models 2013-11-08 10:34:05 +01:00
Magne Sjaastad 2315ab9014 Added flag to control adding of well data 2013-10-28 10:31:46 +01:00
Magne Sjaastad 7a9c488cdc Added Id to mock model
p4#: 22367
2013-09-10 07:15:45 +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
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
Jacob Støren f0174a02fa More file renaming:
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21070
2013-03-22 16:58:44 +01:00
Jacob Støren e493db37d0 Major renaming of classes. Filenames not done yet.
RimReservoir		RimCase
RimResultReservoir	RimResultCase
RimInputReservoir	RimInputCase
RigEclipseCase		RigCaseData
RigReservoirCellResults	RigCaseCellResultsData
RigWellResults		RigSingleWellResultsData
RigGridCollection	RigGridManager
p4#: 21064
2013-03-22 15:43:42 +01:00
Magne Sjaastad 21065176f2 Rename of functions in RigActiveCellInfo
p4#: 21045
2013-03-22 09:32:42 +01:00
Magne Sjaastad a5fb1e1764 One shared active cell info for all statistical cases
Invalidate existing statisticsCases when adding/removing source cases
Moved computation of active cell union from RigStatistics to RimIdenticalGridCaseGroup
Recompute active cell union when opening project file
p4#: 21023
2013-03-21 10:31:58 +01:00