From 56f9e680c6ce1dd5be7a9371b5d2358e4ff32c1d Mon Sep 17 00:00:00 2001 From: sjplimp Date: Tue, 11 Jan 2011 17:50:53 +0000 Subject: [PATCH] git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@5529 f3b2605a-c512-4ea7-a41b-209d697bcdaa --- src/KSPACE/fft3d.cpp | 3 ++- src/REPLICA/fix_event_tad.cpp | 2 +- src/fix_orient_fcc.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/KSPACE/fft3d.cpp b/src/KSPACE/fft3d.cpp index dd5cb9a9ff..88e25ca3a8 100644 --- a/src/KSPACE/fft3d.cpp +++ b/src/KSPACE/fft3d.cpp @@ -840,7 +840,8 @@ void bifactor(int n, int *factor1, int *factor2) { int n1,n2,facmax; - facmax = static_cast (sqrt((double) n)); + //facmax = static_cast (sqrt((double) n)); + facmax = static_cast (sqrt(n)); for (n1 = facmax; n1 > 0; n1--) { n2 = n/n1; diff --git a/src/REPLICA/fix_event_tad.cpp b/src/REPLICA/fix_event_tad.cpp index 108668b638..8968ec8b7a 100644 --- a/src/REPLICA/fix_event_tad.cpp +++ b/src/REPLICA/fix_event_tad.cpp @@ -88,7 +88,7 @@ void FixEventTAD::restart(char *buf) event_number = static_cast (list[n++]); event_timestep = static_cast (list[n++]); - tlo = static_cast (list[n++]); + tlo = list[n++]; ebarrier = list[n++]; } diff --git a/src/fix_orient_fcc.cpp b/src/fix_orient_fcc.cpp index 5f7fdc0680..cf91d3f0ae 100644 --- a/src/fix_orient_fcc.cpp +++ b/src/fix_orient_fcc.cpp @@ -446,7 +446,7 @@ int FixOrientFCC::pack_comm(int n, int *list, double *buf, for (i = 0; i < n; i++) { k = list[i]; num = nbr[k].n; - buf[m++] = static_cast (num); + buf[m++] = num; buf[m++] = nbr[k].duxi; for (j = 0; j < num; j++) { @@ -461,7 +461,7 @@ int FixOrientFCC::pack_comm(int n, int *list, double *buf, id = nbr[k].id[j]; if (k < nlocal) id = tag[id]; - buf[m++] = static_cast (id); + buf[m++] = id; } m += (12-num) * 3;