- if (O != NULL && C != NULL && !allInitBefore) {
- for (vector<para>::iterator parit=delayedParaAdd.begin(); parit != delayedParaAdd.end(); ++parit) {
- O->addPara(parit->parid, parit->val);
- C->addPara(parit->parid, parit->val);
- }
- for (vector<para>::iterator parit=delayedParaSet.begin(); parit != delayedParaSet.end(); ++parit) {
- O->setPara(parit->parid, parit->val);
- C->setPara(parit->parid, parit->val);
+ if ( nequileft < 0 && readnewconfig_nonex )
+ activeCFile = fileOfPath(C->getInFileName());
+ else
+ activeCFile = "";
+
+ /* try to find more equilibrated config-file configuration for equilibration in excluded files */
+ if ( nequileft > 0 && C->inFilesLeft() > 0 ) {
+ *log << "HYPERCACHE: Trying to find more equilibrated config in excluded files." << endl << flush;
+
+ char *tmpconfig = (char*) malloc(C->getConfigSize());
+
+ while (true) {
+ bool readnewconfig_ex;
+ int nequileftReadConfig_ex;
+
+ memcpy (tmpconfig, C->getConfigMem(), C->getConfigSize());
+ C->readConfig(readnewconfig_ex, nequileftReadConfig_ex, NULL);
+
+ if (! readnewconfig_ex) {
+ *log << "HYPERCACHE: No more excluded config-files for possible equilibration available." << endl << flush;
+ break;
+ }
+
+ if (nequileftReadConfig_ex <= nequileft) {
+ *log << "HYPERCACHE: Found more equilibrated or same equilibrated excluded config-file configuration for equilibration." << endl << flush;
+ nequileft = nequileftReadConfig_ex;
+ readAtLeastOneConfig = true;
+ }
+ else if (nequileftReadConfig_ex > nequileft) {
+ *log << "HYPERCACHE: Excluded config-file configuration for equilibration is less equilibrated than actual config." << endl << flush;
+ memcpy (C->getConfigMem(), tmpconfig, C->getConfigSize());
+ }