OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-12 08:25:03 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,570 Commits 58 Branches 85 Tags
ef2179f1ba1824e22ad22e210a97ae8fa6605638
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Magne Sjaastad ef2179f1ba #2545 Move fields from public to private 2018-03-02 14:27:52 +01:00
Magne Sjaastad bb0f026644 Whitespace 2018-03-02 14:09:46 +01:00
Magne Sjaastad 08995cf63e #2483 Refactoring : Simplify generation of well branch geometry (2) 2018-03-02 14:07:31 +01:00
Magne Sjaastad 7bd0bdc612 #2483 Refactoring : Simplify generation of well branch geometry (1) 2018-03-02 14:07:23 +01:00
Magne Sjaastad e39105503b #2483 Use update pattern of intersections when updating simwell fractures 2018-03-02 12:43:12 +01:00
Magne Sjaastad db276fff03 #2483 Intersections : Use branch detection switch in "Simulation Wells" 2018-03-02 12:42:46 +01:00
Magne Sjaastad 26884d97b6 #2536 Merge branch 'cmake-improvements' into dev 2018-02-28 11:05:12 +01:00
Magne Sjaastad 7b5963d75c #2536 Build System : Add list of internal ResInsight libraries 2018-02-28 10:54:53 +01:00
Magne Sjaastad 25a1823f35 Merge branch 'dev' into cmake-improvements 2018-02-28 08:47:01 +01:00
Magne Sjaastad 89c090ba24 #2536 Build System : Remove obsolete code for cmake older than "2.8.2" 2018-02-28 08:05:00 +01:00
Magne Sjaastad ca0087eb55 #2536 Build System VizFwk : Use target_* and remove includes 2018-02-28 07:42:19 +01:00
Magne Sjaastad 233df05f68 #2536 Build System : Remove obsolete includes and update depending includes 2018-02-27 20:00:56 +01:00
Magne Sjaastad 3b63c8d433 #2536 Build System : Add target_include_directories to app libraries 2018-02-27 19:05:04 +01:00
Magne Sjaastad 4f20273e55 #2536 Build System : Add target_include_directories to clipper, exprparser, qwt 2018-02-27 18:56:12 +01:00
Magne Sjaastad 72a3b731bc #2536 Build System : Add target_include_directories to boost-Subset 2018-02-27 18:49:24 +01:00
Magne Sjaastad 3fbce58fa5 #2536 Build System AppFwk : Several updates 
Simplified automoc
Use target_include_directories and target_link_libraries
Use CMake 2.8.12
 2018-02-27 18:37:11 +01:00
Magne Sjaastad 65c3d6ff12 #2536 Build System AppFwk : Use target_include_directories 2018-02-27 17:19:23 +01:00
Magne Sjaastad 10bc5c92ab #2532 Fracture : Create copy of fracture template if non-matching units is detected 2018-02-27 12:05:41 +01:00
Magne Sjaastad f4bae6f796 #2529 Fracture : Remove RESINSIGHT_ENABLE_PROTOTYPE_FEATURE_FRACTURES from CMake files 2018-02-26 21:11:14 +01:00
Magne Sjaastad 72b5f540e5 #2529 Fracture : Remove all #ifdef USE_PROTOTYPE_FEATURE_FRACTURES 2018-02-26 20:54:45 +01:00
Magne Sjaastad 0cee37ce86 Add missing ifdef macro for use of fracture template 2018-02-26 14:42:00 +01:00
Magne Sjaastad 1706a6c0c4 System : Reorder initialization order to match declaration order 2018-02-24 09:17:02 +01:00
Magne Sjaastad 905ebb49de System : Add missing default statements in switch block 2018-02-24 09:16:15 +01:00
Magne Sjaastad bba69e7b98 Clang : Add power shell scripts 2018-02-24 09:15:31 +01:00
Magne Sjaastad 7ce6177bc5 System : Add missing braces 2018-02-23 22:39:29 +01:00
Magne Sjaastad ae064463a9 System : Add missing default statements 2018-02-23 22:39:14 +01:00
Magne Sjaastad 245ea2dac2 System : Use unsigned type as index 2018-02-23 22:38:46 +01:00
Magne Sjaastad 0006c786cf System : Reorder initialization order to match declaration 2018-02-23 22:38:08 +01:00
Magne Sjaastad 34c6e3d906 System : Add missing default sections of switch statements 2018-02-23 21:30:24 +01:00
Magne Sjaastad 70faea56df AppFwk : Add missing initialization of variables and handling of switch statements 2018-02-23 21:29:54 +01:00
Magne Sjaastad 671818d72e AppFwk : Reorder initialization to match declaration 2018-02-23 19:57:09 +01:00
Magne Sjaastad 8bc3f06acd AppFwk : Add missing default handling in switch statements 2018-02-23 19:56:38 +01:00
Magne Sjaastad 309b1f0749 AppFwk Clang : Reorder initialization order to match declaration order 2018-02-23 19:43:48 +01:00
Magne Sjaastad f9de64c538 AppFwk : Use freopen_s instead of freopen 2018-02-23 19:34:43 +01:00
Magne Sjaastad 80af97c1a8 #2521 Fishbones : Clamp MD ranges to max MD of well path 2018-02-22 14:48:24 +01:00
Magne Sjaastad 814c55f849 Merge branch 'master' into dev after patch release 2018-02-22 09:34:44 +01:00
Magne Sjaastad 36581daa9b Merge pull request #2520 from OPM/2018.01.01-patch 
2018.01.01 patch
 2018-02-22 08:11:07 +01:00
