[cig-commits] r7773 - mc/3D/CitcomS/branches/compressible/lib

[tan2 at geodynamics.org]

Author: tan2
Date: 2007-08-03 12:00:41 -0700 (Fri, 03 Aug 2007)
New Revision: 7773

Modified:
   mc/3D/CitcomS/branches/compressible/lib/Stokes_flow_Incomp.c
Log:
Naming the functions for Uzawa iteration by the algorithm (CG or BiCG), instead of by the approximation (BA or TALA)

Modified: mc/3D/CitcomS/branches/compressible/lib/Stokes_flow_Incomp.c
===================================================================
--- mc/3D/CitcomS/branches/compressible/lib/Stokes_flow_Incomp.c	2007-08-03 18:59:06 UTC (rev 7772)
+++ mc/3D/CitcomS/branches/compressible/lib/Stokes_flow_Incomp.c	2007-08-03 19:00:41 UTC (rev 7773)
@@ -38,10 +38,10 @@
 static float solve_Ahat_p_fhat(struct All_variables *E,
                                double **V, double **P, double **F,
                                double imp, int *steps_max);
-static float solve_Ahat_p_fhat_BA(struct All_variables *E,
+static float solve_Ahat_p_fhat_CG(struct All_variables *E,
                                   double **V, double **P, double **F,
                                   double imp, int *steps_max);
-static float solve_Ahat_p_fhat_TALA(struct All_variables *E,
+static float solve_Ahat_p_fhat_BiCG(struct All_variables *E,
                                     double **V, double **P, double **F,
                                     double imp, int *steps_max);
 static double initial_vel_residual(struct All_variables *E,
@@ -105,9 +105,9 @@
     float residual;
 
     if(E->control.inv_gruneisen < 1e-6)
-        residual = solve_Ahat_p_fhat_BA(E, V, P, F, imp, steps_max);
+        residual = solve_Ahat_p_fhat_CG(E, V, P, F, imp, steps_max);
     else
-        residual = solve_Ahat_p_fhat_TALA(E, V, P, F, imp, steps_max);
+        residual = solve_Ahat_p_fhat_BiCG(E, V, P, F, imp, steps_max);
 
     return(residual);
 }
@@ -117,7 +117,7 @@
  * conjugate gradient (CG) iterations
  */
 
-static float solve_Ahat_p_fhat_BA(struct All_variables *E,
+static float solve_Ahat_p_fhat_CG(struct All_variables *E,
                                   double **V, double **P, double **F,
                                   double imp, int *steps_max)
 {
@@ -309,7 +309,7 @@
  * bi-conjugate gradient stablized (BiCG-stab)iterations
  */
 
-static float solve_Ahat_p_fhat_TALA(struct All_variables *E,
+static float solve_Ahat_p_fhat_BiCG(struct All_variables *E,
                                     double **V, double **P, double **F,
                                     double imp, int *steps_max)
 {