diff options
author | baiotti <baiotti@e5a5a894-0e4f-0410-be11-d22c8b0a171a> | 2011-04-08 10:25:33 +0000 |
---|---|---|
committer | baiotti <baiotti@e5a5a894-0e4f-0410-be11-d22c8b0a171a> | 2011-04-08 10:25:33 +0000 |
commit | a4babd71a8251036606085d3106fbd01a80abb31 (patch) | |
tree | 50fd645e38343716b64c10084252d8bd7d1eceb8 | |
parent | f4538ac131c85a70651dfcfce7fe17df128b0439 (diff) |
Correct signature of functions scheduled at STARTUP and SHUTDOWN.
git-svn-id: http://svn.aei.mpg.de/numrel/AEIThorns/ManualTermination/trunk@19 e5a5a894-0e4f-0410-be11-d22c8b0a171a
-rw-r--r-- | src/ManualTermination.c | 6 | ||||
-rw-r--r-- | src/ManualTerminationFile.c | 17 |
2 files changed, 12 insertions, 11 deletions
diff --git a/src/ManualTermination.c b/src/ManualTermination.c index b796ece..69300ed 100644 --- a/src/ManualTermination.c +++ b/src/ManualTermination.c @@ -9,7 +9,7 @@ static CCTK_REAL watchminutes; -int ManualTermination_StartTimer (CCTK_ARGUMENTS) +void ManualTermination_StartTimer (CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -31,7 +31,7 @@ int ManualTermination_StartTimer (CCTK_ARGUMENTS) return (retval); } -int ManualTermination_ResetMinutes (CCTK_ARGUMENTS) +void ManualTermination_ResetMinutes (CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -41,7 +41,7 @@ int ManualTermination_ResetMinutes (CCTK_ARGUMENTS) return 0; } -int ManualTermination_CheckWalltime (CCTK_ARGUMENTS) +void ManualTermination_CheckWalltime (CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; diff --git a/src/ManualTerminationFile.c b/src/ManualTerminationFile.c index f5fd647..cf7d016 100644 --- a/src/ManualTerminationFile.c +++ b/src/ManualTerminationFile.c @@ -44,7 +44,7 @@ const char * MT_get_terminate_filename (CCTK_STRING terminate_filename) return buf; } -int ManualTermination_Init (CCTK_ARGUMENTS) +void ManualTermination_Init (CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -66,12 +66,12 @@ int ManualTermination_Init (CCTK_ARGUMENTS) MT_get_terminate_filename (NULL), strerror (errno)); } } - return 0; + return; } -int ManualTerminationFile (CCTK_ARGUMENTS) +void ManualTerminationFile (CCTK_ARGUMENTS) { - int retval = 0, terminate; + int terminate; FILE *terminationfile; DECLARE_CCTK_PARAMETERS; @@ -79,12 +79,12 @@ int ManualTerminationFile (CCTK_ARGUMENTS) /* only one processor needs to query the elapsed runtime */ if (CCTK_MyProc (cctkGH) != 0) { - return 0; + return; } if (((cctkGH->cctk_iteration- 1) % check_file_every * 1.0e0) != 0) { - return 0; + return; } terminationfile = fopen (MT_get_terminate_filename (NULL), "r"); @@ -105,10 +105,11 @@ int ManualTerminationFile (CCTK_ARGUMENTS) } } - return retval; + return; } -int ManualTermination_Cleanup (CCTK_ARGUMENTS) +//int ManualTermination_Cleanup (CCTK_ARGUMENTS) +int ManualTermination_Cleanup (void) { DECLARE_CCTK_PARAMETERS; |