diff options
author | pollney <pollney@b1d164ef-f17a-46e7-89d4-021c7118ef4e> | 2003-06-26 11:37:17 +0000 |
---|---|---|
committer | pollney <pollney@b1d164ef-f17a-46e7-89d4-021c7118ef4e> | 2003-06-26 11:37:17 +0000 |
commit | f6be10b987d8db12434c2607dcd6d434a277157b (patch) | |
tree | bdfcb7c3758a15d492447b34e2fd727e2ab56aa5 /src/macro/DZZDG_guts.h | |
parent | 948ce995e5d8976df0b5a69d7f4c3cb63a3448da (diff) |
Update of macros for 4th order differencing.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@53 b1d164ef-f17a-46e7-89d4-021c7118ef4e
Diffstat (limited to 'src/macro/DZZDG_guts.h')
-rw-r--r-- | src/macro/DZZDG_guts.h | 48 |
1 files changed, 34 insertions, 14 deletions
diff --git a/src/macro/DZZDG_guts.h b/src/macro/DZZDG_guts.h index 601589b..853c12d 100644 --- a/src/macro/DZZDG_guts.h +++ b/src/macro/DZZDG_guts.h @@ -20,33 +20,53 @@ #ifdef FCODE - DZZDG_OODZ2 = 1D0/(dz*dz) +#include "ADM_Derivative.h" /* Factor involving 2nd derivative of conformal factor */ IF (conformal_state .eq. 0) THEN DZZDG_FAC = 0 ELSE - DZZDG_FAC = DZDG_PSI4*(4*DZZDG_DZZDPSI_O_PSI + 12*DZDG_DZDPSI_O_PSI*DZDG_DZDPSI_O_PSI) + DZZDG_FAC = DZDG_PSI4*(4*DZZDG_DZZDPSI_O_PSI \ + + 12*DZDG_DZDPSI_O_PSI*DZDG_DZDPSI_O_PSI) ENDIF - DZZDG_DZZDGXX = 2*DZDCG_DZDCGXX*DZDG_FAC+DZZDG_FAC*DZDG_GXX+DZDG_PSI4 \ - *DZZDG_OODZ2*(DZDCG_GXX_KP-2*DZDG_GXX+DZDCG_GXX_KM) + if (spatial_order.eq.2) then + DZZDG_DZZDGXX = 2*DZDCG_DZDCGXX*DZDG_FAC + DZZDG_FAC*DZDG_GXX \ + + DZDG_PSI4*ADM_DZZ_2(gxx,i,j,k) - DZZDG_DZZDGXY = 2*DZDCG_DZDCGXY*DZDG_FAC+DZZDG_FAC*DZDG_GXY+DZDG_PSI4 \ - *DZZDG_OODZ2*(DZDCG_GXY_KP-2*DZDG_GXY+DZDCG_GXY_KM) + DZZDG_DZZDGXY = 2*DZDCG_DZDCGXY*DZDG_FAC + DZZDG_FAC*DZDG_GXY \ + + DZDG_PSI4*ADM_DZZ_2(gxy,i,j,k) - DZZDG_DZZDGXZ = 2*DZDCG_DZDCGXZ*DZDG_FAC+DZZDG_FAC*DZDG_GXZ+DZDG_PSI4 \ - *DZZDG_OODZ2*(DZDCG_GXZ_KP-2*DZDG_GXZ+DZDCG_GXZ_KM) + DZZDG_DZZDGXZ = 2*DZDCG_DZDCGXZ*DZDG_FAC + DZZDG_FAC*DZDG_GXZ \ + + DZDG_PSI4*ADM_DZZ_2(gxz,i,j,k) - DZZDG_DZZDGYY = 2*DZDCG_DZDCGYY*DZDG_FAC+DZZDG_FAC*DZDG_GYY+DZDG_PSI4 \ - *DZZDG_OODZ2*(DZDCG_GYY_KP-2*DZDG_GYY+DZDCG_GYY_KM) + DZZDG_DZZDGYY = 2*DZDCG_DZDCGYY*DZDG_FAC + DZZDG_FAC*DZDG_GYY \ + + DZDG_PSI4*ADM_DZZ_2(gyy,i,j,k) - DZZDG_DZZDGYZ = 2*DZDCG_DZDCGYZ*DZDG_FAC+DZZDG_FAC*DZDG_GYZ+DZDG_PSI4 \ - *DZZDG_OODZ2*(DZDCG_GYZ_KP-2*DZDG_GYZ+DZDCG_GYZ_KM) + DZZDG_DZZDGYZ = 2*DZDCG_DZDCGYZ*DZDG_FAC + DZZDG_FAC*DZDG_GYZ \ + + DZDG_PSI4*ADM_DZZ_2(gyz,i,j,k) - DZZDG_DZZDGZZ = 2*DZDCG_DZDCGZZ*DZDG_FAC+DZZDG_FAC*DZDG_GZZ+DZDG_PSI4 \ - *DZZDG_OODZ2*(DZDCG_GZZ_KP-2*DZDG_GZZ+DZDCG_GZZ_KM) + DZZDG_DZZDGZZ = 2*DZDCG_DZDCGZZ*DZDG_FAC + DZZDG_FAC*DZDG_GZZ \ + + DZDG_PSI4*ADM_DZZ_2(gzz,i,j,k) + else + DZZDG_DZZDGXX = 2*DZDCG_DZDCGXX*DZDG_FAC + DZZDG_FAC*DZDG_GXX \ + + DZDG_PSI4*ADM_DZZ_4(gxx,i,j,k) + DZZDG_DZZDGXY = 2*DZDCG_DZDCGXY*DZDG_FAC + DZZDG_FAC*DZDG_GXY \ + + DZDG_PSI4*ADM_DZZ_4(gxy,i,j,k) + + DZZDG_DZZDGXZ = 2*DZDCG_DZDCGXZ*DZDG_FAC + DZZDG_FAC*DZDG_GXZ \ + + DZDG_PSI4*ADM_DZZ_4(gxz,i,j,k) + + DZZDG_DZZDGYY = 2*DZDCG_DZDCGYY*DZDG_FAC + DZZDG_FAC*DZDG_GYY \ + + DZDG_PSI4*ADM_DZZ_4(gyy,i,j,k) + + DZZDG_DZZDGYZ = 2*DZDCG_DZDCGYZ*DZDG_FAC + DZZDG_FAC*DZDG_GYZ \ + + DZDG_PSI4*ADM_DZZ_4(gyz,i,j,k) + + DZZDG_DZZDGZZ = 2*DZDCG_DZDCGZZ*DZDG_FAC + DZZDG_FAC*DZDG_GZZ \ + + DZDG_PSI4*ADM_DZZ_4(gzz,i,j,k) + end if #endif #ifdef CCODE |