Changeset b0aa9c for pcp

Timestamp:

Apr 22, 2008, 9:17:10 AM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

9a9fee9

Parents:

6edeca

Message:

MinimisePerturbed(): verbosity changed, some comments

File:

• pcp/src/perturbed.c (modified) (4 diffs)

pcp/src/perturbed.c

@@ -115 +115 @@
   for (type=Perturbed_P0;type<=Perturbed_RxP2;type++) {  // go through each perturbation group separately //
     *Stop=0;   // reset stop flag
-    fprintf(stderr,"(%i)Beginning perturbed minimisation of type %s ...\n", P->Par.me, R->MinimisationName[type]);
+    if(P->Call.out[LeaderOut]) fprintf(stderr,"(%i)Beginning perturbed minimisation of type %s ...\n", P->Par.me, R->MinimisationName[type]);
     //OutputOrbitalPositions(P, Occupied);
     R->PsiStep = R->MaxPsiStep; // reset in-Psi-minimisation-counter, so that we really advance to the next wave function
     UpdateActualPsiNo(P, type); // step on to next perturbed one
-    fprintf(stderr, "(%i) Re-initializing perturbed psi array for type %s ", P->Par.me, R->MinimisationName[type]);
+    if(P->Call.out[MinOut]) fprintf(stderr, "(%i) Re-initializing perturbed psi array for type %s ", P->Par.me, R->MinimisationName[type]);
     if (P->Call.ReadSrcFiles && ReadSrcPsiDensity(P,type,1, R->LevSNo)) {
       SpeedMeasure(P, InitSimTime, StartTimeDo);  
-      fprintf(stderr,"from source file of recent calculation\n");
+      if(P->Call.out[MinOut]) fprintf(stderr,"from source file of recent calculation\n");
       ReadSrcPsiDensity(P,type, 0, R->LevSNo);
       ResetGramSchTagType(P, Psi, type, IsOrthogonal); // loaded values are orthonormal
@@ -140 +140 @@
       if (P->Call.ReadSrcFiles != 2) {
         if (R->LevSNo == Lat->MaxLevel-1) { // is it the starting level? (see InitRunLevel())
-          fprintf(stderr, "randomly.\n");
+          if(P->Call.out[MinOut]) fprintf(stderr, "randomly.\n");
           InitPsisValue(P, Psi->TypeStartIndex[type], Psi->TypeStartIndex[type+1]);  // initialize perturbed array for this run
         } else {
-          fprintf(stderr, "from source file of last level.\n");
+          if(P->Call.out[MinOut]) fprintf(stderr, "from source file of last level.\n");
           ReadSrcPerturbedPsis(P, type);
         }
@@ -162 +162 @@
       EnergyOutput(P,0);
       while (*Stop != 1) {
-        //P->R.PsiStep = P->R.MaxPsiStep; // make it advance to next Psi
-        FindPerturbedMinimum(P);        
+        //debug(P,"FindPerturbedMinimum");
+        FindPerturbedMinimum(P);   // find minimum
         //debug(P,"UpdateActualPsiNo");
         UpdateActualPsiNo(P, type); // step on to next perturbed Psi
@@ -180 +180 @@
       }
       // now release normalization condition and minimize wrt to norm
-      if(P->Call.out[NormalOut]) fprintf(stderr,"(%i) Write %s srcpsi to disk\n", P->Par.me, R->MinimisationName[type]);
+      if(P->Call.out[MinOut]) fprintf(stderr,"(%i) Writing %s srcpsi to disk\n", P->Par.me, R->MinimisationName[type]);
       OutputSrcPsiDensity(P, type);
 //      if (!TestReadnWriteSrcDensity(P,type))