summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/include/CactusTimers.h2
-rw-r--r--src/include/cctk.h1
-rw-r--r--src/include/cctk_Coord.h10
-rw-r--r--src/include/cctk_Flesh.h24
-rw-r--r--src/include/cctk_WarnLevel.h5
-rw-r--r--src/include/cctk_schedule.h2
-rw-r--r--src/main/Groups.c1
-rw-r--r--src/main/InitialiseCactus.c5
-rw-r--r--src/main/InitialiseDataStructures.c6
-rw-r--r--src/main/Parameters.c11
-rw-r--r--src/main/ScheduleInterface.c11
-rw-r--r--src/main/ShutdownCactus.c2
-rw-r--r--src/main/Subsystems.c2
-rw-r--r--src/schedule/ScheduleCreater.c6
-rw-r--r--src/util/BinaryTree.h2
15 files changed, 74 insertions, 16 deletions
diff --git a/src/include/CactusTimers.h b/src/include/CactusTimers.h
index 04172fa6..e79cb483 100644
--- a/src/include/CactusTimers.h
+++ b/src/include/CactusTimers.h
@@ -73,7 +73,7 @@ t_TimerInfo *CCTK_TimerCreateInfo(void);
void CCTK_TimerDestroyInfo(t_TimerInfo *info);
#ifdef __cplusplus
- }
+}
#endif
#define INITIALISATION 0
diff --git a/src/include/cctk.h b/src/include/cctk.h
index f1208a10..5f451a76 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -77,6 +77,7 @@
#include "cctk_ActiveThorns.h"
#include "cctk_Banner.h"
+#include "cctk_Cache.h"
#include "cctk_Coord.h"
#include "cctk_File.h"
#include "cctk_Groups.h"
diff --git a/src/include/cctk_Coord.h b/src/include/cctk_Coord.h
index 24961ea3..b45f8533 100644
--- a/src/include/cctk_Coord.h
+++ b/src/include/cctk_Coord.h
@@ -12,7 +12,8 @@
#define _CCTK_COORD_H_
#ifdef __cplusplus
-extern "C" {
+extern "C"
+{
#endif
int CCTK_CoordIndex(const char *name);
@@ -25,11 +26,10 @@ int CCTK_RegisterCoordI(int dir, int index, const char *name);
int CCTK_RegisterCoordRange( cGH *GH, CCTK_REAL min, CCTK_REAL max, const char *coordname);
+CCTK_REAL CCTK_CoordOrigin(const char *name);
+
#ifdef __cplusplus
}
#endif
-#endif
-
-
-
+#endif /* _CCTK_COORD_H_ */
diff --git a/src/include/cctk_Flesh.h b/src/include/cctk_Flesh.h
index 883cd5a2..3ab7cddb 100644
--- a/src/include/cctk_Flesh.h
+++ b/src/include/cctk_Flesh.h
@@ -10,12 +10,12 @@
#include "CactusTimers.h"
#include "cctk.h"
+#include "cGH.h"
+
#ifndef _FLESH_H_
#define _FLESH_H_
-#include "cGH.h"
-
/* Typedefs */
@@ -34,11 +34,20 @@ typedef struct
/* Function prototypes */
#ifdef __cplusplus
-extern "C" {
+extern "C"
+{
#endif
int InitialiseCactus(int *, char ***, tFleshConfig *);
+int InitialiseSubsystemDefaults(void);
+
+void CactusBanner(void);
+
+int InitialiseScheduler(tFleshConfig *ConfigData);
+
+void CCTK_PrintBanners(void);
+
int CCTKi_SetParameter(const char *parameter, const char *value);
int ShutdownCactus(tFleshConfig *);
@@ -64,11 +73,20 @@ int CCTK_VarTypeNumber(const char *type);
int CCTK_GroupTypeNumber(const char *type);
int CCTKi_BindingsImplementationsInitialise(void);
+int CCTKi_BindingsScheduleInitialise(void);
+int CCTKi_BindingsVariablesInitialise(void);
+int CCTKi_BindingsParametersInitialise(void);
+
+int CCTKi_RegisterDefaultTimerFunctions(void);
int CCTK_MainLoopIndex (void);
int CCTK_SetMainLoopIndex (int main_loop_index);
+int SetupMainFunctions(void);
+int SetupCommFunctions(void);
+int SetupIOFunctions(void);
+
#ifdef __cplusplus
}
#endif
diff --git a/src/include/cctk_WarnLevel.h b/src/include/cctk_WarnLevel.h
index d4c1d58d..3da90c21 100644
--- a/src/include/cctk_WarnLevel.h
+++ b/src/include/cctk_WarnLevel.h
@@ -12,7 +12,8 @@
#define _CCTK_WARNLEVEL_H_
#ifdef __cplusplus
-extern "C" {
+extern "C"
+{
#endif
void CCTK_Warn(int level,
@@ -27,6 +28,8 @@ void CCTK_VWarn(int level,
const char *format, ...);
void CCTK_ParamWarn(const char *thorn, const char *message);
void CCTK_Info(const char *thorn, const char *message);
+
+void CCTKi_NotYetImplemented(const char *message);
#ifdef __cplusplus
}
diff --git a/src/include/cctk_schedule.h b/src/include/cctk_schedule.h
index df2f2a50..4f8cffad 100644
--- a/src/include/cctk_schedule.h
+++ b/src/include/cctk_schedule.h
@@ -50,6 +50,8 @@ int CCTK_ScheduleTraverse(const char *where, void *GH);
int CCTK_ScheduleGHInit(void *GH);
+int CCTK_SchedulePrint(const char *where);
+int CCTK_SchedulePrintTimes(const char *where);
#ifdef __cplusplus
}
diff --git a/src/main/Groups.c b/src/main/Groups.c
index eb53255b..971569e8 100644
--- a/src/main/Groups.c
+++ b/src/main/Groups.c
@@ -19,6 +19,7 @@
#include "cctk_Misc.h"
#include "cctk_Groups.h"
#include "cctk_WarnLevel.h"
+#include "cctk_ParameterFunctions.h"
/*#define DEBUG_GROUPS*/
diff --git a/src/main/InitialiseCactus.c b/src/main/InitialiseCactus.c
index fad375e2..d39c4987 100644
--- a/src/main/InitialiseCactus.c
+++ b/src/main/InitialiseCactus.c
@@ -7,16 +7,19 @@
@enddesc
@@*/
+static char *rcsid = "$Header$";
+
#include <stdio.h>
#include "cctk.h"
#include "cctk_Flesh.h"
+
+#include "cctk_schedule.h"
#include "cctki_schedule.h"
int ProcessCommandLine(int *inargc, char ***inargv, tFleshConfig *ConfigData);
int ProcessEnvironment(int *argc, char ***argv,tFleshConfig *ConfigData);
-static char *rcsid = "$Header$";
/*@@
diff --git a/src/main/InitialiseDataStructures.c b/src/main/InitialiseDataStructures.c
index ad656c03..6bf1443c 100644
--- a/src/main/InitialiseDataStructures.c
+++ b/src/main/InitialiseDataStructures.c
@@ -7,6 +7,8 @@
@enddesc
@@*/
+static char *rcsid = "$Id$";
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -18,8 +20,7 @@
#include "cctk_ActiveThorns.h"
-static char *rcsid = "$Id$";
-
+#include "cctki_Cache.h"
/*@@
@routine InitialiseDataStructures
@@ -59,6 +60,7 @@ int InitialiseDataStructures(tFleshConfig *ConfigData)
/*CCTKi_BindingsScheduleInitialise();*/
CCTKi_ActivateThorn("Cactus");
+ CCTKi_SetupCache();
return 0;
}
diff --git a/src/main/Parameters.c b/src/main/Parameters.c
index 6a3c6698..6716fdbd 100644
--- a/src/main/Parameters.c
+++ b/src/main/Parameters.c
@@ -7,6 +7,8 @@
@enddesc
@@*/
+const char *rcsid="$Header$";
+
#include "config.h"
#include <stdio.h>
@@ -23,7 +25,14 @@
#include "ParameterBindings.h"
#include "cctk_ParameterFunctions.h"
-const char *rcsid="$Header$";
+
+#include "gnu_regex.h"
+
+int CCTK_RegexMatch(const char *string,
+ const char *pattern,
+ const int nmatch,
+ regmatch_t *pmatch);
+
int STR_cmpi(const char *string1, const char *string2);
diff --git a/src/main/ScheduleInterface.c b/src/main/ScheduleInterface.c
index 71cb714f..6359a9af 100644
--- a/src/main/ScheduleInterface.c
+++ b/src/main/ScheduleInterface.c
@@ -129,6 +129,17 @@ static int CCTKi_SchedulePrintTimesFunction(void *function, t_attribute *attribu
static void CCTKi_SchedulePrintTimerInfo(t_TimerInfo *info);
static void CCTKi_SchedulePrintTimerHeaders(t_TimerInfo *info);
+
+/********************************************************************
+ ********************* Other Routine Prototypes *********************
+ ********************************************************************/
+
+/* FIXME: these should be renamed and put in a header somewhere */
+
+int CCTKi_rfrTriggerSaysGo(cGH *GH, int variable);
+int CCTKi_rfrTriggerAction(void *GH, int variable);
+
+
/********************************************************************
********************* Local Data *****************************
********************************************************************/
diff --git a/src/main/ShutdownCactus.c b/src/main/ShutdownCactus.c
index 602936dd..150bc79f 100644
--- a/src/main/ShutdownCactus.c
+++ b/src/main/ShutdownCactus.c
@@ -11,6 +11,8 @@
#include <stdlib.h>
#include "cctk.h"
+#include "cctk_schedule.h"
+
#include "cctk_parameters.h"
static char *rcsid = "$Id$";
diff --git a/src/main/Subsystems.c b/src/main/Subsystems.c
index 1e27f6b5..0d55aa17 100644
--- a/src/main/Subsystems.c
+++ b/src/main/Subsystems.c
@@ -7,7 +7,9 @@
@enddesc
@@*/
+static char *rcsid = "$Header$";
+#include "cctk_Flesh.h"
/*@@
diff --git a/src/schedule/ScheduleCreater.c b/src/schedule/ScheduleCreater.c
index a0d80e05..bfedfa1a 100644
--- a/src/schedule/ScheduleCreater.c
+++ b/src/schedule/ScheduleCreater.c
@@ -492,9 +492,13 @@ static int ScheduleSortGroup(t_sched_group *group)
signed char **array;
int number;
int mod;
- int i, j;
+ int i;
int errcode;
+#ifdef DEBUG_SCHEDULAR
+ int j;
+#endif
+
/* Create the data staructures */
array = CCTKi_ScheduleCreateArray(group->n_scheditems);
order = CCTKi_ScheduleCreateIVec(group->n_scheditems);
diff --git a/src/util/BinaryTree.h b/src/util/BinaryTree.h
index 33e02b62..07356f3f 100644
--- a/src/util/BinaryTree.h
+++ b/src/util/BinaryTree.h
@@ -38,7 +38,7 @@ void TreePrintNodes(t_tree *root, int depth, void (*print_node)(void *, int));
t_tree *TreeFindNode(t_tree *root, void *data, int (*compare)(const void *, const void *));
#ifdef _cplusplus
- }
+}
#endif
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-06 22:56:41 +0000