 Joakim Hove
|
bdd587bf93
|
Minor merge fixup - sorry
|
2013-07-30 14:56:21 +02:00 |
|
|
Joakim Hove
|
07ed1a19f1
|
Merge remote-tracking branch 'upstream/master' into save-eclgrid-after-deactivating-cells
Conflicts:
opm/core/io/eclipse/EclipseGridParser.cpp
opm/core/io/eclipse/EclipseGridParser.hpp
|
2013-07-30 14:49:37 +02:00 |
|
 Júlio Hoffimann
|
8385a9bcbb
|
Remove trailing whitespaces
|
2013-07-28 08:34:13 -03:00 |
|
|
Joakim Hove
|
9cc3d4dd2d
|
Changed EclipseGridParser::saveEGRID() to take globalCells as input
|
2013-07-25 12:08:08 +02:00 |
|
|
Joakim Hove
|
8c32146093
|
Rewritten EclipseGridParser to use input actnum instead of ACTNUM from deck
|
2013-07-24 14:42:40 +02:00 |
|
 Markus Blatt
|
68eb3fbcb1
|
Changed std::tr1 occurences to boost.
std::tr1 might not be supported by all compilers and will eventually
be dropped by others. Using boost instead makes this more
portable.
|
2013-07-04 16:04:35 +02:00 |
|
 Atgeirr Flø Rasmussen
|
25867007ed
|
Moved opm/core/eclipse/* to opm/core/io/eclipse/*.
|
2013-03-07 22:59:06 +01:00 |
|