diff options
| -rw-r--r-- | param.ccl | 4 | ||||
| -rw-r--r-- | src/Output.c | 7 | ||||
| -rw-r--r-- | src/Output2D.c | 7 | ||||
| -rw-r--r-- | src/Startup.c | 8 |
4 files changed, 6 insertions, 20 deletions
@@ -124,8 +124,8 @@ CCTK_INT out2D_yzplane_xi "x-index (from 0) for 2D planes in yz" ############################################################################# shares: IO -# FIXME: want USES STRING out_dir AS default_out_dir -# FIXME: want USES INT out_every AS default_out_every +USES STRING out_dir AS io_out_dir +USES INT out_every AS io_out_every USES CCTK_REAL out_yzplane_x USES CCTK_REAL out_xzplane_y diff --git a/src/Output.c b/src/Output.c index 812149f..e74949d 100644 --- a/src/Output.c +++ b/src/Output.c @@ -291,12 +291,7 @@ static void CheckSteerableParameters (const cGH *GH) /* how often to output */ myGH = (flexioGH *) CCTK_GHExtension (GH, "IOFlexIO"); i = myGH->out_every_default; - myGH->out_every_default = out_every; - if (myGH->out_every_default < 0) - { - myGH->out_every_default = *(const CCTK_INT *) - CCTK_ParameterGet ("out_every", CCTK_ImplementationThorn ("IO"), NULL); - } + myGH->out_every_default = out_every >= 0 ? out_every : io_out_every; /* report if frequency changed */ if (myGH->out_every_default != i && ! CCTK_Equals (verbose, "none")) diff --git a/src/Output2D.c b/src/Output2D.c index 7da9ac2..4aba537 100644 --- a/src/Output2D.c +++ b/src/Output2D.c @@ -251,12 +251,7 @@ static void CheckSteerableParameters (flexioGH *myGH) /* how often to output */ i = myGH->out2D_every_default; - myGH->out2D_every_default = out2D_every; - if (myGH->out2D_every_default < 0) - { - myGH->out2D_every_default = *(const CCTK_INT *) - CCTK_ParameterGet ("out_every", CCTK_ImplementationThorn ("IO"), NULL); - } + myGH->out2D_every_default = out2D_every >= 0 ? out2D_every : io_out_every; /* report if frequency changed */ if (myGH->out2D_every_default != i && ! CCTK_Equals (verbose, "none")) diff --git a/src/Startup.c b/src/Startup.c index e75b1d4..edcfc1f 100644 --- a/src/Startup.c +++ b/src/Startup.c @@ -208,7 +208,6 @@ static void *SetupGH (tFleshConfig *config, int conv_level, cGH *GH) int i, numvars; flexioGH *myGH; const ioGH *ioUtilGH; - const char *default_out_dir; const char *timer_names[4] = {"IOFlexIO time to dump parameters", "IOFlexIO time to dump datasets", "IOFlexIO total time to checkpoint", @@ -254,11 +253,8 @@ static void *SetupGH (tFleshConfig *config, int conv_level, cGH *GH) myGH->out2D_every_default = out2D_every - 1; /* get the names of output directories */ - default_out_dir = *(const char **) - CCTK_ParameterGet ("out_dir", - CCTK_ImplementationThorn ("IO"), NULL); - myGH->out2D_dir = strdup (*out2D_dir ? out2D_dir : default_out_dir); - myGH->out_dir = strdup (*out_dir ? out_dir : default_out_dir); + myGH->out2D_dir = strdup (*out2D_dir ? out2D_dir : io_out_dir); + myGH->out_dir = strdup (*out_dir ? out_dir : io_out_dir); /* create the output directories */ ioUtilGH = (const ioGH *) CCTK_GHExtension (GH, "IO"); |