Last change
on this file since f70c2a was e08f45, checked in by Frederik Heber <heber@…>, 17 years ago |
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 << ...
|
-
Property mode
set to
100755
|
File size:
561 bytes
|
Line | |
---|
1 | #ifndef pcp_h
|
---|
2 | #define pcp_h
|
---|
3 |
|
---|
4 | /** \file pcp.h
|
---|
5 | * Header file for \ref pcp.c
|
---|
6 | *
|
---|
7 | * Contains declarations of the functions implemented in \ref pcp.c and
|
---|
8 | * definition of external sig_atomic.
|
---|
9 | *
|
---|
10 | Project: ParallelCarParrinello
|
---|
11 | Jan Hamaekers
|
---|
12 | 2000
|
---|
13 |
|
---|
14 | File: pcp.h
|
---|
15 | $Id: pcp.h,v 1.6 2006/03/30 22:19:51 foo Exp $
|
---|
16 | */
|
---|
17 |
|
---|
18 | #ifdef HAVE_CONFIG_H
|
---|
19 | #include <config.h>
|
---|
20 | #endif
|
---|
21 |
|
---|
22 | #include <signal.h>
|
---|
23 |
|
---|
24 | extern volatile sig_atomic_t cpulim; //!< external signal which calls for end of calculation
|
---|
25 | int CheckCPULIM(struct Problem *P);
|
---|
26 | int main(int argc, char **argv);
|
---|
27 |
|
---|
28 | #endif
|
---|
Note:
See
TracBrowser
for help on using the repository browser.