From 685ddd5c8e515f4a2f79c7c613b1bf0293b00f9f Mon Sep 17 00:00:00 2001
From: "Timothy A. Smith" <tasmith4@illinois.edu>
Date: Tue, 3 Sep 2019 14:14:30 -0500
Subject: [PATCH] cleanup some more post-merge issues

---
 test/data_for_test.py         | 4 ++--
 test/test_eigensystem.py      | 3 ++-
 test/test_flux_derivatives.py | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/data_for_test.py b/test/data_for_test.py
index 18cd5ea..558bf33 100644
--- a/test/data_for_test.py
+++ b/test/data_for_test.py
@@ -27,7 +27,7 @@ class FluxDataSingle:
 
         self.state_pair = self.swap_array_rows(
                 u.transposed_array_from_string(states_str), self.dir_internal)
-        self.states = u.expand_to_6(self.state_pair)
+        self.states = u.expand_to_n(self.state_pair, 6)
 
         # FIXME: these should be generalized fluxes
         # FIXME: make a clear distinction between fluxes in physical and
@@ -108,7 +108,7 @@ class FluxDataVector:
         self.fluxes = self.fill_transverse_with_halo(
                 u.expand_to_n(flux_pair, self.nxhalo))
 
-        identity = np.identity(self.ndim, dtype=float64, order="F")
+        identity = np.identity(self.ndim, dtype=np.float64).copy(order="F")
         self.metrics = np.empty((self.ndim, self.ndim,
                 self.nxhalo, self.nyhalo, self.nzhalo))
         for i in range(self.nxhalo):
diff --git a/test/test_eigensystem.py b/test/test_eigensystem.py
index 4b0a7a6..de37e89 100644
--- a/test/test_eigensystem.py
+++ b/test/test_eigensystem.py
@@ -83,7 +83,8 @@ def test_lax_wavespeeds(
 
     nvars = 5
 
-    lam_pointwise = u.expand_to_6(u.transposed_array_from_string(lam_pointwise_str))
+    lam_pointwise = u.expand_to_n(
+            u.transposed_array_from_string(lam_pointwise_str), 6)
     lam_roe = u.array_from_string(lam_roe_str)
     lam_dev = u.empty_array_on_device(queue, nvars)
 
diff --git a/test/test_flux_derivatives.py b/test/test_flux_derivatives.py
index b768625..f506f85 100644
--- a/test/test_flux_derivatives.py
+++ b/test/test_flux_derivatives.py
@@ -17,10 +17,10 @@ from pyopencl.tools import (  # noqa
 import utilities as u
 from data_for_test import (  # noqa: F401
         cfd_test_data_fixture
-        vector_data as vd
         )
 
 
+@pytest.mark.slow
 def test_compute_flux_derivatives_uniform_grid(ctx_factory, cfd_test_data_fixture):
     data = cfd_test_data_fixture
 
-- 
GitLab