From 2eb03eb0fe89cb2e188bf35a352b6f8a937286a4 Mon Sep 17 00:00:00 2001 From: goodale Date: Sat, 27 Mar 2004 17:39:45 +0000 Subject: Untabified. Maybe this will help with the problem with the cpp in older versions of gcc. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@67 b1d164ef-f17a-46e7-89d4-021c7118ef4e --- src/macro/ADM_Derivative.h | 12 ++++++------ src/macro/DXZDG_guts.h | 6 +++--- src/macro/DYZDG_guts.h | 4 ++-- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/macro/ADM_Derivative.h b/src/macro/ADM_Derivative.h index 8e62310..802bcb9 100644 --- a/src/macro/ADM_Derivative.h +++ b/src/macro/ADM_Derivative.h @@ -80,17 +80,17 @@ #define ADM_ADV_DZ_M1(var,i,j,k) betaz(i,j,k)*IDZ*(var(i,j,k) - var(i,j,k-1)) #define ADM_ADV_DX_P2(var,i,j,k) betax(i,j,k)*I2DX*(-3.d0*var(i,j,k) \ - + 4.d0*var(i+1,j,k) - var(i+2,j,k)) + + 4.d0*var(i+1,j,k) - var(i+2,j,k)) #define ADM_ADV_DY_P2(var,i,j,k) betay(i,j,k)*I2DY*(-3.d0*var(i,j,k) \ - + 4.d0*var(i,j+1,k) - var(i,j+2,k)) + + 4.d0*var(i,j+1,k) - var(i,j+2,k)) #define ADM_ADV_DZ_P2(var,i,j,k) betaz(i,j,k)*I2DZ*(-3.d0*var(i,j,k) \ - + 4.d0*var(i,j,k+1) - var(i,j,k+2)) + + 4.d0*var(i,j,k+1) - var(i,j,k+2)) #define ADM_ADV_DX_M2(var,i,j,k) betax(i,j,k)*I2DX*(3.d0*var(i,j,k) \ - - 4.d0*var(i-1,j,k) + var(i-2,j,k)) + - 4.d0*var(i-1,j,k) + var(i-2,j,k)) #define ADM_ADV_DY_M2(var,i,j,k) betay(i,j,k)*I2DY*(3.d0*var(i,j,k) \ - - 4.d0*var(i,j-1,k) + var(i,j-2,k)) + - 4.d0*var(i,j-1,k) + var(i,j-2,k)) #define ADM_ADV_DZ_M2(var,i,j,k) betaz(i,j,k)*I2DZ*(3.d0*var(i,j,k) \ - - 4.d0*var(i,j,k-1) + var(i,j,k-2)) + - 4.d0*var(i,j,k-1) + var(i,j,k-2)) #endif diff --git a/src/macro/DXZDG_guts.h b/src/macro/DXZDG_guts.h index 129cb85..029aa82 100644 --- a/src/macro/DXZDG_guts.h +++ b/src/macro/DXZDG_guts.h @@ -96,15 +96,15 @@ DXZDG_DXZDGYY = DZDCG_DZDCGYY*DXDG_FAC+DXDCG_DXDCGYY*DZDG_FAC+DXZDG_FAC*DXDG_GYY+ DXDG_PSI4*DXZDG_OO4DXDZ*(DXZDG_GYY_IPKP-DXZDG_GYY_IPKM-DXZDG_GYY_IMKP+ - DXZDG_GYY_IMKM); + DXZDG_GYY_IMKM); DXZDG_DXZDGYZ = DZDCG_DZDCGYZ*DXDG_FAC+DXDCG_DXDCGYZ*DZDG_FAC+DXZDG_FAC*DXDG_GYZ+ DXDG_PSI4*DXZDG_OO4DXDZ*(DXZDG_GYZ_IPKP-DXZDG_GYZ_IPKM-DXZDG_GYZ_IMKP+ - DXZDG_GYZ_IMKM); + DXZDG_GYZ_IMKM); DXZDG_DXZDGZZ = DZDCG_DZDCGZZ*DXDG_FAC+DXDCG_DXDCGZZ*DZDG_FAC+DXZDG_FAC*DXDG_GZZ+ DXDG_PSI4*DXZDG_OO4DXDZ*(DXZDG_GZZ_IPKP-DXZDG_GZZ_IPKM-DXZDG_GZZ_IMKP+ - DXZDG_GZZ_IMKM); + DXZDG_GZZ_IMKM); #endif diff --git a/src/macro/DYZDG_guts.h b/src/macro/DYZDG_guts.h index f5ea2c4..28dd4e6 100644 --- a/src/macro/DYZDG_guts.h +++ b/src/macro/DYZDG_guts.h @@ -89,7 +89,7 @@ DYZDG_DYZDGXZ = DZDCG_DZDCGXZ*DYDG_FAC+DYDCG_DYDCGXZ*DZDG_FAC+DYZDG_FAC*DYDG_GXZ +DYDG_PSI4*DYZDG_OO4DYDZ*(DYZDG_GXZ_JPKP-DYZDG_GXZ_JPKM-DYZDG_GXZ_JMKP - +DYZDG_GXZ_JMKM); + +DYZDG_GXZ_JMKM); DYZDG_DYZDGYY = DZDCG_DZDCGYY*DYDG_FAC+DYDCG_DYDCGYY*DZDG_FAC+DYZDG_FAC*DYDG_GYY +DYDG_PSI4*DYZDG_OO4DYDZ*(DYZDG_GYY_JPKP-DYZDG_GYY_JPKM-DYZDG_GYY_JMKP @@ -97,7 +97,7 @@ DYZDG_DYZDGYZ = DZDCG_DZDCGYZ*DYDG_FAC+DYDCG_DYDCGYZ*DZDG_FAC+DYZDG_FAC*DYDG_GYZ +DYDG_PSI4*DYZDG_OO4DYDZ*(DYZDG_GYZ_JPKP-DYZDG_GYZ_JPKM-DYZDG_GYZ_JMKP - +DYZDG_GYZ_JMKM); + +DYZDG_GYZ_JMKM); DYZDG_DYZDGZZ = DZDCG_DZDCGZZ*DYDG_FAC+DYDCG_DYDCGZZ*DZDG_FAC+DYZDG_FAC*DYDG_GZZ +DYDG_PSI4*DYZDG_OO4DYDZ*(DYZDG_GZZ_JPKP-DYZDG_GZZ_JPKM-DYZDG_GZZ_JMKP -- cgit v1.2.3