OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-03 20:57:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
17,540 Commits 27 Branches 60 Tags 288 MiB
8e6d8ee317
Commit Graph

445 Commits

Author SHA1 Message Date
Bård Skaflestad
3ebb106623 Max 2P Sat-Sum: Don't Dereference Null Pointer 
A simulation run might not activate all three phases.  We therefore
must guard against querying the connate saturations of the missing
phase.

Pointy hat: Bard.Skaflestad@sintef.no
Thanks to: Magne Sjåstad
 2019-02-13 23:35:51 -06:00
Magne Sjaastad
288ee59587 #4066 System : Improve cmake macros for cotire 2019-02-11 07:13:08 +01:00
Magne Sjaastad
2fd54b1d0a #4061 : Harmonize how to find Qt5 2019-02-08 13:22:33 +01:00
Magne Sjaastad
0a2b9241ae #4061 Harmonize how Qt5 is found 2019-02-08 11:28:51 +01:00
Magne Sjaastad
5fd80920c8 Merge remote-tracking branch 'origin/master' into dev 2019-02-04 15:48:36 +01:00
Magne Sjaastad
bd6bbe9da9 #4020 System : Use ri_apply_cotire() 2019-02-01 06:56:11 +01:00
Magne Sjaastad
24628e8ca4 #3937 libecl : Workaround to avoid crash for some summary files 2019-01-31 09:21:10 +01:00
Magne Sjaastad
e0ce64e11c #3937 libecl : Workaround to avoid crash for some summary files 2019-01-31 09:20:19 +01:00
Magne Sjaastad
dfac372a9c #4028 Fix performance issues 2019-01-31 09:13:29 +01:00
Magne Sjaastad
55b215e66b #4028 NNC fix 
9d68e3bc60
 2019-01-31 09:06:16 +01:00
Magne Sjaastad
a4b9b3db12 #3982 System : Remove debug output and add comment 2019-01-21 21:52:58 +01:00
Magne Sjaastad
a03e92c7b3 #3982 System : Avoid recompile of libecl at every commit 
set git info to zero
 2019-01-21 21:46:51 +01:00
Magne Sjaastad
fca21efe05 #3982 System : Avoid recompile of libecl at every commit 2019-01-21 21:37:22 +01:00
Bård Skaflestad
6839c1cf77 ECLFluxCalc: Remove Unused 'useEPS' Constructor Parameter 
Recent developments have rendered this parameter unused.  Remove
it to make API simpler.  The library now always loads arrays as
if the caller requests end-point scaling behaviour and we defer
effects of actual end-point scaling until client code queries
the flux calculator at run time.
 2018-12-21 13:14:45 +01:00
Gaute Lindkvist
17e12a92a0 Update CMake to only look for Qt5 if RESINSIGHT_BUILD_WITH_QT5 is set 2018-12-10 15:10:46 +01:00
Gaute Lindkvist
83c5f63291 #3754 Qt4/Qt5 CMake build configuration for Nightcharts and ExpressionParser 2018-11-30 09:47:53 +01:00
Gaute Lindkvist
cc672eb31b #3752 Upgrade Qwt to 6.1.3 to support Qt5 2018-11-30 09:47:53 +01:00
Magne Sjaastad
4d924e2d17
Merge pull request #3682 from bska/refactor-flux-calc 
Refactor Flux Calculator to Eliminate Warnings and Reduce Clutter
 2018-11-14 15:28:47 +01:00
Magne Sjaastad
9589d0fbb7 System : Remove warning from header file in boost subset 2018-11-14 15:27:48 +01:00
Bård Skaflestad
daa6604e3d Flux Calculator: Use 'phaseSaturation' Result Set Query 
This simplifies the implementation of the 'phaseProperties' member
function and, in particular, restores the original code symmetry
amongst the individual phase cases.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
c15432d1b2 Saturation Functions: Add Public Query for Phase Saturations 
Simplifies retrieving the phase saturation values in the context of
computing phase fluxes at cell interfaces.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
5347c475be Saturation Functions: Create Helpers for Retrieving Sw and Sg 
Limits the amount of magic keyword references to the result vectors
SWAT and SGAS.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
f17b38c479 FluxCalc Interface: Rewrap Doxygen Documentation 
Mostly to follow common style elsewhere in library.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
5167299797 DeadOilConstCompr: Re-adjust Whitespace and Comments 
No functional changes.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
3c3dfb3dc1 Refactor Constant Compr. Index to Separate Helper 
Limits the use of magic constants in the middle of the main logic.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
3d5dca4693 Surface Density: Explicitly Recognise Failure Path 
Use the "throw if invalid phase" approach.
 2018-11-14 14:40:06 +01:00
Bård Skaflestad
4be1685604 Vertical Scaling [PCOW]: Use Value at Minimum Saturation 
The oil-water capillary pressure is a non-increasing function of
water saturation so we need to ensure that we use the capillary
pressure value at the minimum tabulated water saturation.  Add
special purpose code to enforce this rule.  This adds a certain
amount of computational overhead because we now compute function
values at two saturation points instead of just one for the case of
pure vertical scaling.  Most of the time those extra function values
will just be subsequently discarded.

Note that this is a bit of hack, because it relies on the fact that
the current implementation assigns

  TableEndPoints::disp = TableEndPoints::low

in the case of two-point horizontal scaling.  We may wish to make
that rule more explicit.
 2018-11-13 09:55:56 +01:00
