OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,469 Commits 53 Branches 83 Tags
9b1b94a4ae823188fe7e54f1f58776a68e1bfeee
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad 9b1b94a4ae #2517 Export COMPDATL : Include diameter for LGR grids 2018-02-20 11:26:39 +01:00
Magne Sjaastad 79a32af209 Octave Plugin : Move definition of qtDataStreamVersion to RiaSocketServerDefines 
After conversion from NULL -> nullptr the octave plugins failed to compile. By moving the define of qtDataStreamVersion this issue was resolved, and the dependency from oct-files to RiaSocketServer.h was not required anymore (and removed)
 2018-02-20 08:26:19 +01:00
Magne Sjaastad 8d30b6e09f Use size_t instead of int 2018-02-18 19:01:38 +01:00
Magne Sjaastad 1ae30ef11a (clang-tidy) : modernize-use-nullptr 2018-02-18 18:56:43 +01:00
Magne Sjaastad 69875eec8f (clang-tidy) : modernize-use-nullptr 2018-02-18 18:22:23 +01:00
Magne Sjaastad cfb75ecc34 AppFwk (clang-tidy) : modernize-use-nullptr 2018-02-18 18:17:50 +01:00
Magne Sjaastad 3239c66f54 AppFwk (clang-tidy) : modernize-use-nullptr 2018-02-18 18:05:08 +01:00
Magne Sjaastad 5a2072e6ec clang-tidy : Add minimal config file 2018-02-18 17:55:20 +01:00
Magne Sjaastad 950617af96 AppFwk : Fix assignment of float value 2018-02-18 17:42:28 +01:00
Magne Sjaastad 88ead1f986 Fix signed /unsigned compare 2018-02-16 16:56:39 +01:00
Magne Sjaastad 917cae9e2d #2455 Non-Darcy Flow : Hide "From Fracture" if no width is available 2018-02-16 14:17:28 +01:00
Magne Sjaastad cf11eff319 #2456 Non-Darcy Flow : Allow transmissibilities close to zero when computing d-factor 2018-02-16 11:22:13 +01:00
Magne Sjaastad 504e80534b #2456 Non-Darcy Flow : Export : Use scientific formatting for kh and d-factor 2018-02-16 11:02:50 +01:00
Magne Sjaastad 52621bae6c #2456 Non-Darcy Flow : Include diameter for fracture completions 2018-02-16 10:51:04 +01:00
Magne Sjaastad dab73009e7 #2456 Non-Darcy Flow : Return the one and only (unmodified) completion 2018-02-16 10:49:53 +01:00
Magne Sjaastad b06d33c5e9 #2455 Non-Darcy Flow : Use DoubleValueEditor 2018-02-16 10:14:41 +01:00
Magne Sjaastad 9184ef14ca AppFwk : Use 'g' instead of 'f' to create text from double values 2018-02-16 10:14:08 +01:00
Magne Sjaastad ec70639a8f Remove obsolete code 2018-02-16 09:54:51 +01:00
Magne Sjaastad db20cf4b5b #2492 : Non-Darcy Flow : Ignore WPIMULT export setting if non-Darcy Flow is active 2018-02-16 09:37:55 +01:00
Magne Sjaastad 7f5ff7be0f #2455 Non-Darcy Flow : Use double in fields to avoid many decimals when converting from float to double 2018-02-16 09:37:55 +01:00
Magne Sjaastad ac96824640 #2455 Non-Darcy Flow : Add fields to fracture template 2018-02-16 09:37:55 +01:00
Magne Sjaastad 6b246f4671 Remove unused function 2018-02-16 09:37:55 +01:00
Magne Sjaastad 8dfe181cc3 #2455 Non-Darcy Flow : Add support for user defined D-factor 2018-02-16 09:37:55 +01:00
Magne Sjaastad dda9bd11ea #2455 Non-Darcy Flow : Add fracture width 2018-02-16 09:37:55 +01:00
Magne Sjaastad e1619d3d62 #2455 Non-Darcy Flow : Show user defined permeability and rename 2018-02-16 09:37:55 +01:00
Magne Sjaastad cdfe6e3000 #2475 Fractures: Use filename as default name when importing a StimPlan fracture 2018-02-15 15:00:09 +01:00
Magne Sjaastad 8e1a7b2bbb #2455 Non-Darcy Flow : Compute D-factor and show in UI 2018-02-14 13:35:35 +01:00
Magne Sjaastad f9bded9c13 #2455 Fracture : Move code to cpp and restructure header 2018-02-14 13:34:38 +01:00
Magne Sjaastad 1a78490991 Fix warnings related to signed / unsigned compare 2018-02-14 13:27:50 +01:00
Magne Sjaastad 03f4b778cc #2471 Fracture : Block selection of fracture if fracture template is selected in Project Tree 2018-02-14 13:07:33 +01:00
Magne Sjaastad 646eb8fee4 StimPlan Fracture : Make sure geometry is recomputed when required 2018-02-14 13:07:16 +01:00
Magne Sjaastad 302edc5677 System : Guard null pointer access 2018-02-14 13:06:54 +01:00
Magne Sjaastad 2ff5842f28 Clang : Avoid special template helper on Windows 2018-02-12 20:12:04 +01:00
Magne Sjaastad 13606f0295 Clang : Exclude special code in release() to avoid warning 2018-02-12 20:09:01 +01:00
Magne Sjaastad c208569fb6 Clang : Remove inline from template function 2018-02-12 20:09:01 +01:00
Magne Sjaastad 59958dcc3a Fix picking on fracture geometry when scale factor is different to 1.0 2018-02-12 20:08:43 +01:00
Magne Sjaastad 123a2830aa Merge patch into dev : Snapshot : Always use _ in generated file names #2446 2018-02-09 11:34:05 +01:00
Magne Sjaastad 6e16a47b0d #2446 : Replace - with _ for all generated file names 2018-02-09 11:19:04 +01:00
Magne Sjaastad b068296afd #2455 Non-Darcy Flow: Add fields to fracture template 2018-02-09 07:26:51 +01:00
Magne Sjaastad 778119bf62 #2442 Fracture Template : Move more fields from public to protected 2018-02-08 14:02:02 +01:00
Magne Sjaastad a1c891cd99 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-02-08 13:18:36 +01:00
Magne Sjaastad 80eefb3141 #2442 Fracture Template : Move several fields from public to protected 2018-02-08 13:17:31 +01:00
Magne Sjaastad beb122c6d0 System : Fix compiler warning 2018-02-08 13:17:31 +01:00
Magne Sjaastad f053dfa8e3 #2446 : Snapshot : Improve generated file, always use _ in generated filename 2018-02-08 13:17:18 +01:00
Magne Sjaastad 1370cfe3e5 Merge fix for fishbone export into dev #2451 2018-02-08 10:31:51 +01:00
Magne Sjaastad 39949923a6 #2451 Export Completion : Remove obsolete test 2018-02-08 10:25:43 +01:00
Magne Sjaastad 0843c3e464 #2451 Export Completion : Exclude main bore cells correctly 2018-02-08 10:18:01 +01:00
Magne Sjaastad 53a1de91d7 #1968 Export Completions : Improve ordering 2018-02-07 14:07:49 +01:00
Magne Sjaastad 68c21e117b #1968 Readability : Whitespace changes 2018-02-07 14:07:00 +01:00
Magne Sjaastad 76e6ec3aef Remove unused function 2018-02-07 14:07:00 +01:00
Magne Sjaastad dd34b0111a #1968 Readability : Major whitespace changes 2018-02-07 14:07:00 +01:00
Magne Sjaastad 598d2c9b96 System : clang-format : One parameter per line 2018-02-07 09:55:28 +01:00
Magne Sjaastad d208f63255 Add .clang-format to cmakelist 2018-02-07 08:54:53 +01:00
Magne Sjaastad c695d40266 #2447 Fracture : Set default conductivity result when creating the first fracture 2018-02-06 13:15:36 +01:00
Magne Sjaastad 519771cb38 #2447 Fracture : Rename to fractureColors 2018-02-06 12:57:50 +01:00
Magne Sjaastad a283a468c2 #2447 Fracture : Show fracture legend when only ellipse fractures are present 2018-02-06 12:42:13 +01:00
Magne Sjaastad d420b74326 Remove unused function 2018-02-06 12:27:55 +01:00
Magne Sjaastad 4fdb7671a8 #2431 : Removed obsolete struct 2018-02-06 11:09:22 +01:00
Magne Sjaastad daad891b24 System : Show grid name and global cell index in result info 2018-02-06 07:27:21 +01:00
Magne Sjaastad 9734774e21 #2439 Fracture : Set default permeability to 1e5 2018-02-05 20:39:42 +01:00
Magne Sjaastad 67da4af831 #2431 : Use const ref and nullptr 2018-02-05 20:12:22 +01:00
Magne Sjaastad b69fc78361 #2431 : Remove Rim3dView from function parameters 2018-02-05 20:12:22 +01:00
Magne Sjaastad df231ab50a #2431 : Remove RivWellPathPartMgr from RimWellPath 2018-02-05 20:12:22 +01:00
Magne Sjaastad cd575ef9c1 #2431 : Use well path part manager in Rim3dView 2018-02-05 20:12:22 +01:00
Magne Sjaastad 91e062fd93 #2431 : Add Rim3dView to event interface object 2018-02-05 20:12:22 +01:00
Magne Sjaastad 5919cb20fb #2431 : Refactor of well part manager 2018-02-05 20:12:22 +01:00
Magne Sjaastad 0679ec4ba5 #2431 : Add part manager for all well paths WIP 2018-02-05 20:12:22 +01:00
Magne Sjaastad 082b82214d #2444 Batch : Fix support for multiple replaceCase in command file 2018-02-05 11:22:31 +01:00
Magne Sjaastad 24cd47abfc Merge fix for failing test into dev 2018-02-05 08:45:20 +01:00
Magne Sjaastad 5a7133f6e2 Fix disabled test 2018-02-03 09:15:04 +01:00
Magne Sjaastad bf0b4f68e1 Merge message box fixes into dev, #2443 2018-02-02 14:47:05 +01:00
Magne Sjaastad ba09906163 #2443 Replace QMessageBox with RiaLogging to avoid blocking of batch commands 2018-02-02 09:37:34 +01:00
Magne Sjaastad dc0c6d1b47 #2443 : Remove obsolete includes of QMessageBox 2018-02-02 09:37:00 +01:00
Magne Sjaastad f21f6e969f #1905 : Make sure picking on perforation intervals reports well path MD 2018-02-02 08:20:57 +01:00
Magne Sjaastad a4eb16883b #2441: Fracture Colors : Make sure conductivity result is set on template for old project files 2018-02-01 15:37:05 +01:00
Magne Sjaastad c5333d09b2 Merge perforation updates into dev #2422 2018-02-01 13:05:00 +01:00
Magne Sjaastad c8e002d532 #2374 Fracture : Incomplete results when computing intersected StimPlan cells 2018-02-01 12:58:48 +01:00
Magne Sjaastad d7fa97f052 Fix wrong include path 2018-01-31 13:54:58 +01:00
Magne Sjaastad 33ef2948f4 Merge "Completion Export LGR" into dev 
#2425 #1758 #2423
 2018-01-31 13:38:05 +01:00
