OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,444 Commits 24 Branches 102 Tags 90 MiB
f6ad3669f8
Commit Graph

586 Commits

Author SHA1 Message Date
Liu Ming
f9892f20d7 Add rough conversation testing for polymer equation. 2014-12-09 10:33:20 +08:00
Liu Ming
4d1f364a40 fix cmax issues. 2014-12-08 13:45:30 +08:00
Liu Ming
601767306a fix cmax issue, which affect Nodesorption results. 2014-12-08 10:00:27 +08:00
Liu Ming
d2892833b4 fix wrong implementation. 2014-12-08 09:54:16 +08:00
Liu Ming
93994a3e53 simplify the implementation. 2014-12-08 09:52:57 +08:00
Liu Ming
d9605b94e7 Merge remote-tracking branch 'opm/master' into fix_cmax 2014-12-08 09:15:01 +08:00
Andreas Lauser
c3d73e6de8 fix typo 2014-12-03 17:03:25 +01:00
Liu Ming
28b2fab7b7 fix gcc4.8 compile issue and remove whitespace. 2014-12-03 17:28:55 +08:00
Liu Ming
242ec598c8 Merge remote-tracking branch 'opm/master' into wpolymer_schedule 2014-12-03 16:56:38 +08:00
Liu Ming
cca03d5421 delete commented line. 2014-11-21 09:29:09 +08:00
Andreas Lauser
d36d7e81cb allow temperature dependent PVT properties 
this has the nice side effect that non-uniform temperature fields also
become supported as long as they are "impressed" externally...
 2014-11-20 19:25:18 +01:00
Liu Ming
9303e41966 add new polymerInflow constructor, get polymer injection rate from schedule section. 2014-11-20 16:32:02 +08:00
Liu Ming
63d68ecd62 add config.h 2014-11-19 08:44:54 +08:00
Liu Ming
c605a22c14 add config.h 2014-11-18 09:47:51 +08:00
Liu Ming
a43fa424a6 remove not-used files, these files belong to Incompressible flow, not 
supported by autodiff.
 2014-11-18 09:33:38 +08:00
Liu Ming
674284d382 fix header gard! 2014-11-18 09:29:27 +08:00
Liu Ming
4ce5661d9e compute cmax every time step. 2014-11-17 17:23:04 +08:00
Liu Ming
9a5c889656 adapt to API changes of opm-autodiff. 2014-11-14 13:16:22 +08:00
Liu Ming
58bdc701e3 since two phase polymer simulator support EclipseWriter, need to remove historical 
files for outputing water cut.
 2014-10-29 13:38:15 +08:00
Liu Ming
ac764bd8a8 let sim_poly_fi2p_comp_ad works as the same way as sim_poly_fibo_ad. 
- move time iteration to simulator class
 - add EclipseWriter and output Eclipse binaries.
 - add DeckConstPtr for polymer inflow.
 2014-10-29 13:23:50 +08:00
Liu Ming
3102c4dab2 use WellStateFullyImplicitBlackoil instead of WellState. 2014-10-29 10:25:06 +08:00
Liu Ming
d44e8e6d9f remove unnecessary referencer. 2014-10-28 16:29:22 +08:00
Liu Ming
a23e4ca63b remove historical and un-used files. 2014-10-28 14:28:34 +08:00
Liu Ming
c0a61c9655 due to the new timer, simulator class should not do time iteration once again. 2014-10-28 13:31:35 +08:00
Liu Ming
5242d6bbf7 move time iterations to Simulator class and pass deck to create polymer inflows. 
This should solve the issues: write the final state to eclipse binaries.
 2014-10-28 13:14:44 +08:00
Liu Ming
5535dd99cc source term should be '-' not '+' to mass balance equation... 2014-10-27 14:10:40 +08:00
Liu Ming
ba6fef4fbd pass wells manager from sim_poly_fibo to Simulator class, instead of directly 
create it in Simulator class, since polymer inflow need deck and wells.
 2014-10-24 14:04:57 +08:00
Liu Ming
6b3b90500f Merge remote-tracking branch 'opm/master' into bo_polymer 
Conflicts:
	opm/polymer/PolymerProperties.hpp
 2014-10-20 13:51:37 +08:00
Liu Ming
88a1ec6e9f fix bugs: polymer head should be dp*trans. 2014-10-20 13:44:12 +08:00
Atgeirr Flø Rasmussen
23ea7cbd11 Merge pull request #69 from qilicun/fix_bugs 
PLYVISC and PLYADS should not just have only one row.
 2014-10-17 12:21:58 +02:00
Liu Ming
89120ed57f output parameters for debugging and remove double loop of timer. 2014-10-16 16:55:36 +08:00
Liu Ming
ddfb030b57 Merge remote-tracking branch 'opm/master' into bo_polymer 2014-10-16 10:00:37 +08:00
Liu Ming
f1f0fa9c29 resize and use ADB::null() to initialize. 2014-10-16 09:59:59 +08:00
Andreas Lauser
7c122c18d3 use the TLMIXPAR keyword directly 
instead of using a table class. This is because the keyword is not a
table...
 2014-10-14 12:29:31 +02:00
Liu Ming
54c8014453 PLYVISC and PLYADS should not just have only one row. 2014-10-14 16:28:11 +08:00
Liu Ming
b18f13bd7f fix phaseIdx problem and make the function more readable. 2014-10-10 17:06:05 +08:00
Liu Ming
dce2047e41 fix bugs caused by canonical phase index and active phase index. 
residual_ and rq_ resize at a proper position.
 2014-10-10 15:42:49 +08:00
