update

Author: GaoHuanCUG

Code/FSDAF.cpp

@@ -1,12 +1,12 @@
 
-#include<algorithm>
-#include<fstream>
+#include <algorithm>
+#include <fstream>
 #include "gdal_priv.h"
 #include "ogr_core.h"
 #include "ogr_spatialref.h"
-#include"dataanalysis.h"
+#include "dataanalysis.h"
 
-#include"FSDAF.h"
+#include "FSDAF.h"
 
 
 int getPerPixSize(size_t &mnDatalength, GDALDataType datatype)
@@ -136,24 +136,22 @@ double stddev(double *dif, int a_size)
 	return result;
 }
 
-/* Read size and projection information of input fine image at t1 */
+/* Read size and projection information of image InputF1 */
 int readImgSize(char InputF1[], size_t &ns, size_t &nl, size_t &nb)
 {
 	GDALAllRegister();
 	CPLSetConfigOption("GDAL_FILENAME_IS_UTF8", "NO");	//support Chinese path
 	GDALDataset *ImgBef = (GDALDataset*)GDALOpen(InputF1, GA_ReadOnly);
 	if (ImgBef == NULL)
 	{
-		printf("load error! The file name may be wrong.\n");
+		printf("load error! The file name \" %s \" may be wrong.\n", InputF1[]);
 		exit(0);
 	}
-	ns = ImgBef->GetRasterXSize();						//samples of each line
-	nl = ImgBef->GetRasterYSize();						//lines of fineImg1
-	nb = ImgBef->GetRasterCount();						//band number
-
+	ns = ImgBef->GetRasterXSize();			//samples of each line
+	nl = ImgBef->GetRasterYSize();			//number of lines
+	nb = ImgBef->GetRasterCount();			//band number
 	GDALClose(ImgBef);
 	ImgBef = NULL;
-
 	return 0;
 }
 
@@ -193,15 +191,14 @@ int writeImg(char InputC2[], short* Img)
 	size_t ns = ImgBef->GetRasterXSize();
 	size_t nl = ImgBef->GetRasterYSize();
 	size_t nb = ImgBef->GetRasterCount();
-
 	double* fNoDataV = new double[nb]();
 	for (size_t i = 0; i < nb; i++)
 		fNoDataV[i] = ImgBef->GetRasterBand(i + 1)->GetNoDataValue();
 	double geoTransform[6];
 	char projref[2048];
 
 	ImgBef->GetGeoTransform(geoTransform);
-	const char *sProRef = ImgBef->GetProjectionRef();	//»ñȡͶӰÐÅÏ¢
+	const char *sProRef = ImgBef->GetProjectionRef();
 	strcpy(projref, sProRef);
 	GDALClose(ImgBef);
 	ImgBef = NULL;

Code/FSDAF.h

