diff options
Diffstat (limited to 'src/Slicing.c')
| -rw-r--r-- | src/Slicing.c | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/src/Slicing.c b/src/Slicing.c index 4df0739..7868ab1 100644 --- a/src/Slicing.c +++ b/src/Slicing.c @@ -236,7 +236,7 @@ void Einstein_ActivateSlicing(cGH *GH) char *item=NULL, *after=NULL; /* Get our grid scalar pointer: initialize with -1*/ - i = CCTK_VarIndex("Einstein::active_slicing_handle"); + i = CCTK_VarIndex("CoordGauge::active_slicing_handle"); if (i<0) { CCTK_WARN(0,"Cannot find grid scalar: active_slicing_handle"); @@ -246,19 +246,14 @@ void Einstein_ActivateSlicing(cGH *GH) /* we have a clearly defined slicing - no "mixed" */ - if (!CCTK_Equals(slicing,"mixed")) + if (!CCTK_Equals(lapse_evolution_method,"coordgauge")) { - handle= Util_GetHandle(Eslicings,slicing,NULL); + handle= Util_GetHandle(Eslicings,lapse_evolution_method,NULL); if (handle<0) { - /* If slicing is set to "none", only warn level 2 (could be initial data only) */ - if (CCTK_Equals(slicing,"none")) - { - CCTK_WARN(2,"No slicing set. Probably fatal for evolution"); - } - else if (CCTK_Equals(slicing,"static")) + if (CCTK_Equals(lapse_evolution_method,"static")) { handle2=Einstein_RegisterSlicing("static"); if (handle2<0) @@ -266,7 +261,7 @@ void Einstein_ActivateSlicing(cGH *GH) CCTK_WARN(1,"Cannot register static slicing"); } } - else if (CCTK_Equals(slicing,"geodesic")) + else if (CCTK_Equals(lapse_evolution_method,"geodesic")) { handle2=Einstein_RegisterSlicing("geodesic"); if (handle2<0) @@ -277,7 +272,7 @@ void Einstein_ActivateSlicing(cGH *GH) else { CCTK_VWarn(1,__LINE__,__FILE__,CCTK_THORNSTRING, - "Cannot get handle for slicing %s",slicing); + "Cannot get handle for slicing %s",lapse_evolution_method); } return; } @@ -312,8 +307,8 @@ void Einstein_ActivateSlicing(cGH *GH) */ /* we attach an additional space for string splitting */ - split_string= (char*)malloc(strlen(mixed_slicing)*sizeof(char)+2); - sprintf(split_string,"%s ",mixed_slicing); + split_string= (char*)malloc(strlen(lapse_list)*sizeof(char)+2); + sprintf(split_string,"%s ",lapse_list); /* Here we take the string appart */ Util_SplitString(&item,&after,split_string," "); @@ -471,16 +466,16 @@ void Einstein_SetNextSlicing(cGH *GH) /* Get our grid scalar pointer */ - i = CCTK_VarIndex("Einstein::active_slicing_handle"); + i = CCTK_VarIndex("CoordGauge::active_slicing_handle"); if (i<0) { CCTK_WARN(0,"Cannot find grid scalar: active_slicing_handle"); } active_slicing_handle = (CCTK_INT *)CCTK_VarDataPtrI(GH,0,i); - if (!CCTK_Equals(slicing,"mixed")) + if (!CCTK_Equals(lapse_evolution_method,"coordgauge")) { - h = Util_GetHandle(Eslicings,slicing,NULL); + h = Util_GetHandle(Eslicings,lapse_evolution_method,NULL); if (h<0) { CCTK_WARN(0,"Slicing parameter specifies non-activated/registered slicing!"); @@ -591,14 +586,3 @@ void Einstein_SetNextSlicing(cGH *GH) } - - - - - - - - - - - |