Commit Graph

5246 Commits

Author SHA1 Message Date
Joakim Hove
71c22d1268 Merge pull request #1184 from joakim-hove/travis-cmake
Using ppa for cmake in travis.
2017-05-18 12:05:40 +02:00
Joakim Hove
7b7d451619 Using ppa for cmake in travis. 2017-05-18 10:46:21 +02:00
Rohith Nair
59ec8a1bf5 edit based on comments 2017-05-17 17:46:10 +02:00
Tor Harald Sandve
a5fed26486 BUGFIX Don't try to compute effective properties for FIP if no solvent 2017-05-15 10:13:22 +02:00
Andreas Lauser
48b7d6ea56 improve writing of the INIT file
now, the dune APIs are used whereever possible and the data is
computed for the global grid, i.e. for parallel runs it does not need
to be gathered across the processes anymore. Also, the INIT file is
now only written once instead of twice.

I've verified that the sequential and the parallel INIT files stay
identical for the Norne case and that the INIT file does not change
w.r.t. before this patch.
2017-05-12 15:44:55 +02:00
Andreas Lauser
7cbea4be41 fix a bug in the transmissibility output code
the fact that faces may point into the opposite Cartesian direction
was not considered and these output fields are specified
w.r.t. logically Cartesian cell indices. (not compressed ones!)
2017-05-12 15:43:51 +02:00
Andreas Lauser
adb2715c8d flow_ebos: also write the non-input NNCs to the init file
the corresponding code was shamelessly lifted from the DerivedGeology
class. it has been substantially modified to adapt it to the flow_ebos
specifics, though.
2017-05-12 15:43:51 +02:00
Andreas Lauser
e2e0e3290d flow_ebos: do no longer use the legacy object for geologic properties
it was already almost unused (except for output). Besides making the
overall flow_ebos code leaner because it reduces redundancies, this
patch also implies a small reduduction of memory consumption and a
minor performance improvement. the latter is due to the fact that the
transmissibilities now do not need to be calculated more often than
necessary anymore.
2017-05-12 15:43:51 +02:00
Tor Harald Sandve
4ecc01d30a Don't output SSOL if no solvent 2017-05-12 14:45:00 +02:00
Joakim Hove
9dda677a28 Merge pull request #1177 from totto82/dummy_pr
Dummy commit
2017-05-12 13:39:02 +02:00
Atgeirr Flø Rasmussen
e07ddfccee Merge pull request #1170 from akva2/2p
Add 2 phase regression test for flow_ebos and flow_legacy
2017-05-12 13:02:46 +02:00
Tor Harald Sandve
2af3019299 Dummy commit 2017-05-10 15:36:20 +02:00
Joakim Hove
8b36daa7aa Merge pull request #1173 from joakim-hove/use-libecl
Use libecl in jenkins build.
2017-05-10 13:37:05 +02:00
Rohith Nair
b95f4fb6a0 edit 2017-05-09 14:05:01 +02:00
Rohith Nair
94da18514f edit 2017-05-09 14:00:49 +02:00
Rohith Nair
53f2a13eb9 Adds header for .PRT file with the following information
1. Flow binary information
2. host names(s)/ machine names
3. host hardware
4. Operating system
5. User
6. System time and date
2017-05-09 13:58:21 +02:00
Joakim Hove
dc65d43109 Use libecl in jenkins build. 2017-05-08 15:03:12 +02:00
Andreas Lauser
f3e0b9c692 Merge pull request #1169 from totto82/prepare_solvent
Prepare for 2p and  extended models.
2017-05-08 13:47:43 +02:00
Tor Harald Sandve
6084721812 Prepare for extended models.
Let the code loop over number of components instead of phase
Pass TypeTag as template parameter instead of all the properties.
2017-05-08 09:52:30 +02:00
Arne Morten Kvarving
6812d9619e add 2 phase case to update_reference_data.sh
ie jenkins update_data trigger support
2017-05-04 21:24:48 +02:00
Arne Morten Kvarving
7d19171a80 add 2 phase spe1 regression test for flow_ebos and flow_legacy 2017-05-04 19:03:01 +02:00
Arne Morten Kvarving
da0fdff5f7 added: extra parameter to handle multiple cases
currently, only a single case has been executed for a
given combination of an opm-data directory and a given simulator.

this will change shortly, add an optional parameter to the test
addition macro to handle this.
2017-05-04 19:00:42 +02:00
Atgeirr Flø Rasmussen
9892edb24b Merge pull request #1167 from akva2/adjust_parameters
adjust for changed ParameterGroup namespacing
2017-05-02 07:19:29 +02:00
Arne Morten Kvarving
3c0cb9e950 adjust for changed ParameterGroup namespacing 2017-04-28 15:36:25 +02:00
Atgeirr Flø Rasmussen
46fff9a926 Merge pull request #1166 from andlaus/update-banner
flow_ebos: update banner
2017-04-28 14:09:56 +02:00
Andreas Lauser
5144359ac0 flow_ebos: update banner
since flow_ebos is the new silverback simulator of the opm-simulators
clan, it should itself as "flow"(the old silverback announces itself
as "flow_legacy" already).

