From 13f45e61241e43d709df10228b946ed9870e8ebb Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 23 Apr 2019 16:12:05 +0000
Subject: [PATCH] Fixing the vesicle 123 and neighbours just for a test
---
src/io.c | 273 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 241 insertions(+), 32 deletions(-)
diff --git a/src/io.c b/src/io.c
index d8c1009..30bd4d6 100644
--- a/src/io.c
+++ b/src/io.c
@@ -1,3 +1,5 @@
+
+/* vim: set ts=4 sts=4 sw=4 noet : */
#include "general.h"
#include<stdio.h>
#include "io.h"
@@ -15,16 +17,17 @@
#include <sys/types.h>
#include <dirent.h>
#include <errno.h>
+#include <snapshot.h>
/** DUMP STATE TO DISK DRIVE **/
ts_bool dump_state(ts_vesicle *vesicle, ts_uint iteration){
/* save current state with wrong pointers. Will fix that later */
ts_uint i,j,k;
- FILE *fh=fopen("dump.bin","wb");
+ FILE *fh=fopen(command_line_args.dump_fullfilename,"wb");
/* dump vesicle */
- fwrite(vesicle, sizeof(ts_vesicle),1,fh);
+ fwrite(vesicle, sizeof(ts_vesicle)-sizeof(ts_double),1,fh);
/* dump vertex list */
fwrite(vesicle->vlist, sizeof(ts_vertex_list),1,fh);
/* dump bond list */
@@ -180,10 +183,10 @@
/** RESTORE DUMP FROM DISK **/
ts_vesicle *restore_state(ts_uint *iteration){
ts_uint i,j,k;
- FILE *fh=fopen("dump.bin","rb");
+ FILE *fh=fopen(command_line_args.dump_fullfilename,"rb");
struct stat sb;
- if (stat("dump.bin", &sb) == -1) {
+ if (stat(command_line_args.dump_fullfilename, &sb) == -1) {
//dump file does not exist.
return NULL;
}
@@ -201,7 +204,7 @@
/* we restore all the data from the dump */
/* restore vesicle */
ts_vesicle *vesicle=(ts_vesicle *)calloc(1,sizeof(ts_vesicle));
- retval=fread(vesicle, sizeof(ts_vesicle),1,fh);
+ retval=fread(vesicle, sizeof(ts_vesicle)-sizeof(ts_double),1,fh);
// fprintf(stderr,"was here! %e\n",vesicle->dmax);
/* restore vertex list */
@@ -418,10 +421,10 @@
vesicle->filament_list->poly[i]->blist->bond[j]->vtx2=vesicle->filament_list->poly[i]->vlist->vtx[idx];
}
}
- vesicle->tape=parsetape("tape");
+ 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);
@@ -439,6 +442,7 @@
sprintf(command_line_args.output_fullfilename,"output.pvd");
sprintf(command_line_args.dump_fullfilename,"dump.bin");
sprintf(command_line_args.tape_fullfilename,"tape");
+ sprintf(command_line_args.tape_templatefull,"./tape");
FILE *file;
while (1)
@@ -448,16 +452,19 @@
{"force-from-tape", no_argument, &(command_line_args.force_from_tape), 1},
{"reset-iteration-count", no_argument, &(command_line_args.reset_iteration_count), 1},
{"tape", no_argument, 0, 't'},
+ {"version", no_argument, 0, 'v'},
{"output-file", required_argument, 0, 'o'},
{"directory", required_argument, 0, 'd'},
{"dump-filename", required_argument,0, 'f'},
{"tape-options",required_argument,0,'c'},
+ {"tape-template", required_argument,0,0},
+ {"restore-from-vtk",required_argument,0,0},
{0, 0, 0, 0}
};
/* getopt_long stores the option index here. */
int option_index = 0;
- c = getopt_long (argc, argv, "d:f:o:t:c:",
+ c = getopt_long (argc, argv, "d:f:o:t:c:v",
long_options, &option_index);
/* Detect the end of the options. */
@@ -470,11 +477,23 @@
/* If this option set a flag, do nothing else now. */
if (long_options[option_index].flag != 0)
break;
- printf ("option %s", long_options[option_index].name);
+/* printf ("option %s", long_options[option_index].name);
if (optarg)
- printf (" with arg %s", optarg);
- printf ("\n");
+ printf (" with arg %s", optarg);
+ printf ("\n"); */
+ //TODO: find a better way.
+ if(strcmp(long_options[option_index].name,"tape-template")==0){
+ strcpy(command_line_args.tape_templatefull,optarg);
+ }
+ if(strcmp(long_options[option_index].name,"restore-from-vtk")==0){
+ strcpy(command_line_args.dump_from_vtk,optarg);
+ }
break;
+ case 'v':
+ fprintf(stdout,"TRISURF-NG v. %s, compiled on: %s %s.\n", TS_VERSION, __DATE__, __TIME__);
+ fprintf(stdout,"Programming done by: Samo Penic and Miha Fosnaric\n");
+ fprintf(stdout,"Released under terms of GPLv3\n");
+ exit(0);
case 'c':
strcpy(command_line_args.tape_opts,optarg);
@@ -513,8 +532,8 @@
case '?':
/* getopt_long already printed an error message. */
-
- ts_fprintf(stderr,"\n\nhere comes the help.\n\n");
+ print_help(stdout);
+//ts_fprintf(stderr,"\n\nhere comes the help.\n\n");
fatal("Ooops, read help first",1);
break;
@@ -534,6 +553,7 @@
if ((file = fopen(buffer, "w")) == NULL) {
fprintf(stderr,"Could not create output file %s!\n", buffer);
fatal("Please specify correct output file or check permissions of the file",1);
+ //there is a tape template. make a copy into desired directory
} else {
fclose(file);
@@ -544,8 +564,15 @@
strcpy(buffer,command_line_args.path);
strcat(buffer,command_line_args.tape_fullfilename);
if (stat(buffer, &sb) == -1) {
- ts_fprintf(stderr,"Tape '%s' does not exist!\n",buffer);
- fatal("Please select correct tape or check permissions of the file",1);
+
+ //tape does not exist. does tape template exist?
+ if(stat(command_line_args.tape_templatefull, &sb)==-1){
+ ts_fprintf(stderr,"Tape '%s' does not exist and no tape template was specified (or does not exist)!\n",buffer);
+ fatal("Please select correct tape or check permissions of the file",1);
+ } else {
+ //tape template found
+ fatal("Samo did not program template copy yet",1);
+ }
} else {
strcpy(command_line_args.tape_fullfilename,buffer);
}
@@ -574,6 +601,31 @@
}
+
+ts_bool print_help(FILE *fd){
+ fprintf(fd,"TRISURF-NG v. %s, compiled on: %s %s.\n", TS_VERSION, __DATE__, __TIME__);
+ fprintf(fd,"Programming done by: Samo Penic and Miha Fosnaric\n");
+ fprintf(fd,"Released under terms of GPLv3\n\n");
+
+ fprintf(fd, "Invoking trisurf-ng without any flags results in default operation. Program reads 'tape' file and 'dump.bin' binary representation of the vesicle from disk and continues the simulation where it was aborted (as specified in 'dump.bin').\n\n");
+ fprintf(fd,"If 'tape' has different values than binary dump, those are used (if possible -- some values in tape, such as nshell cannot be modified).\n\n\n");
+ fprintf(fd,"However, if dump.bin is not present, user is notified to specify --force-from-tape flag. The vesicle will be created from specifications in tape.\n\n\n");
+ fprintf(fd,"Flags:\n\n");
+ fprintf(fd,"--force-from-tape\t\t makes initial shape of the vesicle from tape. Ignores already existing binary dump and possible simulation results.\n");
+ fprintf(fd,"--restore-from-vtk\t\t VTK's file ending with '.vtu' are preferred way to make state snapshots for restoration. With this flag the restoration of the vesicle from vtk is possible. The simulation will continue if hidden '.status' file with last iteration done is present. Otherwise it will start simulation from timestep 0.\n");
+ fprintf(fd,"--reset-iteration-count\t\t starts simulation from the beginning (using binary dump).\n");
+ fprintf(fd,"--tape (or -t)\t\t specifies tape filename. For --force-from-tape and restoring from binary dump. Defaults to 'tape'.\n");
+ fprintf(fd,"--version (or -v)\t\t Prints version information.\n");
+ fprintf(fd,"--output-file (or -o)\t\t Specifies filename of .PVD file. Defaults to 'output.pvd'\n");
+ fprintf(fd,"--dump-filename (or -f)\t\t specifies filename for binary dump&restore. Defaults to 'dump.bin'\n\n\n");
+ fprintf(fd,"Examples:\n\n");
+ fprintf(fd,"trisurf --force-from-tape\n");
+ fprintf(fd,"trisurf --reset-iteration-count\n");
+ fprintf(fd,"trisurf --restore-from-vtk filename.vtu\n");
+ fprintf(fd,"\n\n");
+
+ return TS_SUCCESS;
+}
@@ -745,7 +797,7 @@
}
fprintf(fh,"<?xml version=\"1.0\"?>\n<VTKFile type=\"Collection\" version=\"0.1\" byte_order=\"LittleEndian\" compressor=\"vtkZLibDataCompressor\">\n<Collection>");
- DIR *dir = opendir(".");
+ DIR *dir = opendir(command_line_args.path);
if(dir){
struct dirent *ent;
tstep=0;
@@ -769,15 +821,19 @@
return TS_SUCCESS;
}
-ts_bool write_vertex_xml_file(ts_vesicle *vesicle, ts_uint timestepno){
+ts_bool write_vertex_xml_file(ts_vesicle *vesicle, ts_uint timestepno, ts_cluster_list *cstlist){
ts_vertex_list *vlist=vesicle->vlist;
ts_bond_list *blist=vesicle->blist;
ts_vertex **vtx=vlist->vtx;
ts_uint i,j;
- char filename[255];
+ //ts_double senergy=0.0;
+ char filename[10000];
+ char just_name[255];
FILE *fh;
+ strcpy(filename,command_line_args.path);
+ sprintf(just_name,"timestep_%.6u.vtu",timestepno);
+ strcat(filename,just_name);
- sprintf(filename,"timestep_%.6u.vtu",timestepno);
fh=fopen(filename, "w");
if(fh==NULL){
err("Cannot open file %s for writing");
@@ -804,9 +860,11 @@
}
}
- fprintf(fh, "<?xml version=\"1.0\"?>\n<VTKFile type=\"UnstructuredGrid\" version=\"0.1\" byte_order=\"LittleEndian\" compressor=\"vtkZLibDataCompressor\">\n <UnstructuredGrid>\n");
- fprintf(fh, "<Piece NumberOfPoints=\"%u\" NumberOfCells=\"%u\">\n",vlist->n+monono*polyno+fonono*filno, blist->n+monono*polyno+filno*(fonono-1));
- fprintf(fh,"<PointData Scalars=\"scalars\">\n<DataArray type=\"Int64\" Name=\"scalars\" format=\"ascii\">");
+ fprintf(fh, "<?xml version=\"1.0\"?>\n<VTKFile type=\"UnstructuredGrid\" version=\"0.1\" byte_order=\"LittleEndian\" compressor=\"vtkZLibDataCompressor\">\n");
+ 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);
+ fprintf(fh,"<PointData Scalars=\"vertices_idx\">\n<DataArray type=\"Int64\" Name=\"vertices_idx\" format=\"ascii\">");
for(i=0;i<vlist->n;i++){
fprintf(fh,"%u ",vtx[i]->idx);
}
@@ -830,15 +888,121 @@
}
}
- fprintf(fh,"</DataArray>\n</PointData>\n<CellData>\n</CellData>\n<Points>\n<DataArray type=\"Float64\" Name=\"Koordinate tock\" NumberOfComponents=\"3\" format=\"ascii\">\n");
+ fprintf(fh,"</DataArray>\n");
+ if(cstlist!=NULL){
+ fprintf(fh,"<DataArray type=\"Int64\" Name=\"vertices_in_cluster\" format=\"ascii\">");
+ for(i=0;i<vlist->n;i++){
+ if(vtx[i]->cluster!=NULL){
+ fprintf(fh,"%u ",vtx[i]->cluster->nvtx);
+ } else {
+ fprintf(fh,"-1 ");
+ }
+ }
+ //polymeres
+ if(poly){
+ poly_idx=vlist->n;
+ for(i=0;i<vesicle->poly_list->n;i++){
+ for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++,poly_idx++){
+ fprintf(fh,"-1 ");
+ }
+ }
+ }
+ //filaments
+ if(fil){
+ poly_idx=vlist->n+monono*polyno;
+ for(i=0;i<vesicle->filament_list->n;i++){
+ for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++,poly_idx++){
+ // fprintf(stderr,"was here\n");
+ fprintf(fh,"-1 ");
+ }
+ }
+ }
+
+ fprintf(fh,"</DataArray>\n");
+
+
+ }
+
+ //here comes additional data as needed. Currently only spontaneous curvature
+ fprintf(fh,"<DataArray type=\"Float64\" Name=\"spontaneous_curvature\" format=\"ascii\">");
for(i=0;i<vlist->n;i++){
- fprintf(fh,"%e %e %e\n",vtx[i]->x,vtx[i]->y, vtx[i]->z);
+ fprintf(fh,"%.17e ",vtx[i]->c);
+ }
+ //polymeres
+ if(poly){
+ poly_idx=vlist->n;
+ for(i=0;i<vesicle->poly_list->n;i++){
+ for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++,poly_idx++){
+ fprintf(fh,"%.17e ", vesicle->poly_list->poly[i]->vlist->vtx[j]->c);
+ }
+ }
+ }
+ //filaments
+ if(fil){
+ poly_idx=vlist->n+monono*polyno;
+ for(i=0;i<vesicle->filament_list->n;i++){
+ for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++,poly_idx++){
+ // fprintf(stderr,"was here\n");
+ fprintf(fh,"%.17e ", vesicle->filament_list->poly[i]->vlist->vtx[j]->c);
+ }
+ }
+ }
+ fprintf(fh,"</DataArray>\n");
+
+ //here comes additional data. Energy!
+ fprintf(fh,"<DataArray type=\"Float64\" Name=\"bending_energy\" format=\"ascii\">");
+ for(i=0;i<vlist->n;i++){
+ fprintf(fh,"%.17e ",vtx[i]->energy*vtx[i]->xk);
+ }
+ //polymeres
+ if(poly){
+ poly_idx=vlist->n;
+ for(i=0;i<vesicle->poly_list->n;i++){
+ for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++,poly_idx++){
+ fprintf(fh,"%.17e ", vesicle->poly_list->poly[i]->vlist->vtx[j]->energy* vesicle->poly_list->poly[i]->k);
+ }
+ }
+ }
+ //filaments
+ if(fil){
+ poly_idx=vlist->n+monono*polyno;
+ for(i=0;i<vesicle->filament_list->n;i++){
+ for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++,poly_idx++){
+ // fprintf(stderr,"was here\n");
+ fprintf(fh,"%.17e ", vesicle->filament_list->poly[i]->vlist->vtx[j]->energy* vesicle->filament_list->poly[i]->k);
+ }
+ }
+ }
+ fprintf(fh,"</DataArray>\n");
+
+
+ fprintf(fh,"</PointData>\n<CellData>\n");
+
+ if(vesicle->tape->stretchswitch==1){
+ fprintf(fh,"<DataArray type=\"Float64\" Name=\"stretching_energy\" format=\"ascii\">");
+ for(i=0;i<blist->n;i++){
+ fprintf(fh, "0.0 ");
+ }
+ for(i=0;i<monono*polyno+filno*(fonono-1);i++){
+ fprintf(fh,"0.0 ");
+ }
+ for(i=0;i<vesicle->tlist->n;i++){
+ fprintf(fh,"%.17e ",vesicle->tlist->tria[i]->energy);
+ }
+ fprintf(fh,"</DataArray>\n");
+ }
+
+
+
+ fprintf(fh,"</CellData>\n<Points>\n<DataArray type=\"Float64\" Name=\"Koordinate tock\" NumberOfComponents=\"3\" format=\"ascii\">\n");
+ for(i=0;i<vlist->n;i++){
+ fprintf(fh,"%.17e %.17e %.17e\n",vtx[i]->x,vtx[i]->y, vtx[i]->z);
}
//polymeres
if(poly){
for(i=0;i<vesicle->poly_list->n;i++){
for(j=0;j<vesicle->poly_list->poly[i]->vlist->n;j++){
- fprintf(fh,"%e %e %e\n", vesicle->poly_list->poly[i]->vlist->vtx[j]->x,vesicle->poly_list->poly[i]->vlist->vtx[j]->y, vesicle->poly_list->poly[i]->vlist->vtx[j]->z );
+ fprintf(fh,"%.17e %.17e %.17e\n", vesicle->poly_list->poly[i]->vlist->vtx[j]->x,vesicle->poly_list->poly[i]->vlist->vtx[j]->y, vesicle->poly_list->poly[i]->vlist->vtx[j]->z );
}
}
}
@@ -846,7 +1010,7 @@
if(fil){
for(i=0;i<vesicle->filament_list->n;i++){
for(j=0;j<vesicle->filament_list->poly[i]->vlist->n;j++){
- fprintf(fh,"%e %e %e\n", vesicle->filament_list->poly[i]->vlist->vtx[j]->x,vesicle->filament_list->poly[i]->vlist->vtx[j]->y, vesicle->filament_list->poly[i]->vlist->vtx[j]->z );
+ fprintf(fh,"%.17e %.17e %.17e\n", vesicle->filament_list->poly[i]->vlist->vtx[j]->x,vesicle->filament_list->poly[i]->vlist->vtx[j]->y, vesicle->filament_list->poly[i]->vlist->vtx[j]->z );
}
}
}
@@ -881,17 +1045,24 @@
}
}
-
+ for(i=0;i<vesicle->tlist->n;i++){
+ fprintf(fh,"%u %u %u\n", vesicle->tlist->tria[i]->vertex[0]->idx, vesicle->tlist->tria[i]->vertex[1]->idx, vesicle->tlist->tria[i]->vertex[2]->idx);
+ }
fprintf(fh,"</DataArray>\n<DataArray type=\"Int64\" Name=\"offsets\" format=\"ascii\">");
for (i=2;i<(blist->n+monono*polyno+(fonono-1)*filno)*2+1;i+=2){
fprintf(fh,"%u ",i);
}
+ for(j=i+1;j<i+3*(vesicle->tlist->n);j+=3){ //let's continue counting from where we left of
+ fprintf(fh,"%u ", j);
+ }
fprintf(fh,"\n");
fprintf(fh,"</DataArray>\n<DataArray type=\"UInt8\" Name=\"types\" format=\"ascii\">\n");
- for (i=0;i<blist->n+monono*polyno+fonono*filno;i++){
+ for (i=0;i<blist->n+monono*polyno+(fonono-1)*filno;i++){
fprintf(fh,"3 ");
}
-
+ for(i=0;i<vesicle->tlist->n;i++){
+ fprintf(fh,"5 ");
+ }
fprintf(fh,"</DataArray>\n</Cells>\n</Piece>\n</UnstructuredGrid>\n</VTKFile>\n");
fclose(fh);
return TS_SUCCESS;
@@ -977,6 +1148,20 @@
ts_tape *parsetape(char *filename){
+ FILE *fd = fopen (filename, "r");
+ long length;
+ size_t size;
+ fseek (fd, 0, SEEK_END);
+ length = ftell (fd);
+ fseek (fd, 0, SEEK_SET);
+ size=fread (tapetxt, 1, length, fd);
+ fclose(fd);
+ if(size);
+ ts_tape *tape=parsetapebuffer(tapetxt);
+ return tape;
+}
+
+ts_tape *parsetapebuffer(char *buffer){
ts_tape *tape=(ts_tape *)calloc(1,sizeof(ts_tape));
tape->multiprocessing=calloc(255,sizeof(char));
@@ -986,13 +1171,20 @@
CFG_SIMPLE_INT("nmono", &tape->nmono),
CFG_SIMPLE_INT("nfil",&tape->nfil),
CFG_SIMPLE_INT("nfono",&tape->nfono),
+ CFG_SIMPLE_INT("internal_poly",&tape->internal_poly),
CFG_SIMPLE_INT("R_nucleus",&tape->R_nucleus),
+ CFG_SIMPLE_FLOAT("R_nucleusX",&tape->R_nucleusX),
+ CFG_SIMPLE_FLOAT("R_nucleusY",&tape->R_nucleusY),
+ CFG_SIMPLE_FLOAT("R_nucleusZ",&tape->R_nucleusZ),
CFG_SIMPLE_FLOAT("dmax", &tape->dmax),
CFG_SIMPLE_FLOAT("dmin_interspecies", &tape->dmin_interspecies),
CFG_SIMPLE_FLOAT("xk0",&tape->xk0),
CFG_SIMPLE_INT("pswitch",&tape->pswitch),
CFG_SIMPLE_INT("constvolswitch",&tape->constvolswitch),
+ CFG_SIMPLE_INT("constareaswitch",&tape->constareaswitch),
CFG_SIMPLE_FLOAT("constvolprecision",&tape->constvolprecision),
+ CFG_SIMPLE_INT("stretchswitch",&tape->stretchswitch),
+ CFG_SIMPLE_FLOAT("xkA0",&tape->xkA0),
CFG_SIMPLE_FLOAT("pressure",&tape->pressure),
CFG_SIMPLE_FLOAT("k_spring",&tape->kspring),
CFG_SIMPLE_FLOAT("xi",&tape->xi),
@@ -1003,18 +1195,33 @@
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),
CFG_SIMPLE_INT("spherical_harmonics_coefficients",&tape->shc),
+ CFG_SIMPLE_INT("number_of_vertices_with_c0", &tape->number_of_vertices_with_c0),
+ CFG_SIMPLE_FLOAT("c0",&tape->c0),
+ CFG_SIMPLE_FLOAT("w",&tape->w),
+ CFG_SIMPLE_FLOAT("F",&tape->F),
+/* Variables related to plane confinement */
+ CFG_INT("plane_confinement_switch", 0, CFGF_NONE),
+ CFG_FLOAT("plane_d", 15, CFGF_NONE),
+ CFG_FLOAT("plane_F", 1000, CFGF_NONE),
+/* Variables related to stretching */
+// CFG_FLOAT("stretchswitch", 0, CFGF_NONE),
+// CFG_FLOAT("xkA0",0,CFGF_NONE),
CFG_END()
};
cfg_t *cfg;
ts_uint retval;
cfg = cfg_init(opts, 0);
- retval=cfg_parse(cfg, filename);
+ retval=cfg_parse_buf(cfg, buffer);
+ tape->plane_confinement_switch=cfg_getint(cfg,"plane_confinement_switch");
+ tape->plane_d=cfg_getfloat(cfg,"plane_d");
+ tape->plane_F=cfg_getfloat(cfg,"plane_F");
+
if(retval==CFG_FILE_ERROR){
fatal("No tape file.",100);
}
@@ -1043,6 +1250,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