From 02296478b1a80163c41318121a24add42ea41fa2 Mon Sep 17 00:00:00 2001 From: Xavier Raynaud Date: Tue, 6 Mar 2012 09:00:05 +0100 Subject: [PATCH] Minor code optimization. --- opm/polymer/TransportModelPolymer.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/opm/polymer/TransportModelPolymer.cpp b/opm/polymer/TransportModelPolymer.cpp index 7130ec536..b40b13c2c 100644 --- a/opm/polymer/TransportModelPolymer.cpp +++ b/opm/polymer/TransportModelPolymer.cpp @@ -197,16 +197,16 @@ namespace Opm } } - void computeBothResiduals(const double s, const double c, double& res_s, double& res_c, double& mc, double& ff) const + void computeBothResiduals(const double s_arg, const double c_arg, double& res_s, double& res_c, double& mc, double& ff) const { double dps = tm.polyprops_.deadPoreVol(); - ff = tm.fracFlow(s, c, cell); - mc = tm.computeMc(c); + ff = tm.fracFlow(s_arg, c_arg, cell); + mc = tm.computeMc(c_arg); double rhor = tm.polyprops_.rockDensity(); double ads0 = tm.polyprops_.adsorbtion(std::max(c0, cmax0)); - double ads = tm.polyprops_.adsorbtion(std::max(c, cmax0)); - res_s = s - s0 + dtpv*(outflux*tm.fracFlow(s, c, cell) + influx); - res_c = (s - dps)*c - (s0 - dps)*c0 + double ads = tm.polyprops_.adsorbtion(std::max(c_arg, cmax0)); + res_s = s_arg - s0 + dtpv*(outflux*ff + influx); + res_c = (s_arg - dps)*c_arg - (s0 - dps)*c0 + rhor*((1.0 - porosity)/porosity)*(ads - ads0) + dtpv*(outflux*ff*mc + influx_polymer); @@ -315,7 +315,7 @@ namespace Opm double rhor = tm.polyprops_.rockDensity(); double ads0 = tm.polyprops_.adsorbtion(std::max(c0, cmax0)); double ads = tm.polyprops_.adsorbtion(std::max(c, cmax0)); - res[0] = s - s0 + dtpv*(outflux*tm.fracFlow(s, c, cell) + influx); + res[0] = s - s0 + dtpv*(outflux*ff + influx); res[1] = (s - dps)*c - (s0 - dps)*c0 + rhor*((1.0 - porosity)/porosity)*(ads - ads0) + dtpv*(outflux*ff*mc + influx_polymer); @@ -331,7 +331,7 @@ namespace Opm double rhor = tm.polyprops_.rockDensity(); double ads0 = tm.polyprops_.adsorbtion(std::max(c0, cmax0)); double ads = tm.polyprops_.adsorbtion(std::max(c, cmax0)); - res[0] = s - s0 + dtpv*(outflux*tm.fracFlow(s, c, cell) + influx); + res[0] = s - s0 + dtpv*(outflux*ff + influx); res[1] = (s - dps)*c - (s0 - dps)*c0 + rhor*((1.0 - porosity)/porosity)*(ads - ads0) + dtpv*(outflux*ff*mc + influx_polymer);