4805 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Kai Bao	a15513e546	adding a rate converter to the BlackoilModelBase	2016-11-16 13:25:35 +01:00
Kai Bao	e65d24aa16	removing outdated log ouptut code about control switching ... Which results from the rebasing process.	2016-11-16 13:25:35 +01:00
Kai Bao	e13cf827b5	applying the efficiency factors to the multi-segment wells.	2016-11-16 13:25:35 +01:00
Kai Bao	623ef3850e	applying the efficiency factor to flow	2016-11-16 13:25:35 +01:00
Kai Bao	aca587b76b	calculate efficiency factor in StandardWells ... which will be used to scale the perforation flow rate when entering the matrial balance equations.	2016-11-16 13:25:35 +01:00
Kai Bao	ac67a10316	removing one updateWellControls from solveWellEq ... not recalling why adding it in the first place. And correcting some comments for clarification.	2016-11-16 13:25:35 +01:00
Kai Bao	e049508eec	adding the group control related part to MultisegmentWells ... while looks like the well potentials part may not work with multisegment wells. Will check later.	2016-11-16 13:25:35 +01:00
Kai Bao	0df52603d7	fixing the interface of wellModel constructors ... to make all the simulators compile.	2016-11-16 13:25:35 +01:00
Kai Bao	26b16c1050	cleaning up the output and adding more comments.	2016-11-16 13:25:11 +01:00
Kai Bao	d992161b82	output cleaning up and add more comment.	2016-11-16 13:24:39 +01:00
Kai Bao	e323f15d2f	putting more things in the prototyping test.	2016-11-16 13:23:55 +01:00
Kai Bao	e0dd9bfabd	keeping putting group control in.	2016-11-16 13:22:52 +01:00
Kai Bao	f62d40fc05	adding a pointer to the well_collection of WellsManger ... might change to reference later. Using pointer now is trying to keep the WellModel constant.	2016-11-16 13:22:52 +01:00
Kai Bao	1c34af4dea	a few warning fixing.	2016-11-16 13:17:35 +01:00
Atgeirr Flø Rasmussen	6df917e9e0	Merge pull request #925 from blattms/use-one-outputStateMatlab ... Removed second implementation of matlab output.	2016-11-16 13:02:57 +01:00
Markus Blatt	b91f747a3e	Removed second implementation of matlab output. ... There is already a generic one with the Grid implementation being the template parameter in the header file. The other implementation using UnstructuredGrid does exactly the same. Therefore we remove it with this commit.	2016-11-16 12:16:40 +01:00
Atgeirr Flø Rasmussen	fd4d57e68c	Merge pull request #923 from blattms/fix-spelling-for-unhandled-ouput ... Fix spelling in warning about unhandled parallel ouput.	2016-11-15 20:50:40 +01:00
Andreas Lauser	89f2636b2e	Merge pull request #921 from totto82/frankenstein_output_fixes ... Frankenstein output fixes	2016-11-15 13:05:27 +01:00
Tor Harald Sandve	b04f79b15f	Fix 2phase celldata output	2016-11-15 12:48:25 +01:00
Andreas Lauser	0b6ef26077	Merge pull request #920 from andlaus/frankenstein_merge_master_v11 ... Frankenstein merge master v11	2016-11-15 12:31:37 +01:00
Andreas Lauser	fc4dfea185	Merge remote-tracking branch 'origin/master' into frankenstein ... * origin/master: checking the residual for the well control equations.	2016-11-15 12:27:04 +01:00
Tor Harald Sandve	f8bf7c392c	Fix some temporary fallouts in the outputwriter	2016-11-15 12:23:46 +01:00
Markus Blatt	55362ecdc2	Fix spelling in warning about unhandled parallel ouput.	2016-11-15 12:08:58 +01:00
Andreas Lauser	7c4dfa784d	Merge branch 'master' into frankenstein ... * master: rename the 'flow' binary to 'flow_legacy' and set a symbolic link	2016-11-15 00:32:27 +01:00
Andreas Lauser	38c4eeb667	Merge pull request #918 from andlaus/frankenstein_fix_fip_valgrind_error ... flow_ebos: fix a memory error in the fluid in place code	2016-11-14 19:52:37 +01:00
Andreas Lauser	e1178455a2	flow_ebos: fix a memory error in the fluid in place code ... as usual for such errors, this was found using valgrind.	2016-11-14 19:49:33 +01:00
Andreas Lauser	293f7ca1c7	Merge pull request #916 from totto82/frankenstein_fix_appleyard2 ... Improvments in convergence for flow_ebos	2016-11-14 15:02:00 +01:00
Andreas Lauser	73f3de39eb	Merge pull request #912 from akva2/norne_ebos ... added: ability to run norne using flow_ebos	2016-11-14 14:24:56 +01:00
Andreas Lauser	401a906ce9	Merge pull request #917 from andlaus/frankenstein_change_startup_message ... flow_ebos: alter the startup message	2016-11-14 14:19:40 +01:00
Andreas Lauser	e84de929cf	flow_ebos: alter the startup message ... ... to make apparent from the output which simulator was used.	2016-11-14 14:18:11 +01:00
Andreas Lauser	f012e07d89	Merge pull request #915 from andlaus/frankenstein_fix_build_with_MPI ... flow_ebos: fix the build	2016-11-14 13:37:17 +01:00
Andreas Lauser	4271da8d84	flow_ebos: fix the build ... mainly, the "linsolver_" attribute is called "istlSolver_" in the BlackoilModelEbos class. Also, this problem possibly only occured if MPI was enabled...	2016-11-14 13:36:01 +01:00
Tor Harald Sandve	739c0906ef	Improvments in convergence for flow_ebos ... - restrict pressure changes. Set default to 1.0 (this also effects flow) - change default number of linear iterations to 150 - tell stabilized newton the residual occilates even if it occilates in only one phase (this also effects flow) - avoid problems realated to division on small numbers Tested on SPE9, norne and Model 2 with significant improvments.	2016-11-14 13:26:38 +01:00
Andreas Lauser	f07ef850e3	Merge pull request #901 from totto82/frankenstein_fip_output ... Frankenstein fip output	2016-11-14 13:18:12 +01:00
Andreas Lauser	7b1d083ffd	Merge pull request #913 from andlaus/frankenstein_install-flow_ebos ... add flow_ebos to the programs which are going to be installed	2016-11-14 11:25:54 +01:00
Andreas Lauser	53462e6fcf	add flow_ebos to the programs which are going to be installed	2016-11-14 11:17:48 +01:00
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