From 60d768b70f941b0ee004d4ad3fbfa6ab34b31af9 Mon Sep 17 00:00:00 2001 From: allen Date: Wed, 22 May 2002 15:13:55 +0000 Subject: Fixes for macros from Bela git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@42 b1d164ef-f17a-46e7-89d4-021c7118ef4e --- src/macro/DXDB_guts.h | 22 +++++++++++----------- src/macro/DYDB_guts.h | 12 ++++++------ src/macro/DZDB_guts.h | 22 +++++++++++----------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/macro/DXDB_guts.h b/src/macro/DXDB_guts.h index 3b1531b..295da7b 100644 --- a/src/macro/DXDB_guts.h +++ b/src/macro/DXDB_guts.h @@ -43,50 +43,50 @@ end if - if (admmacros_advectiony .eq. 0) then /* CENTER */ + if (admmacros_advectionx .eq. 0) then /* CENTER */ DXDB_DXDBY = DXDB_OO2DX*(DXDB_BY_IP - DXDB_BY_IM) - else if (admmacros_advectiony .eq. 1) then /* UPWIND1 */ + else if (admmacros_advectionx .eq. 1) then /* UPWIND1 */ DXDB_DXDBY = (DXDB_BY_IP - DXDB_BY)/DXDB_DX - else if (admmacros_advectiony .eq. -1) then /* UPWIND1 */ + else if (admmacros_advectionx .eq. -1) then /* UPWIND1 */ DXDB_DXDBY = (DXDB_BY - DXDB_BY_IM)/DXDB_DX - else if (admmacros_advectiony .eq. 2) then /* UPWIND2 */ + else if (admmacros_advectionx .eq. 2) then /* UPWIND2 */ DXDB_DXDBY = - 0.5D0/DXDB_DX \ *(3.0D0*DXDB_BY - 4.0D0*DXDB_BY_IP + DXDB_BY_IPP) - else if (admmacros_advectiony .eq. -2) then /* UPWIND2 */ + else if (admmacros_advectionx .eq. -2) then /* UPWIND2 */ DXDB_DXDBY = 0.5D0/DXDB_DX \ *(3.0D0*DXDB_BY - 4.0D0*DXDB_BY_IM + DXDB_BY_IMM) end if - if (admmacros_advectionz .eq. 0) then /* CENTER */ + if (admmacros_advectionx .eq. 0) then /* CENTER */ DXDB_DXDBZ = DXDB_OO2DX*(DXDB_BZ_IP - DXDB_BZ_IM) - else if (admmacros_advectionz .eq. 1) then /* UPWIND1 */ + else if (admmacros_advectionx .eq. 1) then /* UPWIND1 */ DXDB_DXDBZ = (DXDB_BZ_IP - DXDB_BZ)/DXDB_DX - else if (admmacros_advectionz .eq. -1) then /* UPWIND1 */ + else if (admmacros_advectionx .eq. -1) then /* UPWIND1 */ DXDB_DXDBZ = (DXDB_BZ - DXDB_BZ_IM)/DXDB_DX - else if (admmacros_advectionz .eq. 2) then /* UPWIND2 */ + else if (admmacros_advectionx .eq. 2) then /* UPWIND2 */ DXDB_DXDBZ = - 0.5D0/DXDB_DX \ *(3.0D0*DXDB_BZ - 4.0D0*DXDB_BZ_IP + DXDB_BZ_IPP) - else if (admmacros_advectionz .eq. -2) then /* UPWIND2 */ + else if (admmacros_advectionx .eq. -2) then /* UPWIND2 */ - DXDB_DXDBY = 0.5D0/DXDB_DX \ + DXDB_DXDBZ = 0.5D0/DXDB_DX \ *(3.0D0*DXDB_BZ - 4.0D0*DXDB_BZ_IM + DXDB_BZ_IMM) end if diff --git a/src/macro/DYDB_guts.h b/src/macro/DYDB_guts.h index 536c6fd..43f5b91 100644 --- a/src/macro/DYDB_guts.h +++ b/src/macro/DYDB_guts.h @@ -67,26 +67,26 @@ end if - if (admmacros_advectionz .eq. 0) then /* CENTER */ + if (admmacros_advectiony .eq. 0) then /* CENTER */ DYDB_DYDBZ = DYDB_OO2DY*(DYDB_BZ_JP - DYDB_BZ_JM) - else if (admmacros_advectionz .eq. 1) then /* UPWIND1 */ + else if (admmacros_advectiony .eq. 1) then /* UPWIND1 */ DYDB_DYDBZ = (DYDB_BZ_JP - DYDB_BZ)/DYDB_DY - else if (admmacros_advectionz .eq. -1) then /* UPWIND1 */ + else if (admmacros_advectiony .eq. -1) then /* UPWIND1 */ DYDB_DYDBZ = (DYDB_BZ - DYDB_BZ_JM)/DYDB_DY - else if (admmacros_advectionz .eq. 2) then /* UPWIND2 */ + else if (admmacros_advectiony .eq. 2) then /* UPWIND2 */ DYDB_DYDBZ = - 0.5D0/DYDB_DY \ *(3.0D0*DYDB_BZ - 4.0D0*DYDB_BZ_JP + DYDB_BZ_JPP) - else if (admmacros_advectionz .eq. -2) then /* UPWIND2 */ + else if (admmacros_advectiony .eq. -2) then /* UPWIND2 */ - DYDB_DYDBY = 0.5D0/DYDB_DY \ + DYDB_DYDBZ = 0.5D0/DYDB_DY \ *(3.0D0*DYDB_BZ - 4.0D0*DYDB_BZ_JM + DYDB_BZ_JMM) end if diff --git a/src/macro/DZDB_guts.h b/src/macro/DZDB_guts.h index a83f12a..75b708e 100644 --- a/src/macro/DZDB_guts.h +++ b/src/macro/DZDB_guts.h @@ -19,48 +19,48 @@ DZDB_OO2DZ = 1D0/(2D0*DZDB_DZ) - if (admmacros_advectionx .eq. 0) then /* CENTER */ + if (admmacros_advectionz .eq. 0) then /* CENTER */ DZDB_DZDBX = DZDB_OO2DZ*(DZDB_BX_KP - DZDB_BX_KM) - else if (admmacros_advectionx .eq. 1) then /* UPWIND1 */ + else if (admmacros_advectionz .eq. 1) then /* UPWIND1 */ DZDB_DZDBX = (DZDB_BX_KP - DZDB_BX)/DZDB_DZ - else if (admmacros_advectionx .eq. -1) then /* UPWIND1 */ + else if (admmacros_advectionz .eq. -1) then /* UPWIND1 */ DZDB_DZDBX = (DZDB_BX - DZDB_BX_KM)/DZDB_DZ - else if (admmacros_advectionx .eq. 2) then /* UPWIND2 */ + else if (admmacros_advectionz .eq. 2) then /* UPWIND2 */ DZDB_DZDBX = - 0.5D0/DZDB_DZ \ *(3.0D0*DZDB_BX - 4.0D0*DZDB_BX_KP + DZDB_BX_KPP) - else if (admmacros_advectionx .eq. -2) then /* UPWIND2 */ + else if (admmacros_advectionz .eq. -2) then /* UPWIND2 */ DZDB_DZDBX = 0.5D0/DZDB_DZ \ *(3.0D0*DZDB_BX - 4.0D0*DZDB_BX_KM + DZDB_BX_KMM) end if - if (admmacros_advectiony .eq. 0) then /* CENTER */ + if (admmacros_advectionz .eq. 0) then /* CENTER */ DZDB_DZDBY = DZDB_OO2DZ*(DZDB_BY_KP - DZDB_BY_KM) - else if (admmacros_advectiony .eq. 1) then /* UPWIND1 */ + else if (admmacros_advectionz .eq. 1) then /* UPWIND1 */ DZDB_DZDBY = (DZDB_BY_KP - DZDB_BY)/DZDB_DZ - else if (admmacros_advectiony .eq. -1) then /* UPWIND1 */ + else if (admmacros_advectionz .eq. -1) then /* UPWIND1 */ DZDB_DZDBY = (DZDB_BY - DZDB_BY_KM)/DZDB_DZ - else if (admmacros_advectiony .eq. 2) then /* UPWIND2 */ + else if (admmacros_advectionz .eq. 2) then /* UPWIND2 */ DZDB_DZDBY = - 0.5D0/DZDB_DZ \ *(3.0D0*DZDB_BY - 4.0D0*DZDB_BY_KP + DZDB_BY_KPP) - else if (admmacros_advectiony .eq. -2) then /* UPWIND2 */ + else if (admmacros_advectionz .eq. -2) then /* UPWIND2 */ DZDB_DZDBY = 0.5D0/DZDB_DZ \ *(3.0D0*DZDB_BY - 4.0D0*DZDB_BY_KM + DZDB_BY_KMM) @@ -86,7 +86,7 @@ else if (admmacros_advectionz .eq. -2) then /* UPWIND2 */ - DZDB_DZDBY = 0.5D0/DZDB_DZ \ + DZDB_DZDBZ = 0.5D0/DZDB_DZ \ *(3.0D0*DZDB_BZ - 4.0D0*DZDB_BZ_KM + DZDB_BZ_KMM) end if -- cgit v1.2.3