ActiveThorns has been replaced by ThornList

This is because we want to specify in the parameter file which thorns
are actually "active", and not just compiled.

The command line arguements have been changed to

-T and -t

instead of

-A and -a


git-svn-id: http://svn.cactuscode.org/flesh/trunk@640 17b73243-c579-4c4c-a9d2-2d5706c11dac

4 files changed, 20 insertions, 20 deletions

diff --git a/src/include/CommandLine.h b/src/include/CommandLine.h
index e7007de0..74ff045d 100644
--- a/src/include/CommandLine.h
+++ b/src/include/CommandLine.h
@@ -14,14 +14,14 @@
 extern "C" {
 #endif
 
-void CCTK_CommandLineTestThornActive(const char *optarg);
+void CCTK_CommandLineTestThornCompiled(const char *optarg);
 void CCTK_CommandLineDescribeAllParameters(void);
 void CCTK_CommandLineDescribeParameter(const char *optarg);
 void CCTK_CommandLineTestParameters(const char *optarg);
 void CCTK_CommandLineWarningLevel(const char *optarg);
 void CCTK_CommandLineErrorLevel(const char *optarg);
 void CCTK_CommandLineRedirectStderr(void);
-void CCTK_CommandLineListActiveThorns(void);
+void CCTK_CommandLineListThorns(void);
 void CCTK_CommandLineVersion(void);
 void CCTK_CommandLineHelp(void);
 void CCTK_CommandLineUsage(void);
diff --git a/src/include/cctk.h b/src/include/cctk.h
index f340610d..f5fa5484 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -33,7 +33,7 @@
 
 
 #define _CCTK_FARGUMENTS  cctk_dim, cctk_gsh, cctk_lsh, cctk_lbnd, cctk_ubnd, cctk_from, cctk_to, cctk_bbox, cctk_delta_time, cctk_time, cctk_delta_space, cctk_origin_space, cctk_levfac, cctk_convlevel, cctk_nghostzones, cctk_iteration, cctkGH
-#define _DECLARE_CCTK_FARGUMENTS CCTK_INT cctk_dim&&\
+#define _DECLARE_CCTK_FARGUMENTS INTEGER cctk_dim&&\
                            INTEGER cctk_gsh(cctk_dim),cctk_lsh(cctk_dim)&&\
                            INTEGER cctk_lbnd(cctk_dim),cctk_ubnd(cctk_dim)&&\
                            INTEGER cctk_from(cctk_dim),cctk_to(cctk_dim)&&\
diff --git a/src/main/CommandLine.c b/src/main/CommandLine.c
index 39fa7e3d..48411909 100644
--- a/src/main/CommandLine.c
+++ b/src/main/CommandLine.c
@@ -27,13 +27,13 @@ char *compileDate(void);
 int CCTK_GetCommandLine(char ***outargv);
 
 /* FIXME. This shouldn't be in this file */
-int CCTK_IsThornActive(const char *thorn) ;
+int CCTK_IsThornCompiled(const char *thorn) ;
 
 
 /* The functions used to deal with each option. */
 
  /*@@
-   @routine    CCTK_CommandLineTestThornActive
+   @routine    CCTK_CommandLineTestThorncompiled
    @date       Wed Feb 17 10:25:30 1999
    @author     Gabrielle Allen
    @desc 
@@ -41,7 +41,7 @@ int CCTK_IsThornActive(const char *thorn) ;
    At the moment the given thorn must be in the format
    <package name>/<thorn name>
    @enddesc 
-   @calls      CCTK_IsThornActive 
+   @calls      CCTK_IsThornCompiled 
    @calledby   
    @history 
  
@@ -49,9 +49,9 @@ int CCTK_IsThornActive(const char *thorn) ;
 
 @@*/
 
-void CCTK_CommandLineTestThornActive(const char *optarg)
+void CCTK_CommandLineTestThornCompiled(const char *optarg)
 {
-  if(CCTK_IsThornActive(optarg))
+  if(CCTK_IsThornCompiled(optarg))
   {
     printf("Thorn '%s' available.\n", optarg);
   }
@@ -141,10 +141,10 @@ void CCTK_CommandLineRedirectStderr(void)
 {
 
 }
-void CCTK_CommandLineListActiveThorns(void)
+void CCTK_CommandLineListThorns(void)
 {
   int i;
-  printf ("\n---------------Active Thorns---------------\n");
+  printf ("\n---------------Compiled Thorns-------------\n");
   for(i=0; i < nthorns; i++)
   {
     fprintf(stdout, "%s\n", thorn_name[i]);
@@ -173,7 +173,7 @@ void CCTK_CommandLineHelp(void)
   argc = CCTK_GetCommandLine(&argv);
 
   printf("%s, compiled on %s at %s\n", argv[0], compileDate(), compileTime());
-  printf("Usage: %s [-h] [-O] [-o paramname] [-x [nprocs]] [-W n] [-E n] [-r] [-A] [-a name] [-v] parameter_file_name>\n", argv[0]);
+  printf("Usage: %s [-h] [-O] [-o paramname] [-x [nprocs]] [-W n] [-E n] [-r] [-T] [-t name] [-v] parameter_file_name>\n", argv[0]);
 
   printf("\n");
   printf("Valid options:\n");
@@ -186,8 +186,8 @@ void CCTK_CommandLineHelp(void)
   printf("-W, -warning-level <n>              : Sets the warning level to n.\n");
   printf("-E, -error-level <n>                : Sets the error level to n.\n");
   printf("-r, -redirect-stderr                : Redirects standard error to files.\n");
-  printf("-A, -list-active-thorns             : Lists the compiled-in thorns.\n");
-  printf("-a, -test-thorn-active <name>       : Tests for the presence of thorn <name>.\n");
+  printf("-T, -list-thorns                    : Lists the compiled-in thorns.\n");
+  printf("-t, -test-thorn-compiled <name>     : Tests for the presence of thorn <name>.\n");
   printf("-v, -version                        : Prints the version.\n");
 
   exit(1);
@@ -209,7 +209,7 @@ void CCTK_CommandLineUsage(void)
 
 
  /*@@
-   @routine    CCTK_IsThornActive
+   @routine    CCTK_IsThornCompiled
    @date       Sat May 16 14:47:14 1998
    @author     Tom Goodale
    @desc 
@@ -223,7 +223,7 @@ void CCTK_CommandLineUsage(void)
 
 @@*/
 
-int CCTK_IsThornActive(const char *thorn) 
+int CCTK_IsThornCompiled(const char *thorn) 
 {
   int i;
   char full_thorn_name[507];
diff --git a/src/main/ProcessCommandLine.c b/src/main/ProcessCommandLine.c
index 92341929..190c9f95 100644
--- a/src/main/ProcessCommandLine.c
+++ b/src/main/ProcessCommandLine.c
@@ -60,27 +60,27 @@ int ProcessCommandLine(int *inargc, char ***inargv, tFleshConfig *ConfigData)
 	{"warning-level", required_argument, NULL, 'W'},
 	{"error-level", required_argument, NULL, 'E'},
 	{"redirect-stderr", no_argument, NULL, 'r'},
-	{"list-active-thorns", no_argument, NULL, 'A'},
-	{"test-thorn-active", required_argument, NULL, 'a'},
+	{"list-thorns", no_argument, NULL, 'T'},
+	{"test-thorn-compiled", required_argument, NULL, 't'},
 	{"version", no_argument, NULL, 'v'},
 	{0, 0, 0, 0}
       };
       
-      c = getopt_long_only (argc, argv, "hOo:x::W:E:rAa:v",
+      c = getopt_long_only (argc, argv, "hOo:x::W:E:rTt:v",
 			    long_options, &option_index);
       if (c == -1)
 	break;
   
       switch (c)
       {
-	case 'a': CCTK_CommandLineTestThornActive(optarg); break;
+	case 't': CCTK_CommandLineTestThornCompiled(optarg); break;
 	case 'O': CCTK_CommandLineDescribeAllParameters(); break;
 	case 'o': CCTK_CommandLineDescribeParameter(optarg); break;
 	case 'x': CCTK_CommandLineTestParameters(optarg); break;
 	case 'W': CCTK_CommandLineWarningLevel(optarg); break;
 	case 'E': CCTK_CommandLineErrorLevel(optarg); break;
 	case 'r': CCTK_CommandLineRedirectStderr(); break;
-	case 'A': CCTK_CommandLineListActiveThorns(); break;
+	case 'T': CCTK_CommandLineListThorns(); break;
 	case 'v': CCTK_CommandLineVersion(); break;
 	case 'h': 
 	case '?':