From 73fe873b69f30f435a8a1861c596e4238e7b2069 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Mon, 9 Sep 2019 12:54:17 +0200
Subject: Rename W_mg to W_val.

---
 interface.ccl |  2 +-
 schedule.ccl  |  7 ++++---
 src/qms.c     | 12 ++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/interface.ccl b/interface.ccl
index f742897..5041ea2 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -15,7 +15,7 @@ CCTK_INT FUNCTION MoLNumIntegratorSubsteps ()
 USES FUNCTION MoLNumIntegratorSubsteps
 
 public:
-REAL W_mg      TYPE=GF TIMELEVELS=2
+REAL W_val     TYPE=GF TIMELEVELS=2
 REAL W_val0    TYPE=GF TIMELEVELS=1 tags='Prolongation="None"'
 REAL W_val1    TYPE=GF TIMELEVELS=1 tags='Prolongation="None"'
 REAL W_val0_time TYPE=ARRAY DIM=1 SIZE=32 DISTRIB=constant
diff --git a/schedule.ccl b/schedule.ccl
index cbea68c..1f2b6d0 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -20,11 +20,11 @@ if (CCTK_EQUALS(lapse_source, "QMS_MG")) {
         SYNC: W_pred1
         SYNC: W_val0
         SYNC: W_val1
-        SYNC: W_mg
+        SYNC: W_val
     } "Quasimaximal slicing solve W"
 
     SCHEDULE qms_mg_sync IN CCTK_POSTSTEP BEFORE qms_mg_solve {
-        SYNC: W_mg
+        SYNC: W_val
         LANG: C
     } ""
 
@@ -40,11 +40,12 @@ if (CCTK_EQUALS(lapse_source, "QMS_MG")) {
         LANG: C
     } ""
 
-    STORAGE: W_mg[2]
     STORAGE: W_pred0
     STORAGE: W_pred1
     STORAGE: W_pred0_time
     STORAGE: W_pred1_time
+
+    STORAGE: W_val[2]
     STORAGE: W_val0
     STORAGE: W_val1
     STORAGE: W_val0_time
diff --git a/src/qms.c b/src/qms.c
index 646c7b9..b922840 100644
--- a/src/qms.c
+++ b/src/qms.c
@@ -1309,7 +1309,7 @@ void qms_mg_solve(CCTK_ARGUMENTS)
                 double *dst = bnd->val + j * bnd->val_stride;
                 for (ptrdiff_t i = -j; i < (ptrdiff_t)cp->solver->local_size[0] + j; i++) {
                     const ptrdiff_t idx = CCTK_GFINDEX3D(cctkGH, ABS(i) + cp->offset_left[0], cp->y_idx, cp->offset_left[1] + cp->solver->local_size[1] - 1 + j);
-                    dst[i] = W_mg[idx];
+                    dst[i] = W_val[idx];
                 }
             }
         }
@@ -1320,7 +1320,7 @@ void qms_mg_solve(CCTK_ARGUMENTS)
                 double *dst = bnd->val + j * bnd->val_stride;
                 for (ptrdiff_t i = -j; i < (ptrdiff_t)cp->solver->local_size[1] + j; i++) {
                     const ptrdiff_t idx = CCTK_GFINDEX3D(cctkGH, cp->offset_left[1] + cp->solver->local_size[0] - 1 + j, cp->y_idx, cp->offset_left[1] + ABS(i));
-                    dst[i] = W_mg[idx];
+                    dst[i] = W_val[idx];
                 }
             }
         }
@@ -1347,9 +1347,9 @@ void qms_mg_solve(CCTK_ARGUMENTS)
 
     start = gettime();
     {
-        double *W_mg_1 = CCTK_VarDataPtr(cctkGH, 1, "QuasiMaximalSlicingMG::W_mg");
-        solution_to_grid(cp, cp->solver, W_mg);
-        memcpy(W_mg_1, W_mg, grid_size * sizeof(*W_mg_1));
+        double *W_val_tl1 = CCTK_VarDataPtr(cctkGH, 1, "QuasiMaximalSlicingMG::W_val");
+        solution_to_grid(cp, cp->solver, W_val);
+        memcpy(W_val_tl1, W_val, grid_size * sizeof(*W_val_tl1));
     }
 
     /* add the solution to the list of past solutions */
@@ -1357,7 +1357,7 @@ void qms_mg_solve(CCTK_ARGUMENTS)
         memcpy(W_val0, W_val1, sizeof(*W_val0) * grid_size);
         W_val0_time[reflevel] = W_val1_time[reflevel];
 
-        memcpy(W_val1, W_mg, sizeof(*W_val1) * grid_size);
+        memcpy(W_val1, W_val, sizeof(*W_val1) * grid_size);
         W_val1_time[reflevel] = ms->gh->cctk_time;
     }
 
-- 
cgit v1.2.3