projects
/
physik
/
nlsop.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8ee9ab6
)
no dprintf for macs
author
hackbard
<hackbard>
Thu, 30 Sep 2004 17:39:56 +0000
(17:39 +0000)
committer
hackbard
<hackbard>
Thu, 30 Sep 2004 17:39:56 +0000
(17:39 +0000)
nlsop.c
patch
|
blob
|
history
runs.txt
patch
|
blob
|
history
diff --git
a/nlsop.c
b/nlsop.c
index
40803d5
..
a6fe553
100644
(file)
--- a/
nlsop.c
+++ b/
nlsop.c
@@
-373,8
+373,10
@@
int write_ac_distr(d3_lattice *d3_l,int ac_distr)
if(*(d3_l->status+offset)&AMORPH) count+=1;
}
}
if(*(d3_l->status+offset)&AMORPH) count+=1;
}
}
+#ifndef MAC
if(ac_distr==4) dprintf(fd,"%d %d\n",z*CELL_LENGTH,count);
else dprintf(fd,"%d %f\n",z*CELL_LENGTH,100.0*count/si_count);
if(ac_distr==4) dprintf(fd,"%d %d\n",z*CELL_LENGTH,count);
else dprintf(fd,"%d %f\n",z*CELL_LENGTH,100.0*count/si_count);
+#endif
}
close(fd);
}
close(fd);
@@
-956,6
+958,7
@@
int load_from_file(char *lf,d3_lattice *d3_l,info *my_inf)
int convert_file(char *cf,d3_lattice *d3_l)
{
int convert_file(char *cf,d3_lattice *d3_l)
{
+#ifndef MAC
int x,y,z;
int c_fd;
int x,y,z;
int c_fd;
@@
-976,6
+979,7
@@
int convert_file(char *cf,d3_lattice *d3_l)
}
}
close(c_fd);
}
}
close(c_fd);
+#endif
return 1;
}
return 1;
}
diff --git
a/runs.txt
b/runs.txt
index
6a563c7
..
9573722
100644
(file)
--- a/
runs.txt
+++ b/
runs.txt
@@
-107,3
+107,10
@@
./nlsop -S data_12_08_2004/default_p0_F0.001_e10000000.save -p 0 -F 0.001 -e 10000000 -n -i -Z > /dev/null 2>&1 &
./nlsop -S data_12_08_2004/default_p0_F0.001_e10000000.save -p 0 -F 0.001 -e 10000000 -n -i -Z > /dev/null 2>&1 &
+TEST - mac pool computers!
+--------------------------
+
+dir: data_30_09_2004/
+new deefaults: b=0; c=0.005
+
+