X-Git-Url: https://www.hackdaworld.org/gitweb/?a=blobdiff_plain;f=sic.c;h=999d860937fe0641cd254c6db57b50636c78ea32;hb=4871747c5c848e5881bea7949a41ceb589263841;hp=5cfbb035810da5de3af88f8156a5ef7acc0e3927;hpb=fb951c04e522e4637618bf622fc67194c2a7b15f;p=physik%2Fposic.git

diff --git a/sic.c b/sic.c
index 5cfbb03..999d860 100644
--- a/sic.c
+++ b/sic.c
@@ -24,10 +24,8 @@ int hook(void *moldyn,void *hook_params) {
 	if(md->schedule.count==1)
 		set_pt_scale(md,0,0,0,0);
 		
-	
 	//set_temperature(md,md->t_ref-100.0);
 
-
 	return 0;
 }
 
@@ -61,12 +59,13 @@ int main(int argc,char **argv) {
 	//set_potential2b(&md,tersoff_mult_2bp,&tp);
 	//set_potential2b_post(&md,tersoff_mult_post_2bp,&tp);
 	//set_potential3b(&md,tersoff_mult_3bp,&tp);
-	set_potential2b(&md,lennard_jones,&lj);
-	//set_potential2b(&md,harmonic_oscillator,&ho);
+	//set_potential2b(&md,lennard_jones,&lj);
+	set_potential2b(&md,harmonic_oscillator,&ho);
 
 	/* cutoff radius */
 	//set_cutoff(&md,TM_S_SI);
-	set_cutoff(&md,2*LC_SI);
+	//set_cutoff(&md,2*LC_SI*0.5*sqrt(1.5));
+	set_cutoff(&md,1.1*LC_SI);
 
 	/*
 	 * potential parameters
@@ -80,7 +79,8 @@ int main(int argc,char **argv) {
 	lj.uc=lj.epsilon4*(lj.sigma12/pow(md.cutoff,12.0)-lj.sigma6/pow(md.cutoff,6));
 
 	/* harmonic oscillator */
-	ho.equilibrium_distance=0.25*sqrt(3.0)*LC_SI;
+	//ho.equilibrium_distance=0.25*sqrt(3.0)*LC_SI;
+	ho.equilibrium_distance=LC_SI;
 	ho.spring_constant=.1;
 
 	/*
@@ -115,16 +115,18 @@ int main(int argc,char **argv) {
 	tersoff_mult_complete_params(&tp);
 
 	/* set (initial) dimensions of simulation volume */
-	set_dim(&md,6*LC_SI,6*LC_SI,6*LC_SI,TRUE);
+	//set_dim(&md,8*LC_SI*0.5*sqrt(1.5),8*LC_SI*0.5*sqrt(1.5),8*LC_SI*0.5*sqrt(1.5),TRUE);
+	set_dim(&md,8*LC_SI,8*LC_SI,8*LC_SI,TRUE);
 
 	/* set periodic boundary conditions in all directions */
 	set_pbc(&md,TRUE,TRUE,TRUE);
 
 	/* create the lattice / place atoms */
-	create_lattice(&md,DIAMOND,LC_SI,SI,M_SI,
+	create_lattice(&md,CUBIC,LC_SI,SI,M_SI,
+	//create_lattice(&md,DIAMOND,LC_SI,SI,M_SI,
 	//               ATOM_ATTR_1BP|ATOM_ATTR_2BP|ATOM_ATTR_3BP|ATOM_ATTR_HB,
 	               ATOM_ATTR_2BP|ATOM_ATTR_HB,
-	               0,6,6,6);
+	               0,8,8,8);
 	moldyn_bc_check(&md);
 
 	/* testing configuration */
@@ -145,7 +147,8 @@ int main(int argc,char **argv) {
 	//           &r,&v);
 
 	/* setting a nearest neighbour distance for the moldyn checks */
-	set_nn_dist(&md,0.25*sqrt(3.0)*LC_SI); /* diamond ! */
+	//set_nn_dist(&md,0.25*sqrt(3.0)*LC_SI); /* diamond ! */
+	set_nn_dist(&md,LC_SI);
 
 	/* set temperature */
 	//set_temperature(&md,273.0+1410.0);
@@ -161,24 +164,26 @@ int main(int argc,char **argv) {
 	/* set p/t scaling */
 	//set_pt_scale(&md,P_SCALE_BERENDSEN,100.0,
 	//                 T_SCALE_BERENDSEN,100.0);
-	set_pt_scale(&md,0,0,T_SCALE_DIRECT,1.0);
+	//set_pt_scale(&md,0,0,T_SCALE_DIRECT,1.0);
 	//set_pt_scale(&md,P_SCALE_BERENDSEN,100.0,0,0);
 	
 	/* initial thermal fluctuations of particles (in equilibrium) */
 	thermal_init(&md,TRUE);
 
 	/* create the simulation schedule */
-	moldyn_add_schedule(&md,1001,3.0);
-	moldyn_add_schedule(&md,501,1.0);
-	moldyn_add_schedule(&md,501,1.0);
+	moldyn_add_schedule(&md,1001,1.0);
+	//moldyn_add_schedule(&md,501,1.0);
+	//moldyn_add_schedule(&md,501,1.0);
 
 	/* schedule hook function */
-	moldyn_set_schedule_hook(&md,&hook,NULL);
+	//moldyn_set_schedule_hook(&md,&hook,NULL);
 
 	/* activate logging */
 	moldyn_set_log_dir(&md,argv[1]);
-	moldyn_set_log(&md,LOG_TOTAL_ENERGY,5);
-	moldyn_set_log(&md,VISUAL_STEP,50);
+	moldyn_set_report(&md,"Frank Zirkelbach","Test 1");
+	moldyn_set_log(&md,LOG_TOTAL_ENERGY,1);
+	moldyn_set_log(&md,VISUAL_STEP,10);
+	moldyn_set_log(&md,CREATE_REPORT,0);
 
 	/*
 	 * let's do the actual md algorithm now