Changeset d3482a for pcp/src/wannier.c

Timestamp:

Apr 23, 2008, 4:03:13 PM (18 years ago)

Author:

Frederik Heber <heber@…>

Children:

4f9fe2

Parents:

d52fb5

Message:

various suffix...[255] or filename[255] were changed from arrays to pointers

Instead of having fixed array length that are fully represented in the code switched to Malloc/Free.

File:

• pcp/src/wannier.c (modified) (4 diffs)

pcp/src/wannier.c

@@ -1855 +1855 @@
   int i,l,j, msglen;
   FILE *SpreadFile;
-  char tagname[255];
+  char *tagname;
   char suffix[18];
   double WannierCentre[NDIM+1]; // combined centre and spread
@@ -1874 +1874 @@
   if (P->Call.out[NormalOut]) fprintf(stderr,"(%i) Parsing Wannier Centres from file ... \n", P->Par.me);
   
-  if (P->Par.me_comm_ST == 0) { 
+  if (P->Par.me_comm_ST == 0) {
+    tagname = (char *) Malloc(sizeof(char)*255, "ParseWannierFile: *tagname");
     if(!OpenFile(P, &SpreadFile, suffix, "r", P->Call.out[ReadOut])) { // check if file exists
       if (MPI_Bcast(&signal,1,MPI_INT,0,P->Par.comm_ST) != MPI_SUCCESS)
@@ -1936 +1937 @@
         for (j=0;j<NDIM;j++) Psi->AddData[OnePsiA->MyLocalNo].WannierCentre[j] = WannierCentre[j];
         Psi->AddData[OnePsiA->MyLocalNo].WannierSpread = WannierCentre[NDIM];
-        //if (P->Par.me ==0 && P->Call.out[ValueOut]) fprintf(stderr,"(%i) %s\t%lg\t%lg\t%lg\t\t%lg\n",P->Par.me, tagname,Psi->AddData[OnePsiA->MyLocalNo].WannierCentre[0],Psi->AddData[OnePsiA->MyLocalNo].WannierCentre[1],Psi->AddData[OnePsiA->MyLocalNo].WannierCentre[2],Psi->AddData[OnePsiA->MyLocalNo].WannierSpread);
+        //if (P->Par.me == 0 && P->Call.out[ValueOut]) fprintf(stderr,"(%i) %s\t%lg\t%lg\t%lg\t\t%lg\n",P->Par.me, tagname,Psi->AddData[OnePsiA->MyLocalNo].WannierCentre[0],Psi->AddData[OnePsiA->MyLocalNo].WannierCentre[1],Psi->AddData[OnePsiA->MyLocalNo].WannierCentre[2],Psi->AddData[OnePsiA->MyLocalNo].WannierSpread);
       } else if (P->Par.me_comm_ST == 0) { // if they are not local, yet we are process 0, send 'em to leader of its Psi group
         if (MPI_Send(WannierCentre, NDIM+1, MPI_DOUBLE, OnePsiA->my_color_comm_ST_Psi, ParseWannierTag, P->Par.comm_ST_PsiT) != MPI_SUCCESS)
@@ -1944 +1945 @@
     }
   }
-  if ((SpreadFile != NULL) && (P->Par.me_comm_ST == 0)) 
+  if ((SpreadFile != NULL) && (P->Par.me_comm_ST == 0)) { 
     fclose(SpreadFile);
+    Free(tagname, "ParseWannierFile: *tagname");
+  }
   //fprintf(stderr,"(%i) Parsing Wannier files succeeded!\n", P->Par.me);
   return 1;