Commit Graph

4245 Commits

Author SHA1 Message Date
Andreas Lauser
f8874a2f19 Merge pull request #935 from andlaus/frankenstein_fix_build
flow_ebos: fix the build
2016-11-17 16:53:52 +01:00
Andreas Lauser
a3fecc8edc flow_ebos: fix the build
this broke after the latest master merge (again, the reason were API
changes. this time they did not lead to merge conflicts.)

I've verified that flow_ebos works with Norne and that the performance
did not regress.
2016-11-17 16:34:53 +01:00
Andreas Lauser
bd1f93ff32 Merge pull request #934 from andlaus/frankenstein_merge_master_v12
Frankenstein merge master v12
2016-11-17 16:12:10 +01:00
Andreas Lauser
0d00579f7d Merge remote-tracking branch 'origin/master' into frankenstein_merge_master_v12
* origin/master:
  Start with a clean globalCellData_ for each data gathering.
  Added assertion that entry was added to globalCellData_ for pack/unpack
  Use data::Solution to gather cell data including user requested data.
  Warn about broken parallel matlab output.
  a few warning fixing.
  Removed second implementation of matlab output.
  Fix spelling in warning about unhandled parallel ouput.
2016-11-17 16:08:21 +01:00
Andreas Lauser
b8a0bb6aea Merge pull request #926 from totto82/frankenstein_revertChanges
Revert som changes in default values
2016-11-17 13:46:37 +01:00
Atgeirr Flø Rasmussen
cf84626da0 Merge pull request #929 from blattms/flexible-parallel-ouput
Allow output for user requested data in parallel runs.
2016-11-17 11:40:09 +01:00
Markus Blatt
80bbabc0b6 Start with a clean globalCellData_ for each data gathering.
Otherwise there might entries from the last call that should
either not be there this time or might have a different size.
2016-11-16 21:21:51 +01:00
Markus Blatt
098bd8f9fc Added assertion that entry was added to globalCellData_ for pack/unpack 2016-11-16 21:20:14 +01:00
Bård Skaflestad
8cc64402be Merge pull request #927 from GitPaean/warning_fixing
a few warning fixing.
2016-11-16 18:48:51 +01:00
Markus Blatt
00440ab344 Use data::Solution to gather cell data including user requested data.
Previously only the cell data registered with SimulationDataContainer
war gathered during parallel output. User requested data was neglected
and a warning was issued. With this commit we intialize the local view
of data::Solution on all processes with the data registered in
SimulationDataContainer and add cell data requested by the user. This is
then gathered on the IO process, and used for the output layer. To
rudimentarily support matlab we also create a global view of
SimulationDataContainer for it.
2016-11-16 17:11:24 +01:00
Markus Blatt
5ad813b4bd Warn about broken parallel matlab output.
If this is a parallel run and matlab output is requested then
we issue a warning that it is broken because of wrong velocities.
2016-11-16 17:09:53 +01:00
Tor Harald Sandve
b66bb27a65 Revert som changes in default values
Make sure flow in Frankenstein and flow in master uses the same default
values
2016-11-16 15:09:54 +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
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