Changeset d6f7f3 for pcp/src/perturbed.c

Timestamp:

May 24, 2008, 12:47:21 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

ccd028

Parents:

cd028d

Message:

CallOptions#ReadSrcFile is now enumerated ParseSrcDensities

This is done to distinguish between when only Occ are parsed (i.e. when StructOpt has been done before and now we do perturbed run), all or we pare and minimise subsequently.

File:

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

pcp/src/perturbed.c

@@ -121 +121 @@
 
     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 && (flag = ReadSrcPsiDensity(P,type,1, R->LevS->LevelNo))) {// in flag store whether stored Psis are readible or not
+    if ((P->Call.ReadSrcFiles == DoReadAllSrcDensities) && (flag = ReadSrcPsiDensity(P,type,1, R->LevS->LevelNo))) {// in flag store whether stored Psis are readible or not
       SpeedMeasure(P, InitSimTime, StartTimeDo);  
       if(P->Call.out[MinOut]) fprintf(stderr,"from source file of recent calculation\n");
@@ -136 +136 @@
       SpeedMeasure(P, InitSimTime, StopTimeDo);  
     }
-    if ((P->Call.ReadSrcFiles != 1) || (!flag)) {  // read and don't minimise only if SrcPsi were parsable!
+    if ((P->Call.ReadSrcFiles != DoReadAllSrcDensities) || (!flag)) {  // read and don't minimise only if SrcPsi were parsable!
       SpeedMeasure(P, InitSimTime, StartTimeDo);  
       ResetGramSchTagType(P, Psi, type, NotOrthogonal); // perturbed now shall be orthonormalized
-      if ((P->Call.ReadSrcFiles != 2) || (!flag)) {
+      if ((P->Call.ReadSrcFiles != DoReadAndMinimise) || (!flag)) {
         if (R->LevSNo == Lat->MaxLevel-1) { // is it the starting level? (see InitRunLevel())
           if(P->Call.out[MinOut]) fprintf(stderr, "randomly.\n");
@@ -4173 +4173 @@
     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.ReadSrcFiles && ReadSrcPsiDensity(P,type,1, R->LevSNo)) {
+    if ((P->Call.ReadSrcFiles == DoReadAllSrcDensities) && ReadSrcPsiDensity(P,type,1, R->LevSNo)) {
       SpeedMeasure(P, InitSimTime, StartTimeDo);  
       fprintf(stderr,"from source file of recent calculation\n");
@@ -4188 +4188 @@
       SpeedMeasure(P, InitSimTime, StopTimeDo);  
     }
-    if (P->Call.ReadSrcFiles != 1) {
+    if (P->Call.ReadSrcFiles != DoReadAllSrcDensities) {
       SpeedMeasure(P, InitSimTime, StartTimeDo);  
       ResetGramSchTagType(P, Psi, type, NotOrthogonal); // perturbed now shall be orthonormalized
-      if (P->Call.ReadSrcFiles != 2) {
+      if (P->Call.ReadSrcFiles != DoReadAndMinimise) {
         if (R->LevSNo == Lat->MaxLevel-1) { // is it the starting level? (see InitRunLevel())
           fprintf(stderr, "randomly.\n");