Changeset e08f45 for util/src/NanoCreator.h

Timestamp:

Feb 9, 2009, 5:24:10 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

451d7a

Parents:

4aef8a

git-author:

Frederik Heber <heber@…> (02/09/09 15:55:37)

git-committer:

Frederik Heber <heber@…> (02/09/09 17:24:10)

Message:

Merge branch 'ConcaveHull' of ../espack2 into ConcaveHull

Conflicts:

molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/builder.cpp
molecuilder/src/linkedcell.cpp
molecuilder/src/linkedcell.hpp
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp
util/src/NanoCreator.c

Basically, this resulted from a lot of conversions two from spaces to one tab, which is my standard indentation. The mess was caused by eclipse auto-indenting. And in espack2:ConcaveHull was the new stuff, so all from ConcaveHull was replaced in case of doubt.
Additionally, vector had ofstream << operator instead ostream << ...

File:

• util/src/NanoCreator.h (modified) (2 diffs, 1 prop)

util/src/NanoCreator.h

@@ -11 +11 @@
 
 // file stuff
-char * ReadBuffer (char *filename, int *bufferlength); 
+char * ReadBuffer (char *filename, int *bufferlength);
 void AddAtomicNumber(char *filename, int atomicnumber, double **Vector, double **Recivector);
 void AddSheetInfo(char *filename, int *axis, int *chiral, int *factors, int seed, int numbercell, double *randomness);
@@ -28 +28 @@
 double Projection(double *vector1, double *vector2);
 double ScalarProduct(double *vector1, double *vector2);
-double Norm(double *vector); 
+double Norm(double *vector);
 void PrintVector(FILE *file, double *vector);