Commit Graph

4885 Commits

Author SHA1 Message Date
Kai Bao
819aa90d84 adding prepareTimeStep() to the StandardWellsDense
to handle the well potential related calculation
2017-04-11 16:51:16 +02:00
Kai Bao
57f7650228 adding a function computeWellPotentials for StandardWellsDense
for each well. It is a temporay approach for testing without breaking
any compilation before changing the interface for WellsManager.
2017-04-11 16:51:16 +02:00
Atgeirr Flø Rasmussen
297dd97c74 Merge pull request #1093 from andlaus/make-flow_ebos-the-default
make the default flow point to flow_ebos instead of flow_legacy
2017-04-11 14:39:17 +02:00
Andreas Lauser
d08d909c00 change the symlink for flow to flow_ebos
`flow_ebos` should be now capable of doing everything that
`flow_legacy` can and recently all testing seems to have been centered
on `flow_ebos`. note that `flow_ebos` does not yet support some more
advanced/exotic features like MPI, solvents, polymer, etc., but
neither does the plain `flow_legacy` binary. until `flow_ebos`
supports these features, the specialized simulators thus continue to
use the legacy code paths.
2017-04-11 13:25:18 +02:00
Atgeirr Flø Rasmussen
39f9d0e397 Merge pull request #1133 from andlaus/flow_ebos-unit-tests
add unit tests for flow_ebos analogous to flow_legacy
2017-04-11 12:59:09 +02:00
Atgeirr Flø Rasmussen
189d91bc9e Merge pull request #1134 from andlaus/report-failure
flow_ebos: print statistics about failed time steps
2017-04-11 12:29:33 +02:00
Atgeirr Flø Rasmussen
2dff8ef141 Merge pull request #1135 from nairr/terminal_output_mod
Minor terminal output modifications
2017-04-11 11:39:27 +02:00
Andreas Lauser
ef2a560fb3 flow_ebos: print statistics about failed time steps
the performance summary at the end of a Norne run which are printed by
`flow_ebos` now looks like this on my machine:

```
Total time (seconds):         773.757
Solver time (seconds):        753.349
 Assembly time (seconds):     377.218 (Failed: 23.537; 6.23965%)
 Linear solve time (seconds): 352.022 (Failed: 23.2757; 6.61201%)
 Update time (seconds):       16.3658 (Failed: 1.13149; 6.91375%)
 Output write time (seconds): 22.5991
Overall Well Iterations:      870 (Failed: 35; 4.02299%)
Overall Linearizations:       2098 (Failed: 136; 6.48236%)
Overall Newton Iterations:    1756 (Failed: 136; 7.74487%)
Overall Linear Iterations:    26572 (Failed: 1786; 6.72136%)
```

for the flow_legacy family, nothing changes.
2017-04-11 11:12:11 +02:00
Rohith Nair
1fd91b2ce0 edit 2017-04-11 10:03:22 +02:00
Rohith Nair
be74630699 minor changes to output tag 2017-04-11 09:49:59 +02:00
Atgeirr Flø Rasmussen
88e4646b71 Merge pull request #1084 from babrodtk/hysteresis_output
Adds hysteresis output and input (for restarting)
2017-04-11 07:44:59 +02:00
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
Rohith Nair
375e4e2678 Changed output classification of NaN residuals to "Bug" from "Problem" 2017-04-10 18:55:54 +02:00
Andreas Lauser
6c7062580f add unit tests for flow_ebos analogous to flow_legacy
or are these called integration tests? anyway, these are the tests
which use the decks from opm-data. This should put flow_ebos testing
on the same level as flow_legacy.
2017-04-10 14:08:11 +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
babrodtk
4d286cf0b3 Makes hysteresis and somax optional in restart file 2017-04-07 16:20:35 +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
babrodtk
1fd36e9451 Fixed hysteresis input/output in flow_legacy 2017-04-07 14:36:36 +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
babrodtk
8340d26890 Adds hysteresis output and input (for restarting) 2017-04-06 14:17:15 +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