Changeset 4931e0 for pcp

Timestamp:

Apr 18, 2008, 1:16:29 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

719746

Parents:

0e5e82

Message:

verbosity levels added to various fprintf

File:

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

pcp/src/run.c ¶

@@ -381 +381 @@
   int i;
   if (R->LevSNo <= R->InitLevSNo) {
-    fprintf(stderr, "(%i) ChangeLevUp: LevSNo(%i) <= InitLevSNo(%i)\n", P->Par.me, R->LevSNo, R->InitLevSNo);
+    if (P->Call.out[LeaderOut] && (P->Par.me == 0))
+      fprintf(stderr, "(%i) ChangeLevUp: LevSNo(%i) <= InitLevSNo(%i)\n", P->Par.me, R->LevSNo, R->InitLevSNo);
     *Stop = 1;
     return;
@@ -561 +562 @@
           break;
         case UnOccupied:
-          fprintf(stderr, "(%i) -------------------------> ARelTGE: %e\tARelKGE: %e\n", P->Par.me, R->ActualRelTotalEnergy[0], R->ActualRelKineticEnergy[0]); 
+          fprintf(stderr, "ARelTGE: %e\tARelKGE: %e\n", R->ActualRelTotalEnergy[0], R->ActualRelKineticEnergy[0]); 
           break;
       }
