OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-01-07 06:33:05 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,248 Commits 29 Branches 60 Tags 289 MiB
718e724760
Commit Graph

77 Commits

Author SHA1 Message Date
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