OilfieldToolsNet/opm-upscaling
4
0
Fork 0
mirror of https://github.com/OPM/opm-upscaling.git synced 2026-08-27 05:27:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
1,777 Commits 29 Branches 91 Tags
f8519bd86355cd78303edc8dd25688390810c1c0
Commit Graph
1777 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Andreas Lauser f8519bd863 Change the version to 2017.10-pre 2017-04-13 13:04:05 +02:00
Atgeirr Flø Rasmussen ce2bd13ff7 Merge pull request #216 from atgeirr/fix-upscaling-bugs 
Require z-clipping for both linear and periodic bc types.
release/2017.04/branchpoint 		2017-04-11 07:38:53 +02:00
Atgeirr Flø Rasmussen 5d8462b19f Require z-clipping for both linear and periodic bc types. 2017-04-10 14:31:55 +02:00
Joakim Hove e43b7b33af Merge pull request #215 from joakim-hove/ert-data-type 
Adapt to change in ert data type.
 2017-04-03 13:21:56 +02:00
Joakim Hove 9713db0090 Adapt to change in ert data type. 2017-03-26 15:19:56 +02:00
Atgeirr Flø Rasmussen a13713f14d Merge pull request #213 from atgeirr/fix-include 
Add missing include directive.
 2016-12-28 14:30:32 +01:00
Atgeirr Flø Rasmussen 7ee40b1942 Add missing include directive. 
Exposed by upstream header changes.
 2016-12-28 14:28:12 +01:00
jokva e1d7ace122 Merge pull request #209 from joakim-hove/add-output-files 
Added file writeECLData from opm-output.
 2016-12-06 16:07:50 +01:00
Atgeirr Flø Rasmussen 853f0ce37c Merge pull request #212 from akva2/update_jenkins_grid 
update jenkins upstream list
 2016-11-29 22:50:12 +01:00
Arne Morten Kvarving afb6ebe7d8 update jenkins upstream list 
opm-grid moved in the dependency graph
 2016-11-29 21:49:17 +01:00
Atgeirr Flø Rasmussen 3ecaed61f6 Merge pull request #211 from andlaus/move_Unused_hpp 
adapt to the move of Unused.hpp from opm-material to opm-common
 2016-11-29 10:35:32 +01:00
Andreas Lauser 6d856ad4ec adapt to the move of Unused.hpp from opm-material to opm-common 2016-11-22 14:49:01 +01:00
Bård Skaflestad 76b8e47d0a Merge pull request #210 from bska/chase-deckitem-api-update 
Bring CornerpointChopper Up-To-Date With DeckItem API

Merging on Maintainer Approval
 2016-11-11 12:36:03 +01:00
