OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
6,090 Commits 28 Branches 61 Tags
da118ac1da71297c758d508ab3ba75472817b203
Commit Graph

991 Commits

Author SHA1 Message Date
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
e2e689e591 Fixed compile issue on Linux 2017-02-03 10:13:08 +01:00
Magne Sjaastad
e8ee077501 #1164 Added feature "Add Stored Well Allocation Plot" 2017-02-02 12:32:01 +01:00
astridkbjorke
64684f6bec #1145 - pre-proto - Export of fracture data for selected wells (either SimWells or WellPaths) 2017-02-02 11:38:55 +01:00
astridkbjorke
30304a5f8a #1157 - pre-proto - Updating how the eclipseCase is handled for transmissibility calculation. Should now avoid segfault when calculating transmissibilities for well path fractures. 2017-02-02 08:50:54 +01:00
astridkbjorke
871146ba68 pre-proto - Updating fracture position from location when creating new fracture in project tree (bugfix) 2017-02-02 08:50:54 +01:00
Magne Sjaastad
57a1cd0c64 Fixed missing regeneration of geometry when deleting all well path fractures 2017-02-02 07:48:58 +01:00
Magne Sjaastad
6d95d00863 #1159 Fixed inaccurate position of new fracture when clicking in 3D view 2017-02-02 07:36:22 +01:00
Magne Sjaastad
bd732d9564 #1148 Always show context menus 2017-02-01 09:52:01 +01:00
astridkbjorke
4c1f7776b9 pre-proto - Sorting includes 2017-01-31 15:58:13 +01:00
astridkbjorke
3a5247e357 #1147 - pre-proto - Adding index number to names for new fractures 2017-01-31 15:54:04 +01:00
Magne Sjaastad
b75fdb4a6d #1152 Replace space in filenames with underscore 2017-01-31 09:58:11 +01:00
astridkbjorke
238b803dce #1145 - pre-proto - Adding command feature for export of fractures only from selected wells. So far only fractures from one well can be exported each time. 2017-01-31 09:56:49 +01:00
Magne Sjaastad
b13ca8bb1c #1135 Compute accumulated length along sim well and added slider 2017-01-30 14:28:41 +01:00
Magne Sjaastad
ccc7345706 #1078 Added context menu for well cells and well cell fence 2017-01-26 17:52:13 +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
Magne Sjaastad
f9a9040ed5 #1078 Added show pipe and show spheres to well collection 2017-01-26 10:27:23 +01:00
Magne Sjaastad
6ee54733f4 #1078 Context menu commands for multi select of EclipseWell objects 2017-01-26 07:23:18 +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
fbfffd4398 #1090 #1089 - pre-proto - Adding perforation length to fracture template and fracture, and azimuth angle to fracture template. 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
Magne Sjaastad
cebe5428be #1107 Moved showWindow field to RimViewWindow and removed showWindow field from derived classes 2017-01-20 16:25:05 +01:00
Jacob Støren
c025c2a3d7 Renaming in the aftermath of the MDI window control refactorization. Aligned fieldChangedByUi in that respact as well. 2017-01-20 11:38:18 +01:00
Jacob Støren
43249f7af8 Refactor related to #1106, #1107, #1109, #1113. Refactored the MDI control 
of windows. This might introduce problems.
 2017-01-19 17:54:01 +01:00
Magne Sjaastad
93e9b04655 Cleanup includes 2017-01-19 13:35:07 +01:00
Magne Sjaastad
b25f630a7e Moved several fields to RimFracture 2017-01-19 10:43:23 +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
9c1e9f0970 #1080 Snapshot : Show parameter and case as default 2017-01-17 10:40:38 +01:00
Magne Sjaastad
22f870bff0 #1082 Snapshot : Added four empty rows 2017-01-16 23:21:28 +01:00
Magne Sjaastad
2292debc6b #1085 Snapshots : Added toggle to control if a snapshot definition is active 2017-01-16 22:55:22 +01:00
Magne Sjaastad
723e0f9286 #1107 #1111 Added update of well allocation plot from 3D view 2017-01-13 13:32:17 +01:00
Magne Sjaastad
ccb88c6520 Rename 2017-01-13 13:32:17 +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
astridkbjorke
703bdb9669 pre-proto - Rename 2017-01-12 13:29:18 +01:00
astridkbjorke
44aefe6ed7 pre-proto - Rename RimFractureDefinition to RimFractureEllipseDefinition 2017-01-12 10:33:33 +01:00
astridkbjorke
a7ecea983c #1092 - pre-proto - Adding function writeFracturesToTextFile which replaces old functions which were separate for SimWellFractures and WellPathFractures. 2017-01-11 14:32:42 +01:00
astridkbjorke
2817e0d34d #1092 - pre-proto - Renaming RicExportFractureWellCompletionFeature to RicExportSimWellFractureWellCompletionFeature 2017-01-11 14:32:42 +01:00
astridkbjorke
9f82319a86 #1092 - pre-proto - Adding feature for exporting COMPDAT file for well path fractures. 2017-01-11 14:32:42 +01:00
astridkbjorke
524f39e434 #1092 - pre-proto - Saving file with COMPDAT keyword for sim well fractures. Transmissibilities still dummy values. 2017-01-11 14:32:42 +01:00
astridkbjorke
9bba00999e #1092 - pre-proto - Added feature for exporting fracture data to file. File is written, but not with any useful information yet. 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
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
46bc8e80aa Removed unused code 2017-01-09 07:43:31 +01:00
astridkbjorke
cf2b47d0b9 #1040 - pre-proto - Setting correct center of fracture for SimWellFracture 2017-01-06 15:55:54 +01:00
astridkbjorke
2a6cceff62 #1040 - pre-proto - Updating position of well path fractures when md is changed, and calculaing correct position when creating new well path fracture from project view 2017-01-06 15:55:53 +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
astridkbjorke
9e933a9c1c #1040 - pre-proto - Calling scheduleCreateDisplayModelAndRedraw when creating / deleting fractures 2017-01-06 15:55:53 +01:00
Magne Sjaastad
508c2ba1a2 #1071 Updated icons for fractures 2017-01-05 14:57:04 +01:00