Commit Graph

4617 Commits

Author SHA1 Message Date
Magne Sjaastad
68e52e1838 #1755 Cleaned up includes 2017-08-11 14:27:57 +02:00
Magne Sjaastad
c4aa625d33 #1755 Move porosity model enum to separate file 2017-08-11 14:27:56 +02:00
Magne Sjaastad
56afc497b3 Add missing includes 2017-08-11 14:27:23 +02:00
Magne Sjaastad
88bbea6339 #1755 Remove porosity enum from RifReaderInterface 2017-08-11 14:27:22 +02:00
Magne Sjaastad
ad09441da1 #1691 Add RigTimeStepInfo 2017-08-11 14:26:16 +02:00
Magne Sjaastad
6b90a94458 #1691 Rename to RigResultInfo 2017-08-11 14:26:15 +02:00
Magne Sjaastad
3253c8968e #1691 Move RigResultInfo into separate file 2017-08-11 14:26:15 +02:00
Magne Sjaastad
78da4c6469 #1691 Add time step filter to RimCase and use from RimEclipseResultCase 2017-08-11 14:24:54 +02:00
Magne Sjaastad
624f14da46 Prefix enum values with RIF_
FLOAT causes Cotire compile to fail
2017-08-11 14:24:54 +02:00
Magne Sjaastad
5775c3bb20 Remove duplicate definitions of file names 2017-08-11 14:24:54 +02:00
Magne Sjaastad
66c28d8cee #1691 File Interface : Add support for time step filtering 2017-08-11 14:24:54 +02:00
Magne Sjaastad
9223282db4 #1691 Remove caching of time step related data 2017-08-11 14:24:54 +02:00
Magne Sjaastad
b1e9e84784 #1691 Removed unused function and cleaned up includes and whitespace 2017-08-11 14:24:54 +02:00
Bjørnar Grip Fjær
2ec68d08fb #1690 Add import settings to pasting ASCII data to summary plot 2017-08-11 13:57:11 +02:00
Bjørnar Grip Fjær
a47c5b5d84 #1690 Summary: Import clipboard data from Excel as new curves 2017-08-11 13:57:11 +02:00
astridkbjorke
abd058da8b #1126 Update after merge - using ALL for PhaseSelection 2017-08-11 11:26:35 +02:00
astridkbjorke
ef1208e2f5 #1126 Adding RigTofAccumulatedPhaseFractionsCalculatorTester with function calling sortTofAndCalculateAccPhaseFraction, so that this function can be set private. 2017-08-11 10:31:13 +02:00
astridkbjorke
ebab0b50a3 #1126 moving finding data and calling sortTofAndCalculateAccPhaseFraction to constructor 2017-08-11 10:31:13 +02:00
astridkbjorke
db6d471e9c #1126 Fixing constructor 2017-08-11 10:31:13 +02:00
astridkbjorke
2ce81e9045 #1126 Updating inserting to map to use insert. Adding access functions for calculated data and constructor for class (not finished) 2017-08-11 10:31:13 +02:00
astridkbjorke
e19a63dcff #1126 Adding test with same TOF-value for two cells 2017-08-11 10:31:13 +02:00
astridkbjorke
35cc413f4d #1126 Adding handling of multiple cells with same tof. No test yet. 2017-08-11 10:31:13 +02:00
astridkbjorke
4f2d3c7f5b #1126 Fixing missing/wrong filenames in cmake-files, and error in last check-in 2017-08-11 10:31:13 +02:00
astridkbjorke
42245b22af #1126 Adding unit test 2017-08-11 10:31:13 +02:00
astridkbjorke
40addb9a10 #1126 Adding (dummy) unit test. Calling the sortTofAndCalculateAccPhaseFraction function, but no check of values calculated yet 2017-08-11 10:31:13 +02:00
astridkbjorke
a61882d092 #1126 Adding first implementation of calculator for TOF-accumulated phaase fraction. Not yet tested or called from any code. 2017-08-11 10:31:13 +02:00
Bjørnar Grip Fjær
efb79ac753 #1202 Flow: Handle separate phase solutions 2017-08-10 15:08:30 +02:00
Bjørnar Grip Fjær
03480c38c4 #1698 Enable Flow Diagnostics cell result when fluxes are not present in Eclipse restart file 2017-08-10 11:17:19 +02:00
Bjørnar Grip Fjær
747721a7f8 #1698 Use opm-flowdiagnostics calculation of fluxes if not present in Eclipse restart file 2017-08-10 10:09:24 +02:00
Bjørnar Grip Fjær
7598d8c196 #1696 Threshold option for aquifer cells 2017-08-09 14:10:39 +02:00
Magne Sjaastad
d5d5cedbf5 #1686 Remove explicit include of Ert
Ert includes are implicit defined by tartget_link_library
2017-08-09 08:31:18 +02:00
Bjørnar Grip Fjær
eee4a65497 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-08 14:24:42 +02:00
Bjørnar Grip Fjær
6c5f974d8e #1743 Use well name for completion export for fractures as well 2017-08-08 14:11:05 +02:00
Bjørnar Grip Fjær
39c3338024 #1742 Allow different wells in same grid when exporting completions to different files per well 2017-08-08 13:56:07 +02:00
Magne Sjaastad
acd7b4784d #1747 Build System : Make variable available to both current and parent scope 2017-08-08 13:51:32 +02:00
Bjørnar Grip Fjær
7e3e538a43 #1662 Octave interface to push generated NNC values back into ResInsight 2017-08-08 13:13:05 +02:00
Jacob Støren
2d9f48d715 Whitespace and typo 2017-08-08 13:12:18 +02:00
Magne Sjaastad
fb158b29bd #1747 Build System : Include hdf5 in package name 2017-08-08 13:07:49 +02:00
Magne Sjaastad
1655585f1e #1676 Remove option RESINSIGHT_ENABLE_HDF5
Always link HDF library files if HDF is available. Windows : Use root folder to HDF as path for include and library files
2017-08-08 09:05:47 +02:00
Magne Sjaastad
bc4edf6db3 #1676 #1388 Windows : Add path to HDF5 files and link with HDF5 static libs 2017-08-08 07:19:15 +02:00
Magne Sjaastad
ca1e08a1a4 #1676 Disable HDF5 by default 2017-08-08 07:07:28 +02:00
Bjørnar Grip Fjær
a3e6ae0dae Fix build warning with size_t to int conversion 2017-08-07 15:30:22 +02:00
Bjørnar Grip Fjær
79c48338a7 #1741 Add octave interface command to get names of available NNC properties 2017-08-07 15:30:16 +02:00
astridkbjorke
09363b2fec #1737 Making small adjustment to polygon to avoid having well path line going though perforation length polygon vertex, due to problems in clipper for this case. 2017-08-07 13:14:22 +02:00
Bjørnar Grip Fjær
156401d0db #1703 Add interpolation when well path clipping to ensure well path is actually visible 2017-08-07 11:41:13 +02:00
Bjørnar Grip Fjær
6ce36b666c #1723 Do not create completions file for wells and completion types that have no data 2017-08-04 16:42:35 +02:00
Bjørnar Grip Fjær
cb06ce11bb #1682 Respect disable result lighting for NNC results 2017-08-04 16:30:21 +02:00
Bjørnar Grip Fjær
861aa292b2 #1706 Ensure new fractures are created with unique names 2017-08-04 15:47:47 +02:00
astridkbjorke
c222612ae0 #1737 Adding unit test re-creating problem with finding well-fracture-overlap for along-oriented fracture 2017-08-04 15:14:46 +02:00
Magne Sjaastad
a3ba1991db #1739 Ellipse Fracture : Recompute the fracture grid when opening project 2017-08-04 14:35:16 +02:00
Bjørnar Grip Fjær
5e48494c9b #1719 Fix issue with commands without parameters in command file 2017-08-04 13:58:32 +02:00
Bjørnar Grip Fjær
37456bfa9b #1730 Include more information in snapshot filenames 2017-08-04 11:25:42 +02:00
Magne Sjaastad
3c5016cb8c #1724 Fix merge issues 2017-08-04 10:45:04 +02:00
Magne Sjaastad
c481a275ee Merge branch 'dev' into pre-proto 2017-08-04 10:37:35 +02:00
Magne Sjaastad
88186619db #1724 Apply fix on dev branch 2017-08-04 10:31:55 +02:00
Magne Sjaastad
6ddfab6823 #1724 Removed unused code 2017-08-04 10:24:30 +02:00
Magne Sjaastad
1adba2caf7 #1724 Removed unused code 2017-08-04 10:21:07 +02:00
Magne Sjaastad
e35bcf1f58 #1724 Fix mapping from picked triangle index to segment index 2017-08-04 10:07:53 +02:00
Bjørnar Grip Fjær
a59735de87 #1730 Move snapshot features to separate files 2017-08-03 16:22:02 +02:00
Bjørnar Grip Fjær
f437f8dc84 #1734 Command File : Use caseId as variable name instead of case 2017-08-03 15:01:13 +02:00
Bjørnar Grip Fjær
cf2df771d4 #1675 Selected cell interface for Octave 2017-08-03 14:35:46 +02:00
astridkbjorke
50eb8b7225 #1617 Adding conductivity scaling factor to StimPlan fracture templates, and scaling the conductivity values in file with this value. 2017-08-03 13:40:35 +02:00
Magne Sjaastad
bf3636a9df #1732 Update path to StimPlan xml if required 2017-08-03 13:21:19 +02:00
Magne Sjaastad
9cd7dcdd91 #1665 Add processEvents() when waiting for external octave process 2017-08-03 11:31:15 +02:00
astridkbjorke
f2c20db534 #1707 Removing check on wheter fracture cell is in contained area or not when calculating flow in fracture and into well. This will allow flow in the fracture and into the well also in eclipse layers excluded by the fracture containment feature, and in areas without any eclipse cells (gaps in grid). 2017-08-03 11:10:07 +02:00
astridkbjorke
ef8fc3dbc6 #1716 Fix spelling 2017-08-02 13:29:45 +02:00
astridkbjorke
fcfe0eb4a9 #1716 Fixing error in Peaceman formula 2017-08-02 13:10:08 +02:00
astridkbjorke
313752bb7c #1721 Updating value used if trig calculation of azimuth value for simWell cannot be used due to 0 y component (well oriented East-West) 2017-08-02 11:37:46 +02:00
astridkbjorke
d55c362bf0 #1714 Adding point at fracture position to the vector of wellPathPoints used in calculation of intersection between fracture and wellpath. 2017-08-02 11:37:46 +02:00
Bjørnar Grip Fjær
7e44fe185e #1704 Include top and base layers in fracture containment 2017-08-02 10:50:11 +02:00
Bjørnar Grip Fjær
a06ae58f83 #1717 Implement exportSimWellCompletions for command file interface 2017-08-02 09:51:56 +02:00
Magne Sjaastad
ffdafcfb97 #1708 Fishbones : Fix use of rand() for orientation of subs on Linux 2017-08-01 14:36:13 +02:00
Bjørnar Grip Fjær
aa1d7775a4 #1709 Be more explicit when an error occurs when combining completion data 2017-08-01 14:31:47 +02:00
Bjørnar Grip Fjær
63c58d0481 #1705 Export fractures to own file when exporting completions to separate files based on completion type 2017-08-01 13:09:42 +02:00
Bjørnar Grip Fjær
7179aaeac9 Merge branch 'dev' into pre-proto 2017-08-01 12:44:11 +02:00
astridkbjorke
5b34414977 #1713 Using time step from view instead of that from export-setting when exporting connection factors for simWell-fracture 2017-07-31 15:10:07 +02:00
Magne Sjaastad
8c7bd87050 #1712 Build System : Add ERT lib to list of third party libs 2017-07-31 14:08:43 +02:00
astridkbjorke
29e40b6dbb #1655 Adding skin factor for main bore for fishbone calculations, and using this value in transmissibility calculations. 2017-07-31 11:49:52 +02:00
Bjørnar Grip Fjær
3dad356d7d #1710 Use usleep on Linux and Sleep on windows 2017-07-31 11:26:21 +02:00
Bjørnar Grip Fjær
48401d5a85 #1710 #1665 Wait for octave process to finish when executing through command file interface 2017-07-31 11:10:43 +02:00
Bjørnar Grip Fjær
94703d72c2 #1665 Send any log-output during argument parsing to console 2017-07-31 11:10:42 +02:00
Bjørnar Grip Fjær
c136e0a3d0 #1665 Fix header file layout for command file interface files 2017-07-31 11:10:42 +02:00
Magne Sjaastad
7e42efaa8f Cast to size_t to silence warnings on Linux 2017-07-31 08:08:53 +02:00
Magne Sjaastad
eef40fdeaa Added missing #pragma once 2017-07-31 08:00:41 +02:00
Bjørnar Grip Fjær
3585ad020b #1665 Fix bug where project modifier was not created before use 2017-07-28 15:15:20 +02:00
Bjørnar Grip Fjær
d54bbcef8a #1665 Ensure map is included when used 2017-07-28 12:54:21 +02:00
Bjørnar Grip Fjær
f23f7b0f7d #1665 Fix Linux build errors 2017-07-28 12:03:16 +02:00
Bjørnar Grip Fjær
14627fae53 #1665 Add exportMultiCaseSnapshots command to command file interface 2017-07-28 11:48:11 +02:00
Bjørnar Grip Fjær
39b5750c39 #1665 Add replaceSourceCases command to command file interface 2017-07-28 11:29:10 +02:00
Bjørnar Grip Fjær
c02c39d59d #1665 Add replaceCase command to command file interface 2017-07-28 11:28:55 +02:00
Bjørnar Grip Fjær
865238bc71 #1665 Handle end of file without error when parsing command file 2017-07-27 15:43:57 +02:00
Bjørnar Grip Fjær
d0564c4d2a #1665 Add error handling and logging to command file execution 2017-07-27 14:26:59 +02:00
Bjørnar Grip Fjær
ab1322c5d7 #1665 Add computeCaseGroupStatistics command to command file interface 2017-07-27 11:49:03 +02:00
Bjørnar Grip Fjær
f6c27a1774 #1665 Add runOctaveScript command to command file interface 2017-07-27 10:52:06 +02:00
Bjørnar Grip Fjær
c11546e46b #1665 Add setMainWindowSize command to command file interface 2017-07-27 10:51:49 +02:00
Bjørnar Grip Fjær
2c88d4bee9 #1665 Add setTimeStep command to command file interface 2017-07-27 10:39:59 +02:00
Bjørnar Grip Fjær
8af00bc1b4 #1665 Add setExportFolder command to command file interface 2017-07-27 10:34:36 +02:00
Bjørnar Grip Fjær
da4f6d72be #1665 Add exportMsw command to command file interface 2017-07-27 10:29:45 +02:00
Bjørnar Grip Fjær
8e444d5cbe #1665 Add exportWellPathComplections command to command file interface 2017-07-27 10:28:41 +02:00
Bjørnar Grip Fjær
51ce7f7bde #1665 Add exportProperty command to command file interface 2017-07-27 10:23:05 +02:00
Bjørnar Grip Fjær
6be1f62c90 #1665 Add exportSnapshots command to command file interface 2017-07-27 10:12:57 +02:00
Bjørnar Grip Fjær
1ed9787a37 #1665 Add loadCase command to command file interface 2017-07-27 09:52:38 +02:00
Bjørnar Grip Fjær
bbb4c80b1b #1665 Add setStartDir command to command file interface 2017-07-26 16:57:43 +02:00
Bjørnar Grip Fjær
59536e9942 #1665 Add closeProject command to command file interface 2017-07-26 16:43:48 +02:00
Bjørnar Grip Fjær
b08757b391 #1665 Add openProject command to command file interface 2017-07-26 16:42:37 +02:00
Bjørnar Grip Fjær
bf23529b55 #1665 Add parameter and basic framework for executing command file 2017-07-26 16:41:17 +02:00
Bjørnar Grip Fjær
1a4e1135a2 #1665 Add support for peeking at next char in command file 2017-07-26 16:22:46 +02:00
Bjørnar Grip Fjær
df1eb2a962 #1665 Add support for reading enums and lists as parameters in batch command file 2017-07-26 16:22:22 +02:00
astridkbjorke
45f47dac0c Changing name of parameter from "Start of History" to "All timesteps" 2017-07-07 14:05:20 +02:00
Jacob Støren
ec4362b247 #1692 Put SourSimRL Results in a separate result type
#1693 Started to separate code for SourSim and Eclipse results data.
2017-07-07 13:31:14 +02:00
astridkbjorke
bf15e48b29 Changing name of fishbone-wellpath-collection from "Well path" to "Imported Laterals" 2017-07-05 10:32:02 +02:00
astridkbjorke
68ec65602a #1687 Updating default file name for export of fishbone laterals. 2017-07-05 09:59:19 +02:00
Jacob Støren
4bc465e096 Guard time history curve creation (Result Plot) from combined results. 2017-07-04 15:32:59 +02:00
Jacob Støren
0a58a752ff Changed to 1-based IJK indices in Octave NNC interface 2017-07-04 13:53:24 +02:00
Jacob Støren
8edac70013 Adjusted argument alignment 2017-07-04 13:51:14 +02:00
Jacob Støren
f96fdc27e7 Guard dynamic nnc access against missing restart file(s) 2017-07-04 13:50:22 +02:00
astridkbjorke
28c572b1fd #1540 Adding comment to make it more clear why direction for calculating length in is calculated as it is. 2017-07-04 11:34:21 +02:00
astridkbjorke
546a6457cc #1652 Creating export folder if it does not already exist. 2017-07-03 15:02:24 +02:00
astridkbjorke
5b62184e2f #1678 Giving an error message and not calculating transmissibiliities if using a stimPlan file without conductivity and finite conductivity in fracture. 2017-07-03 13:55:59 +02:00
astridkbjorke
bcbb5202df #1678 Bugfix to set property for polygon for stimplan fractures, to avoid potentially confusing error messages for stimplan files without conductivity. 2017-07-03 11:36:58 +02:00
astridkbjorke
0dfc76dd3e #1678 Setting fracture template unit for stimplan based on unit on grid (ft or m) instead of unit for conductivity (which may be missing in the file). 2017-07-03 11:00:06 +02:00
astridkbjorke
032630f6e9 #1634 Calculating smallest positive value and using this value for the min range value when using logarithmic scale 2017-06-30 16:16:27 +02:00
Magne Sjaastad
78a779424f #1677 Store dialog data in project file 2017-06-30 16:14:15 +02:00
Magne Sjaastad
f8f57d3184 #1670 Use PtrField instead of PdmPointer 2017-06-30 16:13:38 +02:00
astridkbjorke
d6ae3b4a53 #1634 Updating tooltip on user defined min value to make it clear that only positive values are valid for log scale. 2017-06-30 16:05:46 +02:00
Magne Sjaastad
5a7755fe0c System : PdmPtrField - Remove PdmPointer interface and add operator() 2017-06-30 15:06:01 +02:00
astridkbjorke
b2b9d0a51e #1628 Turning off viaualization of polygon for fracture templates, and hiding all related parameters from UI. 2017-06-30 12:54:51 +02:00
Magne Sjaastad
917ee860d2 #1670 Minor UI adjustments 2017-06-30 12:49:12 +02:00
Magne Sjaastad
d265f79242 #1670 Fix wrong include path 2017-06-29 22:41:34 +02:00
Magne Sjaastad
b2b4ab95ba #1670 Add command feature "Export CARFIN" 2017-06-29 22:37:00 +02:00
Magne Sjaastad
ec990b5e2c Add static cast from size_t to int 2017-06-29 22:37:00 +02:00
Magne Sjaastad
407547d454 #1670 Add cell range UI 2017-06-29 22:37:00 +02:00
Magne Sjaastad
15e805fba3 #1670 Move commands to ExportCommands folder 2017-06-29 22:37:00 +02:00
Magne Sjaastad
468d5134cb #1670 Move grid functions from RimCellRangeFilterCollection to RigReservoirGridTools 2017-06-29 22:37:00 +02:00
Magne Sjaastad
7cc95c3fa8 #1670 Add const and move some functions to private section 2017-06-29 22:37:00 +02:00
Jacob Støren
1de6986ba2 #1666 CommandFile: Add line numbers to parse messages 2017-06-29 17:44:05 +02:00
Jacob Støren
352e044bbf #1666 Linux compile fix 2017-06-29 16:43:58 +02:00
Jacob Støren
bc0379d246 #1666 CommandFile: Add command and argument name to error messages 2017-06-29 16:29:50 +02:00
Jacob Støren
c25895bdad #1666 CommandFile: Add error messages to reading.
Remove some  reader bugs
2017-06-29 16:12:51 +02:00
astridkbjorke
c7d708e9d4 #1658 Setting azimuth angle from fracture template if orientation type is Azimuth. Changing updateAzimuthFromFractureTemplate to updateAzimuthBasedOnWellAzimuthAngle and only using this function to update azimuth angles if orientation type is not azimuth. 2017-06-29 15:06:44 +02:00
Jacob Støren
64bee4bb57 #1666 Fix errors in CommandFile parsing for space between argname and "=" 2017-06-29 13:19:06 +02:00
Jacob Støren
ba84b9ec5a #1666 Add CommandFileInterface system 2017-06-29 13:19:06 +02:00
astridkbjorke
e7043db156 #1618 Changing proxy fields from double to QString to have more control over the output and limit accuracy of numbers printed. 2017-06-29 11:28:30 +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
astridkbjorke
dad066adf0 #1618 Using proxy-fields for wellpathazimuth and wellFractureAzimuthDifference 2017-06-29 10:34:20 +02:00
Bjørnar Grip Fjær
9bea767cdf #1663 Octave interface to get NNC-pair information 2017-06-29 09:07:21 +02:00
Bjørnar Grip Fjær
03aa6c8eb7 #1667 MSW Export : Move parameters from export dialog to project 2017-06-28 20:51:16 +02:00
Bjørnar Grip Fjær
6dac618af0 #1642 Batch : Replace folder for input files 2017-06-28 20:36:11 +02:00
Magne Sjaastad
70d3c501a4 #1668 Use "Export" instead of "OK" in export dialogs 2017-06-28 10:13:59 +02:00
Magne Sjaastad
286ec08b05 #1668 Use title "Export Well Segments" 2017-06-28 10:11:56 +02:00
Bjørnar Grip Fjær
a9d64edd57 #1643 Allow filename including extension for --case command line parameter 2017-06-27 14:49:33 +02:00
astridkbjorke
2625ce6ea9 #1618 Fixing bug in well path angle calculation + corresponding update to fracture azimuth angle. Calculating difference between well path and fracture angle and displaying warning if less than 10 deg. 2017-06-27 14:12:50 +02:00
astridkbjorke
2501264013 #1618 Showing well path direction in read only field. Also updating azimuth angle of wellpath / simwell to avoid negative angles and instead have angles 0-360deg. 2017-06-27 14:12:50 +02:00
Jacob Støren
2ed872e8fc Add comment to make it clear that using mainGrid::cellCornerVertices with reservoir cell index is valid. 2017-06-27 13:21:04 +02:00
Jacob Støren
fc05dd665f #1585 Add visualization (gray out) inactive parts of fractures based on containment. 2017-06-27 13:21:04 +02:00
astridkbjorke
63b478b18d #1650 Only use linear transmissibility for fractures along well pipe (and no radial transmissibility to end points). 2017-06-26 14:12:17 +02:00
astridkbjorke
9f3dad9465 #1654 In WELSEGS export, using liner diameter as diameter for main bore and ICD, computed effective diameter for laterals. 2017-06-26 11:45:20 +02:00
astridkbjorke
e95966cfb8 #1598 Hiding wellDiamanter (not used) when using Infinite cond 2017-06-26 11:07:15 +02:00
Jacob Støren
6610977c9f Linux compile fixes 2017-06-26 11:05:46 +02:00
Jacob Støren
9d1cc2eb19 #1653 Make fracture mesh visualization independent of active view.
Removed use of timestep index in rimfracture (use template timestep)

