Merge pull request #79 from stevenrbrandt/fix-minor

Fix minor issues: breaks wavetoyX, but that's @stevenrbrandt 's jurisdiction.
zachetienne · Jun 6, 2023 · 2c73527 · 2c73527
2 parents cecb7ee + 2c6145f
commit 2c73527
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 25 deletions.
diff --git a/CarpetX/WaveToy.py b/CarpetX/WaveToy.py
@@ -132,7 +132,7 @@ def main():
     z0 = thorn.declare_param('z0',default=0,vmin=-100,vmax=100,doc="The z pos of the wave")
     zero = thorn.declare_param('zero',default=0,vmin=0,vmax=0,doc="zero")
 
-    centering='VVC'
+    centering='CVV'
 
     # AUXEVOL needed for the evo, can be freed after evaluating rhs (1 time level)
     # AUX uu_rhs (1 time level)

diff --git a/cactusthorn.py b/cactusthorn.py
@@ -58,8 +58,7 @@ def __iter__(self):
         li = sorted(li)
         return li.__iter__()
 
-# FIXME: "name" is an unused argument:
-def check_eqns(name, eqns):
+def check_eqns(eqns):
     forgotten = sortedset()
     scalar_reads = sortedset()
     scalar_writes = sortedset()
@@ -166,7 +165,7 @@ def _add_src(self, src):
 
     def add_func(self, name, body, schedule_bin, doc, where='interior', centering=None, sync=None):
         body = flatten(body)
-        check_eqns(name, body)
+        check_eqns(body)
         self.sync[name] = sync
         check_centering(centering)
         if gri.ET_driver == "Carpet":
@@ -255,11 +254,6 @@ def add_func(self, name, body, schedule_bin, doc, where='interior', centering=No
         centerings_needed = sortedset()
         centerings_needed.add(centering)
         layout_decls = ""
-        # FIXME: dead code
-        # for c in centerings_needed:
-        #     if c not in centerings_used:
-        #         nums = ",".join(["1" if n in ["c","C"] else "0" for n in c])
-        #         #layout_decls += f(" CCTK_CENTERING_LAYOUT({c},({{ {nums} }})); ")
         tmp_centerings = {}
         for gf in tmps:
             c = gri.find_centering(gf)
@@ -401,8 +395,8 @@ def do_body(self, body, where, centering):
             body = f("""
   {decl}
   {checkbounds}
-  gri.loop_{wtag}_device<{centering}_centered[0], {centering}_centered[1], {centering}_centered[2], CCTK_VECSIZE>(
-  gri.nghostzones, [=] CCTK_DEVICE (
+  grid.loop_{wtag}_device<{centering}_centered[0], {centering}_centered[1], {centering}_centered[2], CCTK_VECSIZE>(
+  grid.nghostzones, [=] CCTK_DEVICE (
   const PointDesc &p) CCTK_ATTRIBUTE_ALWAYS_INLINE {{
   const GF3D5index CCTK_ATTRIBUTE_UNUSED {centering}_index({centering}_layout, p.I);
   const GF3D5index CCTK_ATTRIBUTE_UNUSED {centering}_tmp_index({centering}_tmp_layout, p.I);
@@ -679,12 +673,6 @@ def generate(self,dirname=None,cactus_config="sim",cactus_thornlist=None,schedul
                             if writegf in gri.find_gfnames():
                                 full_name = self.get_full_name(writegf)
                                 print(f(u"    WRITES: {full_name}({src.where})"),file=fd)
-                        # FIXME: dead code
-                        # if src.where == "interior":
-                        #     for writegf in func.writegfs:
-                        #         if writegf in gri.find_gfnames():
-                        #             full_name = self.get_full_group_name(writegf)
-                        #             pass #print(f(u"    SYNC: {full_name}"),file=fd)
                         sync = self.sync.get(func.name, None)
                         if sync is not None:
                             print(f(u"    SYNC: {sync}"), file=fd)

diff --git a/grid.py b/grid.py
@@ -31,9 +31,6 @@ def glb_gridfcs_map():
     return m
 
 
-# Grids may have centerings. These will be C=cell-centered or V=vertex centered, with either one C or V per dimension
-gf_centering = {}
-
 # griddata_struct contains data needed by each grid
 glb_griddata = namedtuple('griddata', 'module string')
 glb_griddata_struct_list = []
@@ -259,8 +256,6 @@ def find_centering(gf_name):
 
 def register_gridfunctions(gf_type, gf_names, rank=0, is_indexed=False, DIM=3, f_infinity=None, wavespeed=None,
                            centering=None, external_module=None):
-    global gf_centering
-
     # Step 0: Sanity check
     if (rank > 0 and not is_indexed) or (rank == 0 and is_indexed):
         print(
@@ -280,9 +275,6 @@ def register_gridfunctions(gf_type, gf_names, rank=0, is_indexed=False, DIM=3, f
         gf_namestmp = [gf_names]
         gf_names = gf_namestmp
 
-    for gf_name in gf_names:
-        gf_centering[gf_name] = centering
-
     f_inf = []
     if f_infinity is None:
         f_infinity = 0.0  # set to default