Difference for src/CudaComputeNonbonded.h from version 1.1 to 1.2

version 1.1version 1.2
Line 6
Line 6
 #include "PatchTypes.h" #include "PatchTypes.h"
 #include "CudaUtils.h" #include "CudaUtils.h"
 #include "ComputeNonbondedUtil.h" #include "ComputeNonbondedUtil.h"
  #include "CudaNonbondedTables.h"
 #include "CudaTileListKernel.h" #include "CudaTileListKernel.h"
 #include "CudaComputeNonbondedKernel.h" #include "CudaComputeNonbondedKernel.h"
 #include "CudaComputeGBISKernel.h" #include "CudaComputeGBISKernel.h"
Line 165
Line 166
  
   // Node lock   // Node lock
   CmiNodeLock lock;   CmiNodeLock lock;
   // List of patch indices on each rank 
   std::vector< std::vector<int> > rankPatches; 
   // List of local PEs that have patches   // List of local PEs that have patches
   std::vector<int> pes;   std::vector<int> pes;
    // List of patch indices on each rank
    std::vector< std::vector<int> > rankPatches;
   // Master Pe = Pe where this Compute and reduction lives   // Master Pe = Pe where this Compute and reduction lives
   int masterPe;   int masterPe;
  
Line 230
Line 231
   void forceDoneSetCallback();   void forceDoneSetCallback();
   void updateComputes();   void updateComputes();
   void buildExclusions();   void buildExclusions();
   void buildVdwCoefTable(); 
   void buildForceAndEnergyTables(int tableSize); 
   void skipPatch(int i);   void skipPatch(int i);
   void openBox(int i);   void openBox(int i);
   void reallocateArrays();   void reallocateArrays();
Line 253
Line 252
   // void writeXYZ(const char* filename);   // void writeXYZ(const char* filename);
  
 public: public:
  CudaComputeNonbonded(ComputeID c, int deviceID, bool doStreaming);  CudaComputeNonbonded(ComputeID c, int deviceID, CudaNonbondedTables& cudaNonbondedTables, bool doStreaming);
  ~CudaComputeNonbonded();  ~CudaComputeNonbonded();
  void registerComputeSelf(ComputeID cid, PatchID pid);  void registerComputeSelf(ComputeID cid, PatchID pid);
  void registerComputePair(ComputeID cid, PatchID* pid, int* trans);  void registerComputePair(ComputeID cid, PatchID* pid, int* trans);
Line 274
Line 273
   virtual void patchReady(PatchID, int doneMigration, int seq);   virtual void patchReady(PatchID, int doneMigration, int seq);
   virtual void gbisP2PatchReady(PatchID, int seq);   virtual void gbisP2PatchReady(PatchID, int seq);
   virtual void gbisP3PatchReady(PatchID, int seq);   virtual void gbisP3PatchReady(PatchID, int seq);
  void buildTables(); 
 }; };
  
 #endif // NAMD_CUDA #endif // NAMD_CUDA

Legend:
Removed in v.1.1 
changed lines
 Added in v.1.2


Made by using version 1.53 of cvs2html