Remove display value from fracture cell
2017-06-26 10:28:23 +02:00
Bjørnar Grip Fjær
de414c4277 #1645 Load dynamic NNC results from restart file 2017-06-26 10:25:08 +02:00
Jacob Støren
febdabc6c6 Minor whitespace adjustments 2017-06-25 10:42:53 +02:00
Jacob Støren
cbb0a58673 #1648 Remove dependency on active view from color generation.
Separate the fracture geometry generation methods from the wellpath methods. Use eclipse View as argument.
Fixed some constness stuff in View
2017-06-25 10:42:53 +02:00
Magne Sjaastad
37a04dd376 #1651 Set default value to 1.0 for Install Success Rate 2017-06-23 17:19:06 +02:00
astridkbjorke
50a0dcd499 #1589 Setting includeFractures to false and read-only when using setting "Use Default Connection Factors and WPImult (excludes fractures)" 2017-06-23 15:45:22 +02:00
astridkbjorke
6febf1dfbf Additional fix after merge 2017-06-23 13:21:47 +02:00
astridkbjorke
ea08cc58fb Merge from dev 2017-06-23 13:21:34 +02:00
astridkbjorke
5899c56b82 Updating number of cells used when setting up fracture grid based on ellipse 2017-06-23 10:41:31 +02:00
Jacob Støren
7d7172f811 #1646 Fix disappearing mesh lines by using double transformation calculations 2017-06-23 10:16:39 +02:00
astridkbjorke
3960c9db90 #1550 Making separate group for MSW parameter in FishbonesCollection to avoid confusion about what parameters are used for. 2017-06-23 10:15:34 +02:00
Bjørnar Grip Fjær
7b7af2b197 #1641 Use new interface for reading trans values from libecl 2017-06-22 16:03:55 +02:00
astridkbjorke
42e41355c1 Fixing printing endMD in perforation interval metadata when exporting compdat values. 2017-06-22 15:20:16 +02:00
astridkbjorke
c8e5e327d9 #1550 Only including contributions for main bore with fishbones if there actually are fishbones on this well. 2017-06-22 15:19:03 +02:00
Jacob Støren
63cf1e91b3 #1440 Split fracture coloring from geometry generation 2017-06-22 14:55:16 +02:00
astridkbjorke
df8f45c649 #1633 Removing option for selected and checked wells, now only option is selected wells if selecting well paths. 2017-06-22 14:35:28 +02:00
astridkbjorke
53917c6195 #1633 Updating options for which wells to include in export to depend on whether a wellPathCollection or WellPaths have been chosen. Also fixing last-save directory to remain at the directory last used. 2017-06-22 14:35:28 +02:00
Jacob Støren
deedb6a90e #1440 Merge dev into pre-proto More cleanup of WellPathPartMgr 2017-06-22 11:21:50 +02:00
Jacob Støren
591e10ee65 #1440 RivWellPathPartMgr Rename and argument alignment 2017-06-22 11:01:44 +02:00
Bjørnar Grip Fjær
faf225d8c3 Merge branch 'master' into hdf-prototype 2017-06-22 10:56:36 +02:00
Jacob Støren
33b037a80b #1440 Merge dev into pre-proto (WellPath viz restructure and constness)
Had to do quite a bit constness fiddeling to make the merge work
2017-06-22 10:42:07 +02:00
Magne Sjaastad
4c7f9d4d31 Merge branch 'master' into dev 2017-06-21 17:42:28 +02:00
Jacob Støren
845b1acbbd Merge branch 'dev' into well-path-restructure 2017-06-21 17:16:17 +02:00
Jacob Støren
b2a1f5690b #1440 Remove all real caching in the well path geometry system
Had no effect anyway.
Rename method to scheduleRedrawAffectedViews()
2017-06-21 17:13:19 +02:00
Bjørnar Grip Fjær
581adbc588 Merge branch 'dev' into pre-proto 2017-06-21 16:41:33 +02:00
Bjørnar Grip Fjær
db65917822 #1635 Use capital 'E' in scientific notation 2017-06-21 16:41:07 +02:00
Bjørnar Grip Fjær
8f06115730 Merge branch 'dev' into pre-proto 2017-06-21 16:38:57 +02:00
Bjørnar Grip Fjær
53ee396c03 #1635 Use scientific numbers for transmissibility in completion data export 2017-06-21 16:25:41 +02:00
astridkbjorke
8d28981664 #1589 Remove option removeLateralsInMainBoreCells, instead implement option for "Exclude main bore" for fishbone export. Also grouping export options. 2017-06-21 15:55:35 +02:00
astridkbjorke
21f0857791 #1589 Replace bools "Calculate Trans" and "Include WPImult" with choice of calc trans or use wpimult and default connection factors 2017-06-21 15:55:35 +02:00
Jacob Støren
3193127e32 #1440 Remove RivWellPathCollectionPartMgr as it did not manage any parts
This is a step to make it easier to make the interface from the views to get the well path related geometry parts more "static".
2017-06-21 15:39:59 +02:00
Bjørnar Grip Fjær
17593fba92 #1602 Include sim well fractures when calculating completion type results 2017-06-21 11:06:38 +02:00
Bjørnar Grip Fjær
7d5157b3b3 Recalculate completions when completion collections are toggled 2017-06-20 17:22:14 +02:00
Bjørnar Grip Fjær
18b26aaf3a #1625 Completion type should only use checked fractures, perforations and fishbones. 2017-06-20 16:56:10 +02:00
Jacob Støren
0826db99f8 Merge branch 'dev' into well-path-restructure 2017-06-20 16:49:28 +02:00
Bjørnar Grip Fjær
4f8f77945c Add method for checking if fracture has non-zero conductivity 2017-06-20 16:40:51 +02:00
Bjørnar Grip Fjær
78c948ea89 #1623 Schedule invalidation of completion type results instead of immediate calculation 2017-06-20 16:40:50 +02:00
Jacob Støren
5a02cf1498 #1574 Make export of fractures to compdat now respects the containment settings 2017-06-20 16:37:25 +02:00
Jacob Støren
47869b4728 Avoid copy of eclipse results arrays in RimReservoirCellResultsStorage::isDataPresent 2017-06-20 16:29:56 +02:00
Magne Sjaastad
8e47d82038 Improve layout in header file 2017-06-20 15:01:30 +02:00
Bjørnar Grip Fjær
d63fdf0c80 #1593 Use well path unit type on fractures 2017-06-20 14:46:58 +02:00