Commit 98e20a96 authored by Peter W. Draper's avatar Peter W. Draper
Browse files

Merge branch 'fix_vel' into 'master'

Fix vel

See merge request !623
parents a6c41421 9434c0c8
......@@ -910,6 +910,22 @@ fi
AC_SUBST([VELOCIRAPTOR_LIBS])
AM_CONDITIONAL([HAVEVELOCIRAPTOR],[test -n "$VELOCIRAPTOR_LIBS"])
# Check for dummy VELOCIraptor.
AC_ARG_ENABLE([dummy-velociraptor],
[AS_HELP_STRING([--enable-dummy-velociraptor],
[Enable dummy velociraptor compilation @<:@yes/no@:>@]
)],
[enable_dummy_velociraptor="$enableval"],
[enable_dummy_velociraptor="no"]
)
if test "$enable_dummy_velociraptor" = "yes"; then
have_velociraptor="yes"
AC_DEFINE(HAVE_VELOCIRAPTOR,1,[The VELOCIraptor library appears to be present.])
AC_DEFINE(HAVE_DUMMY_VELOCIRAPTOR,1,[The dummy VELOCIraptor library is present.])
fi
# Check for floating-point execeptions
AC_CHECK_FUNC(feenableexcept, AC_DEFINE([HAVE_FE_ENABLE_EXCEPT],[1],
[Defined if the floating-point exception can be enabled using non-standard GNU functions.]))
......
......@@ -61,7 +61,7 @@ AM_SOURCES = space.c runner.c queue.c task.c cell.c engine.c \
part_type.c xmf.c gravity_properties.c gravity.c \
collectgroup.c hydro_space.c equation_of_state.c \
chemistry.c cosmology.c restart.c mesh_gravity.c velociraptor_interface.c \
outputlist.c
outputlist.c velociraptor_dummy.c
# Include files for distribution, not installation.
nobase_noinst_HEADERS = align.h approx_math.h atomic.h barrier.h cycle.h error.h inline.h kernel_hydro.h kernel_gravity.h \
......
......@@ -19,6 +19,8 @@
#ifndef SWIFT_VELOCIRAPTOR_PART_H
#define SWIFT_VELOCIRAPTOR_PART_H
#include "part_type.h"
/* SWIFT/VELOCIraptor particle. */
struct swift_vel_part {
......
/*******************************************************************************
* This file is part of SWIFT.
* Copyright (c) 2018 James Willis (james.s.willis@durham.ac.uk)
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published
* by the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
******************************************************************************/
/* Config parameters. */
#include "../config.h"
/* Some standard headers. */
#include <stddef.h>
/* Local includes. */
#include "velociraptor_interface.h"
#include "swift_velociraptor_part.h"
/* Dummy VELOCIraptor interface for testing compilation without linking the actual VELOCIraptor library. */
#ifdef HAVE_DUMMY_VELOCIRAPTOR
int InitVelociraptor(char *config_name, char *output_name,
struct cosmoinfo cosmo_info, struct unitinfo unit_info,
struct siminfo sim_info){return 0;}
int InvokeVelociraptor(const size_t num_gravity_parts,
const size_t num_hydro_parts,
struct swift_vel_part *swift_parts,
const int *cell_node_ids, char *output_name) {return 0;}
#endif /* HAVE_DUMMY_VELOCIRAPTOR */
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment