From d519d82a3e4b32944b77b1ae26cfefa45ec29d71 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sat, 26 Jan 2019 10:19:30 +0100
Subject: ell_relax -> ell_grid_solve

Generalize the API to allow for multiple solver types. This is done in
preparation for the exact linear system inversion solver.
---
 relax_test.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'relax_test.c')

diff --git a/relax_test.c b/relax_test.c
index e885d55..d211e35 100644
--- a/relax_test.c
+++ b/relax_test.c
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "ell_relax.h"
+#include "ell_grid_solve.h"
 #include "log.h"
 #include "mg2d_boundary.h"
 #include "mg2d_constants.h"
@@ -49,7 +49,7 @@ static double findmax(double *arr, size_t len)
 
 int main(int argc, char **argv)
 {
-    EllRelaxContext *ctx;
+    EGSContext *ctx;
     long int log2N, log2maxiter;
     long int N, maxiter;
     double res_old, res_new;
@@ -71,7 +71,7 @@ int main(int argc, char **argv)
     N       = (1L << log2N) + 1;
     maxiter = 1L << log2maxiter;
 
-    ctx = mg2di_ell_relax_alloc((size_t [2]){N, N});
+    ctx = mg2di_egs_alloc(EGS_SOLVER_RELAXATION, (size_t [2]){N, N});
     if (!ctx) {
         fprintf(stderr, "Error allocating the solver context\n");
         return 1;
@@ -164,7 +164,7 @@ int main(int argc, char **argv)
                sizeof(*ctx->diff_coeffs[0]) * ctx->domain_size[0]);
     }
 
-    ret = mg2di_ell_relax_init(ctx);
+    ret = mg2di_egs_init(ctx);
     if (ret < 0) {
         fprintf(stderr, "Error initializing the solver context: %d\n", ret);
         ret = 1;
@@ -174,7 +174,7 @@ int main(int argc, char **argv)
     res_old = findmax(ctx->residual, ctx->residual_stride * ctx->domain_size[1]);
 
     for (int i = 0; i < maxiter; i++) {
-        ret = mg2di_ell_relax_step(ctx);
+        ret = mg2di_egs_solve(ctx);
         if (ret < 0) {
             fprintf(stderr, "Error during relaxation\n");
             ret = 1;
@@ -206,6 +206,6 @@ int main(int argc, char **argv)
     }
 
 fail:
-    mg2di_ell_relax_free(&ctx);
+    mg2di_egs_free(&ctx);
     return ret;
 }
-- 
cgit v1.2.3