Changeset 0b638d for pcp

Timestamp:

Apr 21, 2008, 8:48:27 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

f50ab8

Parents:

da4244

Message:

OutVisIons(): some suffixes were still missing

Went from using defines directly to a char array suffix, and some were forgotten

File:

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

pcp/src/output.c

@@ -1394 +1394 @@
             fclose(SrcIonDoc);
         }
-          // read basis, then positions and speeds of ions
-    if (OpenFile(P, &SrcIonData, suffixsrciondat, "rb",P->Call.out[ReadOut])) {
+    // check basis, then read positions and speeds of ions
+    suffix = (char *)
+      Realloc(suffix, strlen(suffixsrciondat) + 3 + 1,"ReadSrcIons: suffix");
+    sprintf(suffix, ".L%i%s", P->Lat.Lev[STANDARTLEVEL].LevelNo, suffixsrciondat);
+    if (OpenFile(P, &SrcIonData, suffix, "rb",P->Call.out[ReadOut])) {
       if (fread(RealBasis, sizeof(double), (size_t)(NDIM_NDIM), SrcIonData) != NDIM_NDIM) {
         //Error(SomeError, "ReadSrcIons: read error");
@@ -1466 +1469 @@
   float data[6];      // holds temporarily twice NDIM values as write buffer
   int Z;
-  char *datnamef, *datnameZ, *posname;
+  char *datnamef, *datnameZ, *posname, suffix[255];
   FILE *IonsDataF, *IonsDataZ, *IonsPos, *IonsDoc, *IonsDx;
   if (!P->Files.MeOutVis && P->Par.me == 0) return;
@@ -1480 +1483 @@
   sprintf(posname, "%s%s", P->Files.mainname, suffixionpos);
   // open, fill and close doc file
-  if (OpenFile(P, &IonsDoc, suffixiondoc, "w",P->Call.out[ReadOut])) {
+  sprintf(suffix, "%s", suffixiondoc);
+  if (OpenFile(P, &IonsDoc, suffix, "w",P->Call.out[ReadOut])) {
     fprintf(IonsDoc,"IonsPos file = %s.####\n", posname);
     fprintf(IonsDoc,"IonsForce file = %s.####\n", datnamef);
@@ -1492 +1496 @@
   }
   // open dx file and fill it with each output step, close it
-  if (OpenFile(P, &IonsDx, suffixiondx, "w",P->Call.out[ReadOut])) {
+  sprintf(suffix, "%s", suffixiondx);
+  if (OpenFile(P, &IonsDx, suffix, "w",P->Call.out[ReadOut])) {
     for (i=0; i < F->OutVisStep+1; i++) {
       if (i==0) {
@@ -1531 +1536 @@
   Free(posname, "OutVisIons: posname");
   // open IonForces, IonZ and IonPosition file, write forces respectively positions for each ion of each type, close them
-  if (OpenFileNo(P, &IonsDataF, suffixionfor, F->OutVisStep, "wb",P->Call.out[ReadOut])) {
-    if (F->OutVisStep == 0) 
-      OpenFile(P, &IonsDataZ, suffixionZ, "wb",P->Call.out[ReadOut]);
-    if (OpenFileNo(P, &IonsPos, suffixionpos, F->OutVisStep, "wb",P->Call.out[ReadOut])) {
+  sprintf(suffix, "%s", suffixionfor);
+  if (OpenFileNo(P, &IonsDataF, suffix, F->OutVisStep, "wb",P->Call.out[ReadOut])) {
+    if (F->OutVisStep == 0) { 
+      sprintf(suffix, "%s", suffixionZ);
+      OpenFile(P, &IonsDataZ, suffix, "wb",P->Call.out[ReadOut]);
+    }
+    sprintf(suffix, "%s", suffixionpos);
+    if (OpenFileNo(P, &IonsPos, suffix, F->OutVisStep, "wb",P->Call.out[ReadOut])) {
       for (is=0; is < I->Max_Types; is++) {
         for (ia=0; ia < I->I[is].Max_IonsOfType; ia++) {