aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlanfer <lanfer@edbb7e70-9571-45d5-a481-0a560a9b4751>1999-09-16 19:44:08 +0000
committerlanfer <lanfer@edbb7e70-9571-45d5-a481-0a560a9b4751>1999-09-16 19:44:08 +0000
commit7379597d67edd0a4abd8721429792c1f5a9cb1d1 (patch)
tree093c1784d62a925399fce4ae9597933ec9072245
parent6a425f2382903a1abdbd712355fb6533dc04bf57 (diff)
making slicing less strict ERRORS->WARNINGS
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/CoordGauge/trunk@10 edbb7e70-9571-45d5-a481-0a560a9b4751
-rw-r--r--src/Slicing.c24
1 files changed, 16 insertions, 8 deletions
diff --git a/src/Slicing.c b/src/Slicing.c
index c24587d..7359912 100644
--- a/src/Slicing.c
+++ b/src/Slicing.c
@@ -223,12 +223,20 @@ void Einstein_ActivateSlicing(cGH *GH) {
DECLARE_CCTK_PARAMETERS
struct Einstein_slicing *slic;
-
- int handle, priority, h;
+ CCTK_INT *active_slicing_handle;
+
+ int handle, priority, h,i;
char *err, *split_string;
char *item=NULL, *after=NULL;
+ /* Get our grid scalar pointer: initialize with -1*/
+ i = CCTK_VarIndex("Einstein::active_slicing_handle");
+ if (i<0) CCTK_WARN(0,"INTERNAL ERROR: cannot find grid scalar: active_slicing_handle");
+ active_slicing_handle = (CCTK_INT *)CCTK_VarDataPtrI(GH,0,i);
+ *active_slicing_handle = -1;
+
+
/* we have a clearly defined slicing - no "mixed" */
if (!CCTK_Equals(slicing,"mixed"))
{
@@ -237,10 +245,10 @@ void Einstein_ActivateSlicing(cGH *GH) {
if (handle<0) {
err = (char*)malloc(256*sizeof(char));
sprintf(err,"%s%s%s%s",
- "ERROR: cannot get handle for slicing: >>",
+ "WARNING: cannot get handle for slicing: >>",
slicing,
- "<< \nTypo? Is that slicing registered by its provider",
- "with Einstein_RegisterSlicing?\n");
+ "<< \nTypo? Slicing registered by its provider ",
+ "with Einstein_RegisterSlicing? \nProb. fatal when you continue to evolve.\n");
CCTK_WARN(1,err);
if (err) free(err);
return;
@@ -348,9 +356,9 @@ int Einstein_GetSlicingHandle(const char *name) {
handle = Util_GetHandle(Eslicings,name,NULL);
if (handle<0) {
err = (char*)malloc(256*sizeof(char));
- sprintf(err,"ERROR: cannot get handle for slicing %s\n%s",name,
- "Typo ? Is this slicing registered by the thorn ? ");
- CCTK_WARN(0,err);
+ sprintf(err,"WARNING: cannot get handle for slicing %s\n%s",name,
+ "Typo ? Slicing registered by the thorn ? Prob. fatal if you continue evolving. ");
+ CCTK_WARN(1,err);
if (err) free(err);
}
return(handle);