Merge branch 'stretching-devel' of ssh://git.penic.eu:29418/trisurf-ng into...

Samo Penic

2018-05-19 c854bf8109ddce134fc0e6fc5c27e7e648bc7734

 src/io.c

@@ -1,3 +1,4 @@

/* vim: set ts=4 sts=4 sw=4 noet : */
#include "general.h"
#include<stdio.h>
@@ -423,7 +424,7 @@
    vesicle->tape=parsetape(command_line_args.tape_fullfilename);
// recreating space for cells // 
    vesicle->clist=init_cell_list(vesicle->tape->ncxmax, vesicle->tape->ncymax, vesicle->tape->nczmax, vesicle->tape->stepsize);
   vesicle->clist->max_occupancy=8;
   vesicle->clist->max_occupancy=16;
//    vesicle->tape=(ts_tape *)malloc(sizeof(ts_tape));
//    retval=fread(vesicle->tape, sizeof(ts_tape),1,fh);
   retval=fread(iteration,sizeof(ts_uint),1,fh);
@@ -825,6 +826,7 @@
   ts_bond_list *blist=vesicle->blist;
   ts_vertex **vtx=vlist->vtx;
    ts_uint i,j;
   //ts_double senergy=0.0;
       char filename[10000];
        char just_name[255];
   FILE *fh;
@@ -862,11 +864,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 +889,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++){
@@ -979,10 +975,26 @@
      }
    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");
   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<blist->n;i++){
         fprintf(fh, "0.0 ");
      }
      for(i=0;i<monono*polyno+filno*(fonono-1);i++){
         fprintf(fh,"0.0 ");
      }
      for(i=0;i<vesicle->tlist->n;i++){
         fprintf(fh,"%.17e ",vesicle->tlist->tria[i]->energy);
      }
       fprintf(fh,"</DataArray>\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);
   }
@@ -1171,6 +1183,8 @@
   CFG_SIMPLE_INT("constvolswitch",&tape->constvolswitch),
   CFG_SIMPLE_INT("constareaswitch",&tape->constareaswitch),
   CFG_SIMPLE_FLOAT("constvolprecision",&tape->constvolprecision),
   CFG_SIMPLE_INT("stretchswitch",&tape->stretchswitch),
   CFG_SIMPLE_FLOAT("xkA0",&tape->xkA0),	
   CFG_SIMPLE_FLOAT("pressure",&tape->pressure),
   CFG_SIMPLE_FLOAT("k_spring",&tape->kspring),
   CFG_SIMPLE_FLOAT("xi",&tape->xi),
@@ -1181,8 +1195,8 @@
        CFG_SIMPLE_INT("iterations",&tape->iterations),
   CFG_SIMPLE_INT("mcsweeps",&tape->mcsweeps),
   CFG_SIMPLE_INT("inititer", &tape->inititer),
        CFG_SIMPLE_BOOL("quiet",&tape->quiet),
        CFG_SIMPLE_STR("multiprocessing",tape->multiprocessing),
            CFG_SIMPLE_BOOL("quiet",(cfg_bool_t *)&tape->quiet),
        CFG_SIMPLE_STR("multiprocessing",&tape->multiprocessing),
        CFG_SIMPLE_INT("smp_cores",&tape->brezveze0),
        CFG_SIMPLE_INT("cluster_nodes",&tape->brezveze1),
        CFG_SIMPLE_INT("distributed_processes",&tape->brezveze2),
@@ -1225,6 +1239,8 @@
ts_bool getcmdline_tape(cfg_t *cfg, char *opts){

   char *commands, *backup, *saveptr, *saveopptr, *command, *operator[2];
   operator[0]=0;
   operator[1]=0;
   ts_uint i,j;
   commands=(char *)malloc(10000*sizeof(char));
    backup=commands; //since the pointer to commands will be lost, we acquire a pointer that will serve as backup.