Bård Skaflestad
be160a5c63 Vertical Scaling/Sr: Remove A Few Asserts 
These were meant for consistency checking, but would occasionally
fail due to round-off error when doing arithmetic on values
converted from 'float' to 'double'.  The actual scaling procedure
does not rely on those relations as long as we ensure that 'fmax' is
the maximum function value, so add a measure of robustness here.

Note that this is at best a work-around for a deeper problem and
that a more refined solution would probably be needed here.
 2018-11-13 09:55:56 +01:00
Bård Skaflestad
8603935aad Capillary Pressure: Truly Fall Back to Scaled Connate Saturations 
This commit ensures that we use the scaled connate water/gas
saturations (SWL/SGL) in place of the scaled capillary pressure
saturations (SWLPC/SGLPC) when the latter are undefined (set to a
sentinel value; -1.0E+20).  We would previously fall directly back
to the connate saturations from the input table in this case and
this would lead to inconsistent curves for the scaled capillary
pressure functions.
 2018-11-13 09:55:56 +01:00
Bård Skaflestad
78dfbfea6b Flux and massflux: Return Empty Vector for Inactive Phases 
This commit introduces a new (private) predicate function

  ECLFluxCalc::phaseIsActive(const ECLPhaseIndex phase) const

that identifies whether or not 'phase' is active in the current
simulation model/result set.  This enables returning an empty result
vector from flux() and/or masssflux() in the case of the caller
requesting fluxes for inactive phases.  That, in turn, mirrors the
behaviour of ECLGraph::flux() on inactive phases and promotes
uniform phase treatment in calling code irrespective of using stored
or calculated flux values.
 2018-11-13 09:55:56 +01:00
Magne Sjaastad
794e703043 System : Disable unused unit test 2018-11-02 11:36:46 +01:00
Bjørn Erik Jensen
5c95b5a605 #3576 Apply patch install-ert.patch after upgrading ecllib 2018-10-30 13:30:44 +01:00
Bjørn Erik Jensen
b51779c568 #3576 Apply patch fix-synthetic-odb-cases.patch after upgrading ecllib 2018-10-30 13:27:01 +01:00
Bjørn Erik Jensen
6924c20ab6 #3576 ecllib upgrade from statoil repo 7f93730c08a4d981a4b738b42146d099977572ce 2018-10-30 13:21:11 +01:00
Bård Skaflestad
405f6426f3 Bring EPS Unit Test Up To Date WRT Changing Behaviour 
A previous commit changed the reverse mapping behaviour in the case
of coincident tabulated scaled displacing saturation and maximum
phase saturation in the two-phase systems.  Bring the corresponding
unit test in line with the changed behaviour (now maps high
saturation values to scaled critical displacing saturation Sr rather
than Smax in this situation).

Pointy Hat: [at]bska
Thanks to: [at]atgeirr
 2018-10-25 13:40:08 +02:00
Bård Skaflestad
d6862265b7 Remark That 3pt EPS Changes Function Shape in [Sr, Smax] 
The three-point vertical scaling option will usually change the
shape of the relative permeability function in the saturation
interval between the scaled critical displacing saturation and the
maximum phase saturation.  In particular, we usually replace a
general, non-linear function with a linear approximation when
applying three-point vertical scaling.

Add a comment to that effect.
 2018-10-25 13:40:08 +02:00
Bård Skaflestad
dc8931f782 Update Flow Diagnostics Application Library 
Fixes incorrect horizontal and vertical end-point scaling of model's
saturation functions.

API Change: No longer supports user-selected behaviour for treating
scaled end-points with a sentinel value (-1.0E+20).  That option was
introduced due to incomplete understanding of the semantics of the
sentinel value.  Now that we understand the meaning (use actual,
unscaled end-point value from input table), we no longer need the
option.  Update the calling code in RigFlowDiagSolverInterface.cpp
accordingly.
 2018-10-25 13:40:08 +02:00
Jacob Støren
5bf5e6c99d #3382 Remove libslvs from the code base, including some cleanup. 2018-10-16 09:20:44 +02:00
Magne Sjaastad
27bbaff56b VS2017 : Hide warnings from gtest 2018-09-10 15:50:15 +02:00
Bjørn Erik Jensen
a4d9212372 #3235 Applied patch install-ert to new ecllib 2018-08-22 14:16:44 +02:00
Bjørn Erik Jensen
f45bc098d1 #3235 Applied patch fix-synthetic-odb-cases to new ecllib 2018-08-22 14:16:44 +02:00
Bjørn Erik Jensen
90a25f67bb #3235 Update ecllib from statoil master repo. Commit 1f051833c8ed819185fd334dfc7e05511ee35d5f 2018-08-22 14:16:43 +02:00
Bjørn Erik Jensen
f6e6cacc36 #3206 ecllib crash. Temporary patch to handle huge ensembles 2018-08-15 09:29:03 +02:00
Bjørn Erik Jensen
1ce7701fa3 #3194 ecllib. Apply patch install-ert after update 2018-08-14 15:08:59 +02:00
Bjørn Erik Jensen
6ebee07c84 #3194 ecllib. Apply patch fix-synthetic-odb-cases after update 2018-08-14 15:08:59 +02:00
Bjørn Erik Jensen
23024b790f Update ecllib from statoil master repo commit a165d636552fa0c0f96219d341f7f2c17c08dc9d 2018-08-13 14:00:26 +02:00
Jacob Støren
22fd7a7692 #2608 Make the constraints in the SolveSpace solver available for editing 2018-08-10 15:57:40 +02:00
Jacob Støren
7156b99b88 #2608 #2609 Add disabled Solvespace S-curve calculation. Use simplified S-curve calculation. Cleaned up Gui to only whats supported. 2018-07-04 17:02:20 +02:00
Bjørn Erik Jensen
08ad8a98db Qwt fix. Fix plotting of interval series having only one sample 2018-07-04 09:15:29 +02:00
Jacob Støren
c5b5980da3 #3049 Add SolveSpaceLib libslvs with an S-Curve test to ResInsight 2018-06-15 14:47:42 +02:00
Bjørn Erik Jensen
6ee84b598c #3042 OPM flowdiag apps update from repo. Commit 24ff768dc509b6c6bbd0121ef46a5932fae92961 2018-06-12 14:36:08 +02:00
Magne Sjaastad
4ca615e74a #2957 Crash with LGR model 
Guard nullptr access in well_state.cpp
 2018-05-31 08:30:04 +02:00
