Merge pull request #39 from CyprienBosserelle/Fix_River_test

Fix river test
CyprienBosserelle · May 2, 2021 · 7ae9bac · 7ae9bac
2 parents c37c79e + 70e9c1d
commit 7ae9bac
Show file tree

Hide file tree

Showing 5 changed files with 323 additions and 49 deletions.
diff --git a/src/Adaptation.cu b/src/Adaptation.cu
@@ -542,21 +542,23 @@ template <class T> int AddBlocks(int nnewblk, Param& XParam, Model<T>& XModel)
 	{
 		XModel.blocks.active[XParam.nblk + ibl] = -1;
 	}
-
+	/**
 	for (int ibl = 0; ibl < XParam.nblkmem; ibl++)
 	{
 		int ib = XModel.blocks.active[ibl];
-		/*
-		if (ib == -1)
-		{
-			XModel.adapt.coarsen[ib] = false;
-			XModel.adapt.refine[ib] = false;
-		}
-		*/
+		
+		//if (ib == -1)
+		//{
+		//	XModel.adapt.coarsen[ib] = false;
+		//	XModel.adapt.refine[ib] = false;
+		//}
+		
 
 		//printf("ibl=%d; availblk[ibl]=%d;\n",ibl, availblk[ibl]);
 
 	}
+	**/
+
 
 	for (int ibl = 0; ibl < (XParam.nblkmem - oldblkmem); ibl++)
 	{

diff --git a/src/Advection.cu b/src/Advection.cu
@@ -40,13 +40,13 @@ template <class T>__global__ void updateEVGPU(Param XParam, BlockP<T> XBlock, Ev
 
 	unsigned int halowidth = XParam.halowidth;
 	unsigned int blkmemwidth = blockDim.x + halowidth * 2;
-	unsigned int blksize = blkmemwidth * blkmemwidth;
+	//unsigned int blksize = blkmemwidth * blkmemwidth;
 	unsigned int ix = threadIdx.x;
 	unsigned int iy = threadIdx.y;
 	unsigned int ibl = blockIdx.x;
 	unsigned int ib = XBlock.active[ibl];
 
-	T eps = T(XParam.eps);
+	//T eps = T(XParam.eps);
 	T delta = calcres(T(XParam.dx), XBlock.level[ib]);
 	T g = T(XParam.g);
 
@@ -100,7 +100,7 @@ template __global__ void updateEVGPU<double>(Param XParam, BlockP<double> XBlock
 template <class T>__host__ void updateEVCPU(Param XParam, BlockP<T> XBlock, EvolvingP<T> XEv, FluxP<T> XFlux, AdvanceP<T> XAdv)
 {
 
-	T eps = T(XParam.eps);
+	//T eps = T(XParam.eps);
 	T delta;
 	T g = T(XParam.g);
 
@@ -171,7 +171,7 @@ template <class T> __global__ void AdvkernelGPU(Param XParam, BlockP<T> XBlock,
 {
 	unsigned int halowidth = XParam.halowidth;
 	unsigned int blkmemwidth = blockDim.x + halowidth * 2;
-	unsigned int blksize = blkmemwidth * blkmemwidth;
+	//unsigned int blksize = blkmemwidth * blkmemwidth;
 	unsigned int ix = threadIdx.x;
 	unsigned int iy = threadIdx.y;
 	unsigned int ibl = blockIdx.x;
@@ -217,8 +217,8 @@ template <class T> __host__ void AdvkernelCPU(Param XParam, BlockP<T> XBlock, T
 
 
 	int ib;
-	int halowidth = XParam.halowidth;
-	int blkmemwidth = XParam.blkmemwidth;
+	//int halowidth = XParam.halowidth;
+	//int blkmemwidth = XParam.blkmemwidth;
 
 	for (int ibl = 0; ibl < XParam.nblk; ibl++)
 	{

diff --git a/src/Boundary.cu b/src/Boundary.cu
@@ -83,7 +83,7 @@ template <class T> __global__ void bndGPU(Param XParam, bndparam side, BlockP<T>
 
 	unsigned int halowidth = XParam.halowidth;
 	unsigned int blkmemwidth = blockDim.x + halowidth * 2;
-	unsigned int blksize = blkmemwidth * blkmemwidth;
+	//unsigned int blksize = blkmemwidth * blkmemwidth;
 
 	unsigned int ibl = blockIdx.x;
 	unsigned int ix, iy;
@@ -196,7 +196,7 @@ template <class T> __host__ void bndCPU(Param XParam, bndparam side, BlockP<T> X
 	//
 	unsigned int halowidth = XParam.halowidth;
 	unsigned int blkmemwidth = XParam.blkmemwidth;
-	unsigned int blksize = blkmemwidth * blkmemwidth;
+	//unsigned int blksize = blkmemwidth * blkmemwidth;
 
 	for (int ibl = 0; ibl < side.nblk; ibl++)
 	{
@@ -498,7 +498,7 @@ template <class T> __global__ void maskbndGPUleft(Param XParam, BlockP<T> XBlock
 	unsigned int blkmemwidth = XParam.blkmemwidth;
 	unsigned int blksize = blkmemwidth * blkmemwidth;
 	unsigned int ibl = blockIdx.x;
-	unsigned int ix, iy;
+	int ix, iy;
 
 	int isright, istop;
 
@@ -668,7 +668,7 @@ template <class T> __global__ void maskbndGPUbot(Param XParam, BlockP<T> XBlock,
 	unsigned int blkmemwidth = XParam.blkmemwidth;
 	unsigned int blksize = blkmemwidth * blkmemwidth;
 	unsigned int ibl = blockIdx.x;
-	unsigned int ix, iy;
+	int ix, iy;
 
 	int isright, istop;