CarpetIO*: New parameter CarpetIO*::out_group_separator

out_group_separator chooses the string by which thorn name and group name are separated in file names. The default is "::" for backward compatibility. This parameter only affects output where CarpetIO*::one_file_per_group is set; otherwise, the thorn name does not appear in the file name.

1 files changed, 10 insertions, 4 deletions

diff --git a/Carpet/CarpetIOScalar/src/ioscalar.cc b/Carpet/CarpetIOScalar/src/ioscalar.cc
index cfdf1843b..e9bba4b30 100644
--- a/Carpet/CarpetIOScalar/src/ioscalar.cc
+++ b/Carpet/CarpetIOScalar/src/ioscalar.cc
@@ -719,11 +719,17 @@ namespace CarpetIOScalar {
       
       char* const fullname = CCTK_FullName(vindex);
       int const gindex = CCTK_GroupIndexFromVarI(vindex);
-      char* const groupname = CCTK_GroupName(gindex);
-      for (char* p=groupname; *p; ++p) *p=tolower(*p);
-      retval = OutputVarAs (cctkGH, fullname, groupname, out_reductions);
+      char* const groupname_c = CCTK_GroupName(gindex);
+      string groupname(groupname_c);
+      transform
+        (groupname.begin(), groupname.end(), groupname.begin(), ::tolower);
+      string const oldsep ("::");
+      size_t const oldseppos = groupname.find(oldsep);
+      assert (oldseppos != string::npos);
+      groupname.replace(oldseppos, oldsep.size(), out_group_separator);
+      retval =
+        OutputVarAs (cctkGH, fullname, groupname.c_str(), out_reductions);
       free (fullname);
-      free (groupname);
       
       int const firstvar = CCTK_FirstVarIndexI(gindex);
       int const numvars = CCTK_NumVarsInGroupI(gindex);