Fredrik Gundersen
6c85751d91
Added suport for new Threshold Pressure behavior
2015-08-24 15:41:32 +02:00
Tor Harald Sandve
cca5410ebb
Fix minor comments in PR#425
2015-08-18 07:24:08 +02:00
Tor Harald Sandve
3b99338bd0
Rename Extended to Solvent
...
- classes and files are renamed to use solvent instead of extended in
their names.
2015-08-18 07:24:08 +02:00
Tor Harald Sandve
7c3f184d43
Rename simulator from flow_extended to flow_solvent
2015-08-18 07:24:08 +02:00
Tor Harald Sandve
86afb1bbf6
Update to new parserMode interface
2015-08-18 07:24:08 +02:00
Tor Harald Sandve
a5f625f541
Add parsermode to EclipseState
2015-08-18 07:24:08 +02:00
Tor Harald Sandve
17cddaf126
Add support for solvent properties
...
-surface density are specified using the Eclipse keyword SDENSITY
and the pvt properties (viscosity (mu) and formation volume factor (b)
using PVDS
2015-08-18 07:24:08 +02:00
Tor Harald Sandve
971e7e19cb
Add simple solvent model
...
assumes:
- solvent is immiscible in the oil phase
- gas pvt and relperms are used for the solvent
- no initial solvent in the model
Solvent is injected using the WSOLVENT keyword
TODO: Make it possible to change WSOLVENT
2015-08-18 07:24:08 +02:00
Joakim Hove
6680279815
Using new string based ParseMode api.
2015-08-09 22:18:36 +02:00
Joakim Hove
7bd36a6b65
Addde ParseMode argument to parse and EclipseState
2015-08-05 14:18:05 +02:00
Atgeirr Flø Rasmussen
6494dee820
Pass parallel info to NewtonIteration... classes.
2015-07-16 14:32:36 +02:00
Robert Kloefkorn
bdb30ec023
GeoProps: fix the use_local_perm implementation for flow_cp. The problem that the
...
faceNormals are scaled differently remains.
2015-07-08 13:15:00 +02:00
Robert Kloefkorn
34429b60f1
[bugfix] CpGrid does not yet work with use_local_perm.
2015-06-30 14:28:01 +02:00
Robert Kloefkorn
5b51a5b7b1
Merge remote-tracking branch 'upstream/master' into PR/merge-flow-and-flow_cp
2015-06-30 13:39:03 +02:00
Atgeirr Flø Rasmussen
5002fe1e37
Add use_interleaved option to flow_cp.
2015-06-19 10:53:33 +02:00
Atgeirr Flø Rasmussen
5d0f654443
Add class NewtonIterationBlackoilInterleaved.
...
Initially it is just a copy of the NewtonIterationBlackoilCPR class.
Also, add use_interleaved parameter to use the class.
2015-06-19 10:53:32 +02:00
Robert Kloefkorn
2d7045b9cd
remove shared_ptr.
2015-06-18 13:29:17 +02:00
Robert Kloefkorn
ee47f2887b
define preprocessor variables to 1.
2015-06-17 16:34:48 +02:00
Robert Kloefkorn
10725c0b70
Merged main program for flow and flow_cp to avoid code duplication.
2015-06-17 13:00:37 +02:00
chflo
08a079b4ff
OPM-212: Added optional cmd parameter override of IOCOnfig Restart setting
2015-06-15 15:36:57 +02:00
Atgeirr Flø Rasmussen
052cf09495
Merge pull request #378 from blattms/less-verbose-parallel-runs
...
Prevent printing stats on more than 1 process for CPR.
2015-05-15 15:38:55 +02:00
Markus Blatt
f4ff1ea4c4
Added missing explicite braces around if branch.
2015-05-15 15:10:42 +02:00
Markus Blatt
0cd174f246
Adds spaces to binary operator.
2015-05-15 14:58:06 +02:00
Markus Blatt
f0691504af
Prevent printing stats on more than 1 process for CPR.
2015-05-08 13:15:59 +02:00
Markus Blatt
1fbe8e3b6d
Distribute the geology information.
...
As it turns out initializing the Geology on a distributed grid
result in wrong values for e.g. saturation. Therefore with this
commit we resort to initializing the global geology and distribute
it using communication.
2015-05-07 12:21:06 +02:00
Atgeirr Flø Rasmussen
db06fa48f5
Merge pull request #374 from babrodtk/throw_causes_core_dumped
...
Changed throw in main() to return EXIT_FAILURE
2015-05-06 12:41:39 +02:00
babrodtk
aab8d2a008
Added missing include
2015-05-06 08:38:49 +02:00
babrodtk
fb99528673
Changed OPM_THROW to return EXIT_FAILURE in flow_cp.cpp
2015-05-06 08:38:18 +02:00
babrodtk
9edbf38439
Changed throw in main() to return EXIT_FAILURE
2015-05-05 15:48:58 +02:00
babrodtk
9f23ce7dbc
Reformated flow header to fit 80 columns
2015-05-05 15:25:55 +02:00
Markus Blatt
c57a10ff76
[bugfix] Use full set of processes to determine whether to redistribute or not.
...
Previously we used the size of the communicator within the CpGrid to check
whether we are running in parallel and need to redistribute the grid.
Unfortunately, this is MPI_COMM_SELF until we actually loadbalance and redistribute.
Therefore we now use the size of the MPI_Helper (i.e. MPI_COMM_WORLD) which
gives us the number of all available processes.
Note that the wrong behaviour was provoked with 656e5de331
. Before that we
redistributed in any case which luckily included runs with more than 1 process.
2015-04-30 14:02:13 +02:00
Edvin Brudevoll
58367e20fd
Now also flow_cp.cpp takes the NOSIM keyword into account.
2015-04-28 10:22:36 +02:00
Edvin Brudevoll
7aa8d91f2d
New commit, NOSIM keyword
2015-04-28 10:17:44 +02:00
Edvin Brudevoll
0d1cce2f26
Support for the NOSIM keyword.
2015-04-28 10:17:44 +02:00
Atgeirr Flø Rasmussen
2eb06d6d6c
Use more appropriate end-of-sim timing output.
2015-04-21 10:42:40 +02:00
Atgeirr Flø Rasmussen
e44ef09212
Accept single deck filename as command line argument.
...
Any argument that is not handled by the parameter parser will
be assumed to be a deck filename. Only one is accepted, and if
given, it will override any deck_filename=<something> on the
command line or in parameter files.
FYI:
The parameter parser handles arguments of the following types:
key=value (note no space around = or in strings)
parameterfile.xml
parameterfile.param
2015-04-14 13:37:25 +02:00
Atgeirr Flø Rasmussen
c4655d7c00
Modify startup message, include version number.
2015-04-14 13:31:39 +02:00
Atgeirr Flø Rasmussen
22391ad144
Provide nicer startup message that includes opm-project URL.
2015-04-14 12:53:34 +02:00
Atgeirr Flø Rasmussen
656e5de331
Bugfix: distribute only if comm size is strictly > 1.
2015-04-08 10:16:25 +02:00
Andreas Lauser
ba4fca5a77
Revert "also pass the deck to the output writer"
...
This reverts commit 88730e855f
.
2015-03-31 12:11:45 +02:00
Andreas Lauser
88730e855f
also pass the deck to the output writer
2015-03-26 17:33:13 +01:00
Atgeirr Flø Rasmussen
04b255a03f
Make more use of move semantics in AD code.
...
This makes some API changes to AutoDiffBlock.
- Add overload for the constant() constructor taking rvalue ref.
- Add overload for the variable() constructor taking rvalue ref.
- Make the function() constructor *require* rvalue refs.
- Add a swap() function.
The remaining changes in this commit are follow-ups especially
to the third change (adding std::move in many places), and
some removal of unnecessary block pattern arguments from calls to
the constant() static method.
2015-03-16 14:22:32 +01:00
Atgeirr Flø Rasmussen
ae31c034b6
Fix compile error instroduced by merging #275 .
...
Moved output directory code near top again, changed rank query
to use Dune::MPIHelper instead of the grid.
2015-03-09 09:37:16 +01:00
Joakim Hove
9b7d84bd9f
ERT-830: Using OpmLog instead of explicit logger
2015-03-09 08:00:13 +01:00
Atgeirr Flø Rasmussen
c6d38f543c
Rename sim_fibo_ad[_cp] -> flow[_cp].
...
In line with the decision we made to use "flow" as name for the
fully implicit black-oil simulators.
2015-02-27 12:35:03 +01:00
Atgeirr Flø Rasmussen
d9ce8625cf
Remove unused classes.
...
After this, the two affected tests fail due to bugs in PVT region
support in BlackoilPropsAdFromDeck.
2015-02-23 13:42:51 +01:00
Atgeirr Flø Rasmussen
eb89236552
Merge pull request #317 from blattms/generic-equil
...
Modified sim_fibo_ad_cp to also allow running with EQUIL keyword.
2015-02-20 18:24:05 +01:00
Markus Blatt
9517dc08b3
Do not print message about querying output parameter for p>0.
2015-02-20 15:47:57 +01:00
Markus Blatt
4b110fb00b
Fixes missing indentation.
2015-02-20 15:44:28 +01:00
Markus Blatt
007acfe018
Modified sim_fibo_ad_cp to also allow running with EQUIL keyword.
...
With now generic implementation of the initStateEquil in opm-core
we added the necessary grid helper functionlality for CpGrid and activated
the processing if the EQUIL keyword is there.
2015-02-20 12:23:35 +01:00