Changeset 9bebe0

Timestamp:

Apr 21, 2008, 7:00:29 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

4d4fc1

Parents:

1ce31f

Message:

CreateDensityOutputGeneral(): char array suffix is used

Instead of a define directly, a char array is filled and used to access the file

File:

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

pcp/src/output.c

@@ -804 +804 @@
 {
   FILE *DensityDoc, *DensityDx;
-  char *posname, *datname; 
+  char *posname, *datname, *suffix; 
   struct LatticeLevel *Lev = &P->Lat.Lev[STANDARTLEVEL];
   unsigned int i, MaxPoints, N[NDIM];
@@ -820 +820 @@
   sprintf(datname, "%s%s", P->Files.mainname, suffixdensdat);
   // write doc file
-  OpenFile(P, &DensityDoc, suffixdensdoc, "w",P->Call.out[ReadOut]);
+  suffix = (char *)
+    Malloc(strlen(suffixdensdoc) + 3 + 1,"CreateDensityOutputGeneral: suffix");
+  sprintf(suffix, ".L%i%s", Lev->LevelNo, suffixdensdoc);
+  OpenFile(P, &DensityDoc, suffix, "w",P->Call.out[ReadOut]);
   fprintf(DensityDoc,"DensityPositions file = %s.####\n", posname);
   fprintf(DensityDoc,"DensityData file = %s.####\n", datname);
@@ -828 +831 @@
   fprintf(DensityDoc,"TimeSeries = %i\n",P->Files.OutVisStep+1);
   fclose(DensityDoc);
+  Free(suffix, "CreateDensityOutputGeneral: suffix");
   // write DX file
-  OpenFile(P, &DensityDx, suffixdensdx, "w",P->Call.out[ReadOut]);
+  suffix = (char *)
+    Malloc(strlen(suffixdensdx) + 3 + 1,"CreateDensityOutputGeneral: suffix");
+  sprintf(suffix, ".L%i%s", Lev->LevelNo, suffixdensdx);
+  OpenFile(P, &DensityDx, suffix, "w",P->Call.out[ReadOut]);
   for (i=0; i < (unsigned int)P->Files.OutVisStep+1; i++) { // for every OutVis step
     if (i==0) { 
@@ -865 +872 @@
     fprintf(DensityDx,"member %i \"obj.%04u\" position %f\n",i,i,(float)i);
   fprintf(DensityDx,"end\n");
-
   fclose(DensityDx);
+  Free(suffix, "CreateDensityOutputGeneral: suffix");
+
   Free(posname, "CreateDensityOutputGeneral: posname");
   Free(datname, "CreateDensityOutputGeneral: datname");