Change arguments of routine that registers the slicing. This routine

is called at startup time.  It does not take CCTK_ARGUMENTS, and it
has to return an int.


git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Exact/trunk@232 e296648e-0e4f-0410-bd07-d597d9acff87

2 files changed, 11 insertions, 5 deletions

diff --git a/schedule.ccl b/schedule.ccl
index 09a7d32..e4ae9bb 100644
--- a/schedule.ccl
+++ b/schedule.ccl
@@ -66,7 +66,7 @@ if ( (CCTK_Equals(initial_data,"slice")) && ! (CCTK_Equals(evolution_method,"sli
 
 if ( (CCTK_Equals(initial_lapse,"exact")) || (CCTK_Equals(initial_shift,"exact")) )
 {
-  schedule Exact__gauge in ADMBase_InitialData after Exact__decode_pars
+  schedule Exact__gauge in ADMBase_InitialGauge after Exact__decode_pars
   {
     LANG: Fortran
   } "Set initial lapse and/or shift from exact solution on a trivial slice"
@@ -82,10 +82,17 @@ if ( (CCTK_Equals(lapse_evolution_method,"exact")) || (CCTK_Equals(shift_evoluti
     OPTIONS: global
   } "Register slicings"
 
+  # Necessary if MoL is not used
   schedule Exact__gauge at CCTK_PRESTEP
   {
     LANG: Fortran
   } "Set evolution lapse and/or shift from exact solution on a trivial slice"
+
+  # Necessary if MoL is used
+  schedule Exact__gauge in MoL_PostStep
+  {
+    LANG: Fortran
+  } "Set evolution lapse and/or shift from exact solution on a trivial slice"
 }
 
 #######################################################################
diff --git a/src/Startup.c b/src/Startup.c
index 13de9cd..35d5d4a 100644
--- a/src/Startup.c
+++ b/src/Startup.c
@@ -2,20 +2,19 @@
 /* $Header$ */
 
 #include "cctk.h"
-#include "cctk_Arguments.h"
-#include "cctk_Parameters.h"
 #include "CactusEinstein/CoordGauge/src/Slicing.h"
 
 /*
  * prototypes for scheduled routines
  */
-void Exact__RegisterSlicing(CCTK_ARGUMENTS);
+int Exact__RegisterSlicing(void);
 
 /******************************************************************************/
 
-void Exact__RegisterSlicing(CCTK_ARGUMENTS) 
+int Exact__RegisterSlicing(void) 
 {
   int handle;
   handle=Einstein_RegisterSlicing("exact");
   if (handle<0) CCTK_WARN(1,"Cannot register exact slicing");
+  return 0;
 }