X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fposic.git;a=blobdiff_plain;f=potentials%2Ftersoff.c;fp=potentials%2Ftersoff.c;h=4ca7141d4252c0aade8386eb4bb3319e1712f594;hp=5039ff7dd76a6ceb11108172fa61408f6abb5242;hb=6e6d7126ea9a845f11637d8e1b8eb2b570ac4dc9;hpb=97dc63eb6a519b8e1f4fbfaa9760dd94539436b0

diff --git a/potentials/tersoff.c b/potentials/tersoff.c
index 5039ff7..4ca7141 100644
--- a/potentials/tersoff.c
+++ b/potentials/tersoff.c
@@ -85,20 +85,28 @@ int tersoff_mult_set_params(t_moldyn *moldyn,int element1,int element2) {
 			p->h[1]=TM_H_C;
 			break;
 		default:
-			printf("[tersoff] WARNING: element1\n");
+			printf("[tersoff] WARNING: element2\n");
 			return -1;
 	}
 
 	printf("[tersoff] parameter completion\n");
 	p->S2[0]=p->S[0]*p->S[0];
 	p->S2[1]=p->S[1]*p->S[1];
-	p->Smixed=sqrt(p->S[0]*p->S[1]);
-	p->S2mixed=p->Smixed*p->Smixed;
+	p->S2mixed=p->S[0]*p->S[1];
+	p->Smixed=sqrt(p->S2mixed);
 	p->Rmixed=sqrt(p->R[0]*p->R[1]);
 	p->Amixed=sqrt(p->A[0]*p->A[1]);
 	p->Bmixed=sqrt(p->B[0]*p->B[1]);
 	p->lambda_m=0.5*(p->lambda[0]+p->lambda[1]);
 	p->mu_m=0.5*(p->mu[0]+p->mu[1]);
+	p->betaini[0]=pow(p->beta[0],p->n[0]);
+	p->betaini[1]=pow(p->beta[1],p->n[1]);
+	p->ci2[0]=p->c[0]*p->c[0];
+	p->ci2[1]=p->c[1]*p->c[1];
+	p->di2[0]=p->d[0]*p->d[0];
+	p->di2[1]=p->d[1]*p->d[1];
+	p->ci2di2[0]=p->ci2[0]/p->di2[0];
+	p->ci2di2[1]=p->ci2[1]/p->di2[1];
 
 	printf("[tersoff] mult parameter info:\n");
 	printf("  S (A)  | %f | %f | %f\n",p->S[0],p->S[1],p->Smixed);
@@ -118,36 +126,6 @@ int tersoff_mult_set_params(t_moldyn *moldyn,int element1,int element2) {
 	return 0;
 }
 
