Fix compile issues

CyprienBosserelle · Oct 17, 2024 · ef90c69 · ef90c69
1 parent b8e8ed9
commit ef90c69
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/src/InitialConditions.cu b/src/InitialConditions.cu
@@ -216,7 +216,7 @@ void InitTSOutput(Param XParam)
 	}
 }
 
-template <class T> void FindTSoutNodes(Param& XParam, BlockP<T> XBlock, BndblockP & bnd)
+template <class T> void FindTSoutNodes(Param& XParam, BlockP<T> XBlock, BndblockP<T> & bnd)
 {
 	int ib;
 	T levdx,x,y,blkxmin,blkxmax,blkymin,blkymax,dxblk;
@@ -263,8 +263,8 @@ template <class T> void FindTSoutNodes(Param& XParam, BlockP<T> XBlock, Bndblock
 
 
 }
-template void FindTSoutNodes<float>(Param& XParam, BlockP<float> XBlock, BndblockP& bnd);
-template void FindTSoutNodes<double>(Param& XParam, BlockP<double> XBlock, BndblockP& bnd);
+template void FindTSoutNodes<float>(Param& XParam, BlockP<float> XBlock, BndblockP<float>& bnd);
+template void FindTSoutNodes<double>(Param& XParam, BlockP<double> XBlock, BndblockP<double>& bnd);
 
 
 
@@ -406,10 +406,10 @@ template <class T> void InitRivers(Param XParam, Forcing<float> &XForcing, Model
 		// Allocate Qnow as pinned memory
 		AllocateMappedMemCPU(XForcing.rivers.size(), 1, XParam.GPUDEVICE,XModel.bndblk.Riverinfo.qnow);
 		AllocateCPU(nribmax, nburmax, XModel.bndblk.Riverinfo.xstart, XModel.bndblk.Riverinfo.xend, XModel.bndblk.Riverinfo.ystart, XModel.bndblk.Riverinfo.yend);
-		FillCPU(nribmax, nburmax, -1, XModel.bndblk.Riverinfo.xstart);
-		FillCPU(nribmax, nburmax, -1, XModel.bndblk.Riverinfo.xend);
-		FillCPU(nribmax, nburmax, -1, XModel.bndblk.Riverinfo.ystart);
-		FillCPU(nribmax, nburmax, -1, XModel.bndblk.Riverinfo.yend);
+		FillCPU(nribmax, nburmax, T(-1.0), XModel.bndblk.Riverinfo.xstart);
+		FillCPU(nribmax, nburmax, T(-1.0), XModel.bndblk.Riverinfo.xend);
+		FillCPU(nribmax, nburmax, T(-1.0), XModel.bndblk.Riverinfo.ystart);
+		FillCPU(nribmax, nburmax, T(-1.0), XModel.bndblk.Riverinfo.yend);
 
 
 

diff --git a/src/InitialConditions.h b/src/InitialConditions.h
@@ -23,7 +23,7 @@ template <class T> void initoutput(Param &XParam, Model<T>& XModel);
 void InitTSOutput(Param XParam);
 //template <class T> void Initbnds(Param XParam, Forcing<float> XForcing, Model<T>& XModel);
 
-template <class T> void FindTSoutNodes(Param& XParam, BlockP<T> XBlock, BndblockP& bnd);
+template <class T> void FindTSoutNodes(Param& XParam, BlockP<T> XBlock, BndblockP<T>& bnd);
 template <class T> void Calcbndblks(Param& XParam, Forcing<float>& XForcing, BlockP<T> XBlock);
 template <class T> void Findbndblks(Param XParam, Model<T> XModel, Forcing<float>& XForcing);
 template <class T> void Initoutzone(Param& XParam, BlockP<T>& XBlock);

diff --git a/src/Setup_GPU.cu b/src/Setup_GPU.cu
@@ -108,7 +108,7 @@ template <class T> void SetupGPU(Param &XParam, Model<T> XModel,Forcing<float> &
 			XModel_g.bndblk.Riverinfo.nburmax = nburmax;
 
 
-			AllocateMappedMemGPU(XForcing.rivers.size(), 1, XModel_g.bndblk.Riverinfo.qnow_g);
+			AllocateMappedMemGPU(XForcing.rivers.size(), 1,XParam.GPUDEVICE, XModel.bndblk.Riverinfo.qnow,XModel_g.bndblk.Riverinfo.qnow_g);
 			XModel_g.bndblk.Riverinfo.qnow = XModel.bndblk.Riverinfo.qnow;
 
 

diff --git a/src/Updateforcing.cu b/src/Updateforcing.cu
@@ -224,7 +224,7 @@ template <class T> __global__ void InjectManyRiversGPU(Param XParam,int irib, Ri
 	{
 
 		i = memloc(halowidth, blkmemwidth, ix, iy, ib);
-		rid = XRin.Xridib[index];
+		rid = XRin.Xridib[indx];
 
 		levdx = calcres(T(XParam.dx), XBlock.level[ib]);