Commit Graph
100 Commits
Author SHA1 Message Date
Xavier Raynaud 2a20e6ebd1 Fixed build. 2013-12-16 11:43:52 +01:00
Xavier Raynaud 5725438b17 Merge remote-tracking branch 'source/master' 2013-12-16 11:39:12 +01:00
Xavier Raynaud 542762abb6 Merge remote-tracking branch 'source/master' 2013-12-12 09:51:29 +01: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
Xavier Raynaud 4db4d715de Last saturation is stored in a mutable variable. 2012-09-10 11:03:59 +02:00
Xavier Raynaud 680276debf Fixed documentation. 2012-09-05 14:07:51 +02:00
Xavier Raynaud 55486d3c03 Fixed source term (measured at reservoir condition). 2012-09-05 13:38:30 +02:00
Xavier Raynaud 7f1a1d7e24 Merge remote-tracking branch 'upstream/master' 2012-09-05 13:35:48 +02:00
Xavier Raynaud 3eda90b7e6 Merge remote-tracking branch 'upstream/master' 2012-09-05 13:35:48 +02:00
Xavier Raynaud 1d98e043a5 Fixed source term (measured at reservoir conditions). 2012-09-05 13:34:25 +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
Xavier Raynaud 32e1ae249d Merge remote-tracking branch 'upstream/master' 2012-09-05 10:11:02 +02:00
Xavier Raynaud 38bcaeb362 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +02:00
Xavier Raynaud 3d01a60099 Changed solvegravity interface. Fixed bug. 2012-09-05 10:10:02 +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 8c68fd0373 Add initial guess in root solver for gravity residual. 2012-09-04 15:13:55 +02:00
Xavier Raynaud 55793cc909 Use same search interval in computation of flux and gravity residuals. 2012-09-04 15:01:14 +02:00
Xavier Raynaud ff78e358f0 Removed unappropriate conversion from water saturation to complete saturation. 2012-09-04 14:22:56 +02:00
Xavier Raynaud 876d23942c Use porevolume of last step in computation of gravity residual. 2012-09-04 14:21:51 +02:00
Xavier Raynaud 845c100dcd Fixed order of arguments in function call. 2012-09-04 11:39:17 +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 76e517516f Added missing initialization of gravity in constructor. 2012-09-03 14:55:19 +02:00
Xavier Raynaud 8752f14015 Added executable example for compressible with polymer. 2012-09-03 13:52:59 +02:00
Xavier Raynaud e1a5c1dc94 Removed redundant header file include. 2012-09-03 12:55:10 +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 a8cb519d4e Fixed comment. 2012-09-03 12:26:22 +02:00
Xavier Raynaud 0701daa4dc Improve documentation. 2012-09-03 11:29:48 +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 becf485795 Changes to avoid compilator warning. 2012-08-29 13:48:19 +02:00
Xavier Raynaud a13f3cf43b Fixed examples/Makefile.am. 2012-08-29 13:47:05 +02:00
Xavier Raynaud b4a4e297a8 Added functionality to compute porosity for compressible fluid. 2012-08-29 10:54:21 +02:00
Xavier Raynaud 928513b561 Added compressible polymer transport solver. Not yet done. 2012-08-28 16:42:26 +02:00
Xavier Raynaud a9456704e1 Removed private configuration options. 2012-08-28 15:29:27 +02:00
Xavier Raynaud 9aa349b1e5 Corrected comment. 2012-08-28 13:12:54 +02:00
Xavier Raynaud 22372710b8 Merge remote-tracking branch 'atgeirr/master' 2012-08-27 13:32:55 +02:00
Xavier Raynaud af8a6fa7da Changed private->protected and added virtual to make class derivation. 2012-08-27 13:19:04 +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 6ad3e6c050 Merged branches: profiling -> default. 2012-08-23 15:02:56 +02:00
Xavier Raynaud 52a19192cb Added PROFILING preprocessor flag. 2012-08-23 14:58:26 +02:00
Xavier Raynaud 10267620f9 Added changes made in default branch to profiling branch. 2012-08-23 13:59:29 +02:00
Xavier Raynaud 9ed0923279 Update surface volume in transport solver. 2012-08-22 10:11:32 +02:00
Xavier Raynaud 660f14df3b Corrected bug (residual should not be divided by dt). 2012-08-21 17:12:07 +02:00
Xavier Raynaud 52ab67201d Changed way to get total number of cells. 2012-08-21 17:10:49 +02:00
Xavier Raynaud 712ccb0309 Corrected typo in comment. 2012-08-21 17:09:19 +02:00
Xavier Raynaud 7e1e1e7951 Fixed sign error and replaced porevol->porevol0. 2012-08-21 10:20:59 +02:00
Xavier Raynaud b470ab8d50 Fix initialization bug. 2012-08-20 15:18:24 +02:00
Xavier Raynaud 83e9afc75a merge. profiling -> default. 2012-06-14 16:54:04 +02:00
Xavier Raynaud 168c4c9e3d Optimized newton solver. 2012-06-14 16:52:03 +02:00
Xavier Raynaud 9e7a738767 merge default -> profiling. 2012-06-14 14:55:23 +02:00
Xavier Raynaud 95c3756443 merge. 2012-06-14 14:35:06 +02:00
Xavier Raynaud 1fc8c9f3b5 merge 2012-06-14 14:02:42 +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
Xavier Raynaud 03c93ec9e5 fixed examples/Makefile.am 2012-06-14 12:48:49 +02:00
Xavier Raynaud 9ce282b069 merge. (included changes made in profiling branch in default branch). 2012-06-14 09:38:45 +02:00
Xavier Raynaud 9df87db47f fixed bug in computation of derivatives for polymer. 2012-06-14 09:35:45 +02:00
Xavier Raynaud ee89824e0d Added gradient method option in polymer reorder. 2012-06-14 08:54:24 +02:00
Xavier Raynaud 87c68cf783 Added forgotten argument to function. 2012-06-14 08:44:09 +02:00
Xavier Raynaud 6620a1b5cd In profiling branch: merged last default branch. 2012-06-14 08:38:01 +02:00
Xavier Raynaud 60f2fd2795 updated profiling branch. 2012-06-13 17:55:33 +02:00
Xavier Raynaud 23580678dc merge 2012-06-13 17:54:20 +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 7257c0fe05 merge. 2012-06-13 16:08:44 +02:00
Xavier Raynaud 342d4a6c0d merge. 2012-06-13 16:01:56 +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
Xavier Raynaud cab3652c49 Added corey fluid class. 2012-06-13 15:48:09 +02:00
Xavier Raynaud ce6e21c0d6 updated polymer_reorder (profiling branch). 2012-06-13 15:44:34 +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
Xavier Raynaud 69d0ceb9a2 merge. 2012-06-12 14:50:38 +02:00
Xavier Raynaud 41ed948c1c Added Corey relative permeability. 2012-06-12 14:48:24 +02:00
Xavier Raynaud 2c1b7a6c66 merge 2012-06-12 14:27:34 +02:00
Xavier Raynaud c583f4b4cd Added corey relative permeabilities. 2012-06-12 14:07:31 +02:00
Xavier Raynaud 37657d9feb Added comment.x 2012-06-11 16:23:33 +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