diff /media/nagateja/TwoTeraByte/Simulations/lammps-17Nov16/src/fix_enforce2d.cpp /home/nagateja/lammps-17Nov16/src/fix_enforce2d.cpp
106d105
<   double **x = atom->x;
115,116c114,115
<       x[i][2] = 0.0;
<       
---
>       v[i][2] = 0.0;
>       f[i][2] = 0.0;
diff /media/nagateja/TwoTeraByte/Simulations/lammps-17Nov16/src/fix_langevin.cpp /home/nagateja/lammps-17Nov16/src/fix_langevin.cpp
268,269c268,271
<       gfactor1[i] = sqrt(24.0*t_period/update->dt/force->mvv2e)/force->ftm2v;
<       gfactor2[i] = sqrt(3*24.0*t_period/update->dt/force->mvv2e)/force->ftm2v/atom->mass[i];
---
>       gfactor1[i] = -atom->mass[i] / t_period / force->ftm2v;
>       gfactor2[i] = sqrt(atom->mass[i]) *
>         sqrt(24.0*force->boltz/t_period/update->dt/force->mvv2e) /
>         force->ftm2v;
463c465
<   double seed1 = seed/1000;
---
> 
500c502
<   double gamma3;
---
> 
527,531c529,532
< 	gamma1 = t_period/boltz/t_stop/ ftm2v;
<   gamma2 = sqrt(24.0*t_period/dt/mvv2e)/ftm2v;
<   gamma1 *= 1.0/ratio[type[i]];
<   gamma2 *= 1.0/sqrt(ratio[type[i]]) * tsqrt;
<   gamma3 = gamma2*sqrt(3)/rmass[i];
---
> 	gamma1 = -rmass[i] / t_period / ftm2v;
> 	gamma2 = sqrt(rmass[i]) * sqrt(24.0*boltz/t_period/dt/mvv2e) / ftm2v;
> 	gamma1 *= 1.0/ratio[type[i]];
> 	gamma2 *= 1.0/sqrt(ratio[type[i]]) * tsqrt;
533,535c534,535
< 	gamma1 = t_period/force->boltz/t_stop/force->ftm2v;
< 	gamma2 = gfactor1[type[i]] * tsqrt;
<   gamma3 = gfactor2[type[i]] * tsqrt;
---
> 	gamma1 = gfactor1[type[i]];
> 	gamma2 = gfactor2[type[i]] * tsqrt;
540c540
<       fran[2] = gamma3*(random->uniform()-0.5);
---
>       fran[2] = gamma2*(random->uniform()-0.5);
544,547c544,547
< 	fdrag[0] = seed1*gamma1*sin(v[i][2]);
<   fdrag[1] = seed1*gamma1*cos(v[i][2]);
<   fdrag[2] = 0;
<   if (v[i][0] == 0.0) fran[0] = 0.0;
---
> 	fdrag[0] = gamma1*v[i][0];
> 	fdrag[1] = gamma1*v[i][1];
> 	fdrag[2] = gamma1*v[i][2];
> 	if (v[i][0] == 0.0) fran[0] = 0.0;
552,554c552,554
< 	fdrag[0] = seed1*gamma1*sin(v[i][2]);
< 	fdrag[1] = seed1*gamma1*cos(v[i][2]);
< 	fdrag[2] = 0;
---
> 	fdrag[0] = gamma1*v[i][0];
> 	fdrag[1] = gamma1*v[i][1];
> 	fdrag[2] = gamma1*v[i][2];
diff /media/nagateja/TwoTeraByte/Simulations/lammps-17Nov16/src/fix_nve.cpp /home/nagateja/lammps-17Nov16/src/fix_nve.cpp
16d15
< #include <math.h>
71c70
<   double PI  =3.141592653589793238463;
---
> 
85,89c84,87
<         dtfm = dtf ;
<         v[i][0] =  f[i][0];
<         v[i][1] =  f[i][1];
<         v[i][2] = fmod(v[i][2],(2*PI));
<         v[i][2] += dtv * f[i][2];
---
>         dtfm = dtf / rmass[i];
>         v[i][0] += dtfm * f[i][0];
>         v[i][1] += dtfm * f[i][1];
>         v[i][2] += dtfm * f[i][2];
92c90
<         x[i][2] += 0;
---
>         x[i][2] += dtv * v[i][2];
98,102c96,99
<         dtfm = dtf ;
<         v[i][0] =  f[i][0];
<         v[i][1] =  f[i][1];
<         v[i][2] = fmod(v[i][2],(2*PI));
<         v[i][2] += dtv * f[i][2];
---
>         dtfm = dtf / mass[type[i]];
>         v[i][0] += dtfm * f[i][0];
>         v[i][1] += dtfm * f[i][1];
>         v[i][2] += dtfm * f[i][2];
105c102
<         x[i][2] += 0;
---
>         x[i][2] += dtv * v[i][2];
117c114
<   double PI  =3.141592653589793238463;
---
> 
130,134c127,130
<         dtfm = dtf ;
<         v[i][0] =  f[i][0];
<         v[i][1] =  f[i][1];
<         v[i][2] = fmod(v[i][2],(2*PI));
<         v[i][2] += dtv * f[i][2];
---
>         dtfm = dtf / rmass[i];
>         v[i][0] += dtfm * f[i][0];
>         v[i][1] += dtfm * f[i][1];
>         v[i][2] += dtfm * f[i][2];
140,145c136,139
<         dtfm = dtf ;
<         v[i][0] =  f[i][0];
<         v[i][1] =  f[i][1];
<         v[i][2] = fmod(v[i][2],(2*PI));
<         v[i][2] += dtv * f[i][2];
< 
---
>         dtfm = dtf / mass[type[i]];
>         v[i][0] += dtfm * f[i][0];
>         v[i][1] += dtfm * f[i][1];
>         v[i][2] += dtfm * f[i][2];
diff /media/nagateja/TwoTeraByte/Simulations/lammps-17Nov16/src/velocity.cpp /home/nagateja/lammps-17Nov16/src/velocity.cpp
282d281
<         //printf("1");
295c294,295
<           v[m][2] = vz*6.28;
---
>           if (dim == 3) v[m][2] = vz * factor;
>           else v[m][2] = 0.0;
317d316
<           //printf("2");
327,328c326,327
<         if (dim == 3) v[i][2] = 6.28*vz;
<         else v[i][2] = 6.28*vz;
---
>         if (dim == 3) v[i][2] = vz * factor;
>         else v[i][2] = 0.0;
343d341
<           //printf("3");
354,355c352,353
<         if (dim == 3) v[i][2] = 6.28*vz;
<         else v[i][2] = vz*6.28;
---
>         if (dim == 3) v[i][2] = vz * factor;
>         else v[i][2] = 0.0;
373c371
<   //rescale(t,t_desired);
---
>   rescale(t,t_desired);
610c608
<     //rescale(t,t_desired);
---
>     rescale(t,t_desired);
614c612
<     //rescale(t,t_desired);
---
>     rescale(t,t_desired);