Commit 2c708e02 authored by Mark Friedrichs's avatar Mark Friedrichs
Browse files

Added missing iostream header

parent 8960d7b2
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include <cuda.h> #include <cuda.h>
#include <vector_functions.h> #include <vector_functions.h>
#include <cstdlib> #include <cstdlib>
#include <iostream>
#include <sstream> #include <sstream>
#define USE_SOFTCORE_LJ #define USE_SOFTCORE_LJ
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "openmm/OpenMMException.h" #include "openmm/OpenMMException.h"
#include <cuda.h> #include <cuda.h>
#include <iostream>
#include <sstream> #include <sstream>
#define PARAMETER_PRINT 0 #define PARAMETER_PRINT 0
...@@ -329,8 +330,8 @@ void kReduceGBVISoftcoreBornSum( freeEnergyGpuContext freeEnergyGpu ) ...@@ -329,8 +330,8 @@ void kReduceGBVISoftcoreBornSum( freeEnergyGpuContext freeEnergyGpu )
float ratio2 = ratio*ratio; float ratio2 = ratio*ratio;
float ratio3 = ratio2*ratio; float ratio3 = ratio2*ratio;
*outValue = 1.0f + ratio3*(-10.f + 15.0f*ratio - 6.0f*ratio2); *outValue = 1.0f + ratio3*(-10.f + 3.0f*ratio*(5.0f - 2.0f*ratio));
*outDerivative = ratio2*(-30.0f + 60.0f*ratio - 30.0f*ratio2)/denominator; *outDerivative = -30.0f*ratio2*( 1.0f + ratio*(ratio - 2.0f))/denominator;
} }
__global__ void kReduceGBVIBornSumQuinticScaling_kernel() __global__ void kReduceGBVIBornSumQuinticScaling_kernel()
...@@ -473,7 +474,7 @@ void kPrintGBVISoftcore( freeEnergyGpuContext freeEnergyGpu, std::string callId, ...@@ -473,7 +474,7 @@ void kPrintGBVISoftcore( freeEnergyGpuContext freeEnergyGpu, std::string callId,
switchDeriviative->Download(); switchDeriviative->Download();
sigEps4->Download(); sigEps4->Download();
(void) fprintf( log, "kPrintGBViSoftcore Cuda comp bR bF swd prm sigeps4\n" ); (void) fprintf( log, "kPrintGBVISoftcore Cuda Softcore bR bF swd prm sigeps4\n" );
for( int ii = 0; ii < gpu->sim.paddedNumberOfAtoms; ii++ ){ for( int ii = 0; ii < gpu->sim.paddedNumberOfAtoms; ii++ ){
(void) fprintf( log, "%6d %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e \n", (void) fprintf( log, "%6d %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e %15.7e \n",
ii, ii,
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include "freeEnergyGpuTypes.h" #include "freeEnergyGpuTypes.h"
#include "GpuFreeEnergyCudaKernels.h" #include "GpuFreeEnergyCudaKernels.h"
#include "openmm/OpenMMException.h" #include "openmm/OpenMMException.h"
#include <iostream>
#include <sstream> #include <sstream>
#define PARAMETER_PRINT 0 #define PARAMETER_PRINT 0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment