From 1d1f5861495fc6e07d8a683ca8dbbaa43936b212 Mon Sep 17 00:00:00 2001
From: Samo Penic <samo.penic@fe.uni-lj.si>
Date: Tue, 06 Dec 2016 13:43:15 +0000
Subject: [PATCH] Fixes conflicts after merge
---
src/io.c | 7 -------
src/tape | 4 ----
2 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/src/io.c b/src/io.c
index 16ab2c8..c8bdcf8 100644
--- a/src/io.c
+++ b/src/io.c
@@ -862,11 +862,7 @@
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)+vesicle->tlist->n);
-<<<<<<< HEAD
- fprintf(fh,"<PointData Scalars=\"scalars\">\n<DataArray type=\"Int64\" Name=\"scalars\" format=\"ascii\">");
-=======
fprintf(fh,"<PointData Scalars=\"vertices_idx\">\n<DataArray type=\"Int64\" Name=\"vertices_idx\" format=\"ascii\">");
->>>>>>> nirgov
for(i=0;i<vlist->n;i++){
fprintf(fh,"%u ",vtx[i]->idx);
}
@@ -891,8 +887,6 @@
}
fprintf(fh,"</DataArray>\n");
-<<<<<<< HEAD
-=======
if(cstlist!=NULL){
fprintf(fh,"<DataArray type=\"Int64\" Name=\"vertices_in_cluster\" format=\"ascii\">");
for(i=0;i<vlist->n;i++){
@@ -980,7 +974,6 @@
fprintf(fh,"</DataArray>\n");
->>>>>>> nirgov
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++){
diff --git a/src/tape b/src/tape
index 4cd382b..bad3739 100644
--- a/src/tape
+++ b/src/tape
@@ -1,10 +1,6 @@
####### Vesicle definitions ###########
# nshell is a number of divisions of dipyramid
-<<<<<<< HEAD
nshell=17
-=======
-nshell=10
->>>>>>> nirgov
# 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)
--
Gitblit v1.9.3