Bjørn Erik Jensen
e8d586054c ecllib: Temp fix to avoid assert. This fix will be included in the next ecllib release 2018-05-22 14:58:42 +02:00
Bjørn Erik Jensen
ff628fa9dd #2852 OPM flowdiag upgrade. Copy from repos 2018-05-07 14:37:32 +02:00
Bjørn Erik Jensen
7a7a8bed0e Apply two ecllib patches after upgrade 2018-05-04 14:24:53 +02:00
Bjørn Erik Jensen
d2e48ef153 Update ecllib from statoil master repo commit 0188b08081eb1ac4ade89ac224b8128b4c9b0481 2018-05-04 14:24:53 +02:00
Bjørn Erik Jensen
c9a1eeef03 Apply two ecllib patches after upgrade 2018-04-16 08:45:53 +02:00
Bjørn Erik Jensen
cdc613f334 #2699 Update ecllib from statoil master repo commit b31b055af2d6b887f47aec84c65ec497a5d12973 2018-04-16 08:43:56 +02:00
Bjørn Erik Jensen
d0905c518b libecl. Local quick-fix to prevent crash under Windows when restart file is located in different directory 2018-04-10 13:11:58 +02:00
Bjørn Erik Jensen
c71ab4e88d #2317 Apply fix for synthetic ODB files 2018-04-09 11:24:31 +02:00
Bjørn Erik Jensen
75d505c9f6 #2011 libecl: Add INSTALL_ERT to control install targets 2018-04-09 11:22:39 +02:00
Bjørn Erik Jensen
b72091bb94 #2661 Update ecllib from statoil master repo 2018-04-09 08:48:36 +02:00
Bjørn Erik Jensen
a833b5a2d7 libecl. Local quick-fix to prevent summary restart file import under Windows 2018-03-20 14:32:54 +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
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
Jacob Støren
09cd140bba #2375 Updated opm-flowdiagnostics-applications to 5bcd6d99259a63f5cd820db541b45c4f07aec808 including fixes for Relperm and PVT curves 2018-01-24 16:37:32 +01:00
Magne Sjaastad
39168a9be8 #2317 Apply fix for synthetic ODB files 2018-01-04 20:38:16 +01:00
Jacob Støren
20164ec003 #2270 Updated opm-flowdiagnostics-applications to 44f7e47ecdc87ba566ab4146629de49039a73b2e to fix crash 2017-12-19 15:07:10 +01:00
sigurdp
64fe9e9a3b Upgraded opm-flowdiagnostics-applications to d76ec747cf22aa4d235f6a6c83c3a814adcf5cb2 2017-12-13 10:06:39 +01:00
sigurdp
09c09a7386 Upgraded opm-flowdiagnostics-applications to a773bcfc963705679ecc28f58048fc38936fbbc6 2017-12-11 11:15:09 +01:00
Jacob Støren
2a3f82875c Upgraded opm-flowdiagnostics-applications to cf8a5d2381776a8887d61f825b40f03b1d1cc4b0 2017-12-05 13:50:26 +01:00
Jacob Støren
2a41b4fbb8 #1994 Update opm-flowdiagnostics-applications to cd614100f3d5b8fcf1fd783e929630f11251682e 2017-11-30 00:07:35 +01:00
Jacob Støren
5efe0f705e #2174 Upgrade opm-flowdiagnostics-applications to 75b333335f6cd055d3130d460c6d87444fb7aed4 
to get more of the PVT/RelPerm functionality.
 2017-11-22 15:28:38 +01:00
Jacob Støren
9f9fb21cbe #2034 Update opm-flowdiagnostics to 7e2be931d4 
Remove monkeypatch
Fixes Exception
 2017-10-27 14:39:03 +02:00
