Changeset d3482a for pcp/src/perturbed.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/perturbed.c (modified) (15 diffs)

pcp/src/perturbed.c

@@ -2894 +2894 @@
   double eta, delta_chi, S, A, iso;
   int cross_lookup[4];
+  char *suffixchi;
+  FILE *ChiFile;
+  time_t seconds;
 
   if(P->Call.out[NormalOut]) fprintf(stderr,"(%i)Calculating Magnetic Susceptibility \n", P->Par.me);  
@@ -2950 +2953 @@
     }
   }
+
+  suffixchi = (char *) Malloc(sizeof(char)*255, "CalculateMagneticSusceptibility: *suffixchi");
   // store symmetrized matrix
   for (in=0;in<NDIM;in++)
@@ -2956 +2961 @@
   // output tensor to file
   if (P->Par.me == 0) {
-    FILE *ChiFile;
-    char suffixchi[255];
-    time_t seconds;
-      
     time(&seconds); // get current time
     sprintf(&suffixchi[0], ".chi.L%i.csv", Lev0->LevelNo);
@@ -3004 +3005 @@
   // output PAS tensor to file
   if (P->Par.me == 0) {
-    FILE *ChiFile;
-    char suffixchi[255];
-    time_t seconds;
-      
     time(&seconds); // get current time
     sprintf(&suffixchi[0], ".chi_PAS.csv");
@@ -3026 +3023 @@
   gsl_vector_free(eval);
   gsl_matrix_complex_free(H);
+  Free(suffixchi, "CalculateMagneticSusceptibility: *suffixchi");
 }
 
@@ -3069 +3067 @@
   gsl_matrix_complex *H = gsl_matrix_complex_calloc(NDIM,NDIM);
   FILE *SigmaFile;
-  char suffixsigma[255];
+  char *suffixsigma = (char *) Malloc(sizeof(char)*255, "CalculateChemicalShieldingByReciprocalCurrentDensity: *suffixsigma");
   
   time_t seconds;  
@@ -3160 +3158 @@
   // output tensor to file
   if (P->Par.me == 0) {
-    sprintf(&suffixsigma[0], ".sigma_chi_rezi.L%i.csv", Lev0->LevelNo);
+    sprintf(suffixsigma, ".sigma_chi_rezi.L%i.csv", Lev0->LevelNo);
     OpenFile(P, &SigmaFile, suffixsigma, "a", P->Call.out[ReadOut]);
     fprintf(SigmaFile,"# chemical shielding tensor sigma_rezi[01,02,03,10,11,12,20,21,22], seed %i, config %s, run on %s", R->Seed, P->Files.default_path, ctime(&seconds));
@@ -3186 +3184 @@
       // output tensor to file
       if (P->Par.me == 0) {
-        sprintf(&suffixsigma[0], ".sigma_i%i_%s_rezi.L%i.csv", ion, I->I[it].Symbol, Lev0->LevelNo);
+        sprintf(suffixsigma, ".sigma_i%i_%s_rezi.L%i.csv", ion, I->I[it].Symbol, Lev0->LevelNo);
         OpenFile(P, &SigmaFile, suffixsigma, "a", P->Call.out[ReadOut]);
         fprintf(SigmaFile,"# chemical shielding tensor sigma_rezi[01,02,03,10,11,12,20,21,22], seed %i, config %s, run on %s", R->Seed, P->Files.default_path, ctime(&seconds));
@@ -3232 +3230 @@
       }
       if (P->Par.me == 0) {
-        FILE *SigmaFile;
-        char suffixsigma[255];
-        sprintf(&suffixsigma[0], ".sigma_i%i_%s_PAS.csv", ion, I->I[it].Symbol);
+        sprintf(suffixsigma, ".sigma_i%i_%s_PAS.csv", ion, I->I[it].Symbol);
         if (Lev0->LevelNo == Lat->MaxLevel-2) {
           OpenFile(P, &SigmaFile, suffixsigma, "w", P->Call.out[ReadOut]);
@@ -3304 +3300 @@
   gsl_vector_free(eval);
   gsl_matrix_complex_free(H);
+  Free(suffixsigma, "CalculateChemicalShieldingByReciprocalCurrentDensity: *suffixsigma");
 }
 
@@ -3337 +3334 @@
   const int N0 = Lev0->Plan0.plan->local_nx;
   FILE *MomentFile;
-  char suffixmoment[255];
+  char *suffixmoment = (char *) Malloc(sizeof(char)*255, "CalculateMagneticMoment: *suffixmoment");
   time_t seconds;  
   time(&seconds); // get current time
@@ -3444 +3441 @@
 
   gsl_matrix_complex_free(H);
+  Free(suffixmoment, "CalculateMagneticMoment: *suffixmoment");
 }
 
@@ -3776 +3774 @@
   struct LatticeLevel *Lev0 = R->Lev0;
   struct Density *Dens0 = Lev0->Dens;
-  char filename[255];
+  char *filename;
   char *suchpointer;
   FILE *PlotFile = NULL;
@@ -3795 +3793 @@
   if (!myPE) { // only process 0 writes to file
     // open file
+    filename = (char *) Malloc(sizeof(char)*255, "PlotVectorPlane: *filename");
     sprintf(&filename[0], ".current.L%i.csv", Lev0->LevelNo);
     OpenFile(P, &PlotFile, filename, "w", P->Call.out[ReadOut]);
@@ -3805 +3804 @@
       fprintf(PlotFile,"\n");
     } else { Error(SomeError, "PlotVectorPlane: Opening Plot File"); }
+    Free(filename, "PlotVectorPlane: *filename");
   }