Merge release-4-5-patches into release-4-6

[alexxy/gromacs.git] / src / mdlib / md_support.c

diff --git a/src/mdlib/md_support.c b/src/mdlib/md_support.c
index edad6659cf3c400788421332e600bd021d84f113..c50f1036d2b34cd715b3123afa97b2e8d4f7f7d2 100644 (file)
--- a/src/mdlib/md_support.c
+++ b/src/mdlib/md_support.c
@@ -37,11 +37,6 @@
 #include <config.h>
 #endif
 
-#if ((defined WIN32 || defined _WIN32 || defined WIN64 || defined _WIN64) && !defined __CYGWIN__ && !defined __CYGWIN32__)
-/* _isnan() */
-#include <float.h>
-#endif
-
 #include "typedefs.h"
 #include "string2.h"
 #include "smalloc.h"
@@ -485,8 +480,7 @@ void compute_globals(FILE *fplog, gmx_global_stat_t gstat, t_commrec *cr, t_inpu
          * Use the box from last timestep since we already called update().
          */
         
-        enerd->term[F_PRES] = calc_pres(fr->ePBC,ir->nwall,box,ekind->ekin,total_vir,pres,
-                                        (fr->eeltype==eelPPPM)?enerd->term[F_COUL_RECIP]:0.0);
+        enerd->term[F_PRES] = calc_pres(fr->ePBC,ir->nwall,box,ekind->ekin,total_vir,pres);
         
         /* Calculate long range corrections to pressure and energy */
         /* this adds to enerd->term[F_PRES] and enerd->term[F_ETOT],