OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,228 Commits 24 Branches 102 Tags 90 MiB
89f2636b2e
Commit Graph

4228 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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