projects
/
physik
/
posic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
actually just bullshit ... (added unique tag -> maybe symmetry)
[physik/posic.git]
/
sic.c
diff --git
a/sic.c
b/sic.c
index
516ee01
..
f4cdd7d
100644
(file)
--- a/
sic.c
+++ b/
sic.c
@@
-8,13
+8,18
@@
#include <math.h>
#include "moldyn.h"
#include <math.h>
#include "moldyn.h"
-#include "math/math.h"
-#include "init/init.h"
-#include "visual/visual.h"
#include "posic.h"
int main(int argc,char **argv) {
#include "posic.h"
int main(int argc,char **argv) {
+
+ /* check argv */
+ if(argc!=2) {
+ printf("[sic] error: arg1 (vis/log/save location) ");
+ printf("must be given!\n");
+ return -1;
+ }
+
/* main moldyn structure */
t_moldyn md;
/* main moldyn structure */
t_moldyn md;
@@
-27,7
+32,7
@@
int main(int argc,char **argv) {
double tau;
/* testing location & velocity vector */
double tau;
/* testing location & velocity vector */
- t_3dvec r,v;
+
//
t_3dvec r,v;
/* values */
tau=1.0e-15; /* delta t = 1 fs */
/* values */
tau=1.0e-15; /* delta t = 1 fs */
@@
-132,8
+137,8
@@
int main(int argc,char **argv) {
/* set temperature */
printf("[sic] setting temperature\n");
/* set temperature */
printf("[sic] setting temperature\n");
- set_temperature(&md,273.0+1410.0);
-
//
set_temperature(&md,273.0+450.0);
+
//
set_temperature(&md,273.0+1410.0);
+ set_temperature(&md,273.0+450.0);
//set_temperature(&md,273.0);
//set_temperature(&md,1.0);
//set_temperature(&md,0.0);
//set_temperature(&md,273.0);
//set_temperature(&md,1.0);
//set_temperature(&md,0.0);
@@
-146,6
+151,7
@@
int main(int argc,char **argv) {
printf("[sic] set p/t scaling\n");
//set_pt_scale(&md,P_SCALE_BERENDSEN,100.0,
// T_SCALE_BERENDSEN,100.0);
printf("[sic] set p/t scaling\n");
//set_pt_scale(&md,P_SCALE_BERENDSEN,100.0,
// T_SCALE_BERENDSEN,100.0);
+ set_pt_scale(&md,0,0,T_SCALE_BERENDSEN,100.0);
/* initial thermal fluctuations of particles (in equilibrium) */
printf("[sic] thermal init\n");
/* initial thermal fluctuations of particles (in equilibrium) */
printf("[sic] thermal init\n");
@@
-153,11
+159,11
@@
int main(int argc,char **argv) {
/* create the simulation schedule */
printf("[sic] adding schedule\n");
/* create the simulation schedule */
printf("[sic] adding schedule\n");
- moldyn_add_schedule(&md,
10
0001,1.0);
+ moldyn_add_schedule(&md,
2
0001,1.0);
/* activate logging */
printf("[sic] activate logging\n");
/* activate logging */
printf("[sic] activate logging\n");
- moldyn_set_log_dir(&md,
"saves/test"
);
+ moldyn_set_log_dir(&md,
argv[1]
);
moldyn_set_log(&md,LOG_TOTAL_ENERGY,200);
moldyn_set_log(&md,VISUAL_STEP,200);
moldyn_set_log(&md,LOG_TOTAL_ENERGY,200);
moldyn_set_log(&md,VISUAL_STEP,200);