[Commits] [svn:einsteintoolkit] SphericalHarmonicRecon/trunk/ (Rev. 4)
yosef at astro.rit.edu
yosef at astro.rit.edu
Thu Aug 25 07:46:49 CDT 2011
User: zlochower
Date: 2011/08/25 07:46 AM
Modified:
/trunk/
configuration.ccl
/trunk/src/
Recon.cc
/trunk/src/util/
ascii_output.c
Log:
fixes to remove compiler warnings.
Fix so that FFTW3 libraries are included in build of
utils (thorn now depends on FFTW3)
File Changes:
Directory: /trunk/src/
======================
File [modified]: Recon.cc
Delta lines: +2 -2
===================================================================
--- trunk/src/Recon.cc 2011-08-25 12:38:23 UTC (rev 3)
+++ trunk/src/Recon.cc 2011-08-25 12:46:49 UTC (rev 4)
@@ -463,7 +463,7 @@
const CCTK_REAL cctk_time, const CCTK_REAL r_extract,
const int read_dt)
{
- const int it = (cctk_time - time0)/dtime;
+ const int it = static_cast<int>((cctk_time - time0)/dtime);
const int it0 = it-2>0 ? it - 2: 0;
const CCTK_REAL x0 = time0 + it0*dtime;
@@ -528,7 +528,7 @@
const CCTK_REAL cctk_time, const CCTK_REAL r_extract,
const int read_dt)
{
- const int it = (cctk_time - time0)/dtime;
+ const int it = static_cast<int>((cctk_time - time0)/dtime);
const int it0 = it-2>0 ? it - 2: 0;
const CCTK_REAL x0 = time0 + it0*dtime;
Directory: /trunk/
==================
File [modified]: configuration.ccl
Delta lines: +1 -1
===================================================================
--- trunk/configuration.ccl 2011-08-25 12:38:23 UTC (rev 3)
+++ trunk/configuration.ccl 2011-08-25 12:46:49 UTC (rev 4)
@@ -1 +1 @@
-REQUIRES HDF5
+REQUIRES HDF5 FFTW3
Directory: /trunk/src/util/
===========================
File [modified]: ascii_output.c
Delta lines: +2 -2
===================================================================
--- trunk/src/util/ascii_output.c 2011-08-25 12:38:23 UTC (rev 3)
+++ trunk/src/util/ascii_output.c 2011-08-25 12:46:49 UTC (rev 4)
@@ -88,6 +88,8 @@
};
int i;
+
+ const int lmax = (int)(sqrt(na)+0.1) - 1;
assert (rC);
assert (iC);
@@ -101,8 +103,6 @@
goto end;
}
- const int lmax = (int)(sqrt(na)+0.1) - 1;
-
if (l<0 || l > lmax)
{
fprintf(stderr, "l must be between 0 and %d\n",
More information about the Commits
mailing list