diff options
| author | allen <allen@b1d164ef-f17a-46e7-89d4-021c7118ef4e> | 2002-05-21 17:05:45 +0000 |
|---|---|---|
| committer | allen <allen@b1d164ef-f17a-46e7-89d4-021c7118ef4e> | 2002-05-21 17:05:45 +0000 |
| commit | 5bc50fd3a4ef4e51ce51d85b8382dc35d0d2a5b3 (patch) | |
| tree | a907e579efc1945ef01c8c8b83c0aa5db9641dfd | |
| parent | 705a773cfc3469379b826dac645af2b3bca9d6d8 (diff) | |
Declare needed variables and fixed a typo
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@40 b1d164ef-f17a-46e7-89d4-021c7118ef4e
| -rw-r--r-- | src/macro/DXDB_declare.h | 7 | ||||
| -rw-r--r-- | src/macro/DYDB_declare.h | 7 | ||||
| -rw-r--r-- | src/macro/DZDB_declare.h | 7 | ||||
| -rw-r--r-- | src/macro/DZDB_guts.h | 24 | ||||
| -rw-r--r-- | src/macro/LIEG_declare.h | 3 |
5 files changed, 36 insertions, 12 deletions
diff --git a/src/macro/DXDB_declare.h b/src/macro/DXDB_declare.h index 54aaaf6..cab9b4e 100644 --- a/src/macro/DXDB_declare.h +++ b/src/macro/DXDB_declare.h @@ -67,6 +67,13 @@ CCTK_REAL DXDB_DXDBY CCTK_REAL DXDB_DXDBZ +#ifndef ADMMACROS_ADVECTION + integer admmacros_advectionx + integer admmacros_advectiony + integer admmacros_advectionz +#define ADMMACROS_ADVECTION +#endif + #endif diff --git a/src/macro/DYDB_declare.h b/src/macro/DYDB_declare.h index 3b73b7d..5d268dd 100644 --- a/src/macro/DYDB_declare.h +++ b/src/macro/DYDB_declare.h @@ -67,6 +67,13 @@ CCTK_REAL DYDB_DYDBY CCTK_REAL DYDB_DYDBZ +#ifndef ADMMACROS_ADVECTION + integer admmacros_advectionx + integer admmacros_advectiony + integer admmacros_advectionz +#define ADMMACROS_ADVECTION +#endif + #endif #ifdef CCODE diff --git a/src/macro/DZDB_declare.h b/src/macro/DZDB_declare.h index 6e08b3a..ab3a7ea 100644 --- a/src/macro/DZDB_declare.h +++ b/src/macro/DZDB_declare.h @@ -67,6 +67,13 @@ CCTK_REAL DZDB_DZDBY CCTK_REAL DZDB_DZDBZ +#ifndef ADMMACROS_ADVECTION + integer admmacros_advectionx + integer admmacros_advectiony + integer admmacros_advectionz +#define ADMMACROS_ADVECTION +#endif + #endif #ifdef CCODE diff --git a/src/macro/DZDB_guts.h b/src/macro/DZDB_guts.h index adcb1d1..a83f12a 100644 --- a/src/macro/DZDB_guts.h +++ b/src/macro/DZDB_guts.h @@ -25,20 +25,20 @@ else if (admmacros_advectionx .eq. 1) then /* UPWIND1 */ - DZDB_DZDBX = (DZDB_BX_KP - DZDB_BX)/DZDB_DX + DZDB_DZDBX = (DZDB_BX_KP - DZDB_BX)/DZDB_DZ else if (admmacros_advectionx .eq. -1) then /* UPWIND1 */ - DZDB_DZDBX = (DZDB_BX - DZDB_BX_KM)/DZDB_DX + DZDB_DZDBX = (DZDB_BX - DZDB_BX_KM)/DZDB_DZ else if (admmacros_advectionx .eq. 2) then /* UPWIND2 */ - DZDB_DZDBX = - 0.5D0/DZDB_DX \ + 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 */ - DZDB_DZDBX = 0.5D0/DZDB_DX \ + DZDB_DZDBX = 0.5D0/DZDB_DZ \ *(3.0D0*DZDB_BX - 4.0D0*DZDB_BX_KM + DZDB_BX_KMM) end if @@ -49,20 +49,20 @@ else if (admmacros_advectiony .eq. 1) then /* UPWIND1 */ - DZDB_DZDBY = (DZDB_BY_KP - DZDB_BY)/DZDB_DX + DZDB_DZDBY = (DZDB_BY_KP - DZDB_BY)/DZDB_DZ else if (admmacros_advectiony .eq. -1) then /* UPWIND1 */ - DZDB_DZDBY = (DZDB_BY - DZDB_BY_KM)/DZDB_DX + DZDB_DZDBY = (DZDB_BY - DZDB_BY_KM)/DZDB_DZ else if (admmacros_advectiony .eq. 2) then /* UPWIND2 */ - DZDB_DZDBY = - 0.5D0/DZDB_DX \ + 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 */ - DZDB_DZDBY = 0.5D0/DZDB_DX \ + DZDB_DZDBY = 0.5D0/DZDB_DZ \ *(3.0D0*DZDB_BY - 4.0D0*DZDB_BY_KM + DZDB_BY_KMM) end if @@ -73,20 +73,20 @@ else if (admmacros_advectionz .eq. 1) then /* UPWIND1 */ - DZDB_DZDBZ = (DZDB_BZ_KP - DZDB_BZ)/DZDB_DX + DZDB_DZDBZ = (DZDB_BZ_KP - DZDB_BZ)/DZDB_DZ else if (admmacros_advectionz .eq. -1) then /* UPWIND1 */ - DZDB_DZDBZ = (DZDB_BZ - DZDB_BZ_KM)/DZDB_DX + DZDB_DZDBZ = (DZDB_BZ - DZDB_BZ_KM)/DZDB_DZ else if (admmacros_advectionz .eq. 2) then /* UPWIND2 */ - DZDB_DZDBZ = - 0.5D0/DZDB_DX \ + DZDB_DZDBZ = - 0.5D0/DZDB_DZ \ *(3.0D0*DZDB_BZ - 4.0D0*DZDB_BZ_KP + DZDB_BZ_KPP) else if (admmacros_advectionz .eq. -2) then /* UPWIND2 */ - DZDB_DZDBY = 0.5D0/DZDB_DX \ + DZDB_DZDBY = 0.5D0/DZDB_DZ \ *(3.0D0*DZDB_BZ - 4.0D0*DZDB_BZ_KM + DZDB_BZ_KMM) end if diff --git a/src/macro/LIEG_declare.h b/src/macro/LIEG_declare.h index 4737407..632f0d2 100644 --- a/src/macro/LIEG_declare.h +++ b/src/macro/LIEG_declare.h @@ -59,9 +59,12 @@ CCTK_REAL LIEG_LGYZ CCTK_REAL LIEG_LGZZ +#ifndef ADMMACROS_ADVECTION integer admmacros_advectionx integer admmacros_advectiony integer admmacros_advectionz +#define ADMMACROS_ADVECTION +#endif #endif |