Fixed bug

CyprienBosserelle · Mar 9, 2018 · 05a1f4d · 05a1f4d
1 parent 9cc3a78
commit 05a1f4d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/Flow_kernel.cu b/Flow_kernel.cu
@@ -178,7 +178,7 @@ __global__ void ubnd1D(int nx, int ny, DECNUM dx, DECNUM dt, DECNUM g, DECNUM rh
 		unsigned int yminus = mminus(iy, ny);
 		unsigned int yplus = pplus(iy, ny);
 
-		DECNUM zsbnd = zsbndi + (zsbndn - zsbndi)*(iy / ny);
+		DECNUM zsbnd = zsbndi + (zsbndn - zsbndi)*(((float)iy) / ((float)ny));
 		DECNUM ui, vi, thetai, vert;
 
 		DECNUM ht, htr;
@@ -343,7 +343,7 @@ __global__ void ubnd1Dnowaves(int nx, int ny, DECNUM dx, DECNUM dt, DECNUM g, DE
 		unsigned int yminus = mminus(iy, ny);
 		unsigned int yplus = pplus(iy, ny);
 
-		DECNUM zsbnd = zsbndi + (zsbndn - zsbndi)*(iy / ny);
+		DECNUM zsbnd = zsbndi + (zsbndn - zsbndi)*(((float)iy) / ((float)ny));;
 		DECNUM ui, vi, thetai, vert;
 
 		DECNUM ht, htr;

diff --git a/Wave_gpu.cu b/Wave_gpu.cu
@@ -1042,6 +1042,9 @@ void flowbnd(XBGPUParam Param, std::vector<SLBnd> slbnd, std::vector<WindBnd> wn
 	zsbndi = interptime(slbnd[SLstepinbnd].wlev0, slbnd[SLstepinbnd - 1].wlev0, slbnd[SLstepinbnd].time - slbnd[SLstepinbnd - 1].time, totaltime - slbnd[SLstepinbnd - 1].time);
 	zsbndn = interptime(slbnd[SLstepinbnd].wlev1, slbnd[SLstepinbnd - 1].wlev1, slbnd[SLstepinbnd].time - slbnd[SLstepinbnd - 1].time, totaltime - slbnd[SLstepinbnd - 1].time);
 
+	//printf("Wlev1=%f\n ", zsbndn);
+
+
 	if (Param.wavebndtype == 1)
 	{
 		timenext = wavebndvec[WAVstepinbnd].time - wavebndvec[WAVstepinbnd - 1].time;

diff --git a/read_input.cpp b/read_input.cpp
@@ -312,6 +312,7 @@ std::vector<SLBnd> readWLfile(std::string WLfilename)
 			if (lineelements.size() > 2)
 			{
 				slbndline.wlev1 = std::stod(lineelements[2]);
+				//printf("Wlev1=%f\n ", slbndline.wlev1);
 			}
 
 			//slbndline = readBSHline(line);