Magne Sjaastad 2b8a19d472 Upped to version 2018.01.1 2018-02-22 07:25:37 +01:00
Magne Sjaastad 594be93883 Whitespace cleanup 2018-02-21 19:53:22 +01:00
Magne Sjaastad c22f38e30c #2509 Fracture : Move fracture commands to separate folder 2018-02-21 19:38:20 +01:00
Magne Sjaastad 69339ad141 #2507 Non-Dracy Flow : Add display of unit and handle unit conversion 2018-02-21 19:25:05 +01:00
Magne Sjaastad 8ad30d9350 #2509 Fracture : Disconnect fracture template when unit changes 2018-02-21 19:07:03 +01:00
Magne Sjaastad 1b7dabdc51 #2291 Fishbones : Use 6 decimals, as this is required when using MD above 1000 2018-02-21 13:06:03 +01:00
Magne Sjaastad ad97b19c30 #2509 Fracture : Exclude files when fracture config is not active 2018-02-21 10:41:11 +01:00
Magne Sjaastad c6b12b85e0 Merge fracture unit refactoring into dev #2509 
Add display of M and F in front of fracture templates
Add convert of StimPlan templates
Add copy/paste of StimPlan templates
Remove obsolete unit conversion code
 2018-02-21 10:15:56 +01:00
Magne Sjaastad 81bb4481ed #2509 Fracture : Rename 2018-02-21 10:10:22 +01:00
Magne Sjaastad 0acab5cd65 #2509 Fracture : Add copy / paste of StimPlan 2018-02-21 09:50:50 +01:00
Magne Sjaastad 0d7e4f460c #2509 Fracture : Find matching template when adding new fracture 2018-02-21 09:10:40 +01:00
Magne Sjaastad 28ab07b199 #2509 Fracture : Remove obsolete unit conversion 2018-02-21 09:10:08 +01:00
Magne Sjaastad f67918eba3 #2509 Fracture : Improve UI 2018-02-21 08:36:18 +01:00
Magne Sjaastad b0be540977 #2509 Fracture : Remove obsolete unit conversion code 2018-02-21 08:18:55 +01:00
Magne Sjaastad 4e737885e4 #2509 Fracture : Move unit conversion of top/bot perforation depth 2018-02-20 15:35:08 +01:00
Magne Sjaastad 35febab8db #2509 Fracture : Add support for unit conversion of stimplan grid coords 2018-02-20 15:15:06 +01:00
Magne Sjaastad 479247dc4d Merge fix for multi case statistics into dev 2018-02-20 14:02:51 +01:00
Magne Sjaastad 65f93814fe #2468 Multi grid statistics : Initialize filename before creating data access object 2018-02-20 13:35:31 +01:00
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 82e706375a Octave Plugin : Move definition of qtDataStreamVersion to riSettings 
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:16:13 +01:00
Magne Sjaastad fb95d896ef #2509 Fracture : Add copy / paste of ellipse fracture template 2018-02-20 07:20:25 +01:00
Magne Sjaastad a218addbe5 clang : Fix to be compatible with Clang 3.8 2018-02-19 21:09:44 +01:00
Magne Sjaastad 0ef0f3b5b1 #2509 Fracture : Guard UI selection of fracture template of different unit 2018-02-19 14:32:33 +01:00
Magne Sjaastad de3aa9f975 #2509 Fracture : Add text to indicate unit of fracture template 2018-02-19 13:54:29 +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