From 23b0edbc039c47c7b39288c8e16a72c968cfe3b3 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 10 Jul 2012 12:45:50 +0000
Subject: [PATCH] Merged with bondflip debug branch
---
src/Makefile.am | 6 +++---
src/main.c | 2 +-
src/spherical_trisurf.c | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index e61ecec..1221acb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -8,10 +8,10 @@
AM_CFLAGS = -Wall -Werror
co_testdir=../
co_test_PROGRAMS=co_test
-co_test_SOURCES= general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c energy.c sh.c co_test.c frame.c
+co_test_SOURCES= general.c vertex.c bond.c triangle.c cell.c vesicle.c initial_distribution.c io.c energy.c sh.c co_test.c frame.c bondflip.c
spherical_trisurfdir=../
spherical_trisurf_PROGRAMS = spherical_trisurf
-spherical_trisurf_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 spherical_trisurf.c sh.c
+spherical_trisurf_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 spherical_trisurf.c sh.c bondflip.c
spherical_trisurf_ffdir=../
spherical_trisurf_ff_PROGRAMS = spherical_trisurf_ff
-spherical_trisurf_ff_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 spherical_trisurf_ff.c sh.c
+spherical_trisurf_ff_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 spherical_trisurf_ff.c sh.c bondflip.c
diff --git a/src/main.c b/src/main.c
index ca9ed07..d84b611 100644
--- a/src/main.c
+++ b/src/main.c
@@ -73,7 +73,7 @@
centermass(vesicle);
cell_occupation(vesicle);
-for(i=0;i<10000;i++){
+for(i=0;i<100;i++){
single_timestep(vesicle);
if(i%100==0){
write_vertex_xml_file(vesicle,i/100);
diff --git a/src/spherical_trisurf.c b/src/spherical_trisurf.c
index feba26a..82e500a 100644
--- a/src/spherical_trisurf.c
+++ b/src/spherical_trisurf.c
@@ -44,7 +44,7 @@
-for(i=0;i<10000;i++){
+for(i=0;i<10;i++){
cell_occupation(vesicle);
for(j=0;j<1000;j++){
single_timestep(vesicle);
--
Gitblit v1.9.3