Changeset 1da479

Timestamp:

Apr 21, 2008, 3:27:08 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

d8bb59

Parents:

333e84

Message:

overall verbosity changes

Mostly just changes such as "if (P->Call.out[NormalOut]) " added in front of printfs

File:

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

pcp/src/output.c

@@ -372 +372 @@
   // send/receive around and write share of coefficient array of each wave function 
   MPI_Allreduce(&sent, &Sent, 1, MPI_INT, MPI_SUM, P->Par.comm_ST); // catch all at the starter line
-  fprintf(stderr,"(%i) me (%i/%i) \t Psi (%i/%i)\t PsiT (%i/%i)\n", P->Par.me, P->Par.me_comm_ST, P->Par.Max_me_comm_ST, P->Par.me_comm_ST_Psi, P->Par.Max_me_comm_ST_Psi, P->Par.me_comm_ST_PsiT, P->Par.Max_me_comm_ST_PsiT);
+  if (P->Call.out[PsiOut]) fprintf(stderr,"(%i) me (%i/%i) \t Psi (%i/%i)\t PsiT (%i/%i)\n", P->Par.me, P->Par.me_comm_ST, P->Par.Max_me_comm_ST, P->Par.me_comm_ST_Psi, P->Par.Max_me_comm_ST_Psi, P->Par.me_comm_ST_PsiT, P->Par.Max_me_comm_ST_PsiT);
   k = -1;  // k is global PsiNo counter for the desired group
   for (j=0; j < Psi->MaxPsiOfType+P->Par.Max_me_comm_ST_PsiT; j++) {  // go through all wave functions (plus the extra one for each process)
@@ -462 +462 @@
   }
   MPI_Allreduce(&sent, &Sent, 1, MPI_INT, MPI_SUM, P->Par.comm_ST); // catch all again at finish
-  fprintf(stderr,"(%i) Out of %i shares %i had to be sent in total, %i from this process alone.\n", P->Par.me, P->Par.Max_me_comm_ST_Psi*Psi->NoOfPsis, Sent, sent);
+  if (P->Call.out[PsiOut]) fprintf(stderr,"(%i) Out of %i shares %i had to be sent in total, %i from this process alone.\n", P->Par.me, P->Par.Max_me_comm_ST_Psi*Psi->NoOfPsis, Sent, sent);
   if (!(P->Par.me_comm_ST))
     fclose(SrcPsiData);
@@ -488 +488 @@
   // write whole array of type to disc
   OutputSrcPsiDensity(P,type);
-  //debug(P,"array written");
+  debug(P,"array written");
   
   // copy specified array to OldPsiDat
@@ -500 +500 @@
       }
     }
-  //debug(P,"array copied");
+  debug(P,"array copied");
     
   // read whole array again
   if (!ReadSrcPsiDensity(P,type,0,R->LevSNo))
     return 0;
-  //debug(P,"array read");
+  debug(P,"array read");
   
   // compare with copied array
@@ -518 +518 @@
         }
     }
-  //debug(P,"array compared");
+  debug(P,"array compared");
   fprintf(stderr,"(%i)TestReadnWriteSrcDensity: OK!\n",P->Par.me); 
   return 1;
@@ -676 +676 @@
     else if (signal == 2)
       Error(SomeError, "ReadSrcPsiDensity: Something went utterly wrong, see root process");
-    else
+    else if (P->Call.out[PsiOut])
       fprintf(stderr,"(%i) ReadSrcPsiDensity: Everything went alright so far\n", P->Par.me);
   }
@@ -700 +700 @@
       if (OnePsiA->PsiType == type) { // only take desired minimisation group
         k++;
-        //fprintf(stderr,"(%i) ST_Psi: OnePsiA %i\tP->Par.me %i\n", P->Par.me,OnePsiA->my_color_comm_ST_Psi,P->Par.my_color_comm_ST_Psi);
+        //fprintf(stderr,"(%i) ST_Psi: OnePsiA %i\tP->Par.my_color_comm_ST_Psi %i\n", P->Par.me,OnePsiA->my_color_comm_ST_Psi,P->Par.my_color_comm_ST_Psi);
         if (OnePsiA->my_color_comm_ST_Psi == P->Par.my_color_comm_ST_Psi) // Belongs to my Psi group?
            LOnePsiA = &Psi->LocalPsiStatus[OnePsiA->MyLocalNo];
@@ -784 +784 @@
     }
     MPI_Allreduce (&recv, &Recv, 1, MPI_INT, MPI_SUM, P->Par.comm_ST);
-    fprintf(stderr,"(%i) Out of %i shares %i had to be received in total, %i from this process alone.\n", P->Par.me, P->Par.Max_me_comm_ST_Psi*Psi->NoOfPsis, Recv, recv);
+    if (P->Call.out[PsiOut]) fprintf(stderr,"(%i) Out of %i shares %i had to be received in total, %i from this process alone.\n", P->Par.me, P->Par.Max_me_comm_ST_Psi*Psi->NoOfPsis, Recv, recv);
     SpeedMeasure(P,ReadnWriteTime,StopTimeDo);
   }
@@ -1492 +1492 @@
 {
   if (P->Call.WriteSrcFiles) {
-    if(P->Call.out[NormalOut]) fprintf(stderr,"(%i) Write srcpsi to disk\n", P->Par.me);
+    if(P->Call.out[NormalOut]) fprintf(stderr,"(%i) Writing %s srcpsi to disk\n", P->Par.me, P->R.MinimisationName[type]);
     OutputSrcPsiDensity(P, type);
-    if(P->Call.out[NormalOut]) fprintf(stderr,"(%i) Write srcion to disk\n", P->Par.me);
+    if(P->Call.out[NormalOut]) fprintf(stderr,"(%i) Writing srcion to disk\n", P->Par.me);
     OutSrcIons(P);
   } 
@@ -1524 +1524 @@
   OutVisDensity(P, srcdens);
   OutVisIons(P);
-  if(P->Call.out[NormalOut]) fprintf(stderr,"(%i) Written OutVisStep %i to disk\n", P->Par.me, P->Files.OutVisStep);
+  if(P->Call.out[MinOut]) fprintf(stderr,"(%i) Written OutVisStep %i to disk\n", P->Par.me, P->Files.OutVisStep);
   P->Files.OutVisStep++;
 }
@@ -1542 +1542 @@
   for (i=0;i<(1)*NDIM;i++)
     P->Files.OutputPosType[P->Files.OutVisStep+i] = P->Lat.RT.ActualUse;
-  fprintf(stderr,"(%i) OutVisStep %i, OutputPosType %p\n",P->Par.me, P->Files.OutVisStep, P->Files.OutputPosType);
+  if(P->Call.out[PsiOut]) fprintf(stderr,"(%i) OutVisStep %i, OutputPosType %p\n",P->Par.me, P->Files.OutVisStep, P->Files.OutputPosType);
   
   // due to preprocessor values we can't put the following stuff into a loop