@@ -39,7 +39,7 @@ int resultSummary(int ns, int nl, int nb, int iblock, int* location_block, int l
 
 int blockComputing(parameter* p1, int ns, int nl, int nb, int iblock, int* location_block, int location_block_neighbor[4], float* fineImg2_block);
 
-/* CUDA version of some steps */
+/* CUDA version of parallel steps */
 int getBlockLine(parameter* p1, int &nL, int ns, int nb, int num_similar_pixel);
 
 int cuGetHetIndex(parameter* p1, int scale_d, int ns_block, int nl_block, short* L1_class, float* het_index);

Code/Parameters.txt

@@ -1,27 +1,27 @@
 cuFSDAF_PARAMETER_START
 
 # The input fine image at t1
-#  IN_F1_NAME = F:\\Datasets\\Daxing_Test\\L-2019-6-14.tif
-#  IN_F1_NAME = F:\\Datasets\\AHB_Test\\L_2018-3-25_4bands.tif 
-  IN_F1_NAME = F:\\Datasets\\Tianjin_Test\\L-2018-10-1_4bands.tif 
+#  IN_F1_NAME = F:\\Testdata\\Daxing\\L-2019-6-14.tif
+#  IN_F1_NAME = F:\\Testdata\\AHB\\L_2018-3-25_4bands.tif 
+  IN_F1_NAME = F:\\Testdata\\Tianjin\\L-2018-10-1_4bands.tif 
 
 
 # The input coarse image at t1
-#  IN_C1_NAME = F:\\Datasets\\Daxing_Test\\M-2019-6-14.tif
-#  IN_C1_NAME = F:\\Datasets\\AHB_Test\\M_2018-3-25_4bands.tif 
-  IN_C1_NAME = F:\\Datasets\\Tianjin_Test\\M-2018-10-1_4bands.tif 
+#  IN_C1_NAME = F:\\Testdata\\Daxing\\M-2019-6-14.tif
+#  IN_C1_NAME = F:\\Testdata\\AHB\\M_2018-3-25_4bands.tif 
+  IN_C1_NAME = F:\\Testdata\\Tianjin\\M-2018-10-1_4bands.tif 
 
 
 # The input coarse image at t2
-#  IN_C2_NAME = F:\\Datasets\\Daxing_Test\\M-2019-8-17.tif
-#  IN_C2_NAME = F:\\Datasets\\AHB_Test\\M_2018-5-12_4bands.tif 
-  IN_C2_NAME = F:\\Datasets\\Tianjin_Test\\M-2018-12-4_4bands.tif 
+#  IN_C2_NAME = F:\\Testdata\\Daxing\\M-2019-8-17.tif
+#  IN_C2_NAME = F:\\Testdata\\AHB\\M_2018-5-12_4bands.tif 
+  IN_C2_NAME = F:\\Testdata\\Tianjin\\M-2018-12-4_4bands.tif 
 
 
 # The classified image for the fine image at t1
-#  IN_F1_CLASS_NAME = F:\\Datasets\\Daxing_Test\\class
-#  IN_F1_CLASS_NAME = F:\\Datasets\\AHB_Test\\class_AHB_180325
-  IN_F1_CLASS_NAME = F:\\Datasets\\Tianjin_Test\\class
+#  IN_F1_CLASS_NAME = F:\\Testdata\\Daxing\\class_daxing
+#  IN_F1_CLASS_NAME = F:\\Testdata\\AHB\\class_AHB
+  IN_F1_CLASS_NAME = F:\\Testdata\\Tianjin\\class_Tianjin
 
 
 

Code/kernel.cu

@@ -1,4 +1,4 @@
-#include<iostream>
+#include <iostream>
 #include <stdio.h>
 
 #include "cuda_runtime.h"
@@ -375,7 +375,6 @@ int cuFinalCalculation(parameter* p1, float* fine2, float *FineImg1, float* Coar
 	size_t nThread = dimGrid.x * dimBlock.x;				//size of 1 cycle
 	size_t nWindowSize = (w + 1 + w) * (w + 1 + w);			//size of window, and w is the length of the searching window
 
-
 	size_t *col_wind = new size_t[(w + 1) * (w + 1) * (w + 1 + w) * (w + 1 + w)]();
 	size_t *row_wind = new size_t[(w + 1) * (w + 1) * (w + 1 + w) * (w + 1 + w)]();
 	for (size_t i = 0; i < w + 1; i++)
@@ -415,11 +414,9 @@ int cuFinalCalculation(parameter* p1, float* fine2, float *FineImg1, float* Coar
 	cudaMalloc((void**)&CoarseImg2_d, sizeof(float) * imgSize);
 	cudaMalloc((void**)&change_21_d, sizeof(float) * imgSize);
 	cudaMalloc((void**)&similar_th_d, sizeof(float) * imgSize);
-
 	cudaMalloc((void**)&D_D_all_d, sizeof(float) * nWindowSize);
 	cudaMalloc((void**)&col_wind_d, sizeof(size_t) * (w + 1) * (w + 1) * nWindowSize);
 	cudaMalloc((void**)&row_wind_d, sizeof(size_t) * (w + 1) * (w + 1) * nWindowSize);
-
 	cudaMalloc((void**)&positionCand_orderDis_d, sizeof(size_t) * nWindowSize * nThread);
 	cudaMalloc((void**)&mmap_order_dis_d, sizeof(float) * nWindowSize * nThread);
 	cudaMalloc((void**)&D_D_cand_d, sizeof(double) * p1->num_similar_pixel * nThread);
@@ -432,12 +429,10 @@ int cuFinalCalculation(parameter* p1, float* fine2, float *FineImg1, float* Coar
 	cudaMemcpy(CoarseImg2_d, CoarseImg2, sizeof(float) * imgSize, cudaMemcpyHostToDevice);
 	cudaMemcpy(change_21_d, change_21, sizeof(float) * imgSize, cudaMemcpyHostToDevice);
 	cudaMemcpy(similar_th_d, similar_th, sizeof(float) * imgSize, cudaMemcpyHostToDevice);
-
 	cudaMemcpy(D_D_all_d, D_D_all, sizeof(float) * nWindowSize, cudaMemcpyHostToDevice);
 	cudaMemcpy(col_wind_d, col_wind, sizeof(size_t) * (w + 1) * (w + 1) * nWindowSize, cudaMemcpyHostToDevice);
 	cudaMemcpy(row_wind_d, row_wind, sizeof(size_t) * (w + 1) * (w + 1) * nWindowSize, cudaMemcpyHostToDevice);
 
-
 	for (size_t iCycle = 0; iCycle * dimGrid.x * dimBlock.x < ns_block * nl_block; iCycle++)
 	{
 		size_t nCyl = (ns_block * nl_block / dimGrid.x / dimBlock.x + 20 - 1) / 20;

Code/main.cpp

@@ -9,7 +9,7 @@ int main(int argc, char* argv[])
 	/* Parameters setting */
 	parameter *p1 = new parameter[1];
 	parseParameters(argv[1], p1);
-	dim3 iDimGrid(512);							//Dimension of threads for CUDA
+	dim3 iDimGrid(512);			//Dimension of threads for CUDA
 	dim3 iDimBlock(256);
 	p1->dimGrid = iDimGrid;
 	p1->dimBlock = iDimBlock;