Atgeirr Flø Rasmussen
83d10ac960
Merge pull request #1132 from atgeirr/fix-data-update
...
Fix data update directory for flow_sequential test.
2017-04-10 22:45:16 +02:00
Atgeirr Flø Rasmussen
a716af2437
Merge pull request #1131 from atgeirr/fix-jenkins-run-spe
...
Add executable name to reference data locations.
2017-04-10 22:41:33 +02:00
Atgeirr Flø Rasmussen
f166c9e15c
Fix data update directory for flow_sequential test.
2017-04-10 13:54:49 +02:00
dr-robertk
9b29b57960
Merge pull request #1124 from atgeirr/output-dir
...
Refactor directory creation
2017-04-10 13:04:42 +02:00
Atgeirr Flø Rasmussen
79aec24f33
Add executable name to reference data locations.
2017-04-10 12:27:19 +02:00
Atgeirr Flø Rasmussen
ddd9f0cb5f
Merge pull request #1130 from akva2/forgotten_paths
...
fixed: forgotten paths in 7bbb4a2a28
2017-04-07 23:48:51 +02:00
Arne Morten Kvarving
2f463916fa
fixed: forgotten paths in 7bbb4a2a28
2017-04-07 19:23:00 +02:00
Atgeirr Flø Rasmussen
db8523e849
Merge pull request #1082 from totto82/satTableIdWells
...
Support for saturation table for each well completion
2017-04-07 14:43:28 +02:00
Atgeirr Flø Rasmussen
38dc182da7
Merge pull request #1127 from akva2/update_ref_paths
...
update scripts to use new paths for reference data
2017-04-07 13:45:19 +02:00
Arne Morten Kvarving
7bbb4a2a28
update scripts to use new paths for reference data
...
reference data paths have been updated to reflect simulator
data is for.
2017-04-07 11:40:45 +02:00
Atgeirr Flø Rasmussen
29f3b86ef0
Merge pull request #1123 from blattms/fix-parallel-istl-verbosity
...
Fix verbosity parameter used for parallel istl solvers.
2017-04-07 10:32:34 +02:00
Atgeirr Flø Rasmussen
d9daa651ac
Merge pull request #960 from dr-robertk/PR/flow_ebos_polyhedral
...
Allow to run flow_ebos with PolyhedralGrid (UnstructuredGrid)
2017-04-07 10:13:25 +02:00
Atgeirr Flø Rasmussen
289b24689f
Merge pull request #1126 from atgeirr/refined-output
...
Refined output to terminal and log
2017-04-06 22:17:34 +02:00
Atgeirr Flø Rasmussen
c851d18144
Merge pull request #1125 from totto82/BUGFIXsoMaxSolvent
...
BUGFIX. Store soMax also for the solvent model
2017-04-06 21:19:28 +02:00
Atgeirr Flø Rasmussen
6f9fcdf7a5
Fix (debug log) output of time taken per report step.
...
First, the stepReport variable was not used with adaptive timestepping.
Second, even when properly updating stepReport, solver_time is still 0.
It just happens that lots of other timing variables are updated, but not
solver_time (nor total_time, pressure_time and transport_time). Simplest
way to handle is to just report the solver_timer seconds (which are still added
to the "full sim report"'s solver_time).
2017-04-06 21:08:21 +02:00
Atgeirr Flø Rasmussen
98debed741
Fix minor output bug and refine output.
...
Previously the substep summary reports were cumulative, misleading the user.
Also, made output a little more compact and readable, ensuring numbers line up
unless unusually many digits are needed for times and iteration counts.
2017-04-06 14:54:08 +02:00
Atgeirr Flø Rasmussen
e325dcd04b
Excessive nonlinear iterations is reported as problem, not error.
2017-04-06 14:52:19 +02:00
Tor Harald Sandve
ac36ad5ad1
BUGFIX. Store soMax also for the solvent model
2017-04-06 14:39:30 +02:00
Tor Harald Sandve
cd564ade5f
Support for saturation table for each well completion
...
Compute relperms for each well completion based on saturation table ids
(satnums)
Does not work in combination with hysteresis.
2017-04-06 14:21:59 +02:00
Atgeirr Flø Rasmussen
85e1544553
Use ensureDirectoryExists() instead of boost::filesystem directly.
...
Motivated by
- proliferation of identical code
- need to avoid strange behaviour with "." directory on some boost versions
- potenial for further refactoring to avoid boost entirely
2017-04-06 12:14:54 +02:00
Atgeirr Flø Rasmussen
d267c1a77d
Create ensureDirectoryExists() free function.
2017-04-06 12:14:06 +02:00
Markus Blatt
9ed02b33bc
Fix verbosity parameter used for parallel istl solvers.
...
These are not aware whether they are parallel or not. Therefore
the user should only specify a verbose verbosity only on one rank.
With this commit we do this on the process responsible for terminal
output.
2017-04-06 12:11:26 +02:00
Atgeirr Flø Rasmussen
431abb0012
Merge pull request #1087 from babrodtk/somax_in_restart
...
Added somax to input/output to restart file
2017-04-06 06:15:51 +02:00
Robert Kloefkorn
8a7141fa88
[feature] Add GridInit for PolyhedralGrid.
2017-04-05 13:54:12 +02:00
Robert Kloefkorn
11f36de73e
[bugfix] Use AutoDiffGrid in unspecialized version of ParallelDebugOutput.
2017-04-05 13:53:28 +02:00
Atgeirr Flø Rasmussen
df2b1190de
Merge pull request #1121 from akva2/fix_update_paths
...
fixed: paths in data update script
2017-04-05 12:54:11 +02:00
babrodtk
e0e1ca51e6
Added soMax to flow_legacy
2017-04-05 12:32:43 +02:00
babrodtk
bd0507cc3b
Added somax to input/output to restart file
2017-04-05 12:32:43 +02:00
Arne Morten Kvarving
5d1e108c26
fixed: these should also use flow_legacy
2017-04-05 12:17:02 +02:00
Arne Morten Kvarving
866001d148
fixed: paths in data update script
...
forgot to update these in https://github.com/OPM/opm-simulators/pull/1096
2017-04-05 12:04:26 +02:00
Atgeirr Flø Rasmussen
69835d2cde
Merge pull request #1114 from blattms/parallel-dens-wells
...
Parallelize and dunify/ewomsify StandardWellDense
2017-04-05 09:10:16 +02:00
Arne Morten Kvarving
32d50eab4a
Merge pull request #1096 from andlaus/use-flow_legacy-for-unit-tests
...
make the unit tests to explicitly use flow_legacy instead of flow
2017-04-04 11:09:36 +02:00
Markus Blatt
30f3d4e2d0
Get rid off TypeTag system in StandardWellsDense.
...
Previously, we kind of hard coded the problem using the TypeTag system.
Instead of this we now simply pass the only additional thing needed, the
ElementContext, as an additional template parameter.
Removes the include of removed header BlackoilModelEbosTypeTags.hpp.
2017-04-04 11:08:17 +02:00
Markus Blatt
312aa24f86
Revert "Factor out ewoms typetag system to separate header."
...
This reverts commit 05c70491257a615472e68fb44776bcd7effb60b8.
2017-04-04 11:08:17 +02:00
Markus Blatt
2bf7f8efa7
Revert "Moved copyright notice to top of header BlackoilModelEbosTypeTags.hpp"
...
This reverts commit d341de0d8b796b66f7bd6d871c84e1c2db265ff1.
2017-04-04 11:08:17 +02:00
Markus Blatt
e56e2cae15
Added requested braces.
2017-04-04 11:08:17 +02:00
Markus Blatt
6b8b8b971e
Use global wellsActive to see whether wells are active at all.
...
This bug must have sneaked in during rebasing. Kudos to Atgeirr for
spotting this.
2017-04-04 11:08:17 +02:00
Markus Blatt
cde162b3d6
Use the global number of cells for the average.
...
This number is still wrong in master but well become correct once
PR #1107 is merged.
2017-04-04 11:07:57 +02:00
Markus Blatt
a6f6e4806e
Moved copyright notice to top of header BlackoilModelEbosTypeTags.hpp
2017-04-04 11:06:41 +02:00
Markus Blatt
29fb281406
Updated Copyright stuff
2017-04-04 11:06:41 +02:00
Markus Blatt
781eadb561
Removed unused method detail::convergenceReduction
2017-04-04 11:06:41 +02:00
Markus Blatt
0e83496740
Make getWellConvergence parallel and omit unnecessary computations.
...
detail::getConvergence computes a lot more than we actually need.
We only need the average over B and the maximum of the well residual.
Therefore we now compute these quantities in getWellConvergence and
do the global reductions manually.
2017-04-04 11:05:50 +02:00
Markus Blatt
4768bc9e90
Remove usage of cachedIntensiveQuantities from getWellConvergence
2017-04-04 11:05:50 +02:00
Markus Blatt
f6153f8133
Factor out ewoms typetag system to separate header.
...
We will need the typetag information also for the wells.
If it is not in a separate header we get problems
with recursive inclusion of the headers (BlackoilEbos.hpp
includes the header that also needs the typetag information).
2017-04-04 11:05:50 +02:00
Atgeirr Flø Rasmussen
1232a7a021
Merge pull request #1111 from blattms/make-updateState-work-for-non-interior-elements
...
Make update state and getConvergence work for non interior elements
2017-04-04 10:47:39 +02:00
Atgeirr Flø Rasmussen
81dbfc8205
Merge pull request #1107 from blattms/fix-ebos-global-cell
...
[Ebos,bugfix] Correctly compute the global number of cells.
2017-04-04 10:33:22 +02:00
Joakim Hove
5a29a012e8
Merge pull request #1117 from joakim-hove/travis-install-bc
...
Install bc in travis.
2017-04-03 13:49:44 +02:00
Joakim Hove
45863ac88d
Install bc in travis.
2017-03-30 10:59:02 +02:00
Markus Blatt
2b0a9351d5
Iterate over Interior_Partition instead of All_Partition and if-clause
2017-03-24 12:25:28 +01:00
Markus Blatt
863bef4722
Fix superfluous dereferencing that broke compilation.
2017-03-24 08:22:32 +01:00