Liu Ming
ddb7b8833f if deck has_polymer, rq_ should resize to store polymer equation. 2014-10-10 10:17:40 +08:00
Liu Ming
d457211cf2 make sure polymer position is the last. 2014-10-10 10:11:04 +08:00
Liu Ming
c2d6347271 make some tricks for initialing polymer_inflow, this maybe wrong, but now no bugs. 2014-10-09 14:23:36 +08:00
Liu Ming
73c2032974 fix some bugs. 2014-10-09 10:04:17 +08:00
Liu Ming
f3553d73c7 since time iteration was moved to the Simulator class, pass PolymerInflowInterface 
as a shared_ptr.
 2014-10-08 14:45:42 +08:00
Liu Ming
e56ba2afae modify them, let them adapt to polymer simulator. 2014-10-08 13:54:45 +08:00
Liu Ming
9c72ca40c8 add concentration and maxconcentration for PolymerBlackoilState. 2014-10-08 11:22:25 +08:00
Liu Ming
4250d4eda5 use phase pressure to compute fluidRecipeFVF(). 2014-10-08 10:23:10 +08:00
Liu Ming
9beaf4e03b add well rate contribution to polymer mass balance equation. 2014-09-30 15:22:50 +08:00
Liu Ming
9db24a22d2 let PolymerBlackoilState return rs() and rv(). 2014-09-29 16:39:50 +08:00
Liu Ming
617f439318 add polymer properties and functions. 2014-09-29 16:38:48 +08:00
Liu Ming
979c2dc0f7 use Newton iteration solver interface from opm-autodiff, prepare for CPR supporting. 2014-09-26 14:54:57 +08:00
Liu Ming
ca70d67d83 some changes, mostly of them are API changes from opm-autodiff and opm-parser. 2014-09-26 14:06:01 +08:00
Liu Ming
1cb1e8475a add PhasePresence, make muOil() function happy. 2014-09-26 14:05:17 +08:00
Liu Ming
e22398c098 make Opm::DerivedGeology as a direct arguement for simulator. 2014-09-25 16:40:01 +08:00
Liu Ming
fb0f4f7a92 comment header files and function for incompProps. 2014-09-25 16:28:35 +08:00
Liu Ming
ca6baf7c73 use phase pressure to compute FVF and density. 2014-09-25 15:14:40 +08:00
Liu Ming
12f1342870 use phasePress to compute viscosity, density. 2014-09-25 14:23:21 +08:00
Liu Ming
219f46a406 update compurePressure(). 2014-09-25 11:24:59 +08:00
Liu Ming
aa30b4567c add phaseCondition for new API of class BlackoilAdInterface 2014-09-25 11:16:56 +08:00
Liu Ming
d5f8cbeec0 move all the output functions to anonymous namespace and clean up unused functions. 2014-09-24 15:44:21 +08:00
Liu Ming
9a41199bd4 Merge remote-tracking branch 'opm/master' into fim 
Conflicts:
	cmake/Modules/Findopm-autodiff.cmake
 2014-09-23 16:04:15 +08:00
Andreas Lauser
9fbf4b2b3b adapt the the table related API changes of opm-parser 2014-09-17 13:28:39 +02:00
Andreas Lauser
67b5cb263e fix a pretty simple compile issue 
This was caused by the new multi-region PVT support in opm-core.
 2014-06-05 14:39:11 +02:00
Andreas Lauser
3a6d989d5e move the code away from EclipsGridParser to opm-parser 2014-04-26 11:13:59 +02:00
Atgeirr Flø Rasmussen
55f5b0a10e Merge pull request #52 from qilicun/read_plyshear 
make PolymerProperties handle PLYSHEAR keyword.
 2014-04-15 08:18:49 +02:00
