]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Rename f_saturation to fractional_flow.
authorbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 7 Feb 2012 10:50:12 +0000 (10:50 +0000)
committerbangerth <bangerth@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 7 Feb 2012 10:50:12 +0000 (10:50 +0000)
git-svn-id: https://svn.dealii.org/trunk@25005 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/examples/step-21/step-21.cc

index 46f7eea76530b32de36b419e60c88aa0e302fd5b..f76379cb9204754dd26f234c10ac6b7a79ca2395 100644 (file)
@@ -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<dofs_per_cell; ++i)
                  local_rhs(i) -= time_step *
                                  normal_flux *
-                                 f_saturation((is_outflow_q_point == true
-                                               ?
-                                               old_solution_values_face[q](dim+1)
-                                               :
-                                               neighbor_saturation[q]),
-                                              viscosity) *
+                                 fractional_flow((is_outflow_q_point == true
+                                                  ?
+                                                  old_solution_values_face[q](dim+1)
+                                                  :
+                                                  neighbor_saturation[q]),
+                                                 viscosity) *
                                  fe_face_values[saturation].value (i,q) *
                                  fe_face_values.JxW(q);
              }

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.