[Commits] [svn:einsteintoolkit] Multipole/trunk/src/ (Rev. 66)

[ian.hinder at aei.mpg.de]

User: hinder
Date: 2010/09/10 01:51 PM

Modified:
 /trunk/src/
  multipole.cc

Log:
 Remove default fallback value for "variables" string
 
 Now if no variables are supplied, none will be decomposed

File Changes:

Directory: /trunk/src/
======================

File [modified]: multipole.cc
Delta lines: +1 -16
===================================================================
--- trunk/src/multipole.cc	2010-07-12 14:50:03 UTC (rev 65)
+++ trunk/src/multipole.cc	2010-09-10 18:51:58 UTC (rev 66)
@@ -83,22 +83,7 @@
   vars.n_vars = 0;
   vars.vars = v;
 
-  const char *actual_var_string = strlen(var_string) == 0 ? 
-    "WeylScal4::Psi4r{sw=-2 cmplx=\'WeylScal4::Psi4i\' name=\'psi4\'}" : 
-    var_string;
-
-  if (strlen(var_string) == 0)
-  {
-    static bool have_warned = false;
-    if (!have_warned)
-    {
-      CCTK_VWarn (1, __LINE__, __FILE__, CCTK_THORNSTRING,
-                  "WARNING: No Multipole::variables string has been specified.  For compatibility, the current default is to use \"%s\" but in future, this default will change to \"\".  Please update your parameter files to include this new parameter.", actual_var_string);
-      have_warned = true;
-    }
-  }
-    
-  int ierr = CCTK_TraverseString(actual_var_string, fill_variable, &vars, CCTK_GROUP_OR_VAR);
+  int ierr = CCTK_TraverseString(var_string, fill_variable, &vars, CCTK_GROUP_OR_VAR);
   assert(ierr > 0);
 
   *n_variables = vars.n_vars;