From bfa6c4d2d234dac214ae05855669844255a32979 Mon Sep 17 00:00:00 2001 From: Samo Penic <samo.penic@gmail.com> Date: Sun, 03 Jul 2016 20:46:31 +0000 Subject: [PATCH] Merge branch 'paraview'. This enables view of triangles in paraview. --- src/io.c | 15 +++++++++++---- src/tape | 18 +++++++++--------- 2 files changed, 20 insertions(+), 13 deletions(-) diff --git a/src/io.c b/src/io.c index f3029db..147b655 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=\"scalars\">\n<DataArray type=\"Int64\" Name=\"scalars\" format=\"ascii\">"); for(i=0;i<vlist->n;i++){ fprintf(fh,"%u ",vtx[i]->idx); @@ -940,17 +940,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 6319c97..50b4272 100644 --- a/src/tape +++ b/src/tape @@ -1,6 +1,6 @@ ####### Vesicle definitions ########### # nshell is a number of divisions of dipyramid -nshell=17 +nshell=5 # dmax is the max. bond length (in units l_min) dmax=1.7 # dmin_interspecies in the min. dist. between different vertex species (in units l_min) @@ -21,30 +21,30 @@ constvolprecision=1e-14 #Constant area constraint (0 disable constant area, 2 enable constant area with epsarea) -constareaswitch=2 +constareaswitch=0 ####### 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=0 ####### 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