@@ -745 +746 @@
     if (!ReadSrcPsiDensity(P,Occupied,1, R->LevSNo)) {  // if file for level exists and desired, read from file
       P->Call.ReadSrcFiles = 0; // -r was bogus, remove it, have to start anew
-      fprintf(stderr,"(%i) Re-initializing, files are missing/corrupted...\n", P->Par.me);
+      if(P->Call.out[MinOut]) fprintf(stderr,"(%i) Re-initializing, files are missing/corrupted...\n", P->Par.me);
       InitPsisValue(P, Psi->TypeStartIndex[Occupied], Psi->TypeStartIndex[Occupied+1]);  // initialize perturbed array for this run
       ResetGramSchTagType(P, Psi, Occupied, NotOrthogonal); // loaded values are orthonormal
@@ -753 +754 @@
     } else {
       SpeedMeasure(P, InitSimTime, StartTimeDo);  
-      fprintf(stderr,"(%i) Reading from file...\n", P->Par.me);
+      if(P->Call.out[MinOut]) fprintf(stderr,"(%i) Reading from file...\n", P->Par.me);
       ReadSrcPsiDensity(P, Occupied, 0, R->LevSNo);
       ResetGramSchTagType(P, Psi, Occupied, IsOrthonormal); // loaded values are orthonormal
@@ -773 +774 @@
   }
   if (P->Call.ReadSrcFiles != 1) {  // otherwise minimise oneself
-    fprintf(stderr,"(%i)Beginning minimisation of type %s ...\n", P->Par.me, R->MinimisationName[Occupied]);
+    if(P->Call.out[LeaderOut]) fprintf(stderr,"(%i)Beginning minimisation of type %s ...\n", P->Par.me, R->MinimisationName[Occupied]);
     while (*Stop != 1) {  // loop testing condition over all Psis
       // in the following loop, we have two cases:
@@ -799 +800 @@
             // if we stepped on to a new Psi, which is already down at DoBrent=1 unlike the last one,
             // then an up-to-date gradient is missing for the following Brent line search
-            fprintf(stderr,"(%i) We stepped on to a new Psi, which is already in the Brent regime ...re-calc delta\n", P->Par.me);
+            if(P->Call.out[LeaderOut]) fprintf(stderr,"(%i) We stepped on to a new Psi, which is already in the Brent regime ...re-calc delta\n", P->Par.me);
             memcpy(LevS->LPsi->OldLocalPsi[R->ActualLocalPsiNo], LevS->LPsi->LocalPsi[R->ActualLocalPsiNo], ElementSize*LevS->MaxG*sizeof(double)); // restore old Psi from OldPsi
             //fprintf(stderr,"(%i) Psi %i at %p stored in OldPsi at %p: Old[0] %lg+i%lg\n", P->Par.me, R->ActualLocalPsiNo, LevS->LPsi->LocalPsi[R->ActualLocalPsiNo], LevS->LPsi->OldLocalPsi[R->ActualLocalPsiNo], LevS->LPsi->OldLocalPsi[R->ActualLocalPsiNo][0].re, LevS->LPsi->OldLocalPsi[R->ActualLocalPsiNo][0].im);
@@ -856 +857 @@
         CalculateEnergy(P);
 
-        fprintf(stderr,"(%i) Preparing brent with f(a) (%lg,%lg)\t f(b) (%lg,%lg)\t f(m) (%lg,%lg) ...\n", P->Par.me,a,f_a,b,f_b,m,f_m);
+        if(P->Call.out[ValueOut]) fprintf(stderr,"(%i) Preparing brent with f(a) (%lg,%lg)\t f(b) (%lg,%lg)\t f(m) (%lg,%lg) ...\n", P->Par.me,a,f_a,b,f_b,m,f_m);
         iter=0; 
         gsl_min_fminimizer_set_with_values (s, &F, m, f_m, a, f_a, b, f_b);
-        fprintf (stderr,"(%i) using %s method\n",P->Par.me, gsl_min_fminimizer_name (s));
-        fprintf (stderr,"(%i) %5s [%9s, %9s] %9s %9s\n",P->Par.me, "iter", "lower", "upper", "min", "err(est)");
-        fprintf (stderr,"(%i) %5d [%.7f, %.7f] %.7f %.7f\n",P->Par.me, iter, a, b, m, b - a);
+        if(P->Call.out[ValueOut]) fprintf (stderr,"(%i) using %s method\n",P->Par.me, gsl_min_fminimizer_name (s));
+        if(P->Call.out[ValueOut]) fprintf (stderr,"(%i) %5s [%9s, %9s] %9s %9s\n",P->Par.me, "iter", "lower", "upper", "min", "err(est)");
+        if(P->Call.out[ValueOut]) fprintf (stderr,"(%i) %5d [%.7f, %.7f] %.7f %.7f\n",P->Par.me, iter, a, b, m, b - a);
         do {
           iter++;
@@ -873 +874 @@
        
           if (status == GSL_SUCCESS)
-            fprintf (stderr,"(%i) Converged:\n",P->Par.me);
+            if(P->Call.out[ValueOut]) fprintf (stderr,"(%i) Converged:\n",P->Par.me);
        
-          fprintf (stderr,"(%i) %5d [%.7f, %.7f] %.7f %.7f\n",P->Par.me,
+          if(P->Call.out[ValueOut]) fprintf (stderr,"(%i) %5d [%.7f, %.7f] %.7f %.7f\n",P->Par.me,
             iter, a, b, m, b - a);
         } while (status == GSL_CONTINUE && iter < max_iter);
@@ -963 +964 @@
   if (P->Call.ReadSrcFiles && ReadSrcPsiDensity(P,UnOccupied,1, R->LevSNo)) {
     SpeedMeasure(P, InitSimTime, StartTimeDo);  
-    fprintf(stderr,"(%i) Reading from file...\n", P->Par.me);
+    if(P->Call.out[MinOut]) fprintf(stderr, "(%i) Re-initializing %s psi array from source file of recent calculation\n", P->Par.me, R->MinimisationName[R->CurrentMin]);
     ReadSrcPsiDensity(P, UnOccupied, 0, R->LevSNo);
     if (P->Call.ReadSrcFiles != 2) {
@@ -997 +998 @@
     R->LevS->Step++;
     EnergyOutput(P,0);
-    fprintf(stderr,"(%i)Beginning minimisation of type %s ...\n", P->Par.me, R->MinimisationName[UnOccupied]);
+    if(P->Call.out[LeaderOut]) fprintf(stderr,"(%i)Beginning minimisation of type %s ...\n", P->Par.me, R->MinimisationName[R->CurrentMin]);
     while (*Stop != 1) {
       CalculateNewWave(P,NULL);
@@ -1334 +1335 @@
       if (P->Par.me == 0) fprintf (stderr,"(%i) converged to minimum at\n", P->Par.me);
 
-    if (P->Par.me == 0) fprintf (stderr, "(%i) %5d %10.5f\n", P->Par.me, (int)iter, s->f);
+    //if (P->Call.out[NormalOut]) fprintf(stderr,"(%i) Commencing '%s' step %i ... \n",P->Par.me, gsl_multimin_fdfminimizer_name(s), P->R.StructOptStep);
+    if ((P->Call.out[NormalOut]) && (P->Par.me == 0)) fprintf (stderr, "(%i) %5d %10.5f\n", P->Par.me, (int)iter, s->f);
   } while (status == GSL_CONTINUE && iter < Run->MaxOuterStep);