4410 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Arne Morten Kvarving	cb7f6cb6e2	added: ability to run norne using flow_ebos	2016-11-14 11:02:30 +01:00
Atgeirr Flø Rasmussen	ae9cd62a5c	Merge pull request #906 from GitPaean/test_residual_checking ... checking the residual for the well control equations.	2016-11-14 10:44:44 +01:00
Tor Harald Sandve	36ce159411	Calculation the original FIP at the beginning	2016-11-14 10:16:57 +01:00
Tor Harald Sandve	5a917a4828	Output FIP in flow_ebos	2016-11-14 09:34:40 +01:00
Andreas Lauser	20353c7f94	Merge pull request #911 from andlaus/frankenstein_merge_master_v10 ... Frankenstein merge master v10	2016-11-11 18:35:30 +01:00
Andreas Lauser	d989c1e2fc	Merge remote-tracking branch 'origin/master' into frankenstein ... * origin/master: Do not throw for unrecognized file when merging log files. Do not populate cellData but issue a warning in parallel. Removed ternary operator in inline initialization. Correctly mark transfer of ownership for ouptut writer Indent nested #if Remove Solution.sdc assignment Cater variable name change in BCRSMatrix of DUNE 2.5 Fix using local active cells for writing eclipse files in parallel. add restart test for SPE1CASE2_ACTNUM rename the 'flow' binary to 'flow_legacy' and set a symbolic link Added ctest for restart files	2016-11-11 18:29:46 +01:00
Atgeirr Flø Rasmussen	129db89dc0	Merge pull request #900 from blattms/fix-parallel-eclipse-writing ... Fix using local active cells for writing eclipse files in parallel.	2016-11-11 15:28:46 +01:00
Atgeirr Flø Rasmussen	38abf56d5e	Merge pull request #905 from blattms/do-not-throw-for-unrecognized-parallel-file ... Do not throw for unrecognized file when merging log files.	2016-11-11 15:23:42 +01:00
Arne Morten Kvarving	44376795ee	Merge pull request #908 from andlaus/frankenstein_remove_applications_directory ... adapt to the rename of "applications/ebos" to "ebos" inside eWoms	2016-11-11 15:14:29 +01:00
Andreas Lauser	5c67d79c72	adapt to the rename of "applications/ebos" to "ebos" inside eWoms	2016-11-11 15:05:13 +01:00
Andreas Lauser	1853379ccb	Merge pull request #907 from andlaus/frankenstein_fix_no_mpi ... fix the build if MPI is not available	2016-11-11 14:31:02 +01:00
Andreas Lauser	42e55ee38b	fix the build if MPI is not available ... I'm not really sure if the fix is semantically correct (Dune communicators are strange beasts if you're new to them), but at least this patch fixes the build without MPI and the resulting flow_ebos binary seems to work fine.	2016-11-11 14:25:19 +01:00
Kai Bao	ce8498c4d7	checking the residual for the well control equations.	2016-11-11 13:26:22 +01:00
Markus Blatt	1882d3315a	Do not throw for unrecognized file when merging log files. ... The regex we are using might also consider a file named bla.2.blub. In that case it is not nice to throw an exception. Instead we print a message to std::cerr.	2016-11-11 12:00:49 +01:00
Markus Blatt	8632c71cef	Do not populate cellData but issue a warning in parallel. ... This will lead to some data missing in the parallel runs but will allow successful runs.	2016-11-10 17:46:49 +01:00
Markus Blatt	747c93e898	Removed ternary operator in inline initialization. ... This made the code rather hard to read. Now we do the initialization in the constructor body if needed.	2016-11-10 13:28:21 +01:00
Markus Blatt	3eba3353d0	Correctly mark transfer of ownership for ouptut writer	2016-11-10 13:04:30 +01:00
Atgeirr Flø Rasmussen	736585e85b	Merge pull request #902 from blattms/support-dune-2.5 ... Cater for variable name change in BCRSMatrix of DUNE 2.5	2016-11-09 12:19:41 +01:00
jokva	cb16d1391f	Merge pull request #903 from jokva/remove-sdc-pointer ... Remove Solution.sdc assignment	2016-11-09 11:50:36 +01:00
Markus Blatt	85c0bbcc10	Indent nested #if	2016-11-09 10:08:56 +00:00
Jørgen Kvalsvik	2bdc46c557	Remove Solution.sdc assignment	2016-11-09 10:46:26 +01:00
Markus Blatt	3f7f81ef03	Cater variable name change in BCRSMatrix of DUNE 2.5 ... One of the variables now has a trailing underline.	2016-11-08 18:59:08 +00:00
Atgeirr Flø Rasmussen	af9df953ed	Merge pull request #895 from andlaus/rename_flow_to_flow_legacy ... rename the 'flow' binary to 'flow_legacy' and set a symbolic link	2016-11-08 11:06:03 +01:00
Markus Blatt	077dc02481	Fix using local active cells for writing eclipse files in parallel. ... Previously, the eclipseGrid used by EclipseWriter was constructed from the one in the EclipseState with the current CpGrid. Unfortunately the latter was the distributed version resembling only the local part that the processor works on. Therefore the information about the active cells was wrong when writing results (which raised an exception in the writer). With this commit we construct the EclipseWriter before distributing the grid and use this writer later on in the OutputWriter.	2016-11-07 19:35:53 +01:00
Atgeirr Flø Rasmussen	e23bd0606f	Merge pull request #822 from akva2/kristfho_restart ... Added ctest for restart files	2016-11-07 14:53:23 +01:00
Arne Morten Kvarving	407ee5fb6e	add restart test for SPE1CASE2_ACTNUM ... to cover restarts on decks with ACTNUM	2016-11-07 12:32:20 +01:00
Andreas Lauser	511a9039ab	rename the 'flow' binary to 'flow_legacy' and set a symbolic link ... this is a precursor of merging flow_ebos into the master branch. hopefully, this won't break any existing setups...	2016-11-04 16:19:15 +01:00
Andreas Lauser	a6f76ddace	rename the 'flow' binary to 'flow_legacy' and set a symbolic link ... this is a precurser of merging flow_ebos into the master branch. hopefully, this won't break any existing setups...	2016-11-04 15:30:37 +01:00
Arne Morten Kvarving	73e084f9ad	Added ctest for restart files	2016-11-04 14:47:59 +01:00
Andreas Lauser	49a279bfac	Merge pull request #894 from andlaus/frankenstein_merge_master_v9 ... Frankenstein merge master v9	2016-11-04 13:58:12 +01:00
Andreas Lauser	414dda420a	Merge remote-tracking branch 'origin/master' into frankenstein_merge_master_v9 ... * origin/master: dune.module: change version to 2017.04-pre FlowMain: make sure to always print exception messages to the terminal	2016-11-04 13:56:44 +01:00
Atgeirr Flø Rasmussen	d3e8a83bae	Merge pull request #893 from atgeirr/bump-version ... dune.module: change version to 2017.04-pre	2016-11-04 12:30:09 +01:00
Atgeirr Flø Rasmussen	da70227807	dune.module: change version to 2017.04-pre	2016-11-04 12:26:59 +01:00
Atgeirr Flø Rasmussen	70f67d1698	Merge pull request #891 from andlaus/fix_catch22 ... FlowMain: use std::cout to print exceptions to the terminal	2016-11-03 21:20:28 +01:00
Andreas Lauser	0858de32b7	Merge pull request #888 from dr-robertk/PR/wip-frankenstone ... [WIP] some cleanup and features for Frankenstone.	2016-11-03 19:02:40 +01:00
Andreas Lauser	edbfdb5ef3	FlowMain: make sure to always print exception messages to the terminal ... this patch only uses OpmLog if it is set up properly, else it uses std::cout. the reason why this is needed is that there's a chicken-and-egg problem: exceptions which are thrown before the logging system has been initialized -- most prominently while parsing the deck -- cause the simulator to silently abort without any user notification which can be very confusing. On the other hand, initializing the logging system requires a fully initialized EclipseState object, i.e. currently to initialze the logging system the deck must be parsed and in order to print the exceptions thrown while parsing the deck one needs the logging system. v2: only prevent using the logging system if has not been set up. thanks to [at]blattms for the suggestion!	2016-11-03 17:22:51 +01:00
Andreas Lauser	627c8944d3	Merge pull request #890 from andlaus/frankenstein_merge_master_v8 ... Frankenstein merge master v8	2016-11-03 14:49:01 +01:00
Andreas Lauser	bc4c43a56a	Merge branch 'master' into frankenstein ... * master: changed: drop usage of python based comparison script in spe integration tests changed: drop usage of python based comparison script in polymer integration test Remove weak enum Opm::Phase	2016-11-03 13:33:45 +01:00
Arne Morten Kvarving	09d4b89c60	Merge pull request #889 from akva2/use_compareECL ... Use compareECL in integration tests	2016-11-03 11:18:07 +01:00
Arne Morten Kvarving	3607ba9127	changed: drop usage of python based comparison script in spe integration tests ... use compareECL from opm-output instead	2016-11-03 09:10:26 +01:00
Arne Morten Kvarving	5c308614b6	changed: drop usage of python based comparison script in polymer integration test ... replace with compareECL from opm-output	2016-11-03 09:10:08 +01:00
Robert Kloefkorn	90247a02b2	[feature] make convergenceReduction work in parallel (needs testing).	2016-11-02 17:44:06 +01:00
Robert Kloefkorn	4ff23191eb	[feature] make flow and flow_ebos use the same linear solver setup.	2016-11-02 16:41:11 +01:00
Robert Kloefkorn	01bb7ee4d7	[cleanup] only print first letter of phaseName in iteration output.	2016-11-02 11:25:43 +01:00
Robert Kloefkorn	11238b1997	[cleanup] Use class variables instead of creating new vectors inside the apply ... method of StandardWellsDense.	2016-11-02 10:43:55 +01:00
Andreas Lauser	fc15fb821a	Merge pull request #885 from totto82/frankenstein_refactor_wellState ... Frankenstein: Cleaning and remove Eigen from StandardWellsDense	2016-11-01 16:26:59 +01:00
Atgeirr Flø Rasmussen	59b7d8c8fc	Merge pull request #883 from jokva/relax-opm-phase-enum-constexpr ... Remove weak enum Opm::Phase; replace with constexpr	2016-11-01 14:52:22 +01:00
Tor Harald Sandve	77d5c8fa38	Remove Eigen from StandardWellsDense	2016-11-01 14:27:05 +01:00
Tor Harald Sandve	f1a9b1f21b	Remove unused file and #includes ... removes StandardWellsDense_impl.hpp	2016-11-01 13:44:38 +01:00
Tor Harald Sandve	362968c315	New WellStateFullyImplicitBlackoilDense ... The WellStateFullyImplicitBlackoil is reverted to master and all extentions moved to WellStateFullyImplicitBlackoilDense	2016-11-01 13:44:38 +01:00