From 4f5ffcfd5ba38b6b7dd6d3b15de8bb8677537b9f Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Thu, 09 Apr 2020 16:15:56 +0000
Subject: [PATCH] Commiting old changes
---
src/Makefile.am | 8 +++++---
src/main.c | 4 +++-
src/io.c | 1 +
src/initial_distribution.c | 2 +-
src/restore.c | 2 ++
5 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index f660c95..74dfa4c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,9 +1,10 @@
bin_PROGRAMS = trisurf
-trisurf_SOURCES = main.c
+trisurf_SOURCES = main.c general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c frame.c energy.c timestep.c vertexmove.c bondflip.c poly.c stats.c sh.c shcomplex.c constvol.c snapshot.c restore.c cluster.c b64zlib_compression.c
GITVERSION:=$(shell git --no-pager describe --tags --always --dirty)
-AM_CFLAGS = -Wall -Werror -DTS_VERSION=\"$(GITVERSION)\" -fgnu89-inline -Wno-error=date-time
+trisurf_CFLAGS = -Wall -Werror -DTS_VERSION=\"$(GITVERSION)\" -fgnu89-inline -Wno-error=date-time $(AM_CFLAGS)
AM_CPPFLAGS = ${libxml2_CFLAGS} -fgnu89-inline
-trisurf_LDADD = libtrisurf.la ${libcurl_LIBS} ${libxml2_LIBS}
+#trisurf_LDADD = libtrisurf.la ${libcurl_LIBS} ${libxml2_LIBS}
+trisurf_LDADD = ${libcurl_LIBS} ${libxml2_LIBS}
#tsmeasure_SOURCES = tsmeasure.c
#tsmeasure_LDADD = libtrisurf.la ${libcurl_LIBS} ${libxml2_LIBS}
@@ -17,4 +18,5 @@
libtrisurf_la_SOURCES= general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c frame.c energy.c timestep.c vertexmove.c bondflip.c poly.c stats.c sh.c shcomplex.c constvol.c snapshot.c restore.c cluster.c b64zlib_compression.c
#libtrisurf_la_CPPFLAGS = ${libxml2_CFLAGS}
libtrisurf_la_LIBADD=${libxml2_LIBS}
+AM_CFLAGS= -DTS_VERSION=\"$(GITVERSION)\"
pkginclude_HEADERS=general.h vertex.h bond.h triangle.h cell.h vesicle.h initial_distribution.h io.h frame.h energy.h timestep.h vertexmove.h bondflip.h poly.h stats.h sh.h shcomplex.h constvol.h snapshot.h restore.h cluster.h b64zlib_compression.h
diff --git a/src/initial_distribution.c b/src/initial_distribution.c
index 87cfb68..95c5368 100644
--- a/src/initial_distribution.c
+++ b/src/initial_distribution.c
@@ -46,7 +46,7 @@
vesicle->clist->dmin_interspecies = tape->dmin_interspecies*tape->dmin_interspecies;
vesicle->poly_list=init_poly_list(tape->npoly,tape->nmono, vesicle->vlist, vesicle);
set_vesicle_values_from_tape(vesicle);
- initial_population_with_c0(vesicle,tape);
+ initial_population_with_c0(vesicle,tape);
return vesicle;
}
diff --git a/src/io.c b/src/io.c
index 64dc53d..b16ab3e 100644
--- a/src/io.c
+++ b/src/io.c
@@ -245,6 +245,7 @@
if(vesicle->filament_list!=NULL){
if(vesicle->filament_list->poly[0]!=NULL){
filno=vesicle->filament_list->n;
+ fprintf(stderr,"WAS HERE AND I SHOULDNT BE\n");
fonono=vesicle->filament_list->poly[0]->vlist->n;
fil=1;
}
diff --git a/src/main.c b/src/main.c
index 92df3d8..8212e11 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,7 +47,9 @@
ts_fprintf(stdout,"**** Restoring vesicle from VTK points list ****\n");
ts_fprintf(stdout,"************************************************\n\n");
vesicle = parseDump(command_line_args.dump_from_vtk);
-// write_vertex_xml_file(vesicle,9999); // here you can test if restoration and rewritting results in the same dump file. Only the date od creation of dump file must differ.
+ write_vertex_xml_file(vesicle,9999, NULL); // here you can test if restoration and rewritting results in the same dump file. Only the date od creation of dump file must differ.
+ printf("Dumped 9999 and exit\n");
+ exit(12);
tape = vesicle->tape;
int arguments_no;
FILE *fd=fopen(".status","r");
diff --git a/src/restore.c b/src/restore.c
index 9f9c3f4..dcd227d 100644
--- a/src/restore.c
+++ b/src/restore.c
@@ -416,6 +416,7 @@
//idx++;
}
xmlFree(points);
+ free(coords);
}
child=child->next;
}
@@ -461,6 +462,7 @@
}
}
xmlFree(bonds);
+ free(conn);
}
xmlFree(conname);
child=child->next;
--
Gitblit v1.9.3