From 597796a929acc0ec241b2bf66d8c560cbe852b4a Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Thu, 11 Jul 2019 13:01:42 +0200
Subject: Move the QMS source function to BSSN.

---
 interface.ccl      | 1 -
 schedule.ccl       | 5 -----
 src/make.code.defn | 2 +-
 src/qms.c          | 7 ++++++-
 src/register.c     | 9 ---------
 5 files changed, 7 insertions(+), 17 deletions(-)
 delete mode 100644 src/register.c

diff --git a/interface.ccl b/interface.ccl
index 7216b74..44c9847 100644
--- a/interface.ccl
+++ b/interface.ccl
@@ -12,6 +12,5 @@ REQUIRES FUNCTION MoLRegisterSaveAndRestore
 REQUIRES FUNCTION MoLRegisterSaveAndRestoreGroup
 
 public:
-CCTK_REAL W TYPE=GF
 CCTK_REAL W_coeffs TYPE=array DIM=3 SIZE=2,basis_order_z,basis_order_r DISTRIB=constant
 CCTK_REAL W_pred   TYPE=array DIM=3 SIZE=2,basis_order_z,basis_order_r DISTRIB=constant
diff --git a/schedule.ccl b/schedule.ccl
index d8eb719..818d9a2 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -17,14 +17,9 @@ SCHEDULE quasimaximal_slicing_axi_solve IN MoL_PreStep {
 #    LANG: C
 #} "Quasimaximal slicing"
 
-SCHEDULE qms_register_mol IN MoL_Register {
-    LANG: C
-} ""
-
 SCHEDULE qms_init IN ADMBase_InitialData {
     LANG: C
 } ""
 
-STORAGE: W
 STORAGE: W_pred
 STORAGE: W_coeffs
diff --git a/src/make.code.defn b/src/make.code.defn
index 2863409..5171428 100644
--- a/src/make.code.defn
+++ b/src/make.code.defn
@@ -1,7 +1,7 @@
 # Main make.code.defn file for thorn MaximalSlicingAxi
 
 # Source files in this directory
-SRCS = basis.c bicgstab.c qms.c qms_solve.c pssolve.c register.c
+SRCS = basis.c bicgstab.c qms.c qms_solve.c pssolve.c
 
 # Subdirectories containing source files
 SUBDIRS = 
diff --git a/src/qms.c b/src/qms.c
index 54cd657..839f16d 100644
--- a/src/qms.c
+++ b/src/qms.c
@@ -353,7 +353,7 @@ void quasimaximal_slicing_axi_eval(CCTK_ARGUMENTS)
 
     int64_t expand_start;
 
-    double *coeffs = NULL;
+    double *coeffs = NULL, *W;
     int i, ret;
 
     if (!qms_context)
@@ -393,6 +393,11 @@ void quasimaximal_slicing_axi_eval(CCTK_ARGUMENTS)
     }
 #endif
 
+    if (ccz4)
+        W = CCTK_VarDataPtr(cctkGH, 0, "ML_CCZ4::W");
+    else
+        W = CCTK_VarDataPtr(cctkGH, 0, "ML_BSSN::W");
+
     CCTK_TimerStart("QuasiMaximalSlicing_Expand");
     expand_start = gettime();
 #if 0
diff --git a/src/register.c b/src/register.c
deleted file mode 100644
index 65c2d21..0000000
--- a/src/register.c
+++ /dev/null
@@ -1,9 +0,0 @@
-
-#include "cctk.h"
-#include "cctk_Arguments.h"
-#include "Slicing.h"
-
-void qms_register_mol(CCTK_ARGUMENTS)
-{
-    MoLRegisterConstrained(CCTK_VarIndex("QuasiMaximalSlicing::W"));
-}
-- 
cgit v1.2.3