Jacob Støren
57a5f7fc66 #2011 libecl: Add INSTALL_ERT to control install targets 2017-10-26 17:16:42 +02:00
Jacob Støren
04404c3b2c #2011 Update libecl to 89f6c44aa0 to fix RFT file reading and missing dyn nnc handling 2017-10-26 17:16:36 +02:00
Magne Sjaastad
f61c83a659 #2031 Curve Calculator : Sort variable names by the order they first appear 2017-10-23 13:31:57 +02:00
Magne Sjaastad
d903226db6 Fix typo in comment 2017-10-23 13:07:49 +02:00
Magne Sjaastad
7c0c45b7b9 Curve Calculator : Do not report detected variables as lowercase 2017-10-19 11:23:30 +02:00
Magne Sjaastad
39dc4c0c06 #2015 Update opm-flowdiagnostics-applications to 64d079b736cd70c7139d5e79fb0080233f47db4b 2017-10-17 08:33:07 +02:00
Magne Sjaastad
a3cd62d315 #1977 Expression Parser : Add error text if expression compiling fails 2017-10-13 12:22:40 +02:00
Magne Sjaastad
445048c24b #1985 Curve Calculator : Simplify interface to expression parser 2017-10-12 10:52:30 +02:00
Magne Sjaastad
c976091336 #1985 Expression Parser: Add exprtk to ThirdParty 2017-10-12 10:52:30 +02:00
Jacob Støren
a8121fb0c4 #1988 Remove assumed wrong test to make the new version of flow diag to actually work 2017-10-11 18:05:53 +02:00
Jacob Støren
4d097a3149 #1988 Update flow diag libraries to handle multiple connections in same well, and have PVT Rel Perm support. 2017-10-11 18:05:53 +02:00
sigurdp
00985b00c3 Testing commit 2017-10-11 13:38:46 +02:00
Bjørn Erik Jensen
19e5e61cb7 LasWell. Parse DATE token from LAS well information section 2017-10-05 16:26:39 +02:00
Jacob Støren
13c011edeb libecl: Add INSTALL_ERT to control install targets 2017-10-02 17:19:36 +02:00
Jacob Støren
c8b329ddc3 Update libecl to 2e36798b43. For better memory usage reading wells 2017-10-02 17:11:36 +02:00
Magne Sjaastad
19be1c09a4 #1748 libecl : Add INSTALL_ERT to control install targets 2017-08-29 11:03:45 +02:00
Magne Sjaastad
7e316edf17 #1768 Update libecl to b17c5ffbf2f82594b01037d39ca9440252a10536 2017-08-29 11:03:45 +02:00
Bjørnar Grip Fjær
b66e957e28 #1800 Ensure auto-scaling of QWT plots with date scale will not miss points in the upper end of the plot 2017-08-22 11:48:37 +02:00
Bjørnar Grip Fjær
46919b463d #1800 Ensure auto-scaling of QWT plots with date scale and week resolution will not miss points in the upper end of the plot 2017-08-22 11:48:37 +02:00
Magne Sjaastad
51c30448e9 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-08-21 10:42:11 +02:00
Magne Sjaastad
f7a333092d System : Hide warnings from boost and NRLib 2017-08-18 10:01:54 +02:00
Magne Sjaastad
afaf6e0d87 Nightcharts : Add return statement to silence warning 2017-08-18 10:01:54 +02:00
Magne Sjaastad
55f23b0902 MSVC : Disable warnings for opm-flowdiag 2017-08-17 14:06:57 +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
Magne Sjaastad
590e2ed753 #1748 libecl : Add INSTALL_ERT to control install targets 2017-08-08 11:23:30 +02:00
Bjørnar Grip Fjær
527151ba23 Do not add OpenMP C-flags as linker arguments for libecl 2017-06-22 14:20:16 +02:00
Bjørnar Grip Fjær
956798afd6 #1641 Update libecl to latest revision from master 2017-06-22 11:51:46 +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
Jacob Støren
690d86b876 #1624 Update opm-flowdiagnostics-applications to c78f50897cea10ed56c7eadd1a1b23aa5ffbc56e that handles none-unified restart files 2017-06-20 09:07:57 +02:00
Bjørnar Grip Fjær
935299b3df Merge branch 'fishbones' into pre-proto 2017-06-01 12:32:36 +02:00
Jacob Støren
4e091641a4 #1483 Update opm-flowdiagnostics and ..-applications 
to b6e59ddcd2fe, and ccaaa4dd1b55 respectively.

In order to include flowCapacityStorageCapacityCurve with max pv fraction threshold
 2017-05-29 13:08:32 +02:00
Magne Sjaastad
a45aee0cc2 Merge branch 'fishbones' into pre-proto 2017-05-23 10:28:42 +02:00
Jacob Støren
50c182aa26 #1514 Add polyline/polygon intersection method 
To be used for wellpath stimplan intersection
 2017-05-22 15:34:50 +02:00
Jacob Støren
df269931c9 #1481 Add subset of Eigen, and method to condense transmisibilities 
Not yet fully tested.
 2017-05-12 14:41:38 +02:00
Magne Sjaastad
776e0ff1c4 #1372 Fix compile error on Windows 2017-05-12 12:20:27 +02:00
Magne Sjaastad
3c07eafab2 #1372 Update flow diagnostics and flow diagnostics applications 2017-05-12 12:17:11 +02:00
Jacob Støren
74a90e204c #1396 Apply patch fix-synthetic-odb-cases 2017-05-08 13:43:31 +02:00
Jacob Støren
f5d1d2d1f9 #1396 Update libEcl to 06a39878636af0bc52582430ad0431450e51139c 
To include phase split well connection rates and some summary intersect support. Supposedly Final update before release.
 2017-05-08 13:37:39 +02:00
Magne Sjaastad
64d41fa109 #1396 Apply patch fix-synthetic-odb-cases 2017-04-25 13:30:09 +02:00
Magne Sjaastad
9dfeef69bf #1396 Add define for updated ERT API used from opm-flowdiag-app 2017-04-24 21:56:04 +02:00
Magne Sjaastad
c701750330 #1396 Update to libert from https://github.com/Statoil/libecl 2017-04-24 21:53:45 +02:00
Jacob Støren
938c8ff69a Update opm-flowdiagnostics-application to include handling of new Ert 2017-04-24 14:42:18 +02:00
Magne Sjaastad
c35e79c3b5 Merge branch 'dev' into pre-proto 2017-04-20 13:40:56 +02:00
Magne Sjaastad
5b5fad46ac #1398 Added file previously hidden by .gitignore 2017-04-05 12:42:20 +02:00
Magne Sjaastad
cd60f80c76 #1398 Include preprocessor part 2017-04-05 12:28:26 +02:00
Magne Sjaastad
2b4efc4b5c #1398 Removed dependency on system boost, added subset of boost to ThirdParty 
Added a subset of boost to ThirdParty folder. Code extracted from version boost version 1.59.0
 2017-04-05 08:38:59 +02:00
