From: bangerth Date: Tue, 7 Feb 2012 10:50:12 +0000 (+0000) Subject: Rename f_saturation to fractional_flow. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3e8665143ad8a669d984cfeb6d4b9060c1d7b062;p=dealii-svn.git Rename f_saturation to fractional_flow. git-svn-id: https://svn.dealii.org/trunk@25005 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/examples/step-21/step-21.cc b/deal.II/examples/step-21/step-21.cc index 46f7eea765..f76379cb92 100644 --- a/deal.II/examples/step-21/step-21.cc +++ b/deal.II/examples/step-21/step-21.cc @@ -486,8 +486,8 @@ namespace Step21 return 1.0 / (1.0/viscosity * S * S + (1-S) * (1-S)); } - double f_saturation (const double S, - const double viscosity) + double fractional_flow (const double S, + const double viscosity) { return S*S / (S * S + viscosity * (1-S) * (1-S)); } @@ -1002,7 +1002,7 @@ namespace Step21 const Tensor<1,dim> grad_phi_i_s = fe_values[saturation].gradient (i, q); local_rhs(i) += (time_step * - f_saturation(old_s,viscosity) * + fractional_flow(old_s,viscosity) * present_u * grad_phi_i_s + @@ -1071,12 +1071,12 @@ namespace Step21 for (unsigned int i=0; i