Ignore:
Timestamp:
Apr 27, 2010, 2:25:42 PM (15 years ago)
Author:
Frederik Heber <heber@…>
Children:
90c4460
Parents:
1561e2 (diff), 2bc713 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'Analysis_PairCorrelation' into StructureRefactoring

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/World.cpp
molecuilder/src/World.hpp
molecuilder/src/boundary.cpp
molecuilder/src/builder.cpp
molecuilder/src/log.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/periodentafel.cpp
molecuilder/src/tesselation.cpp
molecuilder/src/unittests/AnalysisCorrelationToSurfaceUnitTest.cpp
molecuilder/src/unittests/Makefile.am
molecuilder/src/unittests/bondgraphunittest.cpp
molecuilder/src/unittests/gslvectorunittest.cpp
molecuilder/src/unittests/logunittest.cpp
molecuilder/src/unittests/tesselation_boundarytriangleunittest.hpp
molecuilder/src/vector.cpp
molecuilder/tests/Tesselations/defs.in

Conflicts have been many and too numerous to listen here, just the few general cases

  • new molecule() replaced by World::getInstance().createMolecule()
  • new atom() replaced by World::getInstance().createAtom() where appropriate.
  • Some DoLog()s added interfered with changes to the message produced by Log() << Verbose(.) << ...
  • DoLog() has been erroneously added to TestRunner.cpp as well, there cout is appropriate
  • ...

Additionally, there was a bug in atom::clone(), sort was set to atom::nr of the atom to clone not of the clone itself. This caused a failure of the fragmentation.

This merge has been fully checked from a clean build directory with subsequent configure,make all install and make check.
It configures, compiles and runs all test cases and the test suite without errors.

Signed-off-by: Frederik Heber <heber@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • molecuilder/src/World.cpp

    r1561e2 r075729  
    5959}
    6060
     61// system
     62
     63double * World::getDomain() {
     64  return cell_size;
     65}
     66
     67void World::setDomain(double * matrix)
     68{
     69
     70}
     71
     72char * World::getDefaultName() {
     73  return defaultName;
     74}
     75
     76void World::setDefaultName(char * name)
     77{
     78  delete[](defaultName);
     79  const int length = strlen(name);
     80  defaultName = new char[length+2];
     81  if (length < MAXSTRINGSIZE)
     82    strncpy(defaultName, name, length);
     83  else
     84    strcpy(defaultName, "none");
     85};
     86
     87
    6188/******************** Methods to change World state *********************/
    6289
     
    86113}
    87114
     115double *World::cell_size = NULL;
     116char *World::defaultName = NULL;
    88117
    89118atom *World::createAtom(){
     
    96125  return res;
    97126}
     127
    98128
    99129int World::registerAtom(atom *atom){
     
    243273    molecules_deprecated(new MoleculeListClass(this))
    244274{
     275  cell_size = new double[6];
     276  cell_size[0] = 20.;
     277  cell_size[1] = 0.;
     278  cell_size[2] = 20.;
     279  cell_size[3] = 0.;
     280  cell_size[4] = 0.;
     281  cell_size[5] = 20.;
     282  defaultName = new char[MAXSTRINGSIZE];
     283  strcpy(defaultName, "none");
    245284  molecules_deprecated->signOn(this);
    246285}
     
    249288{
    250289  molecules_deprecated->signOff(this);
     290  delete[] cell_size;
     291  delete[] defaultName;
    251292  delete molecules_deprecated;
    252293  delete periode;
Note: See TracChangeset for help on using the changeset viewer.