Bård Skaflestad
4c0e0c8361 Implement low-level init() routines 
These are needed by the initialisation routines of the refactored
opm-core (PR OPM/opm-core#518) that introduces support for parallel
grids.
 2014-04-14 23:52:50 +02:00
Liu Ming
31ddb2f098 let shear vef return derivative. 2014-03-26 16:02:39 +08:00
Liu Ming
7a193dca1e return the value by linear interpolation. 2014-03-21 14:34:46 +08:00
Liu Ming
9204434a4d make the member functions return a const reference. 2014-03-19 09:23:20 +08:00
Andreas Lauser
8e5b442b17 fix all remaining CLang warnings 
this time, I've rebuild the whole module and it seems to work...
 2014-03-18 13:15:59 +01:00
Andreas Lauser
a6f4365344 remove forgotten reference to unused attribute "_gravity" 
for some reason Clang compiled last time. I've got no idea why...
 2014-03-18 13:13:05 +01:00
Andreas Lauser
3cce559d52 adapt to the SimulatorTimer renames of opm-core 2014-03-18 12:44:33 +01:00
Andreas Lauser
911e55c5e6 fix a few harmless CLang warnings 
i.e. rename class to struct in two forward declarations and remove an
unused private attribute...
 2014-03-18 12:44:33 +01:00
Liu Ming
1e41e58ce7 makd PolymerProperties handle PLYSHEAR keyword. 2014-03-18 13:25:52 +08:00
Liu Ming
06bed8d945 fix copyright statement. 2014-03-17 10:54:29 +08:00
Liu Ming
84fab85860 Remove opm/autodiff/ files, fix header files. 2014-03-14 14:12:26 +08:00
Liu Ming
010676ad30 add license statement. 2014-03-03 10:20:44 +08:00
Liu Ming
979d503b7d Add license and documentation. 2014-02-25 09:52:10 +08:00
Liu Ming
e63e318d40 apply PVT function changes. 2014-02-20 16:58:02 +08:00
Liu Ming
f01c4dac10 fix eigen bug when compute the capPress. 2014-01-27 16:53:45 +08:00
Liu Ming
075e16dc36 add capillary pressure for incom solver. 2014-01-27 16:26:48 +08:00
Liu Ming
c4d567c5e4 add capPress functionality for PEDs, just use phase pressure to compute 
laplace term, all the properties are computed by reference pressure
 which maybe oil pressure in OPM.
 2014-01-27 14:48:26 +08:00
Liu Ming
0055ae1def output watercut for incomp polymer solver. 2014-01-23 08:48:42 +08:00
Liu Ming
b9d3b8b1c4 add computeinjecprod function for incomp solver. 2014-01-22 17:07:28 +08:00
Liu Ming
4d2f2fb6a5 using last time step's cmax value when computing adsorption for inconp solver 2014-01-22 16:59:51 +08:00
Liu Ming
12318fe754 output watercut by using utilities.cpp/computeInjectedProduced function. 2014-01-22 14:17:04 +08:00
Liu Ming
8987a4c1d7 write max concentration to PolymerBlackoilState. 2014-01-21 13:45:02 +08:00
Liu Ming
f762684564 computing adsorption using last time step's value of cmax, fix the 
bug that the front cells' concentrations is negative.
 2014-01-20 16:25:30 +08:00
Liu Ming
5ac5df6b86 fix bug when compute the adsorption term in mass balance equation. 2014-01-14 15:33:32 +08:00
Liu Ming
6f6a986595 fix the bug when compute the adsorption term in the mass conservation 
equation.
 2014-01-14 12:59:45 +08:00
Liu Ming
65764ce6f2 add a private member cmax_ to store the max concentration for per cell. 2014-01-10 17:53:54 +08:00
Liu Ming
97f5c5ace5 fix bug when computing the maxconcentration that the cell experienced. 2014-01-10 17:20:08 +08:00
Liu Ming
139bfb7e62 refactor well controls use new well controls gourp. 2014-01-10 14:15:24 +08:00
Liu Ming
7243418cc5 Merge remote-tracking branch 'opm/master' into adsorption 2014-01-10 13:38:40 +08:00
Joakim Hove
a2fd7307b8 Using the well_controls_get_xxx() functions. 2014-01-09 12:06:26 +01:00
Liu Ming
689a3505b7 change residual norm from l2 to lp(p can be infinity). 2014-01-09 16:29:38 +08:00
Liu Ming
391287283d mistake use of typename. 2014-01-03 15:35:00 +08:00
Liu Ming
ff91428fe0 fix bug: check bhp vector is not empty. 2014-01-03 15:27:48 +08:00
Liu Ming
cf28164a5a new simulator for fully implicit compressible twophase 
polymer works.
 2013-12-27 15:48:04 +08:00
Liu Ming
c37539b3ab add well controls for polymer, but rate control just for 
water phase and oil phase.
 2013-12-24 17:31:11 +08:00
Liu Ming
7a874427af remove fullyincomp twophase solver from cmake file list, 
because they are handled in opm/autodiff.
 2013-12-17 23:53:58 +08:00
Liu Ming
2985dc7cce make the simulator read from deckfile 
make it much more gerenal.
 2013-12-17 23:49:09 +08:00
Liu Ming
6d5b90df54 modified the simulator more general. 2013-12-17 20:28:32 +08:00
Liu Ming
970fe665d8 add the bhp well controls. 2013-12-17 17:36:43 +08:00
Xavier Raynaud
2a20e6ebd1 Fixed build. 2013-12-16 11:43:52 +01:00
Liu Ming
c2cdc7ec17 add dead poro volume functionality. 2013-12-12 22:46:29 +08:00
Liu Ming
2eaf24decf fix errors for debugging. 2013-12-12 21:58:25 +08:00
Liu Ming
25160d019a add adsorption term for polymer equation. 
rewrite some function for simplify.
 2013-12-12 21:24:47 +08:00
Liu Ming
0558184439 modify the function for the polymer term. 2013-12-12 20:29:40 +08:00
Liu Ming
720e7ebbef fix derivative of effective relperm respect to concentration. 2013-12-12 17:44:00 +08:00
Liu Ming
a7db4f3cf0 add adsorption and effective relperm functions. 2013-12-11 22:52:11 +08:00
Liu Ming
11ea882ed8 remove some output commits. 
get values from command line for exapmes.
 2013-12-11 18:27:05 +08:00
Liu Ming
a358da7afa fix the polymer source bug, 
warnning: water initial saturation should not bt zero when
running this simulator.
 2013-12-10 20:36:30 +08:00
Liu Ming
6fc24236df fix FullyImplicitTwophasePolymersolver constructor problem. 
add some input commits for debugging.
 2013-12-09 22:57:44 +08:00
Liu Ming
fb12565ddf make PolymerState return numPhases. 2013-12-09 20:34:23 +08:00
Liu Ming
e226b5d95e Simulator for fullyimplicit two phase flow with polymer 2013-12-09 20:33:05 +08:00
Liu Ming
080116c66b Add fully implicit solver for incomp two phase with polymer 
and the polymer properties based on AD.
 2013-12-06 23:35:13 +08:00
Liu Ming
eded8f735c chang include header from opm/autodiff to opm/polymer/fullyimplicit 2013-12-06 22:25:22 +08:00
Liu Ming
f6acccd396 incompressible two phase fully implicit simulator. 2013-12-06 22:13:29 +08:00
Andreas Lauser
44e0848127 make headers autonomously includable and fix a few harmless clang warnings 2013-09-10 19:41:49 +02:00
Andreas Lauser
4859e77c79 explicitly include <iostream> in files which use std::cout or std::cerr 2013-09-05 12:39:11 +02:00
Andreas Lauser
05af2ab6ff Replace MESSAGE by OPM_MESSAGE 2013-09-03 15:43:58 +02:00
Andreas Lauser
7e8d941a6f Replace THROW by OPM_THROW 2013-09-03 15:43:58 +02:00
Andreas Lauser
6a6d0c9b28 Replace the ASSERT and ASSERT2 macros by assert 2013-09-03 15:43:51 +02:00
Atgeirr Flø Rasmussen
d065a908d3 Fix issue 27, bug in call to viscosity(). 2013-06-10 10:31:18 +02:00
Atgeirr Flø Rasmussen
7d5d314fc0 Update to match opm-core changes. 2013-03-18 13:10:32 +01:00
Atgeirr Flø Rasmussen
c16cb6987b Renames classes in line with opm-core changes. 2013-03-15 18:33:41 +01:00
Atgeirr Flø Rasmussen
04abba4d5e Adapt to changed opm-core header name. 2013-03-15 17:55:24 +01:00
Atgeirr Flø Rasmussen
864cce5f5e Adapt to moved opm-core headers. 2013-03-14 13:59:31 +01:00
Atgeirr Flø Rasmussen
23cef788fc Adapt to changed include paths for some opm-core headers. 2013-03-12 11:08:33 +01:00
Atgeirr Flø Rasmussen
b4d5e03c61 Add eclipse output to simulator. 
Note: so far only for incompressible fluid simulator.
 2012-11-26 11:01:23 +01:00
Atgeirr Flø Rasmussen
b6b59918e1 Suppress output of multi-cell-block sizes and #iterations. 2012-11-26 11:00:20 +01:00
Atgeirr Flø Rasmussen
bcfcfdc930 Use minimum 5 digits for step numbers in output file names. 
Was 3 digits, created trouble for certain scripts reading
the files when more than 1000 steps were taken.
 2012-11-05 15:37:14 +01:00
Atgeirr Flø Rasmussen
2b292108ad Added well management to SimulatorCompressiblePolymer. 
Another polymer-specific overload of computeFractionalFlow()
has been added in support of this (this overload deals with
compressible properties.

Also added pressure normalization for situations with arbitrary
absolute pressure.
 2012-10-15 14:23:13 +02:00
Atgeirr Flø Rasmussen
f5861f0cc8 Added well management to SimulatorPolymer. 
A polymer-specific overload of computeFractionalFlow()
has been added in support of this.

Also added a minor feature: pressure normalization for
situations with arbitrary absolute pressure.
 2012-10-10 23:19:35 +02:00
Xavier Raynaud
9cf746b0b0 Removed TAB spaces. 2012-10-08 15:00:19 +02:00
Xavier Raynaud
20d7cf80ea Reintroduced Newton Simple (in s, c variables). 2012-10-08 13:07:22 +02:00
Xavier Raynaud
ef053a1883 Cleaned up single cell Newton solver. 2012-10-08 10:29:45 +02:00
Atgeirr Flø Rasmussen
2f14ed70c4 Modified compressible transport src term. 
Using surface volume for injection rather than reservoir volume.
Chase change in class TransportModelCompressiblePolymer and
function computeInjectedProduced().

Also changed interface to computeInjectedProduced() to take state
rather than individual state variables.
 2012-10-04 22:32:55 +02:00
Atgeirr Flø Rasmussen
f4abfd6cbb Fix mass balance report for multi-epoch case. 
Compute initial polymer amount instead of setting it to zero.
Error obvious with multiple epochs.
 2012-10-04 20:02:34 +02:00
Atgeirr Flø Rasmussen
e13e77a7bb Simulators handle WPOLYMER keyword. 
They do this by using the class PolymerInflowFromDeck
instead of PolymerInflowBasic if there is a WPOLYMER
keyword somewhere in the deck epochs. If there is no
WPOLYMER, the parameters 'poly_start_days' etc. will
be used to construct an instance of PolymerInflowBasic
instead.
 2012-10-04 16:00:33 +02:00
Atgeirr Flø Rasmussen
f2e7c0bece Made getInflowValues() a const method. 2012-10-04 15:59:15 +02:00
Atgeirr Flø Rasmussen
0428c4abb4 Moved PolymerInflow* classes to separate file. 
Also, implemented PolymerInflowFromDeck (but not yet used).
 2012-10-04 15:15:32 +02:00
Atgeirr Flø Rasmussen
6033e5ca69 Make polymer inflow specification by cell. 
Before, it was a single number for the whole domain. It could vary
with time, though.

Simulator behaviour should be identical before and after this commit.

This touches the classes TransportModel*Polymer, Simulator*Polymer,
and the computeInjectedProduced() functions. The PolymerInflow class
and its usage has been replaced with PolymerInflowInterface, and
a subclass PolymerInflowBasic has been created which provides the
old behaviour (using parameters poly_start_days, poly_end_days and
poly_amount).
 2012-10-04 13:38:22 +02:00
Atgeirr Flø Rasmussen
b32c212e56 Fix mass balance report. 
Now reports surface volumes for water and oil, instead of useless
(for mass balance) reservoir volumes. Also makes the case with
multiple transport steps more accurate.
 2012-10-04 11:25:42 +02:00
Atgeirr Flø Rasmussen
c6b76e715d Fix for case with incompressible rock. 
Made rock comp argument optional in computePolymerAdsorbed().
Check inside func for active rock comp.
 2012-10-03 16:17:54 +02:00
Atgeirr Flø Rasmussen
dbd4c9e7b5 Reinstate 10% ad-hoc c-interval overestimation. 
Similar to in TransportModelPolymer.
 2012-10-03 16:16:08 +02:00
Atgeirr Flø Rasmussen
25e528df0d Make output work the same as in other sims. 
I.e. putting each field in its own directory, adding the
output_vtk parameter etc.
 2012-10-03 16:02:27 +02:00
Atgeirr Flø Rasmussen
dc3b0dd6f4 Improve function comment (similar to in SimulatorPolymer). 2012-10-03 16:01:54 +02:00
Atgeirr Flø Rasmussen
753a0c6949 Reinstate 10% ad-hoc c-interval overestimation. 2012-10-03 16:00:51 +02:00
Atgeirr Flø Rasmussen
2990b0a3e8 Improve function comment. 2012-10-03 16:00:13 +02:00
Atgeirr Flø Rasmussen
349c81fb1e Stop writing ascii output twice. 2012-10-03 15:59:18 +02:00
Atgeirr Flø Rasmussen
678611166d Improve reporting of volume balance. 
Should now give more accurate results when taking multiple substeps.
 2012-10-03 14:25:20 +02:00
Atgeirr Flø Rasmussen
076164d3f3 Add "output_vtk" parameter, split output function in two. 
Vtk and Matlab output now happens in two different functions.
 2012-09-17 07:54:50 +02:00
Xavier Raynaud
4db4d715de Last saturation is stored in a mutable variable. 2012-09-10 11:03:59 +02:00
Halvor M. Nilsen
594eca3633 Added lines which is need to compile with PROFILING. Did not check if code brakes. 2012-09-08 11:11:23 +02:00
Xavier Raynaud
55486d3c03 Fixed source term (measured at reservoir condition). 2012-09-05 13:38:30 +02:00
Xavier Raynaud
938fc0f0d4 Fixed comment line. 2012-09-05 12:34:17 +02:00
Xavier Raynaud
7721defbd3 Fixed/Added documentation comments. 2012-09-05 11:45:54 +02:00
Xavier Raynaud
5f27612b05 Merged from upstream. 2012-09-05 11:11:06 +02:00
Xavier Raynaud
7fb671ffbf Changed computation of polymer production. Added functionalities for compressible case. 2012-09-05 11:09:45 +02:00
Bård Skaflestad
36e017d48d Honour initialisation order requirement. 
Introduced in change-set 85cde6f721a4.
 2012-09-05 10:27:37 +02:00
Xavier Raynaud
8e089dd80d Use porevolume instead of porosity, as argument for the transport solver. 2012-09-05 09:11:05 +02:00
Xavier Raynaud
fa84128ddc Fixed bug. 2012-09-05 09:07:47 +02:00
Xavier Raynaud
612a1ffc63 Fixed bug. 2012-09-03 16:46:02 +02:00
Xavier Raynaud
27dea09311 Added initializations in constructor. 2012-09-03 16:45:50 +02:00
Xavier Raynaud
8752f14015 Added executable example for compressible with polymer. 2012-09-03 13:52:59 +02:00
Xavier Raynaud
8bf900f1bf Update surface volume in transport solver. 2012-09-03 12:52:25 +02:00
Xavier Raynaud
708c56bb94 Simplified computation of adsorbed mass of polymer. 2012-09-03 12:49:04 +02:00
Xavier Raynaud
a335e1b149 Added Simulator for compressible polymer. Not tested. 2012-08-31 10:38:50 +02:00
Xavier Raynaud
8b40a4a68f Fixed comments. 2012-08-30 15:58:14 +02:00
Xavier Raynaud
99fe7bf46e Fixed preprocessor flag names in some header files. 2012-08-30 15:31:28 +02:00
Xavier Raynaud
92def1d514 Cleaned up ownership (private vs public) in class definition. 2012-08-30 09:09:23 +02:00
Xavier Raynaud
eb52ee58c1 Added gravity transport solver functionality. Not tested. 2012-08-29 13:49:02 +02:00
Xavier Raynaud
928513b561 Added compressible polymer transport solver. Not yet done. 2012-08-28 16:42:26 +02:00
Xavier Raynaud
9a271a6038 Added (fluid) compressible pressure solver for polymer. 2012-08-27 13:16:10 +02:00
Xavier Raynaud
72658ac91c Simplified code: Only one occurence of residual evaluation. 2012-08-23 17:18:19 +02:00
Xavier Raynaud
51e0512989 Removed non-used members in class ResidualEquation. 2012-08-23 16:51:51 +02:00
Xavier Raynaud
52a19192cb Added PROFILING preprocessor flag. 2012-08-23 14:58:26 +02:00
Halvor M. Nilsen
497822b893 Added posibility to use eclipse fluid for 1D case. Corrected bug in guess for newton solver 2012-07-03 11:05:51 +02:00
Halvor M. Nilsen
0d97945aba Removed safetyfactor with membervariable which for now is put to 1.0. Made jacobian calculations more transparent and fixed pointer error. 2012-06-26 08:37:08 +02:00
Halvor M. Nilsen
aba26a0583 Tried to make derivative genneral 2012-06-23 15:04:59 +02:00
Halvor M. Nilsen
b13416be86 Made new single cell solvers. 2012-06-15 14:40:07 +02:00
Atgeirr Flø Rasmussen
92bc55385d Update porosities before calling transport solver. 2012-06-14 21:53:56 +02:00
Xavier Raynaud
168c4c9e3d Optimized newton solver. 2012-06-14 16:52:03 +02:00
Xavier Raynaud
95c3756443 merge. 2012-06-14 14:35:06 +02:00
Atgeirr Flø Rasmussen
cd9be1030a Adapt to moved SimulatorTimer class, and use common SimulatorReport class. 2012-06-14 14:26:29 +02:00
Xavier Raynaud
6e7980ba47 fixed bug in relperm computation. 2012-06-14 14:01:53 +02:00
Xavier Raynaud
5f4b68fe33 merge profiling branch. 2012-06-14 13:39:12 +02:00
Xavier Raynaud
f3eb14e528 Added sc formulation for gradient method. 2012-06-14 13:37:08 +02:00
Atgeirr Flø Rasmussen
eb845fd45a Added reporting of time usage to interface, similar to SimulatorTwophase. 2012-06-14 13:24:38 +02:00
Atgeirr Flø Rasmussen
d9ea18dc9d Bugfix: fix dkr/ds matrix in IncompPropertiesDefaultPolymer::relperm(). 
Note: this class seems unused now. Can it be removed?
 2012-06-14 13:16:24 +02:00
Xavier Raynaud
9df87db47f fixed bug in computation of derivatives for polymer. 2012-06-14 09:35:45 +02:00
Xavier Raynaud
6620a1b5cd In profiling branch: merged last default branch. 2012-06-14 08:38:01 +02:00
Atgeirr Flø Rasmussen
502215832d Fix erroneous includes again. 2012-06-13 21:59:11 +02:00
Atgeirr Flø Rasmussen
7a40153e51 Added IncompTpfaPolymer class. 2012-06-13 19:56:44 +02:00
Xavier Raynaud
60f2fd2795 updated profiling branch. 2012-06-13 17:55:33 +02:00
Xavier Raynaud
a7e91a0bbc cleaned up TransportModelPolymer (default branch) 2012-06-13 17:52:07 +02:00
Xavier Raynaud
56ef0105af fixed wrong include. 2012-06-13 17:51:47 +02:00
Xavier Raynaud
f04f80e696 cleaned up TransportModelPolymer (profiling branch) 2012-06-13 17:36:36 +02:00
Xavier Raynaud
ab1591df40 fixed computation of derivatives in PolymerProperties.cpp (default branch) 2012-06-13 17:07:08 +02:00
Xavier Raynaud
4732ca3bbc Fixed computation of derivatives in PolymerProperties (profiling branch). 2012-06-13 17:01:23 +02:00
Xavier Raynaud
564ab4bc44 Removed some standard output messages. 2012-06-13 16:13:26 +02:00
Xavier Raynaud
20b87da8d5 Removed some standard output messages (profiling branch) 2012-06-13 16:12:32 +02:00
Xavier Raynaud
acaaada2d0 merge. 2012-06-13 15:56:44 +02:00
Xavier Raynaud
4c7c439dd7 merge. 2012-06-13 15:56:09 +02:00
Atgeirr Flø Rasmussen
005cda508c Improved docs. 2012-06-13 15:55:23 +02:00
Atgeirr Flø Rasmussen
876335908d Added class SimulatorPolymer. 2012-06-13 15:46:15 +02:00
Atgeirr Flø Rasmussen
42e862e7ec Added TransportModelPolymer::setPreferredMethod(). 2012-06-13 15:44:46 +02:00
Atgeirr Flø Rasmussen
b6001c8dac Added helper class PolymerInflow (moved from polymer_reorder.cpp). 2012-06-13 15:44:12 +02:00
Xavier Raynaud
9637906a35 Make compatible with incomptpfa (default branch). 2012-06-13 15:33:31 +02:00
Xavier Raynaud
a5de5341c5 Make compatible with incomptpfa interface. 2012-06-13 15:31:49 +02:00
Xavier Raynaud
6033527a82 Added pure Newton single cell method. Correction of Jacobi. sc formulation. 2012-06-13 15:11:30 +02:00
Atgeirr Flø Rasmussen
1e4db53e7f Bugfix: use water saturation vector where it is expected, not full saturation. 2012-06-13 14:35:18 +02:00
Atgeirr Flø Rasmussen
ffd33be55d Changed interface of TransportModelPolymer to expect full saturation, not just water. 2012-06-13 14:18:32 +02:00
Atgeirr Flø Rasmussen
c4b81d8da5 Removed two unnecessary arguments from TransportModelPolymer constructor. 2012-06-13 12:46:57 +02:00
Xavier Raynaud
022b1ccb11 Small changes in Newton/Gradient method. 2012-06-11 15:59:33 +02:00
Xavier Raynaud
02c5935865 Added profiling branch. Compute number of residual evaluations. 2012-06-11 14:44:21 +02:00
Xavier Raynaud
9eb9ba372d merge 2012-06-11 14:40:55 +02:00
Xavier Raynaud
6a9dc03085 Change copy assignment to reference. 2012-06-07 13:45:09 +02:00
Xavier Raynaud
ad1734265f Added documentation. 2012-06-06 17:03:19 +02:00
Atgeirr Flø Rasmussen
3660ec8e8c Follow headers that were moved in opm-core. 2012-06-05 15:45:41 +02:00
Atgeirr Flø Rasmussen
c3dac20d65 Use new interface for regula falsi, switch to non-throwing error policy. 2012-05-24 10:27:27 +02:00
Xavier Raynaud
91fe1c5d63 Removed useless commented regions. 2012-05-23 16:24:08 +02:00
Xavier Raynaud
4b805c191e Added bound checks to Newton column solver. 2012-05-23 16:22:48 +02:00
Xavier Raynaud
263a41b84b treat case when searching direction is small in Newton reorder solver. 2012-05-22 17:43:18 +02:00
Xavier Raynaud
afca287757 In Newton reordering solver, set smin to zero. 2012-05-22 17:22:31 +02:00
Xavier Raynaud
6a12fe0208 Added default concentration if guess_old_solution is false. 2012-05-22 17:21:12 +02:00
Xavier Raynaud
a9a93d795e Include concentration in error estimation for gauss seidel. 2012-05-22 10:45:43 +02:00
Xavier Raynaud
8e0936fadd Fixed bug in gauss seidel gravity solver. 2012-05-22 09:51:32 +02:00
Xavier Raynaud
48adf98b5a Corrected some mistakes in Gauss Seidel gravitation transport solver. 2012-05-21 16:41:29 +02:00
Xavier Raynaud
12bb246c06 corrected bug in SinglePointUpwindTwoPhasePolymer. 2012-05-21 16:35:39 +02:00
Atgeirr Flø Rasmussen
c115ba2c28 Adapt to renaming and other small modifications of state and initialization. 2012-05-16 15:59:37 +02:00
Xavier Raynaud
360ec5f86d merge. 2012-05-16 15:09:36 +02:00
Xavier Raynaud
76e82a718e fixed mistake in computation of one of the residuals. 2012-05-16 15:09:07 +02:00
Xavier Raynaud
60599b9dbf Implemented Gauss-Seidel solver for polymer. Not tested! 2012-05-16 15:06:14 +02:00
Xavier Raynaud
c0368fa61d Fixed problem induced by s=0 in gravitation transport solver. 2012-05-15 16:09:07 +02:00
Atgeirr Flø Rasmussen
088c61ce00 Added check for single-cell columns. 2012-05-14 11:04:00 +02:00
Atgeirr Flø Rasmussen
67a6674495 Update for simplified column data structure. 2012-05-11 09:41:01 +02:00
Xavier Raynaud
1eb75314e6 Make polymer_reorder.cpp compliant with well management. Not tested! 2012-05-10 14:42:08 +02:00
Xavier Raynaud
0a0ca3bbd3 Added compressibility to polymer reorder transport solver. 2012-05-10 09:42:35 +02:00
Xavier Raynaud
9010f2da42 Fixed bug in Newton solver for polymer. 2012-04-26 14:16:40 +02:00
Xavier Raynaud
6748a6e5e9 some code optimization (instead of mu_w_eff, use its inverse). 2012-04-26 09:25:46 +02:00
Xavier Raynaud
af79b9555c Fixed bug in computation of effectiveTotalMobility. 2012-04-25 09:23:59 +02:00
Xavier Raynaud
3ecb7bf88c Removed compiler warnings. 2012-04-25 08:51:32 +02:00
Xavier Raynaud
ab961dda94 more efficient polymer code (replaced std::vector by double*). 2012-04-25 08:39:39 +02:00
Xavier Raynaud
6eb68c9652 Fixed bug in SinglePointUpwindTwoPhasePolymer. 2012-04-24 11:20:06 +02:00
Xavier Raynaud
e867c53722 polymerUtilities uses now PolymerProperties to compute effective mobilities. 2012-04-23 11:49:05 +02:00
Xavier Raynaud
4794348740 added computeMc function in PolymerProperties. 2012-04-23 10:27:27 +02:00
Xavier Raynaud
88941610ed Corrected a bug in computation of effective mobilities. 2012-04-23 10:07:51 +02:00
Xavier Raynaud
a0794117c9 Cleaned code for computation of residual, many changes, not tested! 2012-04-19 17:21:08 +02:00
Atgeirr Flø Rasmussen
eb502faae7 Moved AdHocProps to new Inc.Props.DefaultPolymer class. 
Also moved some functions in polymer_reorder.cpp to be more similar to spu_2p.cpp.
 2012-04-12 14:10:47 +02:00
Atgeirr Flø Rasmussen
c99e396ed1 Silence warnings related to ad-hoc polymer fluid wrapper class. 2012-04-12 09:07:15 +02:00
Atgeirr Flø Rasmussen
6e26837dc7 Silence warnings resulting from unneeded redeclaration of dps etc. 2012-04-12 09:01:09 +02:00
Atgeirr Flø Rasmussen
b197c6b86e Added rock compressibility terms to residuals (bracketing method only). 2012-04-11 16:04:04 +02:00
Atgeirr Flø Rasmussen
d71742871b Expand concentration interval in which we look for solution. 
This is an ad-hoc fix. We should investigate if (or how much)
the concentration may be above from the injected value.
 2012-04-10 14:08:32 +02:00
Atgeirr Flø Rasmussen
dce3068343 Modified some assertions. 
- In a gravity segregation setting, total upwind mobility may be zero.
 - Make assertion more readable by removing negation.
 2012-04-10 14:05:39 +02:00
Atgeirr Flø Rasmussen
8b8d10d58f Comment unused variables to silence warnings. 2012-04-10 10:25:29 +02:00
Atgeirr Flø Rasmussen
adf40b19c1 Fixed initialization bug in PolymerProperties. 2012-04-10 10:25:07 +02:00
Atgeirr Flø Rasmussen
9fadfc316e Added clarification. 2012-04-02 15:45:34 +02:00
Atgeirr Flø Rasmussen
0e178199ce Added simulator state class for polymer case. 2012-04-02 15:44:32 +02:00
Xavier Raynaud
515bcb485e In transport-reorder Newton, limit interval check for s, c (reset if needed). 2012-03-28 13:10:53 +02:00
Xavier Raynaud
18e45caf4f Added enum to choose gradient computation method. By default, analytic. 2012-03-28 10:14:24 +02:00
Atgeirr Flø Rasmussen
724645b3f8 Introduced enum for adsorption behaviour to make code more self-documenting. 2012-03-27 15:33:48 +02:00
Xavier Raynaud
252fada2b4 Adapted to change in gravitation solver interface. 2012-03-27 13:05:53 +02:00
Xavier Raynaud
b846b15f1f Corrected typo: adsorbtion -> adsorption. 2012-03-27 11:26:55 +02:00
Xavier Raynaud
acedd4b596 Added adsorbtion in residual computation. 2012-03-27 11:20:20 +02:00
Xavier Raynaud
6d9f0ea3ec Added support for adsorbtion index (desorbtion allowed or not). 2012-03-26 16:37:39 +02:00
Atgeirr Flø Rasmussen
294c8b03be Bugfix in calculation of adsorbed polymer for balance reports. 2012-03-26 15:33:38 +02:00
Xavier Raynaud
023cbb228e Fixed bug for computeMc. 2012-03-26 13:45:14 +02:00
Xavier Raynaud
4e3f486d13 Simplified computation of coefficient mc. 2012-03-26 11:31:12 +02:00
Xavier Raynaud
01aab0270b Fixed bug in lapack call for band matrices. 2012-03-26 11:29:19 +02:00
Xavier Raynaud
1836247dab Added actual resistance factor. Not tested. 2012-03-23 17:40:03 +01:00
Xavier Raynaud
4c77354d56 Changed the definition of dead pore space. 2012-03-23 16:08:41 +01:00
Xavier Raynaud
62a1c1ad98 Corrected various bugs in gravitation solver. 2012-03-20 17:43:25 +01:00
Xavier Raynaud
49b9f340ac Added functions to compute mobilities and coefficient mc (with derivatives). 2012-03-20 11:58:09 +01:00
Xavier Raynaud
542ed94b84 removed bugs. can compile. Not tested. 2012-03-19 16:33:32 +01:00
Xavier Raynaud
b6b720f338 Removed useless comment. 2012-03-19 11:30:00 +01:00
Xavier Raynaud
2daf397268 removed dmcds because the coefficient mc does not depend on s. 2012-03-19 11:28:55 +01:00
Xavier Raynaud
b513b129ce changed syntax for BandMatrixCoef. 2012-03-19 09:56:20 +01:00
Xavier Raynaud
dc0771ee3e merge 2012-03-15 18:10:10 +01:00
Xavier Raynaud
efe0408b71 Gravity column solver with polymer. 2012-03-15 18:09:29 +01:00
Xavier Raynaud
54844f60c1 Computes s and c-residual and its Jacobian at a cell interface. 2012-03-15 18:08:30 +01:00
Atgeirr Flø Rasmussen
b120aa6c90 Bugfix: corrected computation of polymer contained in reservoir. 2012-03-14 21:12:54 +01:00
Atgeirr Flø Rasmussen
1554bfff11 Still working on adsorption computations. 2012-03-14 16:13:59 +01:00
Atgeirr Flø Rasmussen
efc03f1596 Remove unneeded dps argument from computePolymerAdsorbed(). 2012-03-14 15:59:56 +01:00
Atgeirr Flø Rasmussen
2f06b301bf Change function name to computePolymerAdsorbed() [with a d, not b]. 2012-03-14 15:57:28 +01:00
Atgeirr Flø Rasmussen
ad470a7796 Bugfix: dead pore space in polymer mass calc. Added computePolymerAbsorbed(). 2012-03-14 15:54:36 +01:00
Atgeirr Flø Rasmussen
bf44f9f72e Added computePolymerMass() and polymer-aware overload of computeInjectedProduced(). 2012-03-14 14:03:07 +01:00
Xavier Raynaud
039c05d9f5 Added comments. 2012-03-07 09:59:04 +01:00
Bård Skaflestad
d12d444411 Include <cmath> for std::pow(). 2012-03-06 21:59:02 +01:00
Atgeirr Flø Rasmussen
ab324ed02e Merged. 2012-03-06 16:09:27 +01:00
Atgeirr Flø Rasmussen
f40aab431b Added polymerUtilitites.hpp and .cpp, implementing polymer-dependent total mobilities etc. 2012-03-06 16:07:27 +01:00
Atgeirr Flø Rasmussen
1919284446 Added effectiveInvVisc() method. 2012-03-06 16:06:00 +01:00
Xavier Raynaud
c3e89e6b5c Added "not so successfull" case in Newton method. 2012-03-06 15:25:37 +01:00
Xavier Raynaud
196c29522d Introduced ResidualEquation class to compute value of residual and derivatives. 2012-03-06 14:58:19 +01:00
Xavier Raynaud
e11cea7432 Set tolerance Newton solver according to tolerance in TransportPolymer. 2012-03-06 09:31:11 +01:00
Xavier Raynaud
801f975b5b Implemented case det(jacobian)=0 in Newton method. 2012-03-06 09:09:37 +01:00
Xavier Raynaud
02296478b1 Minor code optimization. 2012-03-06 09:00:05 +01:00
Xavier Raynaud
93503662ce Fixed bug for Newton method. Added initial residual check for Bracketing method. 2012-03-05 15:32:22 +01:00
Xavier Raynaud
a91b2d991d Use tolerance consistantly. 2012-03-05 12:58:09 +01:00
Xavier Raynaud
f783f9eebe Removed unused code. 2012-03-05 12:50:13 +01:00