Changeset 02ba60 for pcp

Timestamp:

Apr 21, 2008, 2:19:23 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

487182

Parents:

8ea7f8

git-author:

Frederik Heber <heber@…> (04/18/08 13:39:22)

git-committer:

Frederik Heber <heber@…> (04/21/08 14:19:23)

Message:

CalculateMinimumStop(): we Stop if above ActualMaxMinStep

File:

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

pcp/src/run.c

@@ -539 +539 @@
   if (R->PsiStep == 0 && SuperStop) Stop = 1;
   if (R->PsiStep == 0 && ((R->MinStopStep % R->ActualMaxMinStopStep == 0 && R->CurrentMin != UnOccupied) || (R->MinStopStep % R->ActualMaxMinGapStopStep == 0 && R->CurrentMin == UnOccupied))) {
-//    if (R->MinStep >= R->ActualMaxMinStep) {
-//      Stop = 1;
-//      fprintf(stderr,"(%i) MinStep %i >= %i MaxMinStep.\n", P->Par.me, R->MinStep, R->ActualMaxMinStep);
-//    }
+    if (R->MinStep >= R->ActualMaxMinStep) Stop = 1;
     for (i=RUNMAXOLD-1; i > 0; i--) {
       R->TotalEnergy[i] = R->TotalEnergy[i-1];
@@ -565 +562 @@
           break;
       }
+      //fprintf(stderr, "(%i) Comparing TE: %lg < %lg\tKE: %lg < %lg?\n", P->Par.me, R->ActualRelTotalEnergy[0], R->ActualRelEpsTotalEnergy, R->ActualRelKineticEnergy[0], R->ActualRelEpsKineticEnergy);
       if ((R->ActualRelTotalEnergy[0] < R->ActualRelEpsTotalEnergy) &&
-          (R->ActualRelKineticEnergy[0]  < R->ActualRelEpsKineticEnergy)) 
+          (R->ActualRelKineticEnergy[0]  < R->ActualRelEpsKineticEnergy))
         Stop = 1;
     }