Commit Graph
1402 Commits
Author SHA1 Message Date
Atgeirr Flø Rasmussen 0ce57cb6db Merge pull request #316 from blattms/parallel-verbose-on-0
Print status output only on rank 0 for parallel runs.
2015-02-20 18:11:38 +01:00
Markus Blatt bc58cfb3b9 Corrects missing space around if and operators. 2015-02-20 16:06:19 +01:00
Markus Blatt fd10c97e46 Fxied typo wether -> whether. 2015-02-20 16:03:08 +01:00
Markus Blatt bcc3ab7d95 Rename variable verbosity_ to terminal_output_. 2015-02-20 16:02:06 +01:00
Markus Blatt 62507b9cf6 [bugfix] Do not check verbosity when increase omega due to oscillation.
If oscillating then the same measures have to be taken on all
processes. This was not the case before the commit. Instead only
process 0 would have adapted omegas and we have produced wrong
results.

Kudos to Atgeirr for detecting this while reading the code.
2015-02-20 15:56:34 +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 d35d301a4b Print status output only on rank 0 for parallel runs. 2015-02-20 11:35:47 +01:00
Atgeirr Flø Rasmussen 1ba856ebfe Merge pull request #314 from totto82/avg_press
Use the average well block pressure when evaluating the properties
2015-02-20 08:36:49 +01:00
Atgeirr Flø Rasmussen ab835ec443 Merge pull request #308 from atgeirr/resv-injectors
Implement RESV limit targets for INJECTOR wells.
2015-02-19 15:45:18 +01:00
Atgeirr Flø Rasmussen fec50b491a Merge pull request #311 from totto82/fix_verticalscaling
Apply the swatinit scaling to new_props
2015-02-19 11:29:00 +01:00
Atgeirr Flø Rasmussen 1e5b691a49 Merge pull request #313 from blattms/redistgridhandle-without-grid
Remove the unsused grid members from BlackoilPropsDataHandle.
2015-02-19 10:03:43 +01:00
Tor Harald Sandve 70a6a2ebf8 Use the average well block pressure when evaluating the properties
The average well block pressure is used instead of the well cell
pressure when the well properties are evaluated.
Temperature, rs, rv, phase conditions are still well cells values.

Perforation pressures are stored in the well state
2015-02-19 09:58:17 +01:00
Markus Blatt 5e72774b89 Remove the unsused grid members from BlackoilPropsDataHandle.
Previously BlackoilPropsDataHandle did hold a grid for sending
and receiving that were either not used or we could prevent their
usage. Therefore this commit removes them from the class and queries
all needed information from the property objects.
2015-02-19 09:35:18 +01:00
Atgeirr Flø Rasmussen 46cfaa1432 Merge pull request #312 from atgeirr/fix-warnings
Fix warnings
2015-02-19 09:14:05 +01:00
Atgeirr Flø Rasmussen e96036bdb3 Move helper functions to namespace detail.
These were in the anonymous namespace, which was not wrong but lead to
false-positive unused function warnings on some compilers, probably due
to being used only from within templates. This allows us to keep the
warning activated by default.
2015-02-19 09:07:42 +01:00
Atgeirr Flø Rasmussen b83bb7bf92 Remove unused function. 2015-02-19 09:03:22 +01:00
Tor Harald Sandve 44e9d2a34e Fix PR comments
1) swatinit() is changed to setSwatInitScaling() to make it obvious that
we are modifying the props.
2) the descriptions of saturation and pc now makes more sense
3) the method is removed from the sibling class and the interface and
the type of new_props is changed from BlackoilPropsAdInterface to
BlackoilPropsAdFromDeck
5) The same modification is added to sim_fibo_ad_cp
2015-02-19 08:34:55 +01:00
Tor Harald Sandve 013d1d3499 Apply the swatinit scaling to new_props
The capillary pressure function in new_props is scaled to match the
capillary pressure function in props.

