Timestamp:
Jul 23, 2009, 11:31:00 AM (16 years ago)
Author:
Frederik Heber <heber@…>
Children:
307290
Parents:
3b470f (diff), d40e32 (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 'test'

Conflicts:

molecuilder/src/analyzer.cpp
molecuilder/src/datacreator.cpp
molecuilder/src/joiner.cpp

all Chi.. matrices were EnergyMatrix instead of ForceMatrix, despite in all branches (test, master, Thermostat) always some ParseIndices was called for them, which is only implemented in the ForceMatrix. I change hence to ForceMatrix and removed the comments from ParseIndices(). But this is untested.

(No files)

Note: See TracChangeset for help on using the changeset viewer.