Tor Harald Sandve
dad89974ae
Make initial viscosity output similar with Ecl
2017-04-24 13:29:47 +02:00
Atgeirr Flø Rasmussen
c4c760ae8d
Merge pull request #1160 from atgeirr/fix-output-kr-sequential
...
Fix output of relative permeability for sequential model.
2017-04-21 19:52:55 +02:00
Atgeirr Flø Rasmussen
90d90fb452
Fix output of relative permeability for sequential model.
...
Bug caused assert() failures for debug mode runs.
2017-04-21 15:30:40 +02:00
Atgeirr Flø Rasmussen
edea16dd74
Merge pull request #1155 from andlaus/fix_asan
...
NewtonIterationBlackoilInterface: make its destructor virtual
2017-04-20 12:15:43 +02:00
Andreas Lauser
4d02d51dd2
NewtonIterationBlackoilInterface: make its destructor virtual
...
this prevents GCC-7's address sanitizer from complaining about a
delete for a new of a different type. (i.e., the new is for the
derived class, but if the destructor is non-virtual only the dtor of
the base class is called if a pointer to the base class is deleted.)
finding this was quite some fun, mainly because it took a while what
the issue was.
2017-04-20 11:03:54 +02:00
Atgeirr Flø Rasmussen
92885f4d7b
Merge pull request #1153 from akva2/readd_symlink_installation
...
fixed: re-add installation of the 'flow' symlink
2017-04-19 21:24:07 +02:00
Arne Morten Kvarving
5cd63f6eee
fixed: re-add installation of the 'flow' symlink
...
got lost due to a bad conflict resolution in 7c4dfa784d
2017-04-19 16:04:17 +02:00
Atgeirr Flø Rasmussen
422d834996
Merge pull request #1152 from atgeirr/conditional-output
...
Only push non-empty data to output.
2017-04-19 13:05:02 +02:00
Atgeirr Flø Rasmussen
2b5000bf06
Merge pull request #1137 from andlaus/jenkins-update-flow_ebos-data
...
update update_reference_data.sh to also update the flow_ebos reference solutions
2017-04-19 13:04:47 +02:00
Atgeirr Flø Rasmussen
0b39c770d8
Merge pull request #1150 from akva2/ebos_parallel_tests
...
enable spe1 and spe9 parallel tests for flow_ebos
2017-04-19 13:03:27 +02:00
Atgeirr Flø Rasmussen
2c3a497767
Merge pull request #1147 from babrodtk/bugfix_pdpb_output_legacy
...
This adds bubble/dew point pressure output to legacy flow
2017-04-19 10:17:29 +02:00
Atgeirr Flø Rasmussen
af4a12b872
Only push non-empty data to output.
2017-04-19 09:58:54 +02:00
Atgeirr Flø Rasmussen
debe044e0f
Merge pull request #1149 from atgeirr/fix-twophase-bug-fip
...
Fix bug in two-phase case.
2017-04-19 09:23:36 +02:00
Atgeirr Flø Rasmussen
839a39d9ca
Merge pull request #1151 from andlaus/add-flow_ebos-dependency
...
add 'flow_ebos' to the dependencies of the 'flow' target
2017-04-18 23:20:35 +02:00
Atgeirr Flø Rasmussen
8a2ded5651
Merge pull request #1148 from akva2/update_packaging_2017.04
...
Packaging updates backport
2017-04-18 23:19:03 +02:00
Andreas Lauser
6c2e828a8d
add 'flow_ebos' to the dependencies of the 'flow' target
...
this allows to use `make flow` instead of `make flow_ebos flow` to
build the stuff.
2017-04-18 18:45:47 +02:00
Arne Morten Kvarving
02fb031b5a
enable spe1 and spe9 parallel tests for flow_ebos
2017-04-18 17:09:26 +02:00
Atgeirr Flø Rasmussen
e7285ba230
Fix bug in two-phase case.
2017-04-18 15:23:27 +02:00
Arne Morten Kvarving
7444f4ec32
re-add system eigen3 usage
2017-04-18 14:43:36 +02:00
Arne Morten Kvarving
d83f866c2a
add ewoms dependency to packaging
2017-04-18 14:43:29 +02:00
babrodtk
8ae7178f0a
This adds bubble/dew point pressure output to legacy flow
2017-04-18 14:03:56 +02:00
Andreas Lauser
6d9440d8e2
Merge pull request #1146 from andlaus/fix_bubble_dew_point_pressure_output
...
only output the bubble and dew point pressures if they are available
2017-04-18 12:39:34 +02:00
Andreas Lauser
e24d8c3a57
SimulatorFullyImplicitBlackoilOutput: print warnings instead of silently ignoring requests for bubble/dew point pressure output
2017-04-18 11:09:09 +02:00
Andreas Lauser
7e388376af
only output the bubble and dew point pressures if they are available
2017-04-18 10:21:26 +02:00
Andreas Lauser
2b0ebe0832
Change the version to 2017.10-pre
2017-04-13 12:57:04 +02:00
Andreas Lauser
d226b3e617
Merge pull request #1139 from blattms/fix-parallel-convergence-max
...
[bugfix,flow_ebos] Fix parallel convergence max
2017-04-13 12:56:22 +02:00
Markus Blatt
9f5a904382
Removes deadlocks in the case where only few processes have wells.
...
The problem was that updateWellControls was not called on all
processes. But this is mandatory as the well switching output
requires global communication.
2017-04-12 17:37:34 +02:00
Markus Blatt
b5612806ac
Revert to using standard algorithms instead of using masks.
...
This is now possible as the values stored for ghost/overlap elements
(minimum where we compute the maxiumum, zero where we sum up)
will not influence the result of the computation any more.
2017-04-12 13:42:02 +02:00
Markus Blatt
0db663fe51
Only compute convergence markers for interior elements.
2017-04-12 13:42:02 +02:00
Markus Blatt
b72a167c76
Correctly compute maximum in a parallel flow_ebos run.
2017-04-12 13:42:02 +02:00
Atgeirr Flø Rasmussen
f88e527a0c
Merge pull request #1138 from atgeirr/silence-warnings
...
Silence warnings
2017-04-12 13:01:26 +02:00
Atgeirr Flø Rasmussen
baa6104f39
Silence unused argument warnings.
2017-04-12 11:13:10 +02:00
Atgeirr Flø Rasmussen
246118d794
Silence sign mismatch warnings.
2017-04-12 11:12:34 +02:00
Atgeirr Flø Rasmussen
a17442f578
Remove unused variables.
2017-04-12 11:12:07 +02:00
Andreas Lauser
d334fc1c70
Merge pull request #1118 from GitPaean/calculating_well_potentials_for_each_timestep
...
[WIP] Changes to improve the StandardWellsDense
2017-04-12 10:33:57 +02:00
Atgeirr Flø Rasmussen
df3f763ec4
Merge pull request #1136 from joakim-hove/restart-optional-keys
...
Using optional restart loading instead of extra.
2017-04-12 07:13:29 +02:00
Joakim Hove
527c0a9e75
Using optional restart loading instead of extra.
2017-04-11 22:59:26 +02:00
Kai Bao
0700c8cf67
adding more checking for the potential values
...
during the well well potential calculation.
2017-04-11 16:51:16 +02:00
Kai Bao
ce0e580cee
fixing comments.
...
no functional change.
2017-04-11 16:51:16 +02:00
Kai Bao
dd95114e6d
fixing well potentials calculation after introducing the saturation table
...
The calculation of well potentials of newly added well failed after using the saturation
table. Here, we fix it using much smaller parameters to stablize the
calculation, while it slows down the iteration process.
TODO: improves the convergence rate by either introducing better
paramters or better iteration strategy.
2017-04-11 16:51:16 +02:00
Kai Bao
972b911495
fixing two warnings.
...
no function change.
2017-04-11 16:51:16 +02:00
Kai Bao
72e2b7c6c3
fixing errors resulting from the rebasing procedure.
2017-04-11 16:51:16 +02:00
Kai Bao
7a4d0bb8aa
slightly re-organizing prepareTimeStep()
...
should not impact the simulation results.
2017-04-11 16:51:16 +02:00
Kai Bao
7038b6eb57
recovering the running of flow_multsigement without group control
...
flow_multisegment should not be able to handel group control yet.
2017-04-11 16:51:16 +02:00
Kai Bao
e0d96b3410
removing compute_well_potentials_ from BlackoilModelParameters
2017-04-11 16:51:16 +02:00
Kai Bao
4ed95fcbf0
calculate well potentials based on requireWellPotentials()
...
from well_colllection. Not based on command line paramters anymore.
2017-04-11 16:51:16 +02:00
Kai Bao
181112491b
recovering group control for legacy_flow.
2017-04-11 16:51:16 +02:00
Kai Bao
8fa3c4b324
removing one unnecessary if condition
2017-04-11 16:51:16 +02:00
Kai Bao
e627f35176
removing well_potential_ from WellStateFullyImplicitBlackoil
2017-04-11 16:51:16 +02:00
Kai Bao
72d0d4ddb8
revising the computeWellPotentials in StandardWells
...
so it compute the potentials for each well instead of each perforation.
2017-04-11 16:51:16 +02:00