From 13d4451f4d12c92a2b43d8d13af43a4087744c65 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@gmail.com>
Date: Tue, 15 May 2018 16:23:02 +0000
Subject: [PATCH] Energy assigned to the triangles

---
 src/io.c |   42 ++++++++++++++----------------------------
 1 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/io.c b/src/io.c
index 83bb26d..82339cf 100644
--- a/src/io.c
+++ b/src/io.c
@@ -826,7 +826,7 @@
 	ts_bond_list *blist=vesicle->blist;
 	ts_vertex **vtx=vlist->vtx;
     ts_uint i,j;
-	ts_double senergy=0.0;
+	//ts_double senergy=0.0;
     	char filename[10000];
         char just_name[255];
 	FILE *fh;
@@ -974,39 +974,25 @@
 			}
 		}
     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<vlist->n;i++){
-			senergy=0.0;
-			for(j=0;j<vtx[i]->tristar_no;j++){
-				senergy+=vtx[i]->tristar[j]->energy;
-			}
-			fprintf(fh,"%.17e ",senergy);
+		for(i=0;i<blist->n+monono*polyno+filno*(fonono-1)
+;i++){
+			fprintf(fh,"0.0 ");
 		}
-			//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 ", 0.0);
-					}
-				}
-			}
-			//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 ", 0.0);
-					}
-				}
-			}
+		for(i=0;i<vesicle->tlist->n;i++){
+			fprintf(fh,"%.17e ",vesicle->tlist->tria[i]->energy);
+		}
 	    fprintf(fh,"</DataArray>\n");
 	}
 
-	
-	fprintf(fh,"</PointData>\n<CellData>\n</CellData>\n<Points>\n<DataArray type=\"Float64\" Name=\"Koordinate tock\" NumberOfComponents=\"3\" format=\"ascii\">\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);
 	}

--
Gitblit v1.9.3