From c76ffda57fa1a5090ff6ae1d9d846553c25333d2 Mon Sep 17 00:00:00 2001 From: hawke Date: Tue, 26 Apr 2005 10:37:19 +0000 Subject: Move boundary conditions to a separate routine, scheduled in level mode. This removes warnings from thorn Boundary when run in MultiPatch. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/ADMConstraints/trunk@113 b7a48df3-cbbf-4440-997f-b4b717c9f7fc --- schedule.ccl | 16 ++++++++++++++-- src/ADMConstraints.F | 21 +++++++++++++++++---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/schedule.ccl b/schedule.ccl index c856ecf..1b687c0 100644 --- a/schedule.ccl +++ b/schedule.ccl @@ -25,7 +25,13 @@ if (constraints_persist) LANG: Fortran } "Evaluate ADM constraints for use in other routines" - schedule GROUP ApplyBCs as ADMConstraints_ApplyBCs at CCTK_POSTSTEP after ADMConstraints + schedule ADMConstraints_Boundaries at CCTK_POSTSTEP after ADMConstraints + { + LANG: Fortran + OPTIONS: LEVEL + } "Apply boundary conditions to the ADM constraints" + + schedule GROUP ApplyBCs as ADMConstraints_ApplyBCs at CCTK_POSTSTEP after ADMConstraints_Boundaries { SYNC: hamiltonian, normalized_hamiltonian, momentum } "Apply (symmetry) boundary conditions" @@ -44,7 +50,13 @@ else LANG: Fortran } "Evaluate ADM constraints" - schedule GROUP ApplyBCs as ADMConstraints_ApplyBCs in ADMConstraintsGroup after ADMConstraints + schedule ADMConstraints_Boundaries in ADMConstraintsGroup after ADMConstraints + { + LANG: Fortran + OPTIONS: LEVEL + } "Apply boundary conditions to the ADM constraints" + + schedule GROUP ApplyBCs as ADMConstraints_ApplyBCs in ADMConstraintsGroup after ADMConstraints_Boundaries { } "Apply (symmetry) boundary conditions" } diff --git a/src/ADMConstraints.F b/src/ADMConstraints.F index 4abc93e..36308c5 100644 --- a/src/ADMConstraints.F +++ b/src/ADMConstraints.F @@ -45,10 +45,6 @@ c flags for excision integer ex_field, ex_type_excised -c Return code from Cactus sync routine and boundary conditions. - - integer ierr - c Various real variables. CCTK_REAL m_rho,m_sx,m_sy,m_sz @@ -274,6 +270,23 @@ c = - (T_{i0} - beta^j T_{ij})/alpha #include "CactusEinstein/ADMMacros/src/macro/MOMYADM_undefine.h" #include "CactusEinstein/ADMMacros/src/macro/MOMZADM_undefine.h" + return + end + + + + subroutine ADMConstraints_Boundaries(CCTK_ARGUMENTS) + + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + +c Return code from Cactus sync routine and boundary conditions. + + integer ierr + c Apply flat boundary conditions at outer boundaries. if (CCTK_Equals(bound,"flat") == 1) then -- cgit v1.2.3