Bård Skaflestad 4e72abc95a Bring CornerpointChopper Up-To-Date With DeckItem API 
Commit OPM/opm-parser@c959055 (PR OPM/opm-parser#950) changed the
syntax for constructing DeckItems.  Update the CornerpointChopper
accordingly.
 2016-11-11 11:46:05 +01:00
Joakim Hove d18f71321f Added file writeECLData from opm-output. 2016-11-05 16:13:29 +01:00
Arne Morten Kvarving be49018e76 Merge pull request #208 from atgeirr/bump-version 
dune.module: change version to 2017.04-pre
 2016-11-04 12:29:52 +01:00
Atgeirr Flø Rasmussen a0f4267a67 dune.module: change version to 2017.04-pre 2016-11-04 12:26:59 +01:00
Atgeirr Flø Rasmussen 1805dce623 Merge pull request #206 from jokva/remove-shared-ptr 
The great shared_ptr purge
 2016-10-20 20:22:37 +02:00
Jørgen Kvalsvik d3f08246b0 Get CornerpointChopper.hpp; remove shared_ptrs 
opm-parser no longer exposes shared_ptr or shared_ptr aliases.
 2016-10-20 15:35:20 +02:00
Atgeirr Flø Rasmussen 6969d38cc8 Merge pull request #204 from andlaus/opm-parser_units 
adapt to the removal of the unit system of opm-core
 2016-10-18 15:25:48 +02:00
Joakim Hove fae4e397ad Merge pull request #207 from joakim-hove/celldata 
Adapt to changes in output-interface.
 2016-10-17 11:46:54 +02:00
Joakim Hove 7ae905f04e Adapt to changes in output-interface. 2016-10-17 06:39:36 +02:00
Arne Morten Kvarving d97c903cfb Merge pull request #205 from akva2/update_packaging_devtoolset 
update redhat6 packaging
 2016-10-12 15:54:34 +02:00
Arne Morten Kvarving f94535a0b9 update redhat6 packaging 
build using devtoolset-3
 2016-10-12 14:19:02 +02:00
Andreas Lauser 8af1929965 adapt to the removal of the unit system of opm-core 
the one which is in opm-parser is now a drop-in replacement.
 2016-10-10 17:31:02 +02:00
Arne Morten Kvarving f4380a0dcd Merge pull request #203 from atgeirr/fix-missing-destripe 
Duplicate destripe() utility.
 2016-09-30 11:16:25 +02:00
Atgeirr Flø Rasmussen 67995583b3 Duplicate destripe() utility. 
Was used from Compat.hpp that was moved out of opm-core.
 2016-09-30 09:15:16 +02:00
Joakim Hove 87cef891c3 Merge pull request #202 from joakim-hove/remove-shared-ptr 
shared_ptr<EclipseGrid> -> const EclipseGrid&
 2016-09-07 11:12:13 +02:00
Joakim Hove 24459b4801 shared_ptr<EclipseGrid> -> const EclipseGrid& 2016-08-31 20:28:07 +02:00
Arne Morten Kvarving 1f84d0046e Merge pull request #201 from akva2/add_multiconfiguration 
add multiconfiguration support to jenkins build script
 2016-08-24 16:02:29 +02:00
Arne Morten Kvarving 2cbce2e274 add multiconfiguration support to jenkins build script 
also unifies build.sh and build-pr.sh and gets rid of
build-opm-upscaling.sh
 2016-08-23 14:30:49 +02:00
Joakim Hove f523008a0b Merge pull request #200 from akva2/simplify_after_ert_reorg 
simplify jenkins build scripts after ert reorganization
 2016-08-22 17:29:52 +02:00
Arne Morten Kvarving 8175a0eea2 simplify jenkins build scripts after ert reorganization 2016-08-22 14:33:29 +02:00
Arne Morten Kvarving 260b85db84 Merge pull request #196 from pgdr/static_assert-false 
usage of static_assert
 2016-08-15 10:47:16 +02:00
Arne Morten Kvarving 3cb7cb10e1 Merge pull request #198 from pgdr/improve-error-msg 
Improved error message on file not found error
 2016-08-15 10:09:29 +02:00
Arne Morten Kvarving 7b2df2a9df changed: keep the result of tests for possible inspection 2016-08-15 10:06:11 +02:00
Arne Morten Kvarving 77208eb162 Merge pull request #199 from flikka/fix-ctest-parallel 
Use separate folders for each test, to avoid deleting the whole resul…
 2016-08-15 09:52:49 +02:00
Kristian Flikka 51e7fb62c3 Use separate folders for each test, to avoid deleting the whole result area when running ctest in parallel. Fixed a non-functioning dependency line in cmake, related to the compareUpscaling program 2016-08-15 09:50:56 +02:00
Pål Grønås Drange cee52c9be0 Improved error message on file not found error 2016-08-10 15:09:23 +02:00
Pål Grønås Drange 0cfc82525e static_assert has signature (bool, str) 2016-08-03 17:37:04 +02:00
Arne Morten Kvarving 5238b40e5e Merge pull request #195 from kristfho/master 
C++ comparison of upscaling .txt files
 2016-07-22 13:11:07 +02:00
Kristian Hole-Drabløs afa72a31ac Added new compareUpscaling test, comparison of .txt files. 2016-07-22 13:06:12 +02:00
Kristian Hole-Drabløs 8778472424 Removed old upscaling comparison test. 2016-07-22 13:04:07 +02:00
Atgeirr Flø Rasmussen 46fa4e7575 Merge pull request #192 from akva2/move_opm_output_upstream 
update jenkins build scripts
 2016-06-30 14:11:38 +02:00
Arne Morten Kvarving b6a2f7a0d9 Merge pull request #194 from jokva/refactor-opm-output 
Breaking opm-core dependency in opm-output; new summary implementation
 2016-06-10 16:41:17 +02:00
Jørgen Kvalsvik 2519f384ac Replace DataMap with data::Solution in WriteECL 2016-06-10 15:48:52 +02:00
Jørgen Kvalsvik 788dc5b3fe writeECL:grid dimensions instead of grid instance 
Update to call site to keep up to date with changes in opm-output's
interface.
 2016-06-10 15:48:27 +02:00
Arne Morten Kvarving 8b6792e8bb Merge pull request #193 from joakim-hove/travis-reorg 
Using build-all travis configuaration.
 2016-06-10 13:56:48 +02:00
Joakim Hove 12da49f1f9 Using build-all travis configuaration. 2016-06-10 13:55:39 +02:00
Arne Morten Kvarving 4e3dfb808c update jenkins build scripts 
update build order, opm-output moved in the dependency tree
 2016-06-10 13:30:32 +02:00