X-Git-Url: https://www.hackdaworld.org/gitweb/?a=blobdiff_plain;f=moldyn.c;h=d56d6f32e5005e135393c246856e3f3351a4e1df;hb=5e3a34afc43f02e9e2d455bb035186752def172f;hp=48129029a1c6e47a6fc0a59893c9fef04caa8999;hpb=c2697c8b6f808b7edef2f9e2ceded0aa65374168;p=physik%2Fposic.git

diff --git a/moldyn.c b/moldyn.c
index 4812902..d56d6f3 100644
--- a/moldyn.c
+++ b/moldyn.c
@@ -872,7 +872,7 @@ int scale_velocity(t_moldyn *moldyn,u8 equi_init) {
 		scale*=2.0;
 	else
 		if(moldyn->pt_scale&T_SCALE_BERENDSEN)
-			scale=1.0+(scale-1.0)*moldyn->timestep/moldyn->t_tc;
+			scale=1.0+(scale-1.0)*moldyn->tau/moldyn->t_tc;
 	scale=sqrt(scale);
 
 	/* velocity scaling */
@@ -1182,8 +1182,8 @@ int scale_volume(t_moldyn *moldyn) {
 
 	/* scaling factor */
 	if(moldyn->pt_scale&P_SCALE_BERENDSEN) {
-		scale=(moldyn->p_ref-moldyn->p)*moldyn->p_tc*moldyn->timestep;
-		scale=pow(1.0-scale,ONE_THIRD);
+		scale=1.0-(moldyn->p_ref-moldyn->p)*moldyn->p_tc*moldyn->tau;
+		scale=pow(scale,ONE_THIRD);
 	}
 	else {
 		scale=pow(moldyn->p/moldyn->p_ref,ONE_THIRD);