Refactoring

This commit is contained in:
André R. Brodtkorb
2018-10-31 15:34:54 +01:00
parent 4fa09d5d39
commit 2d8858e7e6
19 changed files with 402 additions and 158 deletions

View File

@@ -21,8 +21,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
"""
#Import packages we need
import numpy as np
from GPUSimulators import Simulator, Common
import numpy as np
@@ -57,11 +57,11 @@ class WAF (Simulator.BaseSimulator):
super().__init__(context, \
nx, ny, \
dx, dy, dt, \
g, \
block_width, block_height);
self.g = np.float32(g)
#Get kernels
self.kernel = context.get_prepared_kernel("cuda/SWE_WAF.cu", "WAFKernel", \
self.kernel = context.get_prepared_kernel("cuda/SWE2D_WAF.cu", "WAFKernel", \
"iiffffiPiPiPiPiPiPi", \
defines={
'BLOCK_WIDTH': self.block_size[0],