diff options
author | eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2013-01-18 14:38:08 +0000 |
---|---|---|
committer | eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2013-01-18 14:38:08 +0000 |
commit | 9b8c2d50c0d37ddd7f5cb74d221290c6fcb6e2f7 (patch) | |
tree | 3401ef28e58b68785299fe82f1067246992c3b14 | |
parent | 8bdc0d07437d3ac4134fb4b9c8e9a15e93a2b93b (diff) |
Only warn (don't err) if a thorn is activated multiple times
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4941 17b73243-c579-4c4c-a9d2-2d5706c11dac
-rw-r--r-- | src/main/ActiveThorns.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/ActiveThorns.c b/src/main/ActiveThorns.c index 43f17355..2912d015 100644 --- a/src/main/ActiveThorns.c +++ b/src/main/ActiveThorns.c @@ -939,7 +939,8 @@ int CCTKi_ActivateThorns(const char *activethornlist) { if (! Util_StringListAdd(activated_thorns, token)) { - CCTK_Warn(0, __LINE__, __FILE__, "Cactus", "internal error"); + printf("Warning: thorn %s already scheduled for activation\n", thorn); + n_warnings++; } } @@ -968,8 +969,8 @@ int CCTKi_ActivateThorns(const char *activethornlist) { if (Util_StringListAdd(new_thorns, new_thorn)) { - printf("Automatic activation requested for thorn %s\n", - new_thorn); + printf("Thorn %s requests automatic activation of %s\n", + thorn, new_thorn); did_add_thorns = 1; } } |