X-Git-Url: https://www.hackdaworld.org/gitweb/?a=blobdiff_plain;f=moldyn.c;h=440a7075d4fe5556e5a679c3a1fc2f8a033c1077;hb=8800ba98083a8e5457b035293999f1c70e780c72;hp=1aff5a8df207c2b5d22077c70ccbc31c128afdd6;hpb=2b6a06cdf69b0d8f1dafc0e21b89c6bb4bfc192c;p=physik%2Fposic.git

diff --git a/moldyn.c b/moldyn.c
index 1aff5a8..440a707 100644
--- a/moldyn.c
+++ b/moldyn.c
@@ -24,6 +24,7 @@
 #include "potentials/harmonic_oscillator.h"
 #include "potentials/lennard_jones.h"
 #include "potentials/albe.h"
+#include "potentials/albe_orig.h"
 #ifdef TERSOFF_ORIG
 #include "potentials/tersoff_orig.h"
 #else
@@ -222,15 +223,13 @@ int set_potential(t_moldyn *moldyn,u8 type) {
 			moldyn->func_j1_k1=tersoff_mult_3bp_k2;
 			moldyn->check_2b_bond=tersoff_mult_check_2b_bond;
 			break;
-		/*
-		case MOLDYN_POTENTIAL_AM:
-			moldyn->func3b_j1=albe_mult_3bp_j1;
-			moldyn->func3b_k1=albe_mult_3bp_k1;
-			moldyn->func3b_j2=albe_mult_3bp_j2;
-			moldyn->func3b_k2=albe_mult_3bp_k2;
-			moldyn->check_2b_bond=albe_mult_check_2b_bond;
+		case MOLDYN_POTENTIAL_AO:
+			moldyn->func_j1=albe_orig_mult_3bp_j1;
+			moldyn->func_j1_k0=albe_orig_mult_3bp_k1;
+			moldyn->func_j1c=albe_orig_mult_3bp_j2;
+			moldyn->func_j1_k1=albe_orig_mult_3bp_k2;
+			moldyn->check_2b_bond=albe_orig_mult_check_2b_bond;
 			break;
-		*/
 		case MOLDYN_POTENTIAL_AM:
 			moldyn->func_i0=albe_mult_i0;
 			moldyn->func_j0=albe_mult_i0_j0;