Commit cba83088 authored by Matthieu Schaller's avatar Matthieu Schaller
Browse files

Merge branch 'TTFeedback'

parents 0f9ccb86 38d2d330
......@@ -1799,7 +1799,6 @@ void engine_make_extra_hydroloop_tasks(struct engine *e) {
/* Cooling tasks should depend on kick and unlock sourceterms */
else if (t->type == task_type_cooling) {
scheduler_addunlock(sched, t->ci->kick, t);
scheduler_addunlock(sched, t->ci->sourceterms, t);
}
/* source terms depend on cooling if performed, else on kick. It is the last
task */
......
......@@ -51,7 +51,7 @@ void sourceterms_print(struct sourceterms* source) {
#ifdef SOURCETERMS_NONE
error(" no sourceterms defined yet you ran with -F");
#ifdef SOURCETERMS_SN_FEEDBACK
#error can't have sourceterms when defined SOURCETERMS_NONE
#error "can't have sourceterms when defined SOURCETERMS_NONE"
#endif
#endif
#ifdef SOURCETERMS_SN_FEEDBACK
......
/*******************************************************************************
* This file is part of SWIFT.
* Coypright (c) 2015 Matthieu Schaller (matthieu.schaller@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/>.
*
******************************************************************************/
#ifndef SWIFT_SOURCETERMS_STRUCT_H
#define SWIFT_SOURCETERMS_STRUCT_H
#include "./const.h"
#ifdef SOURCETERMS_SN_FEEDBACK
#include "sourceterms/sn_feedback/sn_feedback_struct.h"
#endif
#endif /* SWIFT_SOURCETERMS_STRUCT_H */
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