merged

Samo Penic

2012-07-13 672ae43d88ba88cf1f4183511bd56f90c7c4d2ed

 src/spherical_trisurf.c

@@ -19,7 +19,7 @@
*/
ts_bool saveAvgUlm2(ts_vesicle *vesicle);
int main(int argv, char *argc[]){
ts_uint i,j;
ts_uint i,j,k;
ts_vesicle *vesicle;
ts_double r0;
vesicle=initial_distribution_dipyramid(17,60,60,60,0.15);
@@ -32,6 +32,22 @@
vesicle->bending_rigidity=25.0;
//fprintf(stderr,"xk=%f",vesicle->bending_rigidity);

   centermass(vesicle);
cell_occupation(vesicle);

//test if the structure is internally organized into cells correctly 
ts_uint cind;
for(i=0;i<vesicle->vlist->n;i++){
   cind=vertex_self_avoidance(vesicle, vesicle->vlist->vtx[i]);

   if(vesicle->clist->cell[cind]==vesicle->vlist->vtx[i]->cell){
      //fprintf(stdout,"(T) Idx match!\n");
   } else {
      fprintf(stderr,"(T) ***** Idx don't match!\n");

   }
}
//end test
vesicle->sphHarmonics=sph_init(vesicle->vlist, 21);

vesicle_volume(vesicle);
@@ -42,26 +58,29 @@
calculateUlm(vesicle);



for(i=0;i<10;i++){
   centermass(vesicle);
   cell_occupation(vesicle);
   for(j=0;j<1000;j++){
   for(j=0;j<200;j++){
      cell_occupation(vesicle);
      for(k=0;k<5;k++){
      single_timestep(vesicle);
      }
      centermass(vesicle);
   }   
vesicle_volume(vesicle);
r0=getR0(vesicle);
    vesicle_volume(vesicle);
    r0=getR0(vesicle);

preparationSh(vesicle,r0);
calculateYlmi(vesicle);
calculateUlm(vesicle);
    preparationSh(vesicle,r0);
    calculateYlmi(vesicle);
    calculateUlm(vesicle);

storeUlm2(vesicle);
saveAvgUlm2(vesicle);
    storeUlm2(vesicle);
    saveAvgUlm2(vesicle);

   write_vertex_xml_file(vesicle,i);
   fprintf(stderr, "Loop %d completed.\n",i+1);

}

write_master_xml_file("test.pvd");
write_dout_fcompat_file(vesicle,"dout");
vesicle_free(vesicle);
@@ -89,6 +108,7 @@
      fprintf(fh,"%d,\t%d,\t%e\n", i, j-i, sph->sumUlm2[i][j]/(ts_double)sph->N);

          }
    fprintf(fh,"\n");
   }
   fclose(fh);
   return TS_SUCCESS;