biod.pnpi.spb.ru
/
alexxy
/
gromacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into pygromacs
[alexxy/gromacs.git]
/
src
/
gromacs
/
gmxana
/
gmx_filter.cpp
diff --git
a/src/gromacs/gmxana/gmx_filter.c
b/src/gromacs/gmxana/gmx_filter.cpp
similarity index 99%
rename from
src/gromacs/gmxana/gmx_filter.c
rename to
src/gromacs/gmxana/gmx_filter.cpp
index 2f8e6c3b8e857dfd418395223c213e61e2332d51..63c6768e29cad1db8221a7e5d169e18fdd52fe87 100644
(file)
--- a/
src/gromacs/gmxana/gmx_filter.c
+++ b/
src/gromacs/gmxana/gmx_filter.cpp
@@
-36,8
+36,8
@@
*/
#include "gmxpre.h"
*/
#include "gmxpre.h"
-#include <
math.
h>
-#include <
string.h
>
+#include <
cmat
h>
+#include <
cstring
>
#include "gromacs/commandline/pargs.h"
#include "gromacs/fileio/confio.h"
#include "gromacs/commandline/pargs.h"
#include "gromacs/fileio/confio.h"
@@
-173,7
+173,7
@@
int gmx_filter(int argc, char *argv[])
sum = 0;
for (i = 0; i < nffr; i++)
{
sum = 0;
for (i = 0; i < nffr; i++)
{
- filt[i] =
cos(2*M_PI*(i - nf + 1)/(real)flen
) + 1;
+ filt[i] =
std::cos(2*M_PI*(i - nf + 1)/static_cast<real>(flen)
) + 1;
sum += filt[i];
}
fprintf(stdout, "filter weights:");
sum += filt[i];
}
fprintf(stdout, "filter weights:");