Changeset f50ab8 for pcp

Timestamp:

Apr 21, 2008, 9:12:22 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

57a69b2

Parents:

0b638d

Message:

CombineOutVisDensity(): suffix instead of direct define

Again, using char array instead of directly a define for filename suffix

File:

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

pcp/src/output.c

@@ -332 +332 @@
   strncpy (suffixdoc, suffixdat, 255);
   // for the various spin cases, output the doc-file if it's process 0
-  if (!(P->Par.me_comm_ST)) {
+  if (P->Par.me_comm_ST == 0) { // if we are process 0 of SpinDouble or SpinUp&-Down
     switch (Lat->Psi.PsiST) {
     case SpinDouble:
@@ -353 +353 @@
       break;
     }
-    if (!OpenFileNo(P, &SrcPsiData, suffixdat, colorNo, "wb",P->Call.out[ReadOut])) // open SourcePsiData as write binary
+    if (!OpenFileNo(P, &SrcPsiData, suffixdat, colorNo, "wb",P->Call.out[ReadOut])) { // open SourcePsiData as write binary
       fprintf(stderr,"(%i) Error opening file with suffix %s for writing!\n",P->Par.me, suffixdat);
-    if (!(P->Par.my_color_comm_ST_Psi)) { // if we are process 0
-        if (!OpenFile(P, &SrcPsiDoc, suffixdoc, "w",P->Call.out[ReadOut])) // open the (text) doc file
-        fprintf(stderr,"(%i) Error opening file with suffix %s for writing!\n",P->Par.me, suffixdoc);
-        fprintf(SrcPsiDoc, "Mintype\t%i\n", (int)type);
-      fprintf(SrcPsiDoc, "LevelNo\t%i\n", LevS->LevelNo);
-      fprintf(SrcPsiDoc, "GridNodes\t%i\t%i\t%i\n", LevS->N[0], LevS->N[1], LevS->N[2]);
-      fprintf(SrcPsiDoc, "PsiNo\t%i\t%i\n", Num, P->Lat.Psi.GlobalNo[PsiMaxAdd]);
-      fprintf(SrcPsiDoc, "Epsilon\t%lg\t%lg\n", P->R.RelEpsTotalEnergy, P->R.RelEpsKineticEnergy);
-        for (i = 0; i < P->Par.Max_my_color_comm_ST_Psi; i++) {
-          fprintf(SrcPsiDoc, "\t%i", Lat->Psi.RealAllLocalNo[i]); // print number of local Psis
-      }
-      fprintf(SrcPsiDoc, "\n");
-        fclose(SrcPsiDoc);
-    }
+      return 1;
+    }
+        if (!OpenFile(P, &SrcPsiDoc, suffixdoc, "w",P->Call.out[ReadOut])) { // open the (text) doc file
+      fprintf(stderr,"(%i) Error opening file with suffix %s for writing!\n",P->Par.me, suffixdoc);
+      return 1;
+    }
+        fprintf(SrcPsiDoc, "Mintype\t%i\n", (int)type);
+    fprintf(SrcPsiDoc, "LevelNo\t%i\n", LevS->LevelNo);
+    fprintf(SrcPsiDoc, "GridNodes\t%i\t%i\t%i\n", LevS->N[0], LevS->N[1], LevS->N[2]);
+    fprintf(SrcPsiDoc, "PsiNo\t%i\t%i\n", Num, P->Lat.Psi.GlobalNo[PsiMaxAdd]);
+    fprintf(SrcPsiDoc, "Epsilon\t%lg\t%lg\n", P->R.RelEpsTotalEnergy, P->R.RelEpsKineticEnergy);
+        for (i = 0; i < P->Par.Max_my_color_comm_ST_Psi; i++) {
+          fprintf(SrcPsiDoc, "\t%i", Lat->Psi.RealAllLocalNo[i]); // print number of local Psis
+    }
+    fprintf(SrcPsiDoc, "\n");
+        fclose(SrcPsiDoc);
   }
   
@@ -1035 +1037 @@
   float step = P->Files.OutVisStep;
   int No=0, destpos;
+  char suffix[255];
   FILE *DensityData, *DensityPos;
   int Nx = Lev0->Plan0.plan->N[0]+1;
@@ -1045 +1048 @@
   switch (Lat->RT.ActualUse) {
   case active:
-    OpenFileNo(P, &DensityPos, suffixdenspos, (int)step, "wb",P->Call.out[ReadOut]);
+    sprintf(suffix, "%s", suffixdenspos);
+    OpenFileNo(P, &DensityPos, suffix, (int)step, "wb",P->Call.out[ReadOut]);
   case inactive:
   case standby:
-    OpenFileNo(P, &DensityData, suffixdensdat, (int)step, "wb",P->Call.out[ReadOut]);
+    sprintf(suffix, "%s", suffixdensdat);
+    OpenFileNo(P, &DensityData, suffix, (int)step, "wb",P->Call.out[ReadOut]);
     break;
   }
@@ -1623 +1628 @@
   if (!P->Files.MeOutCurr) return;
 
+  if(P->Call.out[NormalOut]) fprintf(stderr,"(%i)Output of Current Density (Vis)\n", P->Par.me);
+
   P->Files.OutputPosType = (enum ModeType *) Realloc(P->Files.OutputPosType,sizeof(enum ModeType)*(P->Files.OutVisStep+(1)*NDIM),"OutputVis");
   for (i=0;i<(1)*NDIM;i++)