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

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;
             }
           }