← Back to branch summary

~ubuntu-branches/debian/sid/lammps/sid

« back to all changes in this revision

Viewing changes to lib/gpu/lal_aux_fun1.h

  • Committer: Package Import Robot
  • Author(s): Anton Gladky
  • Date: 2013-11-20 22:41:36 UTC
  • mfrom: (1.2.2)
  • Revision ID: package-import@ubuntu.com-20131120224136-tzx7leh606fqnckm
Tags: 0~20131119.git7162cf0-1
* [e65b919] Imported Upstream version 0~20131119.git7162cf0
* [f7bddd4] Fix some problems, introduced by upstream recently.
* [3616dfc] Use wrap-and-sort script.
* [7e92030] Ignore quilt dir

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/gpu/lal_aux_fun1.h
77
77
  if (offset==0) {                                                          \
78
78
    engv+=ii;                                                               \
79
79
    if (eflag>0) {                                                          \
80
 
      *engv=energy;                                                         \
 
80
      *engv=energy*(acctyp)0.5;                                             \
81
81
      engv+=inum;                                                           \
82
82
    }                                                                       \
83
83
    if (vflag>0) {                                                          \
84
84
      for (int i=0; i<6; i++) {                                             \
85
 
        *engv=virial[i];                                                    \
 
85
        *engv=virial[i]*(acctyp)0.5;                                        \
86
86
        engv+=inum;                                                         \
87
87
      }                                                                     \
88
88
    }                                                                       \
125
125
  if (offset==0) {                                                          \
126
126
    engv+=ii;                                                               \
127
127
    if (eflag>0) {                                                          \
128
 
      *engv=energy;                                                         \
 
128
      *engv=energy*(acctyp)0.5;                                             \
129
129
      engv+=inum;                                                           \
130
 
      *engv=e_coul;                                                         \
 
130
      *engv=e_coul*(acctyp)0.5;                                             \
131
131
      engv+=inum;                                                           \
132
132
    }                                                                       \
133
133
    if (vflag>0) {                                                          \
134
134
      for (int i=0; i<6; i++) {                                             \
135
 
        *engv=virial[i];                                                    \
 
135
        *engv=virial[i]*(acctyp)0.5;                                        \
136
136
        engv+=inum;                                                         \
137
137
      }                                                                     \
138
138
    }                                                                       \
160
160
  if (offset==0) {                                                          \
161
161
    engv+=ii;                                                               \
162
162
    if (eflag>0) {                                                          \
163
 
      *engv=energy;                                                         \
 
163
      *engv=energy*(acctyp)0.5;                                             \
164
164
      engv+=inum;                                                           \
165
165
    }                                                                       \
166
166
    if (vflag>0) {                                                          \
167
167
      for (int i=0; i<6; i++) {                                             \
168
 
        *engv=virial[i];                                                    \
 
168
        *engv=virial[i]*(acctyp)0.5;                                        \
169
169
        engv+=inum;                                                         \
170
170
      }                                                                     \
171
171
    }                                                                       \
192
192
  if (offset==0) {                                                          \
193
193
    engv+=ii;                                                               \
194
194
    if (eflag>0) {                                                          \
195
 
      *engv=energy;                                                         \
 
195
      *engv=energy*(acctyp)0.5;                                             \
196
196
      engv+=inum;                                                           \
197
 
      *engv=e_coul;                                                         \
 
197
      *engv=e_coul*(acctyp)0.5;                                             \
198
198
      engv+=inum;                                                           \
199
199
    }                                                                       \
200
200
    if (vflag>0) {                                                          \
201
201
      for (int i=0; i<6; i++) {                                             \
202
 
        *engv=virial[i];                                                    \
 
202
        *engv=virial[i]*(acctyp)0.5;                                        \
203
203
        engv+=inum;                                                         \
204
204
      }                                                                     \
205
205
    }                                                                       \