Magne Sjaastad d111fde68b #2425 Export Completions : Include cleanup 2018-01-31 10:20:47 +01:00
Magne Sjaastad 8fbd417c4f #2425 Export Completions : Move function 2018-01-31 10:20:47 +01:00
Magne Sjaastad f8b020e364 #2425 Export Completions : Whitespace 2018-01-31 10:20:47 +01:00
Magne Sjaastad c04ef6bbbf #2425 Export Completions : Move app logic into separate file 2018-01-31 10:20:47 +01:00
Magne Sjaastad 965deeb67a #2425 Export Completions : Separated feature UI from app logic 2018-01-31 10:20:47 +01:00
Magne Sjaastad 52875a57dc #2423 Export Completions : Cleaned up private functions, moved to cpp and improved whitespace 2018-01-31 10:20:47 +01:00
Magne Sjaastad 20652a0597 #2423 Export Completions : Move folder one level up 2018-01-31 10:20:47 +01:00
Magne Sjaastad e989b3afc9 #2423 Export Completions : Move Rig*-files to completion export folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad f0f7c954cc #2423 Export Completions : Move files to separate folder 2018-01-31 10:20:47 +01:00
Magne Sjaastad e18a08a425 #1758 Use RigMainGrid in interface to CompletionDataGridCell 2018-01-31 10:20:47 +01:00
Magne Sjaastad 6f0f73a017 #1758 Add direct access to RigMainGrid from RimEclipseCase 2018-01-31 10:20:47 +01:00
Magne Sjaastad 54a7320b59 #1758 Export main grid data to one file and LGR data to one file 2018-01-31 10:20:47 +01:00
Magne Sjaastad 38f18dbecb #1758 Add support for export of WPIMULTL 2018-01-31 10:20:47 +01:00
Magne Sjaastad c7b5e091c6 #1758 Rename to gridName 2018-01-31 10:20:47 +01:00
Magne Sjaastad 5cc6877afa #1758 Use map to sort RigCompletionDataGridCell based on grid 2018-01-31 10:20:47 +01:00
Magne Sjaastad 4516941d2c #1758 Add RigCompletionDataGridCell 2018-01-31 10:20:47 +01:00
Magne Sjaastad 028b5303a7 #1758 Add support for export of COMPDATL for LGR grid 2018-01-31 10:20:47 +01:00
Magne Sjaastad c0359f1776 #1758 Refactor IJKCellIndex 2018-01-31 10:20:47 +01:00
Magne Sjaastad 85d9d21bb6 #1758 Rename to globalCellIndex 2018-01-31 10:20:47 +01:00
Magne Sjaastad d5c1e1e898 #1758 Moved implementation to source and improved formatting 2018-01-31 10:20:47 +01:00
Magne Sjaastad 71deeb8954 Merge remote-tracking branch 'origin/2018.01.01-patch' into dev 2018-01-29 10:09:54 +01:00