From 41c6d99f77de90fcd04a9fe866a819b389ce8216 Mon Sep 17 00:00:00 2001 From: Gerber van der Graaf Date: Thu, 25 Apr 2013 16:13:28 +0200 Subject: [PATCH] OMP bugrepair --- src/validate/errvec.c | 67 +++++++++++++++++---------------------------------- 1 file changed, 22 insertions(+), 45 deletions(-) diff --git a/src/validate/errvec.c b/src/validate/errvec.c index 2a69559..bb47bdf 100644 --- a/src/validate/errvec.c +++ b/src/validate/errvec.c @@ -420,18 +420,17 @@ main (int argc, != NULL) gpiv_error ("%s: %s", argv[0], err_msg); - if (res_stats == TRUE - || auto_thresh == TRUE) { /* - * We also need image evaluation parameters for piv now + * We also need image evaluation parameters for piv */ - gpiv_scan_parameter (GPIV_PIVPAR_KEY, PARFILE, piv_par, - verbose); - if ((err_msg = - gpiv_scan_resourcefiles (GPIV_PIVPAR_KEY, piv_par, verbose)) - != NULL) gpiv_error ("%s: %s", argv[0], err_msg); - gpiv_piv_print_parameters (fp_par_dat, piv_par); - } + gpiv_scan_parameter (GPIV_PIVPAR_KEY, PARFILE, piv_par, + verbose); + if ((err_msg = + gpiv_scan_resourcefiles (GPIV_PIVPAR_KEY, piv_par, verbose)) + != NULL) gpiv_error ("%s: %s", argv[0], err_msg); + gpiv_piv_print_parameters (fp_par_dat, piv_par); + + fclose (fp_par_dat); @@ -440,30 +439,22 @@ main (int argc, * use stdin, stdout */ gpiv_scan_parameter (GPIV_VALIDPAR_KEY, PARFILE, valid_par, - verbose); + verbose); if ((err_msg = gpiv_scan_resourcefiles (GPIV_VALIDPAR_KEY, valid_par, - verbose)) + verbose)) != NULL) gpiv_error ("%s: %s", argv[0], err_msg); - if (res_stats == TRUE - || auto_thresh == TRUE) { - gpiv_scan_parameter (GPIV_PIVPAR_KEY, PARFILE, piv_par, - verbose); + gpiv_scan_parameter (GPIV_PIVPAR_KEY, PARFILE, piv_par, + verbose); if ((err_msg = gpiv_scan_resourcefiles (GPIV_PIVPAR_KEY, piv_par, - verbose)) + verbose)) != NULL) gpiv_error ("%s: %s", argv[0], err_msg); - } - } - + } gpiv_valid_check_parameters_read (valid_par, NULL); - - if (res_stats == TRUE - || auto_thresh == TRUE) { - gpiv_piv_check_parameters_read (piv_par, NULL); - } + gpiv_piv_check_parameters_read (piv_par, NULL); /* * Check parameters on correct values and adjust belonging variables */ @@ -486,7 +477,8 @@ main (int argc, if (valid_par->subst_type == GPIV_VALID_SUBSTYPE__COR_PEAK) { if ((image = gpiv_fread_image (fname_img)) - == NULL) gpiv_error ("%s: %s", argv[0], err_msg); + == NULL) gpiv_error ("%s: %s %s", argv[0], + "failing gpiv_fread_image", fname_img); } if ((fp = fopen (fname_in_piv, "rb")) == NULL) { @@ -494,17 +486,16 @@ main (int argc, } if ((in_data = gpiv_read_pivdata (fp)) == NULL) { - gpiv_error ("%s: %s", argv[0], err_msg); + gpiv_error ("%s: %s", argv[0], "failing gpiv_read_pivdata"); } fclose (fp); } else { if ((in_data = gpiv_read_pivdata (NULL)) == NULL) { - gpiv_error ("%s: %s", argv[0], err_msg); + gpiv_error ("%s: %s", argv[0], "failing gpiv_read_pivdata"); } } - /* * estimation of critical residu by means of fitting a straight line * through inverse cumulative histogram data. @@ -540,27 +531,13 @@ main (int argc, * Validating PIV data on outliers and substituting * or calculating residu histogram */ - - if ((err_msg = - ft = gpiv_alloc_ft (GPIV_ZEROPAD_FACT * piv_par->int_size_i)) - == NULL) gpiv_error ("%s: %s", argv[0], err_msg); - - ft->plan_forwardFFT = - fftw_plan_dft_r2c_2d (ft->size, ft->size, (double *) &ft->re[0][0], - (fftw_complex *) &ft->co[0][0], - FFTW_MEASURE); - ft->plan_reverseFFT = - fftw_plan_dft_c2r_2d (ft->size, ft->size, (fftw_complex *) &ft->co[0][0], - (double *)&ft->re[0][0], - FFTW_MEASURE); + if ((ft = gpiv_alloc_ft (GPIV_ZEROPAD_FACT * piv_par->int_size_i)) + == NULL) gpiv_error ("%s: %s", argv[0], "failing gpiv_alloc_ft"); if ((err_msg = gpiv_valid_errvec (in_data, image, piv_par, valid_par, ft, FALSE)) != NULL) gpiv_error ("%s: %s", argv[0], err_msg); - - fftw_destroy_plan(ft->plan_forwardFFT); - fftw_destroy_plan(ft->plan_reverseFFT); gpiv_free_ft (ft); } out_data = gpiv_cp_pivdata (in_data); -- 2.11.4.GIT