Changeset 57a69b2 for pcp

Timestamp:

Apr 21, 2008, 9:43:30 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

cc46b0

Parents:

f50ab8

Message:

CombineOutVisDensity(), CreateDensityOutputGeneral(), OutVisIons(): Filename suffixes also carry ".L?" level information

File:

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

pcp/src/output.c

@@ -816 +816 @@
   MaxPoints = (N[0]+1)*(N[1]+1)*(N[2]+1);
   posname = (char*)
-    Malloc(strlen(P->Files.mainname) + strlen(suffixdenspos) + 1,"OpenFile");
-  sprintf(posname, "%s%s", P->Files.mainname, suffixdenspos);
+    Malloc(strlen(P->Files.mainname) + strlen(suffixdenspos) + 3 + 1,"CreateDensityOutputGeneral: posname");
+  sprintf(posname, "%s.L%i%s", P->Files.mainname, Lev->LevelNo, suffixdenspos);
   datname = (char*)
-    Malloc(strlen(P->Files.mainname) + strlen(suffixdensdat) + 1,"OpenFile");
-  sprintf(datname, "%s%s", P->Files.mainname, suffixdensdat);
+    Malloc(strlen(P->Files.mainname) + strlen(suffixdensdat) + 3 + 1,"CreateDensityOutputGeneral: datname");
+  sprintf(datname, "%s.L%i%s", P->Files.mainname, Lev->LevelNo, suffixdensdat);
   // write doc file
   suffix = (char *)
@@ -1048 +1048 @@
   switch (Lat->RT.ActualUse) {
   case active:
-    sprintf(suffix, "%s", suffixdenspos);
+    sprintf(suffix, ".L%i%s", P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixdenspos);
     OpenFileNo(P, &DensityPos, suffix, (int)step, "wb",P->Call.out[ReadOut]);
   case inactive:
   case standby:
-    sprintf(suffix, "%s", suffixdensdat);
+    sprintf(suffix, ".L%i%s", P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixdensdat);
     OpenFileNo(P, &DensityData, suffix, (int)step, "wb",P->Call.out[ReadOut]);
     break;
@@ -1470 +1470 @@
   struct Ions *I = &P->Ion;
   struct FileData *F = &P->Files;
+  struct LatticeLevel *Lev = &P->Lat.Lev[STANDARTLEVEL];
   int i,is,ia;
   double *fion, *pos;
@@ -1480 +1481 @@
   datnamef = (char*)
     malloc(strlen(P->Files.mainname)+strlen(suffixionfor) + 1);
-  sprintf(datnamef, "%s%s", P->Files.mainname, suffixionfor);
+  sprintf(datnamef, "%s.L%i%s", P->Files.mainname, P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixionfor);
   datnameZ = (char*)
     malloc(strlen(P->Files.mainname)+strlen(suffixionZ) + 1);
-  sprintf(datnameZ, "%s%s", P->Files.mainname, suffixionZ);
+  sprintf(datnameZ, "%s.L%i%s", P->Files.mainname, P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixionZ);
   posname = (char*)
     malloc(strlen(P->Files.mainname)+strlen(suffixionpos) + 1);
-  sprintf(posname, "%s%s", P->Files.mainname, suffixionpos);
+  sprintf(posname, "%s.L%i%s", P->Files.mainname, P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixionpos);
   // open, fill and close doc file
-  sprintf(suffix, "%s", suffixiondoc);
+  sprintf(suffix, ".L%i%s", P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixiondoc);
   if (OpenFile(P, &IonsDoc, suffix, "w",P->Call.out[ReadOut])) {
     fprintf(IonsDoc,"IonsPos file = %s.####\n", posname);
@@ -1501 +1502 @@
   }
   // open dx file and fill it with each output step, close it
-  sprintf(suffix, "%s", suffixiondx);
+  sprintf(suffix, ".L%i%s", P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixiondx);
   if (OpenFile(P, &IonsDx, suffix, "w",P->Call.out[ReadOut])) {
     for (i=0; i < F->OutVisStep+1; i++) {
@@ -1541 +1542 @@
   Free(posname, "OutVisIons: posname");
   // open IonForces, IonZ and IonPosition file, write forces respectively positions for each ion of each type, close them
-  sprintf(suffix, "%s", suffixionfor);
+  sprintf(suffix, ".L%i%s", P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixionfor);
   if (OpenFileNo(P, &IonsDataF, suffix, F->OutVisStep, "wb",P->Call.out[ReadOut])) {
     if (F->OutVisStep == 0) { 
-      sprintf(suffix, "%s", suffixionZ);
+      sprintf(suffix, ".L%i%s", P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixionZ);
       OpenFile(P, &IonsDataZ, suffix, "wb",P->Call.out[ReadOut]);
     }
-    sprintf(suffix, "%s", suffixionpos);
+    sprintf(suffix, ".L%i%s", P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixionpos);
     if (OpenFileNo(P, &IonsPos, suffix, F->OutVisStep, "wb",P->Call.out[ReadOut])) {
       for (is=0; is < I->Max_Types; is++) {