diff options
27 files changed, 81 insertions, 81 deletions
diff --git a/lib/sbin/CreateImplementationBindings.pl b/lib/sbin/CreateImplementationBindings.pl index 6e0055bc..77b61709 100644 --- a/lib/sbin/CreateImplementationBindings.pl +++ b/lib/sbin/CreateImplementationBindings.pl @@ -42,7 +42,7 @@ sub CreateImplementationBindings @data = (); push(@data, "#include <stdio.h>\n"); - push(@data, "#include \"ActiveThorns.h\"\n\n"); + push(@data, "#include \"cctk_ActiveThorns.h\"\n\n"); push(@data, "int CCTKi_BindingsImplementationsInitialise(void)\n{\n"); diff --git a/lib/sbin/CreateParameterBindings.pl b/lib/sbin/CreateParameterBindings.pl index 21bfaa15..f2cb57fe 100644 --- a/lib/sbin/CreateParameterBindings.pl +++ b/lib/sbin/CreateParameterBindings.pl @@ -202,8 +202,8 @@ sub CreateParameterBindings #include <stdlib.h> #include <string.h> #include "config.h" -#include "Misc.h" -#include "WarnLevel.h" +#include "cctk_Misc.h" +#include "cctk_WarnLevel.h" EOT diff --git a/lib/sbin/GridFuncStuff.pl b/lib/sbin/GridFuncStuff.pl index 7ad1d710..dce01078 100644 --- a/lib/sbin/GridFuncStuff.pl +++ b/lib/sbin/GridFuncStuff.pl @@ -110,8 +110,8 @@ sub CreateVariableBindings { open(OUT, ">$thorn.c") || die "Cannot create $thorn.c"; - print OUT "\#include \"Groups.h\"\n"; -# print OUT "#include \"flesh.h\"\n"; + print OUT "\#include \"cctk_Groups.h\"\n"; +# print OUT "#include \"cctk_Flesh.h\"\n"; # print OUT "#include \"StoreVariableData.h\"\n\n"; print OUT "int CactusBindingsVariables_$thorn"."_Initialise(void)\n{\n"; diff --git a/lib/sbin/create_c_stuff.pl b/lib/sbin/create_c_stuff.pl index 08eaac59..6508146a 100644 --- a/lib/sbin/create_c_stuff.pl +++ b/lib/sbin/create_c_stuff.pl @@ -50,7 +50,7 @@ sub CreateParameterBindingFile push(@data, $line); $line = "\#include \"CParameterStructNames.h\""; push(@data, $line); - $line = "\#include \"Misc.h\""; + $line = "\#include \"cctk_Misc.h\""; push(@data, $line); $line = "\#include \"ParameterBindings.h\""; push(@data, $line); diff --git a/lib/sbin/schedule_parser.pl b/lib/sbin/schedule_parser.pl index db23aa8a..c2335ee0 100644 --- a/lib/sbin/schedule_parser.pl +++ b/lib/sbin/schedule_parser.pl @@ -104,12 +104,12 @@ sub write_rfr_header { $header = "#define THORN_IS_$thorn\n"; $header .= "#include <stdio.h>\n"; $header .= "#include \"cctk.h\"\n"; - $header .= "#include \"flesh.h\"\n"; - $header .= "#include \"Comm.h\"\n"; - $header .= "#include \"ActiveThorns.h\"\n"; - $header .= "#include \"Groups.h\"\n"; - $header .= "#include \"GroupsOnGH.h\"\n"; - $header .= "#include \"rfr_constants.h\"\n"; + $header .= "#include \"cctk_Flesh.h\"\n"; + $header .= "#include \"cctk_Comm.h\"\n"; + $header .= "#include \"cctk_ActiveThorns.h\"\n"; + $header .= "#include \"cctk_Groups.h\"\n"; + $header .= "#include \"cctk_GroupsOnGH.h\"\n"; + $header .= "#include \"rfrConstants.h\"\n"; $header .= "#include \"cctk_parameters.h\"\n"; $header .= "#include \"cctk_arguments.h\"\n"; $header .= "\n"; @@ -133,9 +133,9 @@ sub write_startup_header { print OUTSTART "#define THORN_IS_$thorn\n"; print OUTSTART "#include <stdio.h>\n"; print OUTSTART "#include \"cctk.h\"\n"; - print OUTSTART "#include \"flesh.h\"\n"; - print OUTSTART "#include \"ActiveThorns.h\"\n"; - print OUTSTART "#include \"rfr_constants.h\"\n"; + print OUTSTART "#include \"cctk_Flesh.h\"\n"; + print OUTSTART "#include \"cctk_ActiveThorns.h\"\n"; + print OUTSTART "#include \"rfrConstants.h\"\n"; print OUTSTART "#include \"cctk_parameters.h\"\n"; print OUTSTART "\n"; print OUTSTART "void $routine ()\n"; @@ -207,7 +207,7 @@ sub create_RegisterRFR print OUT <<EOT; -#include "flesh.h" +#include "cctk_Flesh.h" $rfr_order_prototypes void Cactus_RegisterRFR(void *data) @@ -663,9 +663,9 @@ sub fortran_wrapper { #define THORN_IS_$thorn #include \"cctk.h\" -#include \"flesh.h\" -#include \"Groups.h\" -#include \"Comm.h\" +#include \"cctk_Flesh.h\" +#include \"cctk_Groups.h\" +#include \"cctk_Comm.h\" #include \"cctk_arguments.h\" void FORTRAN_NAME($routine)($THORN_C2F_PROTO); diff --git a/src/main/ActiveThorns.c b/src/main/ActiveThorns.c index 3103c526..3793b537 100644 --- a/src/main/ActiveThorns.c +++ b/src/main/ActiveThorns.c @@ -11,7 +11,7 @@ #include <stdlib.h> #include <string.h> -#include "ActiveThorns.h" +#include "cctk_ActiveThorns.h" #include "SKBinTree.h" diff --git a/src/main/CactusDefaultEvolve.c b/src/main/CactusDefaultEvolve.c index 5c3cb6fc..61991134 100644 --- a/src/main/CactusDefaultEvolve.c +++ b/src/main/CactusDefaultEvolve.c @@ -11,10 +11,10 @@ #include <stdio.h> -#include "flesh.h" +#include "cctk_Flesh.h" #include "cctk.h" #include "cctk_parameters.h" -#include "rfr_constants.h" +#include "rfrConstants.h" #include "rfrInterface.h" #include "CactusIOFunctions.h" diff --git a/src/main/CactusDefaultInitialise.c b/src/main/CactusDefaultInitialise.c index eca02301..78f98f7d 100644 --- a/src/main/CactusDefaultInitialise.c +++ b/src/main/CactusDefaultInitialise.c @@ -12,11 +12,11 @@ #include <stdio.h> #include <stdlib.h> -#include "flesh.h" +#include "cctk_Flesh.h" #include "CactusMainDefaults.h" #include "CactusCommFunctions.h" -#include "GHExtensions.h" -#include "rfr_constants.h" +#include "cctk_GHExtensions.h" +#include "rfrConstants.h" #include "CactusrfrInterface.h" #include "CCTK_Bindings.h" #include "rfrInterface.h" diff --git a/src/main/CactusDefaultShutdown.c b/src/main/CactusDefaultShutdown.c index 271fe273..551f035b 100644 --- a/src/main/CactusDefaultShutdown.c +++ b/src/main/CactusDefaultShutdown.c @@ -11,9 +11,9 @@ #include "cctk.h" -#include "flesh.h" +#include "cctk_Flesh.h" -#include "Comm.h" +#include "cctk_Comm.h" #ifdef MPI #include "mpi.h" diff --git a/src/main/CallStartupFunctions.c b/src/main/CallStartupFunctions.c index dfeab5c4..7db2e5ee 100644 --- a/src/main/CallStartupFunctions.c +++ b/src/main/CallStartupFunctions.c @@ -9,9 +9,7 @@ #include <stdio.h> -#include "flesh.h" - -#include "CactusRegister.h" +#include "cctk_Flesh.h" static char *rcsid = "$Id$"; @@ -34,15 +32,8 @@ int dummy(tFleshConfig *); int CallStartupFunctions(tFleshConfig *ConfigData) { - CCTKi_BindingsScheduleRegister("STARTUP", NULL); - /* These used to be here to set the defaults afterwards. Now set the default before. - * SetupMainFunctions(); - * SetupCommFunctions(); - * SetupIOFunctions(); - */ - return 0; } diff --git a/src/main/CommandLine.c b/src/main/CommandLine.c index 76ba49b5..023e5400 100644 --- a/src/main/CommandLine.c +++ b/src/main/CommandLine.c @@ -12,10 +12,10 @@ #include <string.h> #include "CommandLine.h" -#include "flesh.h" +#include "cctk_Flesh.h" #include "cGH.h" -#include "Comm.h" -#include "WarnLevel.h" +#include "cctk_Comm.h" +#include "cctk_WarnLevel.h" #include "CCTK_Bindings.h" /* FIXME. This shouldn't be here !*/ @@ -138,7 +138,7 @@ void CCTKi_CommandLineErrorLevel(const char *optarg) errorlevel = atoi(optarg); - CCTK_SetErrorLevel(errorlevel); + CCTKi_SetErrorLevel(errorlevel); } diff --git a/src/main/ConfigData.c b/src/main/ConfigData.c index 6f144ff6..f3d495bd 100644 --- a/src/main/ConfigData.c +++ b/src/main/ConfigData.c @@ -10,7 +10,7 @@ #include <stdio.h> #include <stdlib.h> -#include "flesh.h" +#include "cctk_Flesh.h" static char *rcsid = "$Id$"; diff --git a/src/main/Coord.c b/src/main/Coord.c index 474accbc..e6076196 100644 --- a/src/main/Coord.c +++ b/src/main/Coord.c @@ -14,12 +14,12 @@ #include "cctk.h" #include "StoreHandledData.h" -#include "WarnLevel.h" -#include "Coord.h" +#include "cctk_WarnLevel.h" +#include "cctk_Coord.h" #include "ErrorCodes.h" -#include "Groups.h" -#include "Misc.h" -#include "FortranString.h" +#include "cctk_Groups.h" +#include "cctk_Misc.h" +#include "cctk_FortranString.h" static cHandledData *coordinates = NULL; static int num_coords = 0; diff --git a/src/main/GHExtensions.c b/src/main/GHExtensions.c index 336bd6a8..4428ec9f 100644 --- a/src/main/GHExtensions.c +++ b/src/main/GHExtensions.c @@ -10,10 +10,11 @@ #include <stdio.h> #include <stdlib.h> -#include "flesh.h" -#include "GHExtensions.h" +#include "cctk_Flesh.h" +#include "cctk_FortranString.h" +#include "cctk_GHExtensions.h" #include "StoreHandledData.h" -#include "WarnLevel.h" +#include "cctk_WarnLevel.h" static char *rcsid = "$Id$"; @@ -33,7 +34,7 @@ static int num_extensions = 0; * c) Check its value in CheckAllExtensionsSetup * d) Provide a dummy function for CheckAllExtensionsSetup to use * e) Provide a registration function. - * f) Add a prototype for the registration function to GHExtensions.h + * f) Add a prototype for the registration function to cctk_GHExtensions.h */ struct GHExtension { @@ -451,6 +452,14 @@ int CCTK_GHExtensionHandle(const char *name) return Util_GetHandle(GHExtensions, name, NULL); } +void FMODIFIER FORTRAN_NAME(CCTK_GHExtensionHandle)(int *handle,ONE_FORTSTRING_ARG) +{ + ONE_FORTSTRING_CREATE(name) + *handle = CCTK_GHExtensionHandle(name); + free(name); +} + + /************************************************************************ * diff --git a/src/main/Groups.c b/src/main/Groups.c index d01234c5..650ff6d7 100644 --- a/src/main/Groups.c +++ b/src/main/Groups.c @@ -12,12 +12,12 @@ #include <string.h> #include <stdarg.h> -#include "flesh.h" -#include "FortranString.h" +#include "cctk_Flesh.h" +#include "cctk_FortranString.h" -#include "Misc.h" -#include "Groups.h" -#include "WarnLevel.h" +#include "cctk_Misc.h" +#include "cctk_Groups.h" +#include "cctk_WarnLevel.h" /*#define DEBUG_GROUPS */ diff --git a/src/main/GroupsOnGH.c b/src/main/GroupsOnGH.c index 0a63fb7d..aefa2a6c 100644 --- a/src/main/GroupsOnGH.c +++ b/src/main/GroupsOnGH.c @@ -12,11 +12,11 @@ #include <string.h> #include <stdarg.h> -#include "flesh.h" -#include "Misc.h" -#include "Groups.h" -#include "WarnLevel.h" -#include "GroupsOnGH.h" +#include "cctk_Flesh.h" +#include "cctk_Misc.h" +#include "cctk_Groups.h" +#include "cctk_WarnLevel.h" +#include "cctk_GroupsOnGH.h" /*#define DEBUG_GROUPS*/ diff --git a/src/main/InitialiseCactus.c b/src/main/InitialiseCactus.c index 864b5c43..e5767288 100644 --- a/src/main/InitialiseCactus.c +++ b/src/main/InitialiseCactus.c @@ -9,7 +9,7 @@ #include <stdio.h> -#include "flesh.h" +#include "cctk_Flesh.h" int ProcessCommandLine(int *inargc, char ***inargv, tFleshConfig *ConfigData); int ProcessEnvironment(int *argc, char ***argv,tFleshConfig *ConfigData); diff --git a/src/main/InitialiseDataStructures.c b/src/main/InitialiseDataStructures.c index 69fd52e8..3f822530 100644 --- a/src/main/InitialiseDataStructures.c +++ b/src/main/InitialiseDataStructures.c @@ -11,8 +11,8 @@ #include <stdlib.h> #include <string.h> -#include "flesh.h" -#include "ActiveThorns.h" +#include "cctk_Flesh.h" +#include "cctk_ActiveThorns.h" static char *rcsid = "$Id$"; diff --git a/src/main/OverloadMain.c b/src/main/OverloadMain.c index 1e3758f0..fd8b5872 100644 --- a/src/main/OverloadMain.c +++ b/src/main/OverloadMain.c @@ -12,7 +12,7 @@ #include <stdio.h> #include <stdlib.h> -#include "flesh.h" +#include "cctk_Flesh.h" #include "OverloadMacros.h" static char *rcsid="$Header$"; diff --git a/src/main/ProcessCommandLine.c b/src/main/ProcessCommandLine.c index fe2f84d2..7f33c3c3 100644 --- a/src/main/ProcessCommandLine.c +++ b/src/main/ProcessCommandLine.c @@ -9,7 +9,7 @@ #include <stdio.h> #include <stdlib.h> -#include "flesh.h" +#include "cctk_Flesh.h" #include "getopt.h" static char *rcsid = "$Header$"; diff --git a/src/main/ProcessEnvironment.c b/src/main/ProcessEnvironment.c index e1b8d903..3da36cef 100644 --- a/src/main/ProcessEnvironment.c +++ b/src/main/ProcessEnvironment.c @@ -31,7 +31,7 @@ } while (0) #endif -#include "flesh.h" +#include "cctk_Flesh.h" static char *rcsid = "$Header$"; diff --git a/src/main/ProcessParameterDatabase.c b/src/main/ProcessParameterDatabase.c index b914d99f..42327f6b 100644 --- a/src/main/ProcessParameterDatabase.c +++ b/src/main/ProcessParameterDatabase.c @@ -9,7 +9,7 @@ #include <stdio.h> -#include "flesh.h" +#include "cctk_Flesh.h" #include "ParameterData.h" diff --git a/src/main/SetParams.c b/src/main/SetParams.c index 64180986..2491fb9c 100644 --- a/src/main/SetParams.c +++ b/src/main/SetParams.c @@ -11,7 +11,7 @@ #include "cctk.h" -#include "WarnLevel.h" +#include "cctk_WarnLevel.h" static char *rcsid = "$Id$"; diff --git a/src/main/ShutdownCactus.c b/src/main/ShutdownCactus.c index 7e260a59..155505a4 100644 --- a/src/main/ShutdownCactus.c +++ b/src/main/ShutdownCactus.c @@ -9,7 +9,7 @@ #include <stdio.h> -#include "flesh.h" +#include "cctk_Flesh.h" static char *rcsid = "$Id$"; diff --git a/src/main/WarnLevel.c b/src/main/WarnLevel.c index 3307b0b5..b6b64ae9 100644 --- a/src/main/WarnLevel.c +++ b/src/main/WarnLevel.c @@ -13,9 +13,9 @@ #include <stdio.h> #include <stdlib.h> -#include "Misc.h" -#include "WarnLevel.h" -#include "FortranString.h" +#include "cctk_Misc.h" +#include "cctk_WarnLevel.h" +#include "cctk_FortranString.h" #include "cctk_parameters.h" static char *rcsid = "$Header$"; @@ -213,7 +213,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_Info)(TWO_FORTSTRINGS_ARGS) /*@@ - @routine CCTK_SetErrorLevel + @routine CCTKi_SetErrorLevel @date Wed Feb 17 00:48:02 1999 @author Tom Goodale @desc @@ -226,7 +226,7 @@ void FMODIFIER FORTRAN_NAME(CCTK_Info)(TWO_FORTSTRINGS_ARGS) @endhistory @@*/ -int CCTK_SetErrorLevel(int level) +int CCTKi_SetErrorLevel(int level) { int retval; int old_level; diff --git a/src/main/flesh.cc b/src/main/flesh.cc index e80a43d1..2644fcb8 100644 --- a/src/main/flesh.cc +++ b/src/main/flesh.cc @@ -8,7 +8,7 @@ @@*/ #include <stdio.h> -#include "flesh.h" +#include "cctk_Flesh.h" #include "CactusMainFunctions.h" static char *rcsid = "$Id$"; diff --git a/src/main/rfrInterface.c b/src/main/rfrInterface.c index cdc0e5e2..6feb41dc 100644 --- a/src/main/rfrInterface.c +++ b/src/main/rfrInterface.c @@ -12,13 +12,13 @@ #include <stdio.h> #include <stdlib.h> -#include "flesh.h" -#include "GHExtensions.h" -#include "Groups.h" +#include "cctk_Flesh.h" +#include "cctk_GHExtensions.h" +#include "cctk_Groups.h" #include "CactusrfrInterface.h" -#include "rfr_constants.h" +#include "rfrConstants.h" #include "CactusCommFunctions.h" -#include "IOMethods.h" +#include "cctk_IOMethods.h" #include "cctk_parameters.h" #include "rfrInterface.h" |