ICODE-ADC/lammps
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,089 Commits 12 Branches 209 Tags
c6a486f71ad160689e034ceba47d9583e09991fb
Commit Graph

17 Commits

Author SHA1 Message Date
Axel Kohlmeyer
454b9f1f44 use additional slots in timer storage for replica methods 2013-07-28 22:09:55 +02:00
Axel Kohlmeyer
2b6468d976 more timer tweaks and simplifications 2013-07-28 18:08:24 +02:00
Axel Kohlmeyer
c1791fc96d add support for a RESET operation 2013-07-27 23:25:17 +02:00
Axel Kohlmeyer
df889fe40c add tags for replica method timers 2013-07-27 23:12:46 +02:00
Axel Kohlmeyer
bbde2c4a81 incorporate print levels into output in finish. 2013-07-26 18:40:19 +02:00
Axel Kohlmeyer
ab8c4854ba make the timer code handle the various flags as expected 2013-07-26 16:51:43 +02:00
Axel Kohlmeyer
8a9817c5d6 bugfixes and cleanup in the timers command 2013-07-26 09:01:30 +02:00
Axel Kohlmeyer
a00c94fa29 rename LOOP timer to TOTAL and implement timers command 2013-07-25 11:51:54 +02:00
Axel Kohlmeyer
3683dac839 remove unused system time, add cpu time for windows 2013-07-04 00:07:07 +02:00
Axel Kohlmeyer
48aa45f7f0 Merge branch 'master' into lammps-icms 
Resolved Conflicts (i hope):
	src/REPLICA/neb.cpp
	src/REPLICA/prd.cpp
	src/REPLICA/tad.cpp
	src/REPLICA/verlet_split.cpp
	src/USER-CUDA/atom_vec_angle_cuda.h
	src/USER-CUDA/atom_vec_atomic_cuda.h
	src/USER-CUDA/atom_vec_charge_cuda.h
	src/USER-CUDA/atom_vec_full_cuda.h
	src/USER-CUDA/compute_pe_cuda.h
	src/USER-CUDA/compute_pressure_cuda.h
	src/USER-CUDA/compute_temp_cuda.h
	src/USER-CUDA/compute_temp_partial_cuda.h
	src/USER-CUDA/cuda.cpp
	src/USER-CUDA/cuda.h
	src/USER-CUDA/cuda_data.h
	src/USER-CUDA/cuda_neigh_list.h
	src/USER-CUDA/fft3d_cuda.h
	src/USER-CUDA/fft3d_wrap_cuda.h
	src/USER-CUDA/fix_addforce_cuda.h
	src/USER-CUDA/fix_aveforce_cuda.h
	src/USER-CUDA/fix_enforce2d_cuda.h
	src/USER-CUDA/fix_freeze_cuda.h
	src/USER-CUDA/fix_gravity_cuda.h
	src/USER-CUDA/fix_nve_cuda.h
	src/USER-CUDA/fix_set_force_cuda.h
	src/USER-CUDA/fix_temp_berendsen_cuda.h
	src/USER-CUDA/fix_temp_rescale_cuda.h
	src/USER-CUDA/fix_temp_rescale_limit_cuda.h
	src/USER-CUDA/fix_viscous_cuda.h
	src/USER-CUDA/pair_born_coul_long_cuda.h
	src/USER-CUDA/pair_buck_coul_cut_cuda.h
	src/USER-CUDA/pair_buck_coul_long_cuda.h
	src/USER-CUDA/pair_buck_cuda.h
	src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.cpp
	src/USER-CUDA/pair_cg_cmm_coul_cut_cuda.h
	src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.cpp
	src/USER-CUDA/pair_cg_cmm_coul_debye_cuda.h
	src/USER-CUDA/pair_cg_cmm_coul_long_cuda.cpp
	src/USER-CUDA/pair_cg_cmm_coul_long_cuda.h
	src/USER-CUDA/pair_cg_cmm_cuda.cpp
	src/USER-CUDA/pair_cg_cmm_cuda.h
	src/USER-CUDA/pair_eam_cuda.h
	src/USER-CUDA/pair_gran_hooke_cuda.h
	src/USER-CUDA/pair_lj96_cut_cuda.h
	src/USER-CUDA/pair_lj_charmm_coul_charmm_cuda.h
	src/USER-CUDA/pair_lj_charmm_coul_charmm_implicit_cuda.h
	src/USER-CUDA/pair_lj_charmm_coul_long_cuda.h
	src/USER-CUDA/pair_lj_class2_coul_cut_cuda.h
	src/USER-CUDA/pair_lj_class2_coul_long_cuda.h
	src/USER-CUDA/pair_lj_class2_cuda.h
	src/USER-CUDA/pair_lj_cut_coul_cut_cuda.h
	src/USER-CUDA/pair_lj_cut_coul_debye_cuda.h
	src/USER-CUDA/pair_lj_cut_coul_long_cuda.h
	src/USER-CUDA/pair_lj_cut_cuda.h
	src/USER-CUDA/pair_lj_cut_experimental_cuda.h
	src/USER-CUDA/pair_lj_expand_cuda.h
	src/USER-CUDA/pair_lj_gromacs_coul_gromacs_cuda.h
	src/USER-CUDA/pair_lj_gromacs_cuda.h
	src/USER-CUDA/pair_lj_sdk_coul_long_cuda.cpp
	src/USER-CUDA/pair_lj_sdk_coul_long_cuda.h
	src/USER-CUDA/pair_lj_sdk_cuda.h
	src/USER-CUDA/pair_lj_smooth_cuda.h
	src/USER-CUDA/pair_morse_cuda.h
	src/USER-CUDA/pair_sw_cuda.h
	src/USER-CUDA/pair_tersoff_cuda.h
	src/USER-CUDA/pair_tersoff_zbl_cuda.h
	src/USER-CUDA/pppm_cuda.h
	src/USER-CUDA/verlet_cuda.cpp
	src/USER-CUDA/verlet_cuda.h
	src/comm.cpp
	src/finish.cpp
	src/fix_rigid_nvt.h
	src/respa.cpp
	src/run.cpp
 2012-06-07 16:42:38 -04:00
sjplimp
ef9e700545 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@8226 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2012-06-06 22:47:51 +00:00
Axel Kohlmeyer
0f4a27ad8b add c++ emacs cookies into all SCM managed headers 2011-12-23 18:27:40 -05:00
Axel Kohlmeyer
488eca7165 implemented improved timer class 2011-08-26 18:39:14 -04:00
sjplimp
2c643b7dc5 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@3655 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2010-01-12 01:37:48 +00:00
sjplimp
69f212d0c3 git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@266 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-01-30 22:09:31 +00:00
sjplimp
209f169cbc git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@254 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2007-01-30 00:22:05 +00:00
sjplimp
222c95507e git-svn-id: svn://svn.icms.temple.edu/lammps-ro/trunk@26 f3b2605a-c512-4ea7-a41b-209d697bcdaa 2006-09-27 19:51:33 +00:00