Commit Graph

70 Commits

Author SHA1 Message Date
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
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
c701750330 #1396 Update to libert from https://github.com/Statoil/libecl 2017-04-24 21:53:45 +02: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
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
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
3b4f1620a5 #804 Updated ERT based on 6287acdb0d039ce13eb9956b67035280a3de9539 2016-10-13 13:40:43 +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
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
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
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