ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE-1.0/libmdtools/SimSetup.cpp
(Generate patch)

Comparing trunk/OOPSE-1.0/libmdtools/SimSetup.cpp (file contents):
Revision 1415 by gezelter, Mon Jul 26 17:50:57 2004 UTC vs.
Revision 1419 by gezelter, Tue Jul 27 18:14:16 2004 UTC

# Line 56 | Line 56 | bool isDivisible(double dividend, double divisor){
56    else
57      return false;  
58   }
59 +
60 + string getPrefix(const string& str ){
61 +  string prefix;
62 +  string suffix;
63 +  int pos;
64 +
65 +  pos = str.rfind(".");
66 +
67 +  if (pos >= 0) {
68 +     prefix = str.substr(0, pos);
69 +     suffix = str.substr(pos, str.size());
70 +
71 +     // leave .bass there in case we've reverted to old habits
72 +     if (LowerCase(suffix) == ".md" || LowerCase(suffix) == ".bass")
73 +       return prefix;
74 +     else
75 +       return str;
76 +    
77 +  } else
78 +    return str;
79 + };
80  
81 +
82   SimSetup::SimSetup(){
83    
84    initSuspend = false;
# Line 122 | Line 144 | void SimSetup::createSim(void){
144  
145   void SimSetup::createSim(void){
146  
147 <  // gather all of the information from the Bass file
147 >  // gather all of the information from the meta-data file
148  
149    gatherInfo();
150  
# Line 645 | Line 667 | void SimSetup::makeMolecules(void){
667   #endif // is_mpi
668  
669   }
648 –
649 – void SimSetup::initFromBass(void){
650 –  int i, j, k;
651 –  int n_cells;
652 –  double cellx, celly, cellz;
653 –  double temp1, temp2, temp3;
654 –  int n_per_extra;
655 –  int n_extra;
656 –  int have_extra, done;
657 –
658 –  double vel[3];
659 –  vel[0] = 0.0;
660 –  vel[1] = 0.0;
661 –  vel[2] = 0.0;
662 –
663 –  temp1 = (double) tot_nmol / 4.0;
664 –  temp2 = pow(temp1, (1.0 / 3.0));
665 –  temp3 = ceil(temp2);
670  
667 –  have_extra = 0;
668 –  if (temp2 < temp3){
669 –    // we have a non-complete lattice
670 –    have_extra = 1;
671 –
672 –    n_cells = (int) temp3 - 1;
673 –    cellx = info[0].boxL[0] / temp3;
674 –    celly = info[0].boxL[1] / temp3;
675 –    cellz = info[0].boxL[2] / temp3;
676 –    n_extra = tot_nmol - (4 * n_cells * n_cells * n_cells);
677 –    temp1 = ((double) n_extra) / (pow(temp3, 3.0) - pow(n_cells, 3.0));
678 –    n_per_extra = (int) ceil(temp1);
679 –
680 –    if (n_per_extra > 4){
681 –      sprintf(painCave.errMsg,
682 –              "SimSetup error. There has been an error in constructing"
683 –              " the non-complete lattice.\n");
684 –      painCave.isFatal = 1;
685 –      simError();
686 –    }
687 –  }
688 –  else{
689 –    n_cells = (int) temp3;
690 –    cellx = info[0].boxL[0] / temp3;
691 –    celly = info[0].boxL[1] / temp3;
692 –    cellz = info[0].boxL[2] / temp3;
693 –  }
694 –
695 –  current_mol = 0;
696 –  current_comp_mol = 0;
697 –  current_comp = 0;
698 –  current_atom_ndx = 0;
699 –
700 –  for (i = 0; i < n_cells ; i++){
701 –    for (j = 0; j < n_cells; j++){
702 –      for (k = 0; k < n_cells; k++){
703 –        makeElement(i * cellx, j * celly, k * cellz);
704 –
705 –        makeElement(i * cellx + 0.5 * cellx, j * celly + 0.5 * celly, k * cellz);
706 –
707 –        makeElement(i * cellx, j * celly + 0.5 * celly, k * cellz + 0.5 * cellz);
708 –
709 –        makeElement(i * cellx + 0.5 * cellx, j * celly, k * cellz + 0.5 * cellz);
710 –      }
711 –    }
712 –  }
713 –
714 –  if (have_extra){
715 –    done = 0;
716 –
717 –    int start_ndx;
718 –    for (i = 0; i < (n_cells + 1) && !done; i++){
719 –      for (j = 0; j < (n_cells + 1) && !done; j++){
720 –        if (i < n_cells){
721 –          if (j < n_cells){
722 –            start_ndx = n_cells;
723 –          }
724 –          else
725 –            start_ndx = 0;
726 –        }
727 –        else
728 –          start_ndx = 0;
729 –
730 –        for (k = start_ndx; k < (n_cells + 1) && !done; k++){
731 –          makeElement(i * cellx, j * celly, k * cellz);
732 –          done = (current_mol >= tot_nmol);
733 –
734 –          if (!done && n_per_extra > 1){
735 –            makeElement(i * cellx + 0.5 * cellx, j * celly + 0.5 * celly,
736 –                        k * cellz);
737 –            done = (current_mol >= tot_nmol);
738 –          }
739 –
740 –          if (!done && n_per_extra > 2){
741 –            makeElement(i * cellx, j * celly + 0.5 * celly,
742 –                        k * cellz + 0.5 * cellz);
743 –            done = (current_mol >= tot_nmol);
744 –          }
745 –
746 –          if (!done && n_per_extra > 3){
747 –            makeElement(i * cellx + 0.5 * cellx, j * celly,
748 –                        k * cellz + 0.5 * cellz);
749 –            done = (current_mol >= tot_nmol);
750 –          }
751 –        }
752 –      }
753 –    }
754 –  }
755 –
756 –  for (i = 0; i < info[0].n_atoms; i++){
757 –    info[0].atoms[i]->setVel(vel);
758 –  }
759 – }
760 –
761 – void SimSetup::makeElement(double x, double y, double z){
762 –  int k;
763 –  AtomStamp* current_atom;
764 –  DirectionalAtom* dAtom;
765 –  double rotMat[3][3];
766 –  double pos[3];
767 –
768 –  for (k = 0; k < comp_stamps[current_comp]->getNAtoms(); k++){
769 –    current_atom = comp_stamps[current_comp]->getAtom(k);
770 –    if (!current_atom->havePosition()){
771 –      sprintf(painCave.errMsg,
772 –              "SimSetup:initFromBass error.\n"
773 –              "\tComponent %s, atom %s does not have a position specified.\n"
774 –              "\tThe initialization routine is unable to give a start"
775 –              " position.\n",
776 –              comp_stamps[current_comp]->getID(), current_atom->getType());
777 –      painCave.isFatal = 1;
778 –      simError();
779 –    }
780 –
781 –    pos[0] = x + current_atom->getPosX();
782 –    pos[1] = y + current_atom->getPosY();
783 –    pos[2] = z + current_atom->getPosZ();
784 –
785 –    info[0].atoms[current_atom_ndx]->setPos(pos);
786 –
787 –    if (info[0].atoms[current_atom_ndx]->isDirectional()){
788 –      dAtom = (DirectionalAtom *) info[0].atoms[current_atom_ndx];
789 –
790 –      rotMat[0][0] = 1.0;
791 –      rotMat[0][1] = 0.0;
792 –      rotMat[0][2] = 0.0;
793 –
794 –      rotMat[1][0] = 0.0;
795 –      rotMat[1][1] = 1.0;
796 –      rotMat[1][2] = 0.0;
797 –
798 –      rotMat[2][0] = 0.0;
799 –      rotMat[2][1] = 0.0;
800 –      rotMat[2][2] = 1.0;
801 –
802 –      dAtom->setA(rotMat);
803 –    }
804 –
805 –    current_atom_ndx++;
806 –  }
807 –
808 –  current_mol++;
809 –  current_comp_mol++;
810 –
811 –  if (current_comp_mol >= components_nmol[current_comp]){
812 –    current_comp_mol = 0;
813 –    current_comp++;
814 –  }
815 – }
816 –
817 –
671   void SimSetup::gatherInfo(void){
672    int i;
673  
# Line 1003 | Line 856 | void SimSetup::gatherInfo(void){
856                    "\tKeyword useSolidThermInt was set to 'true' but\n"
857                    "\tthermodynamicIntegrationLambda (and/or\n"
858                    "\tthermodynamicIntegrationK) was not specified.\n"
859 <                  "\tPlease provide a lambda value and k value in your .bass file.\n");
859 >                  "\tPlease provide a lambda value and k value in your meta-data file.\n");
860            painCave.isFatal = 1;
861            simError();    
862          }
# Line 1012 | Line 865 | void SimSetup::gatherInfo(void){
865          if (globals->getUseSolidThermInt()) {
866            sprintf( painCave.errMsg,
867                     "SimSetup Warning: It appears that you have both solid and\n"
868 <                   "\tliquid thermodynamic integration activated in your .bass\n"
868 >                   "\tliquid thermodynamic integration activated in your meta-data\n"
869                     "\tfile. To avoid confusion, specify only one technique in\n"
870 <                   "\tyour .bass file. Liquid-state thermodynamic integration\n"
870 >                   "\tyour meta-data file. Liquid-state thermodynamic integration\n"
871                     "\twill be assumed for the current simulation. If this is not\n"
872                     "\twhat you desire, set useSolidThermInt to 'true' and\n"
873 <                   "\tuseLiquidThermInt to 'false' in your .bass file.\n");
873 >                   "\tuseLiquidThermInt to 'false' in your meta-data file.\n");
874            painCave.isFatal = 0;
875            simError();
876          }
# Line 1032 | Line 885 | void SimSetup::gatherInfo(void){
885                    "\tKeyword useLiquidThermInt was set to 'true' but\n"
886                    "\tthermodynamicIntegrationLambda (and/or\n"
887                    "\tthermodynamicIntegrationK) was not specified.\n"
888 <                  "\tPlease provide a lambda value and k value in your .bass file.\n");
888 >                  "\tPlease provide a lambda value and k value in your meta-data file.\n");
889            painCave.isFatal = 1;
890            simError();    
891          }
# Line 1041 | Line 894 | void SimSetup::gatherInfo(void){
894          sprintf(painCave.errMsg,
895                  "SimSetup Warning: If you want to use Thermodynamic\n"
896                  "\tIntegration, set useSolidThermInt or useLiquidThermInt to\n"
897 <                "\t'true' in your .bass file.  These keywords are set to\n"
897 >                "\t'true' in your meta-data file.  These keywords are set to\n"
898                  "\t'false' by default, so your lambda and/or k values are\n"
899                  "\tbeing ignored.\n");
900          painCave.isFatal = 0;
# Line 1136 | Line 989 | void SimSetup::gatherInfo(void){
989    }
990    
991   #ifdef IS_MPI
992 <  strcpy(checkPointMsg, "Successfully gathered all information from Bass\n");
992 >  strcpy(checkPointMsg, "Successfully gathered all information from meta-data file\n");
993    MPIcheckPoint();
994   #endif // is_mpi
995   }
# Line 1305 | Line 1158 | void SimSetup::initSystemCoords(void){
1158    }
1159    else{
1160      
1161 <    // no init from bass
1161 >    // no init from md file
1162      
1163      sprintf(painCave.errMsg,
1164              "Cannot intialize a simulation without an initial configuration file.\n");
# Line 1323 | Line 1176 | void SimSetup::makeOutNames(void){
1176  
1177   void SimSetup::makeOutNames(void){
1178    int k;
1179 +  string prefix;
1180  
1327 –
1181    for (k = 0; k < nInfo; k++){
1182   #ifdef IS_MPI
1183      if (worldRank == 0){
1184   #endif // is_mpi
1185 <
1186 <      if (globals->haveFinalConfig()){
1187 <        strcpy(info[k].finalName, globals->getFinalConfig());
1188 <      }
1189 <      else{
1337 <        strcpy(info[k].finalName, inFileName);
1338 <        char* endTest;
1339 <        int nameLength = strlen(info[k].finalName);
1340 <        endTest = &(info[k].finalName[nameLength - 5]);
1341 <        if (!strcmp(endTest, ".bass")){
1342 <          strcpy(endTest, ".eor");
1343 <        }
1344 <        else if (!strcmp(endTest, ".BASS")){
1345 <          strcpy(endTest, ".eor");
1346 <        }
1347 <        else{
1348 <          endTest = &(info[k].finalName[nameLength - 4]);
1349 <          if (!strcmp(endTest, ".bss")){
1350 <            strcpy(endTest, ".eor");
1351 <          }
1352 <          else if (!strcmp(endTest, ".mdl")){
1353 <            strcpy(endTest, ".eor");
1354 <          }
1355 <          else{
1356 <            strcat(info[k].finalName, ".eor");
1357 <          }
1358 <        }
1359 <      }
1360 <
1361 <      // make the sample and status out names
1185 >      
1186 >      if(globals->haveFinalConfig())
1187 >        prefix = getPrefix(globals->getFinalConfig());  
1188 >      else
1189 >        prefix = getPrefix(inFileName);
1190  
1191 <      strcpy(info[k].sampleName, inFileName);
1192 <      char* endTest;
1193 <      int nameLength = strlen(info[k].sampleName);
1366 <      endTest = &(info[k].sampleName[nameLength - 5]);
1367 <      if (!strcmp(endTest, ".bass")){
1368 <        strcpy(endTest, ".dump");
1369 <      }
1370 <      else if (!strcmp(endTest, ".BASS")){
1371 <        strcpy(endTest, ".dump");
1372 <      }
1373 <      else{
1374 <        endTest = &(info[k].sampleName[nameLength - 4]);
1375 <        if (!strcmp(endTest, ".bss")){
1376 <          strcpy(endTest, ".dump");
1377 <        }
1378 <        else if (!strcmp(endTest, ".mdl")){
1379 <          strcpy(endTest, ".dump");
1380 <        }
1381 <        else{
1382 <          strcat(info[k].sampleName, ".dump");
1383 <        }
1384 <      }
1385 <
1386 <      strcpy(info[k].statusName, inFileName);
1387 <      nameLength = strlen(info[k].statusName);
1388 <      endTest = &(info[k].statusName[nameLength - 5]);
1389 <      if (!strcmp(endTest, ".bass")){
1390 <        strcpy(endTest, ".stat");
1391 <      }
1392 <      else if (!strcmp(endTest, ".BASS")){
1393 <        strcpy(endTest, ".stat");
1394 <      }
1395 <      else{
1396 <        endTest = &(info[k].statusName[nameLength - 4]);
1397 <        if (!strcmp(endTest, ".bss")){
1398 <          strcpy(endTest, ".stat");
1399 <        }
1400 <        else if (!strcmp(endTest, ".mdl")){
1401 <          strcpy(endTest, ".stat");
1402 <        }
1403 <        else{
1404 <          strcat(info[k].statusName, ".stat");
1405 <        }
1406 <      }
1407 <
1408 <      strcpy(info[k].rawPotName, inFileName);
1409 <      nameLength = strlen(info[k].rawPotName);
1410 <      endTest = &(info[k].rawPotName[nameLength - 5]);
1411 <      if (!strcmp(endTest, ".bass")){
1412 <        strcpy(endTest, ".raw");
1413 <      }
1414 <      else if (!strcmp(endTest, ".BASS")){
1415 <        strcpy(endTest, ".raw");
1416 <      }
1417 <      else{
1418 <        endTest = &(info[k].rawPotName[nameLength - 4]);
1419 <        if (!strcmp(endTest, ".bss")){
1420 <          strcpy(endTest, ".raw");
1421 <        }
1422 <        else if (!strcmp(endTest, ".mdl")){
1423 <          strcpy(endTest, ".raw");
1424 <        }
1425 <        else{
1426 <          strcat(info[k].rawPotName, ".raw");
1427 <        }
1428 <      }
1191 >      info[k].finalName = prefix + ".eor";      
1192 >      info[k].sampleName = prefix + ".dump";
1193 >      info[k].statusName = prefix + ".stat";
1194  
1195   #ifdef IS_MPI
1196  
# Line 1853 | Line 1618 | void SimSetup::makeIntegrator(void){
1618          else{
1619            sprintf(painCave.errMsg,
1620                    "SimSetup error: If you use a constant pressure\n"
1621 <                  "\tensemble, you must set targetPressure in the BASS file.\n");
1621 >                  "\tensemble, you must set targetPressure in the meta-data file.\n");
1622            painCave.isFatal = 1;
1623            simError();
1624          }
# Line 1904 | Line 1669 | void SimSetup::makeIntegrator(void){
1669          else{
1670            sprintf(painCave.errMsg,
1671                    "SimSetup error: If you use a constant pressure\n"
1672 <                  "\tensemble, you must set targetPressure in the BASS file.\n");
1672 >                  "\tensemble, you must set targetPressure in the meta-data file.\n");
1673            painCave.isFatal = 1;
1674            simError();
1675          }    
# Line 1957 | Line 1722 | void SimSetup::makeIntegrator(void){
1722          else{
1723            sprintf(painCave.errMsg,
1724                    "SimSetup error: If you use a constant pressure\n"
1725 <                  "\tensemble, you must set targetPressure in the BASS file.\n");
1725 >                  "\tensemble, you must set targetPressure in the meta-data file.\n");
1726            painCave.isFatal = 1;
1727            simError();
1728          }    

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines