|
Last change
on this file since f39735 was f39735, checked in by Frederik Heber <heber@…>, 16 years ago |
|
Merge branch 'MultipleMolecules'
Conflicts:
molecuilder/src/analyzer.cpp
molecuilder/src/atom.cpp
molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/builder.cpp
molecuilder/src/config.cpp
molecuilder/src/datacreator.hpp
molecuilder/src/helpers.cpp
molecuilder/src/joiner.cpp
molecuilder/src/moleculelist.cpp
molecuilder/src/molecules.cpp
molecuilder/src/molecules.hpp
molecuilder/src/parser.cpp
molecuilder/src/parser.hpp
molecuilder/src/vector.cpp
molecuilder/src/verbose.cpp
merges:
- analyzer.cpp: all from HEAD, Hessian stuff
- atom.cpp: ostream & operator << (ostream &ost, const atom &a), 2nd param is const
- boundary.cpp: DoSingleStepOutput, VRMLSUffix, HULLEPSILON, Get_center_of_sphere(), Find_next_suitable_point_via_Angle_of_Sphere() and all of tesselation stuff from MultipleMolecules; DoRaster3DOutput, ~BoundaryLineSet(), ~Tesselation() from HEAD; write_raster3d_file with some changes from MultipleMolecules
- boundary.hpp: all from MultipleMolecules
- builder.cpp: all in ParseCommandLineOptions() from MultipleMolecules
- config.cpp: all from HEAD, is stuff from ThermoStat and ConstrainedMD
- datacreator.hpp: all from HEAD, Hessian stuff
- helpers.cpp: all from HEAD, ReAlloc() differed just by indentation
- moleculelist.cpp: all from MultipleMolecules, has to do with introduced molecule centers
- molecules.cpp: all from HEAD, was ConstrainedMD stuff
- molecules.hpp: ConstrainedMD and VerletForceIntegration from HEAD, moleculelist stuff from MultipleMolecules
- parser.cpp: all from HEAD, ColumnCounter is *ColumnCounter there
- parser.hpp: all from HEAD
- vector.cpp: completely from MultipleMolecules (more lines)
- verbose.cpp: all from HEAD
compilation fixes:
|
-
Property mode
set to
100755
|
|
File size:
337 bytes
|
| Line | |
|---|
| 1 | # exclude some dirs
|
|---|
| 2 | build*
|
|---|
| 3 | bin
|
|---|
| 4 | tests
|
|---|
| 5 |
|
|---|
| 6 | # exclude generated html
|
|---|
| 7 | *html*
|
|---|
| 8 |
|
|---|
| 9 | # exclude Eclipse files
|
|---|
| 10 | .cdt*
|
|---|
| 11 | .cproject
|
|---|
| 12 | .project
|
|---|
| 13 | .settings
|
|---|
| 14 |
|
|---|
| 15 |
|
|---|
| 16 | # exclude automake generated stuff
|
|---|
| 17 | *.in
|
|---|
| 18 | *.in~
|
|---|
| 19 | *.swp
|
|---|
| 20 | *.bak
|
|---|
| 21 | configure
|
|---|
| 22 | config
|
|---|
| 23 | aclocal.m4
|
|---|
| 24 | autom4te.cache
|
|---|
| 25 | missing
|
|---|
| 26 | INSTALL
|
|---|
| 27 | COPYING
|
|---|
| 28 | NEWS
|
|---|
| 29 | AUTHORS
|
|---|
| 30 | CHANGES
|
|---|
| 31 | README
|
|---|
| 32 |
|
|---|
| 33 | # exclude archives
|
|---|
| 34 | *.tgz
|
|---|
| 35 | *.tar.gz
|
|---|
| 36 | *.bgz
|
|---|
| 37 | *.tar.bz2
|
|---|
Note:
See
TracBrowser
for help on using the repository browser.
