From 9447bd5e078944df080b75e054cd4dc95c6c9303 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Wed, 22 Jun 2016 13:06:50 +0000
Subject: [PATCH] Merge with paraview's branch. Added triangles as cells for visualization
---
src/io.c | 16 +++++++++++-----
src/tape | 14 +++++++-------
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/src/io.c b/src/io.c
index 9c0bb75..7066657 100644
--- a/src/io.c
+++ b/src/io.c
@@ -861,7 +861,7 @@
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));
+ 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);
@@ -941,7 +941,6 @@
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");
for(i=0;i<vlist->n;i++){
@@ -994,17 +993,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;
diff --git a/src/tape b/src/tape
index 0fb355e..fe611f8 100644
--- a/src/tape
+++ b/src/tape
@@ -25,26 +25,26 @@
####### Polymer (brush) definitions ###########
# npoly is a number of polymers attached to npoly distinct vertices on vesicle
-npoly=3
+npoly=0
# nmono is a number of monomers in each polymer
-nmono=10
+nmono=2
# Spring constant between monomers of the polymer
k_spring=800
####### Filament (inside the vesicle) definitions ###########
# nfil is a number of filaments inside the vesicle
-nfil=2
+nfil=0
# nfono is a number of monomers in each filament
-nfono=300
+nfono=3
# Persistence lenght of the filaments (in units l_min)
xi=100
####### Nucleus (inside the vesicle) ###########
# Radius of an impenetrable hard sphere inside the vesicle
R_nucleus=0
-R_nucleusX=6.0
-R_nucleusY=12.0
-R_nucleusZ=6.0
+R_nucleusX=0
+R_nucleusY=0
+R_nucleusZ=0
####### Cell definitions ############
nxmax=60
nymax=60
--
Gitblit v1.9.3