This is a temporary workaround while the simulator uses two different
property object.
2015-02-19 08:18:39 +01:00
Atgeirr Flø Rasmussen 47d9b3438e Merge pull request #310 from atgeirr/fix-warnings
Fix warnings and adapt to API changes
2015-02-18 13:16:07 +01:00
Atgeirr Flø Rasmussen f0190dd2bb Remove const from bool return type.
Since it has no effect for value types, and generates a warning.
2015-02-17 13:45:14 +01:00
Atgeirr Flø Rasmussen 850845c61d Suppress re-declaration warning. 2015-02-17 13:44:52 +01:00
Atgeirr Flø Rasmussen 17ade0457f Suppress unused argument errors. 2015-02-17 13:44:33 +01:00
Atgeirr Flø Rasmussen a4024a3f9e Remove unused functions. 2015-02-17 13:42:26 +01:00
Atgeirr Flø Rasmussen 355bfb0e70 Suppress signed/unsigned warning.
Also fix formatting.
2015-02-17 13:41:31 +01:00
Atgeirr Flø Rasmussen 7cdb65cff3 Suppress unused argument warnings. 2015-02-17 13:41:00 +01:00
Atgeirr Flø Rasmussen 75d98c7e3b Remove uneeded function argument. 2015-02-17 13:40:09 +01:00
Atgeirr Flø Rasmussen bd2f659770 Adapt to API change in WellsManager. 2015-02-17 13:22:43 +01:00
Atgeirr Flø Rasmussen 3873e5d810 Merge pull request #309 from chflo/opm-166
opm-166: Fix due to signature change in method thresholdPressures
2015-02-17 10:49:43 +01:00
chflo 82839f9580 opm-166: Fix due to signature change in method thresholdPressures 2015-02-17 09:53:57 +01:00
Atgeirr Flø Rasmussen 484f1e4438 Merge pull request #302 from blattms/distribute-input-props-data
Adds data redistribution capabilities and makes sim_fibo_ad_cp parallel.
2015-02-16 12:48:03 +01:00
Markus Blatt 684da9aa84 Throw an excpetion if either eclipse or matlab output is activated. 2015-02-16 11:52:50 +01:00
Markus Blatt 3eb13e74dd Adds braces to if() return; 2015-02-16 11:42:42 +01:00
Markus Blatt f19a83bbda Remove superluous casts. 2015-02-16 11:40:49 +01:00
Markus Blatt 3575fdce6a Removes stackobject_to_heap. 2015-02-16 11:24:05 +01:00
Atgeirr Flø Rasmussen 3ade13d235 Implement RESV limit targets for INJECTOR wells. 2015-02-16 11:08:57 +01:00
Markus Blatt 60cdc583ae Make right hand passed to the linear solver consistent.
Previously, we had to use two layers of overlap cells such the
innermost layer contains the rightvalues automatically (as it is
surrounded by internal edges). No we use communication to get
the correct values in the whole overlap region and one layer
suffices as it should.
2015-02-12 21:33:41 +01:00
Markus Blatt 01ea7bacba Adds data redistribution capabilities and makes sim_fibo_ad_cp parallel.
With this commit we add the possibility to start with a global representation
of a simulator that is read on each process and afterwards this presentation
is redistributed among the processors together with the properties and
state data needed to initialize the simulation.

There still is no parallel well handling and no parallel output. But with the
equilibrium example of @dr-robertk and deactivated output we can already
perform parallel runs.
2015-02-12 21:33:41 +01:00
Markus Blatt fc137afcd5 Adds a constructor to BlackoilPropsAdFromDeck that allows copy the grid independant part.
In the parallel simulator we will have to be able adress only poperties on
some part of the global grid. To create thos properties we need to be able
to copy the grid independant data of the properties object and resize the rest.
This commit adds a construct taking a properties object for reading and a
new number of cells to accomplish this.
2015-02-12 21:33:41 +01:00
Atgeirr Flø Rasmussen 15aa7ec2ab Merge pull request #306 from joakim-hove/stream-open-c_str
The stream::open() functions require c_str()
2015-02-12 17:31:44 +01:00
Joakim Hove c021b66c18 The stream::open() functions require c_str() 2015-02-12 17:25:40 +01:00
Atgeirr Flø Rasmussen eea8bb23a9 Merge pull request #304 from blattms/parallel-info-by-value
Store the boost::any of ParallelIstlInformation by value. (Alternative to #303)
2015-02-12 14:48:46 +01:00
Markus Blatt 70fb0e7b79 Store the boost::any of ParallelIstlInformation by value.
During the constructor the underlying object only holds smart
pointers and an empty vector. The FullyImplicitBlackoilSolver
obtains  a reference to it from the NewtInterationInterface instances.
Therefore copying boost::any and storing it by value should be cheap
and safe.
2015-02-12 14:04:53 +01:00
Atgeirr Flø Rasmussen d2b3e52472 Merge pull request #292 from blattms/parallel-newton-convergence
Adds parallel solver support for sim_fibo_ad_cp
2015-02-12 11:24:15 +01:00
Markus Blatt d1239d0a35 Adds space between parameters and stops eliding zeros. 2015-02-12 10:41:45 +01:00
Markus Blatt be7221aa9b Moved output parameters to the end of the list in extractParallelGridInformationToISTL 2015-02-12 10:41:44 +01:00
Markus Blatt 11848acf0c Added braces around else statement (coding guidelines) 2015-02-12 10:41:44 +01:00
Markus Blatt a37421d2ad Rely on delete being null safe. 2015-02-12 10:41:44 +01:00
Markus Blatt 31da0de909 Fixes indentation in CMakeLists_files.cmake 2015-02-12 10:41:44 +01:00
Markus Blatt bf281a74b8 Make symbol extractParallelGridInformationToISTL available if CpGrid is there. 2015-02-12 10:41:44 +01:00