diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ADMConstraints.F | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/ADMConstraints.F b/src/ADMConstraints.F index 9c30b1b..a4423b9 100644 --- a/src/ADMConstraints.F +++ b/src/ADMConstraints.F @@ -20,11 +20,7 @@ #include "cctk_Parameters.h" #include "cctk_Arguments.h" -#include "cctk_DefineThorn.h" - -#ifdef BETATHORNS_CARTOON2D -#include "BetaThorns/Cartoon2D/src/Cartoon2D_tensors.h" -#endif +#include "cctk_Faces.h" subroutine ADMConstraints(CCTK_ARGUMENTS) @@ -34,6 +30,10 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS +c Function aliases. + + CCTK_INT :: Boundary_SelectVarForBC, Boundary_SelectGroupForBC + integer i,j,k integer nx,ny,nz @@ -278,17 +278,18 @@ c Cartoon. if (cartoon==1) then -#ifdef BETATHORNS_CARTOON2D if (CCTK_IsThornActive("Cartoon2D")==1) then - call BndCartoon2DGN(ierr,cctkGH,TENSORTYPE_SCALAR,"admconstraints::hamiltonian") - call BndCartoon2DGN(ierr,cctkGH,TENSORTYPE_U,"admconstraints::momentum") + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, + $ "admconstraints::ham", "None") + ierr = Boundary_SelectVarForBC(cctkGH, CCTK_ALL_FACES, + $ "admconstraints::hamnormalized", "None") + ierr = Boundary_SelectGroupForBC(cctkGH, CCTK_ALL_FACES, + $ "admconstraints::momentum", "None") + else + call CCTK_WARN(0,"You have not activated Cartoon2D") end if -#else - call CCTK_WARN(0,"You have not compiled with Cartoon2D") -#endif end if return end - |