Merge branch 'nirgov' into HEAD

Samo Penic

2016-12-06 0634b97e436e480b203a22e1113c473d3ae4d281

 src/tsmeasure.c

@@ -34,9 +34,9 @@
}

void vesicle_calculate_ulm2(ts_vesicle *vesicle){
   complex_sph_free(vesicle->sphHarmonics);
   //complex_sph_free(vesicle->sphHarmonics);

   vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,21);
   //vesicle->sphHarmonics=complex_sph_init(vesicle->vlist,21);
   vesicle_volume(vesicle);
   preparationSh(vesicle,getR0(vesicle));
   calculateUlmComplex(vesicle);
@@ -68,8 +68,7 @@
      ent=list[n];   
               i=rindex(ent->d_name,'.');
               if(i==NULL) {
         free(ent);  
         continue;
            continue;
      }
               if(strcmp(i+1,"vtu")==0){
                    j=rindex(ent->d_name,'_');
@@ -81,12 +80,16 @@
         vesicle=restoreVesicle(ent->d_name);
         vesicle_calculate_ulm2(vesicle);
                       tstep++;
         //vesicle_free(vesicle);
                    free(number);
         tape_free(vesicle->tape);
         vesicle_free(vesicle);
               }
      free(ent);  
      }
   for (n = 0; n < count; n++)
     {
        free(list[n]);
     }
	
   free(list);
   return 0;
}