From ded11ede7e9eb11c216d35d61ab9331e697f47bc Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sat, 07 Dec 2013 09:09:37 +0000
Subject: [PATCH] commiting before checking out onother branch
---
src/io.c | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/io.c b/src/io.c
index 9e278ec..f35b57d 100644
--- a/src/io.c
+++ b/src/io.c
@@ -25,10 +25,10 @@
ts_vertex **vtx=vlist->vtx;
printf("Vertex id(neigh no): (neighvertex coord) (neighvertex coord) ...\n");
for(i=0;i<vlist->n;i++){
- printf("%u(%u): ",vtx[i]->idx,vtx[i]->neigh_no);
- for(j=0;j<vtx[i]->neigh_no;j++){
- printf("(%f,%f,%f)",vtx[i]->neigh[j]->x,
-vtx[i]->neigh[j]->y,vtx[i]->neigh[j]->z);
+ printf("%u(%u): ",vtx[i]->idx,vtx[i]->neigh->n);
+ for(j=0;j<vtx[i]->neigh->n;j++){
+ printf("(%f,%f,%f)",vtx[i]->neigh->vtx[j]->x,
+vtx[i]->neigh->vtx[j]->y,vtx[i]->neigh->vtx[j]->z);
}
printf("\n");
}
@@ -59,9 +59,9 @@
for(i=0;i<vlist->n;i++){
fprintf(fh," %.17E\t%.17E\t%.17E\t%u\n",vlist->vtx[i]->x,
vlist->vtx[i]->y, vlist->vtx[i]->z,
- vlist->vtx[i]->neigh_no);
- for(j=0;j<vlist->vtx[i]->neigh_no;j++){
- fprintf(fh,"\t%u",(ts_uint)(vlist->vtx[i]->neigh[j]->idx));
+ vlist->vtx[i]->neigh->n);
+ for(j=0;j<vlist->vtx[i]->neigh->n;j++){
+ fprintf(fh,"\t%u",(ts_uint)(vlist->vtx[i]->neigh->vtx[j]->idx));
//-vlist->vtx+1));
}
fprintf(fh,"\n");
@@ -107,11 +107,11 @@
fprintf(fh," %.17E\t%.17E\t%.17E\t%.17E\t%.17E\t%u\n",
vlist->vtx[i]->xk,vlist->vtx[i]->c,vlist->vtx[i]->energy,
vlist->vtx[i]->energy_h, vlist->vtx[i]->curvature, 0);
- for(j=0;j<vlist->vtx[i]->neigh_no;j++){
+ for(j=0;j<vlist->vtx[i]->neigh->n;j++){
fprintf(fh," %.17E", vlist->vtx[i]->bond[j]->bond_length_dual);
}
fprintf(fh,"\n");
- for(j=0;j<vlist->vtx[i]->neigh_no;j++){
+ for(j=0;j<vlist->vtx[i]->neigh->n;j++){
fprintf(fh," %.17E", vlist->vtx[i]->bond[j]->bond_length);
}
fprintf(fh,"\n");
--
Gitblit v1.9.3