Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SWIFT
SWIFTsim
Commits
ffc8fd98
Commit
ffc8fd98
authored
Jan 30, 2019
by
Matthieu Schaller
Browse files
Schaye08 --> EAGLE for the star formation model name.
parent
64af2707
Changes
4
Hide whitespace changes
Inline
Side-by-side
configure.ac
View file @
ffc8fd98
...
...
@@ -1760,7 +1760,7 @@ case "$with_star_formation" in
AC_DEFINE([STAR_FORMATION_NONE], [1], [No star formation])
;;
EAGLE)
AC_DEFINE([STAR_FORMATION_
SCHAY
E], [1], [Schaye and Dalla Vecchia (2008)
star formation
])
AC_DEFINE([STAR_FORMATION_
EAGL
E], [1], [
EAGLE star formation model (
Schaye and Dalla Vecchia (2008)
)
])
;;
*)
AC_MSG_ERROR([Unknown star formation model])
...
...
src/star_formation.h
View file @
ffc8fd98
...
...
@@ -30,8 +30,8 @@
/* Import the right star formation law definition */
#if defined(STAR_FORMATION_NONE)
#include "./star_formation/none/star_formation.h"
#elif defined(STAR_FORMATION_
SCHAY
E)
#include "./star_formation/
schaye08
/star_formation.h"
#elif defined(STAR_FORMATION_
EAGL
E)
#include "./star_formation/
EAGLE
/star_formation.h"
#else
#error "Invalid choice of star formation law"
#endif
...
...
src/star_formation/
schaye08
/star_formation.h
→
src/star_formation/
EAGLE
/star_formation.h
View file @
ffc8fd98
...
...
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*******************************************************************************/
#ifndef SWIFT_
SCHAY
E_STARFORMATION_H
#define SWIFT_
SCHAY
E_STARFORMATION_H
#ifndef SWIFT_
EAGL
E_STAR
_
FORMATION_H
#define SWIFT_
EAGL
E_STAR
_
FORMATION_H
/* Some standard headers */
#include <stdlib.h>
...
...
@@ -570,4 +570,4 @@ struct star_formation_history {
};
};
#endif
/* SWIFT_
SCHAY
E_STARFORMATION_H */
#endif
/* SWIFT_
EAGL
E_STAR
_
FORMATION_H */
src/star_formation/none/star_formation.h
View file @
ffc8fd98
...
...
@@ -16,8 +16,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*******************************************************************************/
#ifndef SWIFT_NO_STARFORMATION_H
#define SWIFT_NO_STARFORMATION_H
#ifndef SWIFT_NO
NE
_STAR
_
FORMATION_H
#define SWIFT_NO
NE
_STAR
_
FORMATION_H
/* Local includes */
#include "cosmology.h"
...
...
@@ -99,4 +99,4 @@ INLINE static void starformation_print_backend(
message
(
"Star formation law is 'No Star Formation'"
);
}
#endif
/* SWIFT_NO_STARFORMATION_H */
#endif
/* SWIFT_NO
NE
_STAR
_
FORMATION_H */
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment