rename functions to clearly identify

Author: BBBuZHIDAO

src/force/force.cu

@@ -134,7 +134,7 @@ void Force::parse_potential(
     potential.reset(new LJ(fid_potential, num_types, number_of_atoms));
   } else if (strcmp(potential_name, "ilp_tmd_sw") == 0) {
     if (num_param != 3) {
-      PRINT_INPUT_ERROR("potential should ILP potential file and SW potential file.\n");
+      PRINT_INPUT_ERROR("potential should contain ILP potential file and SW potential file.\n");
     }
     FILE* fid_sw = my_fopen(param[2], "r");
     potential.reset(new ILP_TMD_SW(fid_potential, fid_sw, num_types, number_of_atoms));
@@ -487,7 +487,7 @@ void Force::compute(
         virial_per_atom);
     } else if (1 == potentials[0]->ilp_flag) {
       // compute the potential with ILP
-      potentials[0]->compute(
+      potentials[0]->compute_ilp(
         box, type, position_per_atom, potential_per_atom, force_per_atom, virial_per_atom, group);
     } else {
       potentials[0]->compute(
@@ -508,7 +508,7 @@ void Force::compute(
           virial_per_atom);
       } else if (1 == potentials[i]->ilp_flag) {
         // compute the potential with ILP
-        potentials[i]->compute(
+        potentials[i]->compute_ilp(
           box, type, position_per_atom, potential_per_atom, force_per_atom, virial_per_atom, group);
       } else {
         potentials[i]->compute(
@@ -782,7 +782,7 @@ void Force::compute(
         virial_per_atom);
     } else if (1 == potentials[0]->ilp_flag) {
       // compute the potential with ILP
-      potentials[0]->compute(
+      potentials[0]->compute_ilp(
         box, type, position_per_atom, potential_per_atom, force_per_atom, virial_per_atom, group);
     } else {
       potentials[0]->compute(
@@ -803,7 +803,7 @@ void Force::compute(
           virial_per_atom);
       } else if (1 == potentials[i]->ilp_flag) {
         // compute the potential with ILP
-        potentials[i]->compute(
+        potentials[i]->compute_ilp(
           box, type, position_per_atom, potential_per_atom, force_per_atom, virial_per_atom, group);
       } else {
         potentials[i]->compute(

src/force/ilp_tmd_sw.cu

@@ -1350,7 +1350,7 @@ void ILP_TMD_SW::compute(
 #define UPDATE_TEMP 10
 #define BIG_ILP_CUTOFF_SQUARE 50.0
 // find force and related quantities
-void ILP_TMD_SW::compute(
+void ILP_TMD_SW::compute_ilp(
   Box &box,
   const GPU_Vector<int> &type,
   const GPU_Vector<double> &position_per_atom,
@@ -1371,7 +1371,7 @@ void ILP_TMD_SW::compute(
 #ifdef USE_FIXED_NEIGHBOR
   if (num_calls++ == 0) {
 #endif
-    find_neighbor(
+    find_neighbor_ilp(
       N1,
       N2,
       rc,

src/force/ilp_tmd_sw.cuh

@@ -90,7 +90,7 @@ public:
     GPU_Vector<double>& force,
     GPU_Vector<double>& virial);
 
-  virtual void compute(
+  virtual void compute_ilp(
     Box& box,
     const GPU_Vector<int>& type,
     const GPU_Vector<double>& position,

src/force/neighbor.cu

@@ -343,7 +343,7 @@ void find_neighbor(
 }
 
 // For ILP, the neighbor could not contain atoms in the same layer
-static __global__ void gpu_find_neighbor_ON1(
+static __global__ void gpu_find_neighbor_ON1_ilp(
   const Box box,
   const int N,
   const int N1,
@@ -433,7 +433,7 @@ static __global__ void gpu_find_neighbor_ON1(
   }
 }
 
-void find_neighbor(
+void find_neighbor_ilp(
   const int N1,
   const int N2,
   double rc,
@@ -465,7 +465,7 @@ void find_neighbor(
   find_cell_list(
     rc_cell_list, num_bins, box, position_per_atom, cell_count, cell_count_sum, cell_contents);
 
-  gpu_find_neighbor_ON1<<<grid_size, block_size>>>(
+  gpu_find_neighbor_ON1_ilp<<<grid_size, block_size>>>(
     box,
     N,
     N1,

src/force/neighbor.cuh

@@ -41,7 +41,7 @@ void find_neighbor(
   GPU_Vector<int>& NL);
 
 // For ILP
-void find_neighbor(
+void find_neighbor_ilp(
   const int N1,
   const int N2,
   double rc,

src/force/potential.cuh

@@ -48,7 +48,7 @@ public:
     GPU_Vector<double>& virial){};
 
   // add group message for ILP TMD SW
-  virtual void compute(
+  virtual void compute_ilp(
     Box& box,
     const GPU_Vector<int>& type,
     const GPU_Vector<double>& position,