Commit 0cb3a382 authored by Steve Plimpton's avatar Steve Plimpton Committed by GitHub
Browse files

Merge pull request #644 from akohlmey/collected-small-fixes 

Collected small fixes for next patch
parents e9277946 cb19ef54

doc/src/Section_commands.txt

+1 −1
Original line number Diff line number Diff line
@@ -532,7 +532,7 @@ package"_Section_start.html#start_3. 
"dump vtk"_dump_vtk.html,

"group2ndx"_group2ndx.html,

"ndx2group"_group2ndx.html,

"temper/grem"_temper_grem.html

"temper/grem"_temper_grem.html,

"temper/npt"_temper_npt.html :tb(c=3,ea=c)



:line

src/.gitignore

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 


/colvarproxy_lammps.cpp

/colvarproxy_lammps.h

/colvarproxy_lammps_version.h

/fix_colvars.cpp

/fix_colvars.h

/dump_molfile.cpp

src/Purge.list

+0 −3
Original line number Diff line number Diff line
@@ -423,9 +423,6 @@ atom_vec_granular.h 
# deleted on Fri Nov 19 12:53:07 2010 -0500

fix_pour_omp.cpp

fix_pour_omp.h

# deleted on Thu Aug 19 23:20:14 2010 +0000

fix_qeq.cpp

fix_qeq.h

# deleted on Thu Jun 17 01:34:38 2010 +0000

compute_vsum.cpp

compute_vsum.h

src/USER-INTEL/intel_preprocess.h

+1 −2
Original line number Diff line number Diff line
@@ -255,11 +255,10 @@ enum {TIME_PACK, TIME_HOST_NEIGHBOR, TIME_HOST_PAIR, TIME_OFFLOAD_NEIGHBOR, 
    ito = inum;                                                 \

  }



#define IP_PRE_omp_range(ifrom, ip, ito, tid, inum, nthreads)   \

#define IP_PRE_omp_range(ifrom, ito, tid, inum, nthreads)       \

  {                                                             \

    ifrom = 0;                                                  \

    ito = inum;                                                 \

    ip = 1;                                                     \

  }



#define IP_PRE_omp_stride_id(ifrom, ip, ito, tid, inum, nthr)   \

CRA Git | Maintained and supported by SUSTech CRA and CCSE