From 5eefcc281fda031d322599fd7094da4fc8450948 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 25 Sep 2018 13:55:53 +0000
Subject: [PATCH] Debugged
---
src/io.c | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/io.c b/src/io.c
index 16ab2c8..1710d17 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1,3 +1,4 @@
+
/* vim: set ts=4 sts=4 sw=4 noet : */
#include "general.h"
#include<stdio.h>
@@ -423,7 +424,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 +863,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 +888,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 +975,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++){
@@ -1181,8 +1175,8 @@
CFG_SIMPLE_INT("iterations",&tape->iterations),
CFG_SIMPLE_INT("mcsweeps",&tape->mcsweeps),
CFG_SIMPLE_INT("inititer", &tape->inititer),
- CFG_SIMPLE_BOOL("quiet",&tape->quiet),
- CFG_SIMPLE_STR("multiprocessing",tape->multiprocessing),
+ CFG_SIMPLE_BOOL("quiet",(cfg_bool_t *)&tape->quiet),
+ CFG_SIMPLE_STR("multiprocessing",&tape->multiprocessing),
CFG_SIMPLE_INT("smp_cores",&tape->brezveze0),
CFG_SIMPLE_INT("cluster_nodes",&tape->brezveze1),
CFG_SIMPLE_INT("distributed_processes",&tape->brezveze2),
@@ -1191,6 +1185,9 @@
CFG_SIMPLE_FLOAT("c0",&tape->c0),
CFG_SIMPLE_FLOAT("w",&tape->w),
CFG_SIMPLE_FLOAT("F",&tape->F),
+ CFG_SIMPLE_INT("plane_confinement_switch", &tape->plane_confinement_switch),
+ CFG_SIMPLE_FLOAT("plane_d", &tape->plane_d),
+ CFG_SIMPLE_FLOAT("plane_F", &tape->plane_F),
CFG_END()
};
cfg_t *cfg;
@@ -1225,6 +1222,8 @@
ts_bool getcmdline_tape(cfg_t *cfg, char *opts){
char *commands, *backup, *saveptr, *saveopptr, *command, *operator[2];
+ operator[0]=0;
+ operator[1]=0;
ts_uint i,j;
commands=(char *)malloc(10000*sizeof(char));
backup=commands; //since the pointer to commands will be lost, we acquire a pointer that will serve as backup.
--
Gitblit v1.9.3