Commit Graph
100 Commits
Author SHA1 Message Date
Liu Ming f0a2959a6d use EclipsePRTLog. 2016-03-15 09:43:18 +08:00
Liu Ming b4b821521e enable relperm diagnostics for solvent model. 2016-03-10 14:41:10 +08:00
Liu Ming b15320b659 change diagnostics function call order. 2016-02-19 16:40:45 +08:00
Liu Ming fe06257f27 rename LOG to PRT file. 2016-02-19 16:23:31 +08:00
Liu Ming 66cde4e052 integrate relperm diagnostics into flow. 2016-02-19 12:45:23 +08:00
Liu Ming 356a35600f use more non-strict ParseMode. 2015-11-18 15:23:12 +08:00
Liu Ming 3898ecde96 Fix parameter errors. 2015-06-22 15:43:01 +08:00
Liu Ming 641113bfa8 remove the debug information. 2015-05-20 15:06:00 +08:00
Liu Ming f66921612c Output well name when wells can't find in WPOLYMER keyword. 2015-05-20 14:57:26 +08:00
Liu Ming f8baad5d91 Fix error: When the injector is not the first of wells, opm should work well. 2015-05-20 12:35:04 +08:00
Liu Ming 825d4a1609 Merge remote-tracking branch 'opm/master' 2015-04-17 16:38:07 +08:00
Liu Ming 975d161359 add HAVE_PETSC for config.h 2015-04-10 15:09:11 +02:00
Liu Ming a8387f67dc Fix duplication errors. 2015-04-10 15:09:10 +02:00
Liu Ming c7cd3c80b5 Let opm-core find Petsc if PETSC_ROOT is specified. 2015-04-10 15:06:08 +02:00
Liu Ming 38d3f29e2a cmake Module for finding Petsc. 2015-04-10 15:06:07 +02:00
Liu Ming c9ad1e33ba Merge remote-tracking branch 'remotes/opm/master' 2015-03-25 09:08:58 +08:00
Liu Ming f23f5fac8e rename sim_poly_fibo_ad to flow_polymer. 2015-03-24 17:06:32 +08:00
Liu Ming d791888430 Merge remote-tracking branch 'remotes/opm/master' into updates
Conflicts:
	opm/polymer/fullyimplicit/FullyImplicitBlackoilPolymerSolver_impl.hpp
2015-03-24 16:56:19 +08:00
Liu Ming 0d0ff9d961 use std::move(), solving conflicts. 2015-03-24 16:41:32 +08:00
Liu Ming efd7b93779 Merge branch 'updates' 2015-03-24 15:18:58 +08:00
Liu Ming b4d834508c Updates FIBOPOLYMER simulator based on flow simulator.
Rename sim_poly_fibo_ad to flow_polymer.
2015-03-24 15:07:25 +08:00
Liu Ming 3ddb930d1f Adapt to api changes of opm-parser. 2015-02-12 16:16:07 +08:00
Liu Ming 6cd0c47b94 support MINPVF. 2015-02-09 11:27:10 +08:00
Liu Ming 3ab3dc555a Use original grid cell volume to compute pore volume. 2015-01-29 16:25:17 +08:00
Liu Ming 74332085dc change PolymerInflow constructor interface due to commit 6628941c9c9d781db9ec8e3ac05a3a8dc49dcf21 in opm-parser. 2015-01-27 12:24:26 +08:00
Liu Ming 6a3bfba846 Adapte to FIBO wellstate API changes in opm-autodiff. 2015-01-19 11:29:32 +08:00
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 953cddce98 Merge branch 'fix_cmax' into wpolymer_schedule 2014-12-08 10:02:38 +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
Liu Ming d0f75da59e Merge remote-tracking branch 'remotes/origin/wpolymer_schedule' into wpolymer_schedule 2014-12-08 09:09:03 +08: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
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 61c76c4294 use std::unique_ptr instead of boost::scoped_ptr. 2014-10-20 17:29:59 +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
Liu Ming 89120ed57f output parameters for debugging and remove double loop of timer. 2014-10-16 16:55:36 +08:00
Liu Ming 6a051b7e4e adapte the API changes of PolymerProperties class. 2014-10-16 10:03:13 +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
Liu Ming d99a0ff7a1 use PLMIXPAR instead of TLMIXPAR. 2014-10-15 09:47:43 +08:00
Liu Ming 54c8014453 PLYVISC and PLYADS should not just have only one row. 2014-10-14 16:28:11 +08:00
Liu Ming 6d76151b6d use std::unique_ptr instead of std::shared_ptr for polymerInflowInterface. 2014-10-11 16:38:59 +08:00
Liu Ming b183fdfa6d if all the phase are stagnate then stagnate will be true. 2014-10-11 13:46:24 +08:00
Liu Ming b18f13bd7f fix phaseIdx problem and make the function more readable. 2014-10-10 17:06:05 +08:00
Liu Ming 5b28b38056 make the for statement more readable. 2014-10-10 17:01:05 +08:00
Liu Ming 66bb1fae8f phaseIdx in this for statement is actual active phase index, should not
active once again.
2014-10-10 16:21:29 +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 be927741b8 create a blackoil+polymer simulator. 2014-10-08 14:46:43 +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 8620ce2641 use std::shared_ptr instead of boost::scoped_ptr. 2014-09-26 14:03:55 +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 5657d32884 use phase pressure to compute FVF. 2014-09-25 14:34:04 +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
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
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