Júlio Hoffimann
8385a9bcbb
Remove trailing whitespaces
2013-07-28 08:34:13 -03:00
Markus Blatt
4a9dd8c483
Fixes setting the verbosity for AGMG.
...
If verbosity is true, we set the iprint parameter such that the
output is print to standard out. If not, we use a negative number
such that only error messages are printed to standard out.
2013-07-05 12:19:57 +02:00
Roland Kaufmann
002e22b9ec
Zero-initialize structure to avoid returning undefined
...
The compiler will otherwise complain that we are returning undefined
data. There is no way for the client code to know whether this was
the case.
2013-07-05 10:59:52 +02:00
Bård Skaflestad
d332129676
Merge pull request #274 from blattms/non-tr1
...
Changed std::tr1 occurences to boost.
2013-07-04 12:01:51 -07:00
Markus Blatt
68eb3fbcb1
Changed std::tr1 occurences to boost.
...
std::tr1 might not be supported by all compilers and will eventually
be dropped by others. Using boost instead makes this more
portable.
2013-07-04 16:04:35 +02:00
Bård Skaflestad
254f70e504
Merge pull request #267 from laods/verbosity
...
Change verbosity level of warning message in transport solver
2013-06-28 02:02:31 -07:00
Atgeirr Flø Rasmussen
34f2d637ab
Merge pull request #263 from bska/remove-redef-kluge
...
Disable build kluge that is no longer pertinent
2013-06-24 06:02:10 -07:00
Markus Blatt
4f41c2ac72
Fixed unused parameters and whitespace issues.
2013-06-21 12:49:35 +02:00
Bård Skaflestad
33320270fc
Disable build kluge that is no longer pertinent
...
The <have_boost_redef.hpp> header was introduced (commit 82369f9 ) as
a work-around for a particular interaction in the Autotools-based
setup of OPM-Core and the Dune core modules. Notably, Dune's
"Enable" trick for Boost failed on some older Autoconf systems. Now
that we're using CMake, however, that kluge is no longer needed
because we (OPM-Core) always
#define HAVE_BOOST 1
i.e., as an explict true/false value.
Therefore, we need no longer include <have_boost_redef.hpp> . The
header will be removed at a later time.
2013-06-20 23:14:39 +02:00
Markus Blatt
b3f24972cc
Fixed spelling
2013-06-20 17:01:35 +02:00
Markus Blatt
c87b98abbb
Unifies the way how AMG is called.
...
After this patch one can set the prolongation factor for all
AMG calls and the number of smoothing steps for all except
of FastAMG that currently only supports on step.
2013-06-20 16:55:07 +02:00
Markus Blatt
97b8203773
Merge remote-tracking branch 'upstream/master'
2013-06-20 16:07:58 +02:00
Lars Vingli Odsæter
f8bad8fd92
Change verbosity level of warning message in transport solver
...
Don't print message "s was clamped in some cells" unless preprocessor
symbol 'VERBOSE' is set.
2013-06-20 13:30:23 +02:00
Markus Blatt
5072014198
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
opm/core/linalg/LinearSolverIstl.cpp
2013-06-19 14:55:50 +02:00
Atgeirr Flø Rasmussen
eac83e6fd2
Add transMult(), poroMultDeriv() and transMultDeriv().
2013-06-03 14:33:18 +02:00
Bård Skaflestad
481c3a4e00
Merge pull request #250 from atgeirr/combined
...
A collection of various updates
2013-06-03 00:58:50 -07:00
Atgeirr Flø Rasmussen
21771218b9
Ensures well rate initialization actually happens.
...
Do not use the well's comp_frac member, only rely on the control's distr
member for initialization. This forced a change to WellsManager's
initialization of the distr member.
2013-06-02 23:30:43 +02:00
Atgeirr Flø Rasmussen
9c890bc19a
Bugfix in well rate init.
...
Do not always try to initialize, also initialize proper phase rates.
2013-06-02 22:19:43 +02:00
Atgeirr Flø Rasmussen
b3acdbb8de
Refined well state initialization.
...
For SURFACE_RATE controlled wells, initialize wellRates() to match.
2013-06-02 21:58:30 +02:00
Atgeirr Flø Rasmussen
d42bccaa8e
Unit conversion factor of RS is not 1 for FIELD units.
2013-05-30 14:37:48 +02:00
Atgeirr Flø Rasmussen
31dd4f707c
Initialize rate-controlled well bhp with safety factor.
...
Safety factor is 1.01 (INJECTOR) or 0.99 (PRODUCER), similar to
mrst's ad-fi/utils/initWellSolLocal.m > initialize().
2013-05-30 11:03:08 +02:00
Atgeirr Flø Rasmussen
8f722702c6
Fix SatGwseg* to handle no-gas situation gracefully.
2013-05-29 00:30:50 +02:00
Atgeirr Flø Rasmussen
7bad081eb4
Merge remote-tracking branch 'totto82/newfluid2' into combined
2013-05-27 15:45:18 +02:00
Atgeirr Flø Rasmussen
af675fcc9d
Created new initialization routine, using RS from deck.
2013-05-27 15:44:07 +02:00
Atgeirr Flø Rasmussen
3b69bef702
Added gasoilratio() to BlackoilState.
2013-05-27 12:53:06 +02:00
Tor Harald Sandve
01bb02f4cd
Adds the new interface to SinglePvtLivGas
2013-05-27 11:14:39 +02:00
Atgeirr Flø Rasmussen
ddfbda7419
Added assert to guard against wrong usage.
2013-05-24 09:21:41 +02:00
Atgeirr Flø Rasmussen
897ec0e909
Fix bug in upwinding code.
...
Accidental usage of std::vector's operator< discovered.
2013-05-24 09:20:46 +02:00
Roland Kaufmann
eefb7a0431
Use boost::bind instead of std::bind to compile with C++03
2013-05-22 21:25:29 +02:00
totto82
1c904aa451
Add new fluid interface
...
- in progress
2013-05-22 12:57:18 +02:00
Atgeirr Flø Rasmussen
7ee481a601
Merge pull request #242 from rolk/242_callback
...
Let external objects observe individual timesteps in a simulation
2013-05-22 03:46:02 -07:00
Atgeirr Flø Rasmussen
221bc7a468
Added wellRates() member.
2013-05-21 23:54:30 +02:00
Roland Kaufmann
5644611dfd
Provide template functions in separate header
...
Template functions must be defined in the header since the library
cannot contain generic code. To keep only the interface in the main
header, all such function bodies are put in a separate _impl file.
2013-05-15 21:32:32 +02:00
Atgeirr Flø Rasmussen
18a3c7fc91
Merge remote-tracking branch 'upstream/master' into add-phaseusage-to-interface
2013-05-15 10:10:18 +02:00
Roland Kaufmann
05636c70c7
Subtract time spend in callbacks from total
...
Since this is not time spent on the simulation itself, it is "unfair"
that this is accounted on the simulator.
2013-05-14 11:38:09 +02:00
Roland Kaufmann
1ae1405c21
Notify callbacks when a timestep has completed
...
Client code can do additional processing for the output of each
timestep.
2013-05-14 11:36:13 +02:00
Bård Skaflestad
7add6048cc
Merge pull request #240 from atgeirr/tof-improvements
...
Ensure (average of) tracers sum to one for DG1.
2013-05-14 02:28:21 -07:00
Roland Kaufmann
34acf3ecd0
Make implementation class "package" visible
...
Since a definition of the class is not in the header, no other
compilation units can safely access the internals of the Impl class
anyway, so it may as well be a regular struct so that the outer class
(SimulatorIncompTwophase) can access it.
2013-05-14 11:11:18 +02:00
Bård Skaflestad
53b082af28
Always interpret 'ref_pressure' as a double
...
Otherwise, when specifying (e.g.)
ref_pressure=1.0e-5
(1 Pascal in bars), the value gets reinterpreted as
ref_pressure=1
which is one bar.
2013-05-14 10:19:12 +02:00
Atgeirr Flø Rasmussen
280bf30a26
Add phaseUsage() method to BlackoilPropertiesInterface.
...
Also implement method in derived classes.
2013-05-13 16:20:00 +02:00
Atgeirr Flø Rasmussen
238bd6b891
Ensure (average of) tracers sum to one for DG1.
2013-05-13 16:17:41 +02:00
Roland Kaufmann
0fb4f14b28
Provide DTD schema to describe parameter file format
...
Notice that this definition specifies a superset of the actual format
as the ParameterGroup tag is context-dependent (which cannot be captured
by DTD schemata).
2013-05-13 10:50:22 +02:00
Joakim Hove
1281d17b60
Changed writeECLDate() to write UNFORMATTED restart files.
2013-05-02 19:06:43 +02:00
Joakim Hove
a6e3bbd610
Updated calls to ecl_util_fmt_file() - result is by reference
2013-05-02 19:04:09 +02:00
Atgeirr Flø Rasmussen
61829dd238
Added limiter for tracer.
2013-04-24 11:27:04 +02:00
Atgeirr Flø Rasmussen
1a84b4fe7d
Add tracer computations (method solveTofTracer()).
...
Same interface as in class TofReorder.
2013-04-24 10:39:50 +02:00
Atgeirr Flø Rasmussen
3086d5d815
Update doc, only initialize tracerhead_by_cell_ if needed.
2013-04-24 10:36:52 +02:00
Atgeirr Flø Rasmussen
8552347080
Tracer computations are now fixed and robust.
...
- Handles noisy source terms.
- Works with repeated solve calls (multi-cell block solves).
2013-04-23 15:35:47 +02:00
Atgeirr Flø Rasmussen
2fbf3bd7cb
Implement solveMultiCell() with Gauss-Seidel.
2013-04-23 13:38:47 +02:00
Atgeirr Flø Rasmussen
8b6faffe00
Work in progress on tracers.
...
- Changed interface.
- Read tracerheads (tracer start locations) from file in compute_tof_from_files.
- Initialize tracerheads from wells in compute_tof.
2013-04-22 14:02:45 +02:00