diff options
Diffstat (limited to 'src/Write1D.c')
| -rw-r--r-- | src/Write1D.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/Write1D.c b/src/Write1D.c index 303ea2b..60ab901 100644 --- a/src/Write1D.c +++ b/src/Write1D.c @@ -211,24 +211,6 @@ int IOASCII_Write1D (const cGH *GH, int vindex, const char *alias) } } - /* DEPRICATED IN BETA12 */ - if (CCTK_ParameterQueryTimesSet ("out_style", CCTK_THORNSTRING) > 0) - { - static int user_was_warned = 0; - - - if (! user_was_warned) - { - CCTK_WARN (1, "IOASCII_Write1D: parameter 'IOASCII::out_style' is " - "deprecated in BETA12, please use 'IOASCII::out1D_style' " - "instead"); - user_was_warned = 1; - } - - out1D_style = CCTK_Equals (out_style, "gnuplot") ? - "gnuplot f(x)" : "xgraph"; - } - /* set header format string */ if (CCTK_Equals (out1D_style, "xgraph")) { @@ -505,7 +487,7 @@ static void OpenFile (const cGH *GH, /* 20 extra characters should be enough for '/', the type extension, the file extension, and the trailing '\0' */ - filename = (char *) malloc (strlen (myGH->outdir1D) + strlen (alias) + + filename = (char *) malloc (strlen (myGH->out1D_dir) + strlen (alias) + sizeof (slicename) + 20); for (i = 0; i < num_files; i++) @@ -572,12 +554,12 @@ static void OpenFile (const cGH *GH, sprintf (slicename, "%s%dD_diagonal", type_extension, gdata->dim); } - sprintf (filename, "%s%s_%s%s", myGH->outdir1D, alias, slicename, + sprintf (filename, "%s%s_%s%s", myGH->out1D_dir, alias, slicename, file_extension); } else { - sprintf (filename, "%s%s%s.%s", myGH->outdir1D, alias, type_extension, + sprintf (filename, "%s%s%s.%s", myGH->out1D_dir, alias, type_extension, extensions[dir]); } |