Magne Sjaastad
d038ea7581 #1371 Removed opm-common and opm-parser 2017-04-04 13:53:44 +02:00
Magne Sjaastad
8255a3aaa3 Merge branch 'dev' into pre-proto 2017-04-03 07:34:56 +02:00
Jacob Støren
9a11949f67 Updated opm-flowdiagnostics-applications to SHA afd3f6c454f52dcfa0a6aa96be9823176a6daa48 2017-03-31 15:13:50 +02:00
Magne Sjaastad
3d67946976 Merge remote-tracking branch 'origin/dev' into pre-proto 2017-03-15 10:10:43 +01:00
Jacob Støren
ba2e4ca3f2 #1269 Updated opm-flowdiagnostics to a14dc4ba1302bcc1e0aeb35c5de6b4bd39bce98a to fix issue with fraction sums > 1.0 2017-03-03 15:07:26 +01:00
Magne Sjaastad
1753449772 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/CMakeLists_files.cmake
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
 2017-02-22 09:42:51 +01:00
Magne Sjaastad
0b806c7664 Fixed #1238 Pie chart not always complete 2017-02-21 14:44:18 +01:00
Magne Sjaastad
a10b96ba3e Merged branch dev into pre-proto 2017-02-17 11:38:32 +01:00
Jacob Støren
590f9995c8 1212 Turned off shadow, changed to radial edge gradient to make the colors more easy to read. 2017-02-16 11:39:02 +01:00
Magne Sjaastad
f9d8ab8bad Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWellCollection.cpp
	ApplicationCode/Resources/ResInsight.qrc
 2017-02-16 10:18:39 +01:00
Jacob Støren
df35335744 #1172 Well Alloc plot: Sorted the tracers according to contribution. 2017-02-14 08:10:39 +01:00
Jacob Støren
4d1c4031ef #1173 Changed the legend text format in the pie chart 2017-02-13 08:44:29 +01:00
Jacob Støren
8596c3f79c #1206 Updated the opm-flowdiag libraries 2017-02-09 14:14:02 +01:00
Magne Sjaastad
93954fece0 Merge remote-tracking branch 'refs/remotes/origin/dev' 
Conflicts:
	ApplicationCode/Commands/RicDeleteItemFeature.cpp
 2017-02-08 07:35:20 +01:00
Jacob Støren
cc095644ce Reapplied fix for synthetic Odb files 2017-02-07 13:53:27 +01:00
Jacob Støren
a6b7bc7c41 Updated Ert to e2a5a9cc20705537d07822958d925e092a323367 to include new accesss to well rates 2017-02-07 13:44:59 +01:00
Magne Sjaastad
405cd382af Reorganized how clipper is included and deleted example files 2017-01-24 15:39:39 +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
Magne Sjaastad
699c2a1103 #1116 Added nightcharts pie plotting library 2017-01-23 12:59:24 +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
astridkbjorke
2c90136a04 pre-proto - Adding clipper library version 6.4.0 to be used for polygon clipping 2017-01-16 09:40:26 +01:00
Jacob Støren
0cec31362b #1117 Temporary patch from @bska. Waiting for an update to the opm-flowdiagnostics library 2017-01-16 09:27:51 +01:00
Jacob Støren
95206315fa opm-flowdiagnostics updated to 80190c28ae0fd4a82cfe88c827559029982db83b 
opm-flowdiagnostics-applications updated to 01ecb8fc22cb70d883edaad398bffc49878859c3
Which fixes error in TOF calculations.
 2017-01-05 14:57:25 +01:00
Jacob Støren
2692abe7fe Renamed catalog to avoid build-server problems due to too long path 2016-12-09 16:25:43 +01:00
Jacob Støren
e25f6cb84d Updated unit test of flow-diag to allign with the example in the flowdiag-app library. 2016-12-08 17:11:47 +01:00
Jacob Støren
147cb5ebe0 Updated opm-flowdiagnostics-applications to sha: 27adc8964f997d0bb508e254b6ff43ad1e1e76bf 2016-12-08 17:11:47 +01:00
Jacob Støren
77180d91cb Opdated opm-flowdiagnostics to sha: d409aedbf96c996c3886e3fd91abd4d8c3b0c601 2016-12-08 17:11:47 +01:00
Jacob Støren
bc493298e2 Flow: Integrated from the FlowDiag branch Step 1. 2016-12-08 17:11:47 +01:00
Magne Sjaastad
f20a8d7dc8 #926 Eclipse Input Data : Do not abort for keywords with more than eight characters 2016-11-25 16:56:26 +01:00
Magne Sjaastad
07e47ce153 #996 Reapplied fix for synthetic Odb files 2016-11-22 21:14:24 +01:00
Magne Sjaastad
9178659449 #996 Updated ERT to 2016.10 2016-11-22 21:14:24 +01:00
Jacob Støren
323f7893cb Made the output from g-test a bit more readable 2016-10-17 15:15:27 +02:00
Magne Sjaastad
ae0da542e2 #804 Reapplied fix for synthetic Odb files 2016-10-13 14:07:17 +02:00
Magne Sjaastad
83e000c91f #804 Updated opm-parser based on 
a3496df501a4369fd827fbf0ff893d03deff425f
 2016-10-13 13:40:44 +02:00
