Updates to convergence plots

2026-01-13 15:19:31 +01:00 · 2018-08-08 16:10:31 +02:00
parent 01174dbae7
commit e01cdb3c19
7 changed files with 2295 additions and 5487 deletions
--- a/CompareSchemes1D.ipynb
+++ b/CompareSchemes1D.ipynb
--- a/ConvergenceShock1D.ipynb
+++ b/ConvergenceShock1D.ipynb
--- a/ConvergenceSmooth1D.ipynb
+++ b/ConvergenceSmooth1D.ipynb
--- a/ConvergenceSmooth2D.ipynb
+++ b/ConvergenceSmooth2D.ipynb
--- a/CUDA.ipynb
+++ b/CUDA.ipynb
--- a/SWESimulators/Common.py
+++ b/SWESimulators/Common.py
@@ -148,7 +148,7 @@ class CUDAArray2D:
        #Make sure data is in proper format
        assert np.issubdtype(data.dtype, np.float32), "Wrong datatype: %s" % str(data.dtype)
        assert not np.isfortran(data), "Wrong datatype (Fortran, expected C)"
-        assert data.shape == (self.ny_halo, self.nx_halo), "Wrong data shape: %s" % str(data.shape)
+        assert data.shape == (self.ny_halo, self.nx_halo), "Wrong data shape: %s vs %s" % (str(data.shape), str((self.ny_halo, self.nx_halo)))

        #Upload data to the device
        self.data = pycuda.gpuarray.to_gpu_async(data, stream=stream)
--- a/WAFExp.ipynb
+++ b/WAFExp.ipynb