From cb2faf7217a026ad114935c1fd71c96240c30055 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Sun, 19 Feb 2017 15:56:14 +0000
Subject: [PATCH] Added library version checking
---
src/io.c | 9 +--------
1 files changed, 1 insertions(+), 8 deletions(-)
diff --git a/src/io.c b/src/io.c
index 16ab2c8..21c8f1d 100644
--- a/src/io.c
+++ b/src/io.c
@@ -423,7 +423,7 @@
vesicle->tape=parsetape(command_line_args.tape_fullfilename);
// recreating space for cells //
vesicle->clist=init_cell_list(vesicle->tape->ncxmax, vesicle->tape->ncymax, vesicle->tape->nczmax, vesicle->tape->stepsize);
- vesicle->clist->max_occupancy=8;
+ vesicle->clist->max_occupancy=16;
// vesicle->tape=(ts_tape *)malloc(sizeof(ts_tape));
// retval=fread(vesicle->tape, sizeof(ts_tape),1,fh);
retval=fread(iteration,sizeof(ts_uint),1,fh);
@@ -862,11 +862,7 @@
xml_trisurf_data(fh,vesicle);
fprintf(fh, " <UnstructuredGrid>\n");
fprintf(fh, "<Piece NumberOfPoints=\"%u\" NumberOfCells=\"%u\">\n",vlist->n+monono*polyno+fonono*filno, blist->n+monono*polyno+filno*(fonono-1)+vesicle->tlist->n);
-<<<<<<< HEAD
- fprintf(fh,"<PointData Scalars=\"scalars\">\n<DataArray type=\"Int64\" Name=\"scalars\" format=\"ascii\">");
-=======
fprintf(fh,"<PointData Scalars=\"vertices_idx\">\n<DataArray type=\"Int64\" Name=\"vertices_idx\" format=\"ascii\">");
->>>>>>> nirgov
for(i=0;i<vlist->n;i++){
fprintf(fh,"%u ",vtx[i]->idx);
}
@@ -891,8 +887,6 @@
}
fprintf(fh,"</DataArray>\n");
-<<<<<<< HEAD
-=======
if(cstlist!=NULL){
fprintf(fh,"<DataArray type=\"Int64\" Name=\"vertices_in_cluster\" format=\"ascii\">");
for(i=0;i<vlist->n;i++){
@@ -980,7 +974,6 @@
fprintf(fh,"</DataArray>\n");
->>>>>>> nirgov
fprintf(fh,"</PointData>\n<CellData>\n</CellData>\n<Points>\n<DataArray type=\"Float64\" Name=\"Koordinate tock\" NumberOfComponents=\"3\" format=\"ascii\">\n");
for(i=0;i<vlist->n;i++){
--
Gitblit v1.9.3