X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=potentials%2Falbe.c;fp=potentials%2Falbe.c;h=08ce4faf70518302c84462bba793370b74a0fcd2;hb=b4628acf6967b179451bd36f74c2ba312590ecbf;hp=b00e173757e0b4bb3d538b110c610cb8bb46d891;hpb=452a348351ae8a2255809918a05683d2510655ce;p=physik%2Fposic.git

diff --git a/potentials/albe.c b/potentials/albe.c
index b00e173..08ce4fa 100644
--- a/potentials/albe.c
+++ b/potentials/albe.c
@@ -176,12 +176,8 @@ int albe_mult_3bp_j1(t_moldyn *moldyn,t_atom *ai,t_atom *aj,u8 bc) {
 }
 
 /* albe 3 body potential function (first k loop) */
-#ifdef PTHREADS
-void *albe_mult_3bp_k1(void *ptr) {
-#else
 int albe_mult_3bp_k1(t_moldyn *moldyn,
                      t_atom *ai,t_atom *aj,t_atom *ak,u8 bc) {
-#endif
 
 	t_albe_mult_params *params;
 	t_albe_exchange *exchange;
@@ -192,19 +188,6 @@ int albe_mult_3bp_k1(t_moldyn *moldyn,
 	double cos_theta,h_cos,d2_h_cos2,frac,g,dg,s_r,arg;
 	double f_c_ik,df_c_ik;
 	int kcount;
-#ifdef PTHREADS
-	t_kdata *kdata;
-	t_moldyn *moldyn;
-	t_atom *ai,*aj,*ak;
-	u8 bc;
-
-	kdata=ptr;
-	moldyn=kdata->moldyn;
-	ai=kdata->ai;
-	aj=kdata->aj;
-	ak=kdata->ak;
-	bc=kdata->bc;
-#endif
 
 	params=moldyn->pot_params;
 	exchange=&(params->exchange);
@@ -298,12 +281,8 @@ int albe_mult_3bp_k1(t_moldyn *moldyn,
 	/* increase k counter */
 	exchange->kcount++;
 
-#ifdef PTHREADS
-}
-#else
 	return 0;
 }
-#endif
 
 int albe_mult_3bp_j2(t_moldyn *moldyn,t_atom *ai,t_atom *aj,u8 bc) {