From 2a1e3d528265c3d366dab9ad4b0c4d3d65e1c4ed Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Mon, 13 Apr 2020 12:13:50 +0000
Subject: [PATCH] Storing previously debugged version
---
src/io.c | 25 ++++++-------------------
1 files changed, 6 insertions(+), 19 deletions(-)
diff --git a/src/io.c b/src/io.c
index 30bd4d6..8fa652c 100644
--- a/src/io.c
+++ b/src/io.c
@@ -424,7 +424,8 @@
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=16;
+//THIS IS HARDCODED IN CELL.C NOW
+// 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);
@@ -750,22 +751,6 @@
}
-ts_bool write_dout_fcompat_file(ts_vesicle *vesicle, ts_char *filename){
- FILE *fh;
- fh=fopen(filename, "w");
- if(fh==NULL){
- err("Cannot open file %s for writing");
- return TS_FAIL;
- }
- fprintf(fh,"%.17E\n%.17E\n",vesicle->stepsize,vesicle->dmax);
- fprint_vertex_list(fh,vesicle->vlist);
- fprint_tristar(fh,vesicle);
- fprint_triangle_list(fh,vesicle);
- fprint_vertex_data(fh,vesicle->vlist);
- fprint_bonds(fh,vesicle);
- fclose(fh);
- return TS_SUCCESS;
-}
ts_bool read_tape_fcompat_file(ts_vesicle *vesicle, ts_char *filename){
FILE *fh;
@@ -845,7 +830,8 @@
ts_uint monono=0, polyno=0, poly_idx=0, filno=0, fonono=0;
ts_bool poly=0, fil=0;
if(vesicle->poly_list!=NULL){
- if(vesicle->poly_list->poly[0]!=NULL){
+ if(vesicle->poly_list->n!=0){
+ //if(vesicle->poly_list->poly[0]!=NULL){
polyno=vesicle->poly_list->n;
monono=vesicle->poly_list->poly[0]->vlist->n;
poly=1;
@@ -853,7 +839,8 @@
}
if(vesicle->filament_list!=NULL){
- if(vesicle->filament_list->poly[0]!=NULL){
+ if(vesicle->filament_list->n!=0){
+ //if(vesicle->filament_list->poly[0]!=NULL){
filno=vesicle->filament_list->n;
fonono=vesicle->filament_list->poly[0]->vlist->n;
fil=1;
--
Gitblit v1.8.0