Also some people seem to have been confused by the eWoms version and
codename. Since this information only exhibits limited value IMI,
let's remove it here.
2017-04-28 12:52:30 +02:00
Atgeirr Flø Rasmussen
4aa9dc5375 Merge pull request #1165 from akva2/no_native_in_packaging
disable native tuning in packaging
2017-04-26 17:50:48 +02:00
Arne Morten Kvarving
8b1162eb3c disable native tuning in packaging 2017-04-26 15:00:39 +02:00
Atgeirr Flø Rasmussen
a5b9b6d922 Merge pull request #1164 from atgeirr/fix-solvent-fip
Workaround: ensure properties necessary for FIP are computed.
2017-04-25 10:01:55 +02:00
Atgeirr Flø Rasmussen
fff99360b3 Workaround: ensure properties necessary for FIP are computed.
Should only result in an extra call the first time in this function.
2017-04-25 09:31:48 +02:00
Andreas Lauser
f570df375e Merge pull request #1162 from totto82/fix_initialOutputVisc
Make initial viscosity output similar with Ecl
2017-04-25 09:26:34 +02:00
Tor Harald Sandve
dad89974ae Make initial viscosity output similar with Ecl 2017-04-24 13:29:47 +02:00
Atgeirr Flø Rasmussen
c4c760ae8d Merge pull request #1160 from atgeirr/fix-output-kr-sequential
Fix output of relative permeability for sequential model.
2017-04-21 19:52:55 +02:00
Atgeirr Flø Rasmussen
90d90fb452 Fix output of relative permeability for sequential model.
Bug caused assert() failures for debug mode runs.
2017-04-21 15:30:40 +02:00
Atgeirr Flø Rasmussen
edea16dd74 Merge pull request #1155 from andlaus/fix_asan
NewtonIterationBlackoilInterface: make its destructor virtual
2017-04-20 12:15:43 +02:00
Andreas Lauser
4d02d51dd2 NewtonIterationBlackoilInterface: make its destructor virtual
this prevents GCC-7's address sanitizer from complaining about a
delete for a new of a different type. (i.e., the new is for the
derived class, but if the destructor is non-virtual only the dtor of
the base class is called if a pointer to the base class is deleted.)

finding this was quite some fun, mainly because it took a while what
the issue was.
2017-04-20 11:03:54 +02:00
Atgeirr Flø Rasmussen
92885f4d7b Merge pull request #1153 from akva2/readd_symlink_installation
fixed: re-add installation of the 'flow' symlink
2017-04-19 21:24:07 +02:00
Arne Morten Kvarving
5cd63f6eee fixed: re-add installation of the 'flow' symlink
got lost due to a bad conflict resolution in 7c4dfa784d
2017-04-19 16:04:17 +02:00
Atgeirr Flø Rasmussen
422d834996 Merge pull request #1152 from atgeirr/conditional-output
Only push non-empty data to output.
2017-04-19 13:05:02 +02:00
Atgeirr Flø Rasmussen
2b5000bf06 Merge pull request #1137 from andlaus/jenkins-update-flow_ebos-data
update update_reference_data.sh to also update the flow_ebos reference solutions
2017-04-19 13:04:47 +02:00
Atgeirr Flø Rasmussen
0b39c770d8 Merge pull request #1150 from akva2/ebos_parallel_tests
enable spe1 and spe9 parallel tests for flow_ebos
2017-04-19 13:03:27 +02:00
Atgeirr Flø Rasmussen
2c3a497767 Merge pull request #1147 from babrodtk/bugfix_pdpb_output_legacy
This adds bubble/dew point pressure output to legacy flow
2017-04-19 10:17:29 +02:00
Atgeirr Flø Rasmussen
af4a12b872 Only push non-empty data to output. 2017-04-19 09:58:54 +02:00
Atgeirr Flø Rasmussen
debe044e0f Merge pull request #1149 from atgeirr/fix-twophase-bug-fip
Fix bug in two-phase case.
2017-04-19 09:23:36 +02:00
Atgeirr Flø Rasmussen
839a39d9ca Merge pull request #1151 from andlaus/add-flow_ebos-dependency
add 'flow_ebos' to the dependencies of the 'flow' target
2017-04-18 23:20:35 +02:00
Atgeirr Flø Rasmussen
8a2ded5651 Merge pull request #1148 from akva2/update_packaging_2017.04
Packaging updates backport
2017-04-18 23:19:03 +02:00
Andreas Lauser
6c2e828a8d add 'flow_ebos' to the dependencies of the 'flow' target
this allows to use `make flow` instead of `make flow_ebos flow` to
build the stuff.
2017-04-18 18:45:47 +02:00
Arne Morten Kvarving
02fb031b5a enable spe1 and spe9 parallel tests for flow_ebos 2017-04-18 17:09:26 +02:00
Atgeirr Flø Rasmussen
e7285ba230 Fix bug in two-phase case. 2017-04-18 15:23:27 +02:00
Arne Morten Kvarving
7444f4ec32 re-add system eigen3 usage 2017-04-18 14:43:36 +02:00