Changes in src/moleculelist.cpp [edcda5:2746be]

File:

• src/moleculelist.cpp (modified) (6 diffs, 1 prop)

src/moleculelist.cpp

@@ -378 +378 @@
  * \param *configuration standard configuration to attach atoms in fragment molecule to.
  * \param *SortIndex Index to map from the BFS labeling to the sequence how of Ion_Type in the config
- * \param DoPeriodic true - call ScanForPeriodicCorrection, false - don't
- * \param DoCentering true - call molecule::CenterEdge(), false - don't
  * \return true - success (each file was written), false - something went wrong.
  */
-bool MoleculeListClass::OutputConfigForListOfFragments(ofstream *out, const char *fragmentprefix, config *configuration, int *SortIndex, bool DoPeriodic, bool DoCentering)
+bool MoleculeListClass::OutputConfigForListOfFragments(ofstream *out, config *configuration, int *SortIndex)
 {
   ofstream outputFragment;
@@ -395 +393 @@
   int FragmentCounter = 0;
   ofstream output;
+  string basis("3-21G");
   
   // store the fragments as config and as xyz
@@ -406 +405 @@
 
     // correct periodic
-    if (DoPeriodic)
-      ListOfMolecules[i]->ScanForPeriodicCorrection(out);
+    //ListOfMolecules[i]->ScanForPeriodicCorrection(out);
 
     // output xyz file
     FragmentNumber = FixedDigitNumber(NumberOfMolecules, FragmentCounter++);
-    sprintf(FragmentName, "%s/%s%s.conf.xyz", configuration->configpath, fragmentprefix, FragmentNumber);
+    sprintf(FragmentName, "%s/%s%s.conf.xyz", configuration->configpath, FRAGMENTPREFIX, FragmentNumber);
     outputFragment.open(FragmentName, ios::out);
-    *out << Verbose(2) << "Saving " << fragmentprefix << " No. " << FragmentNumber << "/" << FragmentCounter-1 << " as XYZ ...";
+    *out << Verbose(2) << "Saving bond fragment No. " << FragmentNumber << "/" << FragmentCounter-1 << " as XYZ ...";
     if ((intermediateResult = ListOfMolecules[i]->OutputXYZ(&outputFragment)))
       *out << " done." << endl;
@@ -432 +430 @@
     
     // center on edge
-    if (DoCentering) {
-      ListOfMolecules[i]->CenterEdge(out, &BoxDimension);
-      ListOfMolecules[i]->SetBoxDimension(&BoxDimension);  // update Box of atoms by boundary
-      int j = -1;
-      for (int k=0;k<NDIM;k++) {
-        j += k+1;
-        BoxDimension.x[k] = 2.5* (configuration->GetIsAngstroem() ? 1. : 1./AtomicLengthToAngstroem);
-        ListOfMolecules[i]->cell_size[j] += BoxDimension.x[k]*2.;
-      }
-      ListOfMolecules[i]->Translate(&BoxDimension);
-    }
+    ListOfMolecules[i]->CenterEdge(out, &BoxDimension);
+    ListOfMolecules[i]->SetBoxDimension(&BoxDimension);  // update Box of atoms by boundary
+    int j = -1;
+    for (int k=0;k<NDIM;k++) {
+      j += k+1;
+      BoxDimension.x[k] = 2.5* (configuration->GetIsAngstroem() ? 1. : 1./AtomicLengthToAngstroem);
+      ListOfMolecules[i]->cell_size[j] += BoxDimension.x[k]*2.;
+    }
+    ListOfMolecules[i]->Translate(&BoxDimension);
 
     // also calculate necessary orbitals
@@ -450 +446 @@
     // change path in config
     //strcpy(PathBackup, configuration->configpath);
-    sprintf(FragmentName, "%s/%s%s/", PathBackup, fragmentprefix, FragmentNumber);
+    sprintf(FragmentName, "%s/%s%s/", PathBackup, FRAGMENTPREFIX, FragmentNumber);
     configuration->SetDefaultPath(FragmentName);
     
     // and save as config
-    sprintf(FragmentName, "%s/%s%s.conf", configuration->configpath, fragmentprefix, FragmentNumber);
-    outputFragment.open(FragmentName, ios::out);
-    *out << Verbose(2) << "Saving " << fragmentprefix << " No. " << FragmentNumber << "/" << FragmentCounter-1 << " as config ...";
-    if ((intermediateResult = configuration->Save(&outputFragment, ListOfMolecules[i]->elemente, ListOfMolecules[i])))
+    sprintf(FragmentName, "%s/%s%s.conf", configuration->configpath, FRAGMENTPREFIX, FragmentNumber);
+    *out << Verbose(2) << "Saving bond fragment No. " << FragmentNumber << "/" << FragmentCounter-1 << " as config ...";
+    if ((intermediateResult = configuration->Save(FragmentName, ListOfMolecules[i]->elemente, ListOfMolecules[i])))
       *out << " done." << endl;
     else
       *out << " failed." << endl;
+    result = result && intermediateResult;
 
     // restore old config
     configuration->SetDefaultPath(PathBackup);
 
-    result = result && intermediateResult;
-    outputFragment.close();
-    outputFragment.clear();
 
     // and save as mpqc input file
-    sprintf(FragmentName, "%s/%s%s.in", configuration->configpath, fragmentprefix, FragmentNumber);
-    outputFragment.open(FragmentName, ios::out);
-    *out << Verbose(2) << "Saving " << fragmentprefix << " No. " << FragmentNumber << "/" << FragmentCounter-1 << " as mpqc input ...";
-    if ((intermediateResult = configuration->SaveMPQC(&outputFragment, ListOfMolecules[i])))
+    sprintf(FragmentName, "%s/%s%s.conf", configuration->configpath, FRAGMENTPREFIX, FragmentNumber);
+    *out << Verbose(2) << "Saving bond fragment No. " << FragmentNumber << "/" << FragmentCounter-1 << " as mpqc input ...";
+    if ((intermediateResult = configuration->SaveMPQC(FragmentName, ListOfMolecules[i])))
       *out << " done." << endl;
     else
@@ -479 +471 @@
        
     result = result && intermediateResult;
-    outputFragment.close();
-    outputFragment.clear();
+    //outputFragment.close();
+    //outputFragment.clear();
     delete(FragmentNumber);
     //Free((void **)&FragmentNumber, "MoleculeListClass::OutputConfigForListOfFragments: *FragmentNumber");