Magne Sjaastad
0306168bb4 #804 Updated opm-common based on 
1216bc052542f24ec6fcfbe1947d52e6300ff754
 2016-10-13 13:40:43 +02:00
Magne Sjaastad
3b4f1620a5 #804 Updated ERT based on 6287acdb0d039ce13eb9956b67035280a3de9539 2016-10-13 13:40:43 +02:00
Magne Sjaastad
88e40aa2d9 #886 LAS Export: Set the STEP if the data is resampled 2016-09-23 10:20:05 +02:00
Jacob Støren
cdfec7a04f #876 Avoid empty lines in LAS export file 2016-09-13 11:47:42 +02:00
Jacob Støren
382bf84036 #875 Fixed wrong number of digits after punctation for numbers < 1000 2016-09-12 15:57:55 +02:00
Magne Sjaastad
5420960b22 #826 Added opm-flowdiagnostics libary with a basic test 2016-09-05 15:23:24 +02:00
Magne Sjaastad
830db2c6ec (#743) Added import of Input Case using opm-parser 2016-06-23 14:36:33 +02:00
Magne Sjaastad
eb6d3e0e8f (#743) Updated opm-parser with support for missing include files 2016-06-23 13:49:44 +02:00
Magne Sjaastad
2f83194a5e #769 Fixed compile issues on Linux 2016-06-19 12:41:13 +02:00
Magne Sjaastad
ee156794b6 Added standalone unit test for opm-parser 2016-06-16 18:10:08 +02:00
Magne Sjaastad
98683944b7 Reapplied fix for synthetic Odb files 2016-06-13 14:57:27 +02:00
Magne Sjaastad
da76b01611 Updated ERT, opm-common and opm-parser 
ERT 80650d05d49b419ec74ba316312313dfc6ba0875
opm-common e7db252f3e310a04718f315e6cdb9d6c428c5762
opm-parser 817722b99baa62cc63a5f859cc90b951f0b0636e
 2016-06-13 14:18:50 +02:00
Magne Sjaastad
7adaa4b45c Integrated opmjson directly in opm-parser, removed dependency to opm-common 2016-06-13 12:27:28 +02:00
Magne Sjaastad
718e724760 Include JSON files directly in opm-parser, opm-parser has now no dependencies 2016-06-13 10:39:57 +02:00
Magne Sjaastad
1c044da54a Always use static libraries for opm libs and NRlib 2016-06-05 18:45:53 +02:00
Magne Sjaastad
a08a4eb5ef Added custom wrapper for json files to control install features of json 2016-06-02 11:31:41 +02:00
Magne Sjaastad
9b6e422d0c #742 Integrated opm-parser and added basic unit test 2016-06-01 15:53:21 +02:00
Magne Sjaastad
2892653298 #742 Added custom-opm-parser, compiles on Windows 2016-06-01 15:53:21 +02:00
Magne Sjaastad
758b4a452b #742 Added custom-opm-common to ThirdParty 2016-06-01 15:53:21 +02:00
Magne Sjaastad
54c98ca9f8 #742 NRLib now uses Boost from CMake 2016-06-01 15:53:21 +02:00
Magne Sjaastad
362dd50e9b Updated internal ERT 
Copied ERT from

614a4295ad
 2016-04-19 14:48:14 +02:00
Magne Sjaastad
7b24b3a96b (#713) Removed temporary workaround for NNC data import in ECLIPSE 2015 2016-01-08 09:25:38 +01:00
Jacob Støren
38be5baca1 NRLib: Fixed missing precision in LAS file export 2015-11-06 15:07:09 +01:00
Magne Sjaastad
56ad3a448e Reapplied fix for synthetic Odb files 
See commit bfdc00edaf
 2015-10-30 14:42:05 +01:00
Magne Sjaastad
aabd5c6cf7 (#613) Updated ERT 
Updated ERT to 9eb4c76cb930450c35e6d44d479da1141e296c7a of the
release/2015.10 branch
 2015-10-30 09:47:37 +01:00
Magne Sjaastad
9aff75c128 (#594) Fixed invalid formatting of well info during export of LAS files 2015-10-27 11:42:37 +01:00
Pål Hagen
c2f0163eef (#541) Using two parameters when adding well info (parameter name and value) 2015-10-16 13:35:09 +02:00
Pål Hagen
7bcbb80691 (#541) Added interface for adding well info for export 2015-10-16 11:02:12 +02:00
Pål Hagen
33a32c9c1a (#541) Added some access methods to NRLib::LasWell to be used when exporting 2015-10-15 16:11:03 +02:00
Pål Hagen
958357b563 (#541) Fixed obvious bug in NRLib (LasWell::WriteToFile()) 2015-10-15 14:55:16 +02:00
Pål Hagen
972d8fe5e0 (#541) Fixed a couple of bugs in NRLib/LasWell. Made export possible. 
Had to add a default constructor to be able to export to a LAS file from
scratch (not based on an existing LAS file). Also corrected a bug in
LasWell::WriteToFile() and LasWell::ParseInformation(). Reading a LAS
file exported from LasWell was not possible before the bug fixes.
 2015-10-15 08:18:14 +02:00
Jacob Storen
10046eed4a Linux fixes 2015-10-14 07:13:45 -07:00
Pål Hagen
5e8a6d90cd (#498) Picking and displaying well log channel unit from LAS files 2015-09-21 10:10:25 +02:00
Pål Hagen
39193396ae (#489) Added interface to get access to depth unit 2015-09-18 13:43:56 +02:00
Pål Hagen
f4df58006c (#434) Added unit tests for NRLib/well 2015-09-14 09:02:27 +02:00
Pål Hagen
a9027ecefa (#434) Added NRLib for LAS support. Created CMake file to build it. 
Readme.txt describes how to update the source code contained in NRLib.
 2015-09-11 16:32:38 +02:00
Pål Hagen
2b87c8c7d6 Added Qwt library and basic classes for well log viewer 2015-08-26 12:27:29 +02:00
Pål Hagen
bfdc00edaf Hack to be able to read synthetic ODB related Eclipse cases 
Similar hack as commit 24fb7ac
 2015-07-01 15:36:23 +02:00
Pål Hagen
c06dabddcb Upgraded ERT from GitHub master commit e71b881 2015-07-01 15:36:22 +02:00
Jacob Støren
24fb7ac584 Hack to be able to read synthetic odb related Eclipse cases 2015-06-10 10:34:05 +02:00
Jacob Støren
09744af4b8 Upgraded ERT from github master commit d9955e849 
Startup on new project
 2015-04-14 15:47:22 +02:00
Magne Sjaastad
f2c75c7f59 Updated ERT to bbab02e02630924471760a7e9357825ad414e2e9 
Integrated fix for MSW reading of large wells
 2014-11-05 17:23:07 +01:00
Magne Sjaastad
a5e4e756af Updated ERT, now possible to read simplified MSW 
Updated ERT to 3ac60303aa2dc58aed9420a24d9a881fec32076b
 2014-10-24 11:19:54 +02:00
Magne Sjaastad
b93053b089 Updated ERT to 946e512ac17c1e2469892072a925428c0a012fa1 2014-10-09 20:13:04 +02:00
Jacob Støren
76d32d1a73 Ert: Updated to 9a2492633ab037b83952c5b643a7ba06851481b1 that fixes MSVC10 compile issues 2013-12-12 22:17:54 +01:00
Jacob Støren
a0404333ab ERT: Updated to nnc-export branch from Joakim b933117d4e 2013-12-12 22:17:51 +01:00
Magne Sjaastad
d1f8f383c4 ERT: Use 1-based ids for well branches and segments. Removed adding of 1 
in picking text info in RimReservoirView.

Integraded ERT from
0f9e820554
 2013-10-08 12:31:15 +02:00
Magne Sjaastad
c07875701a ERT: Integrated ERT/master from 
13c3c25fe1
 2013-10-07 14:50:14 +02:00
Magne Sjaastad
d3ef53285a Updated to ERT version fix for amalgamated-nnc-bug 
e47dfe0ee4
p4#: 22363
 2013-09-09 12:13:33 +02:00
Jacob Støren
81aaf707de Ert: Fixed build settings to build static libs on linux 
p4#: 22243
 2013-08-29 11:50:03 +02:00
Jacob Støren
14dc3def92 MswRollUp: Ert : Fix of missing MSW branches 
This is an intermediate commit and does not compile
p4#: 22228
 2013-08-26 15:17:20 +02:00
Jacob Støren
3151f99129 MswRollUp: Ert: Fix of wrongly named define: WINDOWS_LSF 
This is an intermediate commit and does not compile
p4#: 22223
 2013-08-26 14:50:27 +02:00
Jacob Støren
d7d5d2942b MswRollUp: Updated Ert to commit 1fea6b00f3 master Fixed an Api change 
This is an intermediate commit and does not compile
p4#: 22222
 2013-08-26 14:44:03 +02:00
Jacob Støren
b63f51921d MswRollUp: Updated Ert to experimental MSW branch. Updated ResInsight code to handle API changes 
067fa99faa
This is an intermediate commit and does not compile
p4#: 22212
 2013-08-26 13:56:42 +02:00
Jacob Støren
4be58edf78 MSW code reverted. Regrettfully the work has to be reconsidered. 
Both ERT and the resinsight code is rolled back to before MSW was introduced as refined.
p4#: 21999
 2013-06-25 15:53:19 +02:00
Magne Sjaastad
7a24b2664e Updated ERT to handle multi segment wells 
Updated input code in ResInsight accordingly

ERT version on GitHub
067fa99faa
p4#: 21920
 2013-06-13 22:12:02 +02:00
Magne Sjaastad
80c5224c65 Updated ERT to e361fe404e 
p4#: 21590
 2013-05-10 10:25:46 +02:00
Magne Sjaastad
5cc4c9a231 Moved Linux directives into ifdef 
Use INSTALL_ERT to control shared/static library type on non-MSVC
p4#: 21478
 2013-04-29 13:21:36 +02:00
Magne Sjaastad
ca856f7603 Updated ERT to 315ceeee250808ea6a6530233dd5125f9f76f06c 
Support of reading LGR dimensions
Close file handles between access to files, keep ERT file-related cache to speed up reading of many files multiple times
p4#: 21477
 2013-04-29 13:13:42 +02:00
Magne Sjaastad
01490c480f Merge pull request #23 from OPM/master 
RHEL/debian packaging and octave fixes
 2013-04-12 05:22:11 -07:00
Magne Sjaastad
1b07630239 Fix for reading wells, verified to be working on case TestCase_LGR_Amalg 
806a18a137
p4#: 21153
 2013-04-07 16:22:39 +02:00
Magne Sjaastad
b0c3bc5fba Added code for reading out grid dimensions from 
5c8ab75e76
p4#: 21150
 2013-04-05 15:08:50 +02:00
Jacob Støren
db62f01e0a Differenced the compiler options on Windows and Linux, making a ton of stupid MSVC compiler warnings go away. 
p4#: 21138
 2013-04-05 10:42:53 +02:00
CeetronResInsight
2d5ed03b9b When ERT is configured to be not installed, do static linking of the Ert modules 
p4#: 21135
 2013-04-05 08:15:03 +02:00
Magne Sjaastad
32d67d9978 Updated ERT from https://github.com/Ensembles/ert/commits/master to version 
4a78d88f1dc7bbc86f173c5adb825bbca29fa116
p4#: 21120
 2013-04-04 08:24:40 +02:00
Torstein Hegge
7b0b923d80 gitignore: Ignore more build system products 
Ignore static libraries, cmake products, generated code and unit test
binaries.

Some extra care must be taken not to ignore more than intended when ignoring
the *_UnitTests. There is no way to directly express a path-neutral "only
ignore files with this pattern, not directories" in a single gitignore
pattern, but it can be expressed as "ignore everything containing this pattern
except directories".
 2013-04-02 19:01:09 +02:00
Jacob Støren
e8bf853231 ERT: Temporary hack fix of crash on well reading with inordered timesteps. 
p4#: 20408
 2013-02-07 11:10:26 +01:00
Jacob Støren
602c9f5535 Fixing the crash on retreiving the fractureActive index on none dual porosity again. 
p4#: 20326
 2013-02-01 09:50:17 +01:00
Jacob Støren
df40d89fe9 Fixing the crash on retreiving the fractureActive index on none dual porosity again. 
p4#: 20326
 2013-02-01 09:26:43 +01:00
Jacob Støren
66f0bc03bd Undo an unintended checkin 
p4#: 20323
 2013-01-31 17:21:30 +01:00
Jacob Støren
4a52c5f7c1 Final rename to cmake with no capitals 2013-01-31 17:18:33 +01:00
Jacob Støren
d48d7d50ff Starting to rename the CMake directory. Case change problem 2013-01-31 17:15:19 +01:00
Jacob Støren
b33dd15372 Ert: Updated to 3f8166c4739fdfe654d3992920a36bf0a6981b4d 
Had to remove a krsj.txt file that caused trouble (again)
p4#: 20320
 2013-01-31 15:55:49 +01:00
Jacob Støren
85238529ef Build system fixes to handle new Ert version 
p4#: 20319
 2013-01-31 15:39:40 +01:00
Magne Sjaastad
f57ed233a1 ERT: Added NULL pointer check 
p4#: 20292
 2013-01-30 07:27:54 +01:00
Jacob Støren
24ac7b819e Version number put into a separate file 
p4#: 20214
 2013-01-22 11:28:35 +01:00
Jacob Støren
e88f62abcf Intermediate fix of bool size inconsistency between C and C++ 
p4#: 20200
 2013-01-21 08:29:50 +01:00
Magne Sjaastad
6f257f7dba Updated to ERT version 67a38b6899f6935cb13b092105c90274f2b632f5 
p4#: 20199
 2013-01-18 15:27:32 +01:00
Magne Sjaastad
825be4e8d0 Removed file with norwegian characters 
p4#: 20196
 2013-01-18 09:15:46 +01:00
Magne Sjaastad
bdfd9c543e Added missing files for ERT revision a39d4b4a9e597532b2dbf845751a70ffe1de3805 
p4#: 20195
 2013-01-18 09:00:23 +01:00
Magne Sjaastad
2cf0e32d4b Updated ERT to GIT version a39d4b4a9e597532b2dbf845751a70ffe1de3805 
p4#: 20194
 2013-01-18 08:53:37 +01:00
Jacob Støren
c74619e79a Fixed cmakelist for Reservoirdatamodel test project 
p4#: 20190
 2013-01-17 21:26:12 +01:00
Magne Sjaastad
04006370ac Added ERT as source code based on https://github.com/Ensembles/ert/ and commit 7b53b5f61f5b47e8169b72098b562071df394bc3 
This is SVN commit 4117
Updated ResInsight cmakelists to build ERT and link directly
Removed precompiled ERT binaries
p4#: 20183
 2013-01-17 13:33:59 +01:00
Magne Sjaastad
a8b5d9cee2 Updated ERT to SVN 4117 for Linux 64 
p4#: 19185
 2012-10-16 09:12:03 +02:00
Magne Sjaastad
427a7cb8c5 Updated ERT to SVN 4117 for Windows 32/64 
p4#: 19184
 2012-10-16 08:40:44 +02:00
Magne Sjaastad
bf8a006c0e Updated ERT to SVN revision 4077 for Windows 32/x64 2012-09-13 11:41:48 +02:00
Magne Sjaastad
5b136d9822 Updated ERT to SVN revision 4077. Use new folder structure for ThirdParty/Ert, one folder for libs and one folder for includes. Minor application changes to be compatible with API changes in ERT. 2012-09-13 11:12:11 +02:00
Magne Sjaastad
748f061a55 Updated ERT to SVN revision 4077. Use new folder structure for ThirdParty/Ert, one folder for libs and one folder for includes. Minor application changes to be compatible with API changes in ERT. 2012-09-13 10:56:39 +02:00
unknown
2c9695e594 Updated to version 0.8.0 2012-06-26 16:10:41 +02:00
Alf B. Rustad
dfe97efb1b Initial commit of ResInsight version 0.4.8 2012-05-18 09:45:23 +02:00