aboutsummaryrefslogtreecommitdiff
path: root/src/Startup.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/Startup.c')
-rw-r--r--src/Startup.c25
1 files changed, 23 insertions, 2 deletions
diff --git a/src/Startup.c b/src/Startup.c
index d862003..7101634 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -8,11 +8,14 @@
@version $Id$
@@*/
+#include <assert.h>
+#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <ctype.h>
#include "cctk.h"
+#include "cctk_Arguments.h"
#include "cctk_Parameters.h"
#include "util_Table.h"
#include "CactusBase/IOUtil/src/ioutil_Utils.h"
@@ -27,6 +30,7 @@ CCTK_FILEVERSION(CactusBase_IOBasic_Startup_c)
******************** External Routines ************************
********************************************************************/
void IOBasic_Startup (void);
+void IOBasic_Init (CCTK_ARGUMENTS);
/********************************************************************
@@ -60,6 +64,22 @@ void IOBasic_Startup (void)
}
+ /*@@
+ @routine IOBasic_Init
+ @date Tue 30 Dec 2003
+ @author Erik Schnetter
+ @desc
+ Initialise the next_*_output_time variables.
+ @enddesc
+@@*/
+void IOBasic_Init (CCTK_ARGUMENTS)
+{
+ DECLARE_CCTK_ARGUMENTS;
+ *next_info_output_time = cctk_time;
+ *next_scalar_output_time = cctk_time;
+}
+
+
/****************************************************************************/
/* local routines */
/****************************************************************************/
@@ -103,6 +123,7 @@ static void *IOBasic_SetupGH (tFleshConfig *config, int conv_level, cGH *GH)
int i;
iobasicGH *myGH;
const char *my_out_dir;
+ char dirname[1000];
DECLARE_CCTK_PARAMETERS
@@ -148,9 +169,9 @@ static void *IOBasic_SetupGH (tFleshConfig *config, int conv_level, cGH *GH)
to the current parameter values
this forces info output about periodic output */
myGH->outInfo_every = outInfo_every >= 0 ? outInfo_every : out_every;
- myGH->outInfo_every--;
myGH->outScalar_every = outScalar_every >= 0 ? outScalar_every : out_every;
- myGH->outScalar_every--;
+ myGH->outInfo_dt = outInfo_dt >= 0 ? outInfo_dt : out_dt;
+ myGH->outScalar_dt = outScalar_dt >= 0 ? outScalar_dt : out_dt;
memset (myGH->outInfo_last, -1, 2 * i * sizeof (int));