-/* tersoff 1 body part */
-int tersoff_mult_1bp(t_moldyn *moldyn,t_atom *ai) {
-
-	int brand;
-	t_tersoff_mult_params *params;
-	t_tersoff_exchange *exchange;
-	
-	brand=ai->brand;
-	params=moldyn->pot_params;
-	exchange=&(params->exchange);
-
-	/*
-	 * simple: point constant parameters only depending on atom i to
-	 *         their right values
-	 */
-
-	exchange->beta_i=&(params->beta[brand]);
-	exchange->n_i=&(params->n[brand]);
-	exchange->c_i=&(params->c[brand]);
-	exchange->d_i=&(params->d[brand]);
-	exchange->h_i=&(params->h[brand]);
-
-	exchange->betaini=pow(*(exchange->beta_i),*(exchange->n_i));
-	exchange->ci2=params->c[brand]*params->c[brand];
-	exchange->di2=params->d[brand]*params->d[brand];
-	exchange->ci2di2=exchange->ci2/exchange->di2;
-
-	return 0;
-}
-	
 /* tersoff 2 body part */
 int tersoff_mult_2bp(t_moldyn *moldyn,t_atom *ai,t_atom *aj,u8 bc) {
 
@@ -239,7 +217,7 @@ int tersoff_mult_2bp(t_moldyn *moldyn,t_atom *ai,t_atom *aj,u8 bc) {
 #endif
 
 	/* virial */
-	virial_calc(aj,&force,&dist_ij);
+	virial_calc(ai,&force,&dist_ij);
 
 	/* energy 2bp contribution */
 	energy=f_r*f_c;
@@ -364,10 +342,10 @@ int tersoff_mult_3bp_k1(t_moldyn *moldyn,
 	cos_theta=v3_scalar_product(&dist_ij,&dist_ik)/(d_ij*d_ik);
 
 	/* g_ijk */
-	h_cos=*(exchange->h_i)-cos_theta;
-	d2_h_cos2=exchange->di2+(h_cos*h_cos);
-	frac=exchange->ci2/d2_h_cos2;
-	g=1.0+exchange->ci2di2-frac;
+	h_cos=params->h[brand]-cos_theta;
+	d2_h_cos2=params->di2[brand]+(h_cos*h_cos);
+	frac=params->ci2[brand]/d2_h_cos2;
+	g=1.0+params->ci2di2[brand]-frac;
 	dg=-2.0*frac*h_cos/d2_h_cos2;
 
 	/* zeta sum += f_c_ik * g_ijk */
@@ -385,11 +363,8 @@ int tersoff_mult_3bp_k1(t_moldyn *moldyn,
 	}
 
 #ifdef DEBUG
-	if((ai==&(moldyn->atom[0]))|
-	   (aj==&(moldyn->atom[864]))|
-	   (ak==&(moldyn->atom[1003]))) {
-		printf(" -> %f %f %f\n",exchange->ci2di2,frac,h_cos);
-	}
+	if(ai==&(moldyn->atom[DATOM]))
+		printf("zeta_ij: %f %f %f %f\n",f_c_ik*g,f_c_ik,g,d_ik);
 #endif
 
 	/* store even more data for second k loop */
@@ -425,8 +400,8 @@ int tersoff_mult_3bp_j2(t_moldyn *moldyn,t_atom *ai,t_atom *aj,u8 bc) {
 	params=moldyn->pot_params;
 	exchange=&(params->exchange);
 
-	brand=aj->brand;
-	if(brand==ai->brand) {
+	brand=ai->brand;
+	if(brand==aj->brand) {
 		S=params->S[brand];
 		R=params->R[brand];
 		B=params->B[brand];
@@ -473,8 +448,8 @@ int tersoff_mult_3bp_j2(t_moldyn *moldyn,t_atom *ai,t_atom *aj,u8 bc) {
 		db=0.0;
 	}
 	else {
-		ni=*(exchange->n_i);
-		tmp=exchange->betaini*pow(exchange->zeta_ij,ni-1.0);
+		ni=params->n[brand];
+		tmp=params->betaini[brand]*pow(exchange->zeta_ij,ni-1.0);
 		b=(1.0+exchange->zeta_ij*tmp);
 		db=chi*pow(b,-1.0/(2.0*ni)-1.0);
 		b=db*b;
@@ -489,12 +464,12 @@ int tersoff_mult_3bp_j2(t_moldyn *moldyn,t_atom *ai,t_atom *aj,u8 bc) {
 	v3_add(&(aj->f),&(aj->f),&force);
 
 #ifdef DEBUG
-	if((ai==&(moldyn->atom[0]))|(aj==&(moldyn->atom[0]))) {
+	if((ai==&(moldyn->atom[DATOM]))|(aj==&(moldyn->atom[DATOM]))) {
 		printf("force 3bp (j2): [%d %d sum]\n",ai->tag,aj->tag);
 		printf("adding %f %f %f\n",force.x,force.y,force.z);
-		if(ai==&(moldyn->atom[0]))
+		if(ai==&(moldyn->atom[DATOM]))
 			printf("total i: %f %f %f\n",ai->f.x,ai->f.y,ai->f.z);
-		if(aj==&(moldyn->atom[0]))
+		if(aj==&(moldyn->atom[DATOM]))
 			printf("total j: %f %f %f\n",aj->f.x,aj->f.y,aj->f.z);
 		printf("energy: %f = %f %f %f %f\n",0.5*f_c*(b*f_a+f_r),
 		                                    f_c,b,f_a,f_r);
@@ -503,7 +478,7 @@ int tersoff_mult_3bp_j2(t_moldyn *moldyn,t_atom *ai,t_atom *aj,u8 bc) {
 #endif
 
 	/* virial */
-	virial_calc(aj,&force,&(exchange->dist_ij));
+	virial_calc(ai,&force,&(exchange->dist_ij));
 
 	/* dzeta prefactor = - 0.5 f_c f_a db */
 	exchange->pre_dzeta=-0.5*f_a*f_c*db;
@@ -534,7 +509,7 @@ int tersoff_mult_3bp_k2(t_moldyn *moldyn,
 	double pre_dzeta;
 	double f_c_ik,df_c_ik;
 	double dijdik_inv,fcdg,dfcg;
-	t_3dvec dcosdri,dcosdrj,dcosdrk;
+	t_3dvec dcosdrj,dcosdrk;
 	t_3dvec force,tmp;
 
 	params=moldyn->pot_params;
@@ -588,30 +563,11 @@ int tersoff_mult_3bp_k2(t_moldyn *moldyn,
 	v3_scale(&dcosdrk,&dist_ij,dijdik_inv);
 	v3_scale(&tmp,&dist_ik,-cos_theta/d_ik2);
 	v3_add(&dcosdrk,&dcosdrk,&tmp);
-	v3_add(&dcosdri,&dcosdrj,&dcosdrk);
-	v3_scale(&dcosdri,&dcosdri,-1.0);
 
 	/* f_c_ik * dg, df_c_ik * g */
 	fcdg=f_c_ik*dg;
 	dfcg=df_c_ik*g;
 
-	/* derivative wrt i */
-	v3_scale(&force,&dist_ik,dfcg);
-	v3_scale(&tmp,&dcosdri,fcdg);
-	v3_add(&force,&force,&tmp);
-	v3_scale(&force,&force,pre_dzeta);
-
-	/* force contribution */
-	v3_add(&(ai->f),&(ai->f),&force);
-	
-#ifdef DEBUG
-	if(ai==&(moldyn->atom[0])) {
-		printf("force 3bp (k2): [%d %d %d]\n",ai->tag,aj->tag,ak->tag);
-		printf("adding %f %f %f\n",force.x,force.y,force.z);
-		printf("total i: %f %f %f\n",ai->f.x,ai->f.y,ai->f.z);
-	}
-#endif
-
 	/* derivative wrt j */
 	v3_scale(&force,&dcosdrj,fcdg*pre_dzeta);
 
@@ -619,17 +575,22 @@ int tersoff_mult_3bp_k2(t_moldyn *moldyn,
 	v3_add(&(aj->f),&(aj->f),&force);
 
 #ifdef DEBUG
-	if(aj==&(moldyn->atom[0])) {
+	if(aj==&(moldyn->atom[DATOM])) {
 		printf("force 3bp (k2): [%d %d %d]\n",ai->tag,aj->tag,ak->tag);
-		printf("adding %f %f %f\n",force.x,force.y,force.z);
-		printf("total j: %f %f %f\n",aj->f.x,aj->f.y,aj->f.z);
+		printf("  adding %f %f %f\n",force.x,force.y,force.z);
+		printf("  total j: %f %f %f\n",aj->f.x,aj->f.y,aj->f.z);
+		printf("  angle: %f\n",acos(cos_theta)*360.0/(2*M_PI));
+		printf("    d ij ik = %f %f\n",d_ij,d_ik);
 	}
 #endif
 
 	/* virial */
-	v3_scale(&force,&force,-1.0);
 	virial_calc(ai,&force,&dist_ij);
 
+	/* force contribution to atom i */
+	v3_scale(&force,&force,-1.0);
+	v3_add(&(ai->f),&(ai->f),&force);
+
 	/* derivative wrt k */
 	v3_scale(&force,&dist_ik,-1.0*dfcg); // dri rik = - drk rik
 	v3_scale(&tmp,&dcosdrk,fcdg);
@@ -640,19 +601,24 @@ int tersoff_mult_3bp_k2(t_moldyn *moldyn,
 	v3_add(&(ak->f),&(ak->f),&force);
 
 #ifdef DEBUG
-	if(ak==&(moldyn->atom[0])) {
+	if(ak==&(moldyn->atom[DATOM])) {
 		printf("force 3bp (k2): [%d %d %d]\n",ai->tag,aj->tag,ak->tag);
-		printf("adding %f %f %f\n",force.x,force.y,force.z);
-		printf("total k: %f %f %f\n",ak->f.x,ak->f.y,ak->f.z);
+		printf("  adding %f %f %f\n",force.x,force.y,force.z);
+		printf("  total k: %f %f %f\n",ak->f.x,ak->f.y,ak->f.z);
+		printf("  angle: %f\n",acos(cos_theta)*360.0/(2*M_PI));
+		printf("    d ij ik = %f %f\n",d_ij,d_ik);
 	}
 #endif
 
 	/* virial */
-	v3_scale(&force,&force,-1.0);
 	virial_calc(ai,&force,&dist_ik);
+
+	/* force contribution to atom i */
+	v3_scale(&force,&force,-1.0);
+	v3_add(&(ai->f),&(ai->f),&force);
 	
 	/* increase k counter */
-	exchange->kcount++;	
+	exchange->kcount++;
 
 	return 0;