aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhawke <hawke@b1d164ef-f17a-46e7-89d4-021c7118ef4e>2002-05-17 19:29:43 +0000
committerhawke <hawke@b1d164ef-f17a-46e7-89d4-021c7118ef4e>2002-05-17 19:29:43 +0000
commit9a006369da98acdb4c94a8c9b2ec6e71be538bee (patch)
treec35b5aa8262e2691fc0aee021baf11a386980590
parent471e57dfab1004d58813686db201fbe3c679b698 (diff)
Change the Fortran continuation lines to C style macros. This allows them to be used in free format Fortran code.
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@38 b1d164ef-f17a-46e7-89d4-021c7118ef4e
Diffstat
-rw-r--r--src/macro/CDXCDK_guts.h32
-rw-r--r--src/macro/CDYCDK_guts.h30
-rw-r--r--src/macro/CDZCDK_guts.h30
-rw-r--r--src/macro/DETG_guts.h4
-rw-r--r--src/macro/DXXDG_guts.h24
-rw-r--r--src/macro/DXYDG_guts.h36
-rw-r--r--src/macro/DXZDG_guts.h36
-rw-r--r--src/macro/DYYDG_guts.h24
-rw-r--r--src/macro/DYZDG_guts.h36
-rw-r--r--src/macro/DZZDG_guts.h24
-rw-r--r--src/macro/GAMMA_guts.h18
-rw-r--r--src/macro/KK_guts.h52
-rw-r--r--src/macro/LIEG_guts.h318
-rw-r--r--src/macro/LIEK_guts.h350
-rw-r--r--src/macro/MOMXADM_guts.h10
-rw-r--r--src/macro/MOMYADM_guts.h10
-rw-r--r--src/macro/MOMZADM_guts.h8
-rw-r--r--src/macro/NABA_guts.h6
-rw-r--r--src/macro/RICCI_guts.h144
-rw-r--r--src/macro/TRKK_guts.h6
-rw-r--r--src/macro/TRK_guts.h6
-rw-r--r--src/macro/TRRICCI_guts.h6
-rw-r--r--src/macro/TRT_guts.h18
-rw-r--r--src/macro/WAVEG_guts.h82
24 files changed, 655 insertions, 655 deletions
diff --git a/src/macro/CDXCDK_guts.h b/src/macro/CDXCDK_guts.h
index 15ad9fc..7ddee37 100644
--- a/src/macro/CDXCDK_guts.h
+++ b/src/macro/CDXCDK_guts.h
@@ -16,22 +16,22 @@
#ifdef FCODE
- CDXCDK_CDXCDKXX = DXDK_DXDKXX - 2D0*(CHR2_XXX*CDXCDK_KXX
- & + CHR2_YXX*CDXCDK_KXY + CHR2_ZXX*CDXCDK_KXZ)
- CDXCDK_CDXCDKYY = DXDK_DXDKYY - 2D0*(CHR2_XXY*CDXCDK_KXY
- & + CHR2_YXY*CDXCDK_KYY + CHR2_ZXY*CDXCDK_KYZ)
- CDXCDK_CDXCDKZZ = DXDK_DXDKZZ - 2D0*(CHR2_XXZ*CDXCDK_KXZ
- & + CHR2_YXZ*CDXCDK_KYZ + CHR2_ZXZ*CDXCDK_KZZ)
-
- CDXCDK_CDXCDKXY = DXDK_DXDKXY - CHR2_XXY*CDXCDK_KXX -
- & (CHR2_XXX + CHR2_YXY)*CDXCDK_KXY - CHR2_ZXY*CDXCDK_KXZ -
- & CHR2_YXX*CDXCDK_KYY - CHR2_ZXX*CDXCDK_KYZ
- CDXCDK_CDXCDKXZ = DXDK_DXDKXZ - CHR2_XXZ*CDXCDK_KXX -
- & (CHR2_XXX + CHR2_ZXZ)*CDXCDK_KXZ - CHR2_YXZ*CDXCDK_KXY -
- & CHR2_YXX*CDXCDK_KYZ - CHR2_ZXX*CDXCDK_KZZ
- CDXCDK_CDXCDKYZ = DXDK_DXDKYZ - CHR2_XXZ*CDXCDK_KXY -
- & CHR2_XXY*CDXCDK_KXZ - CHR2_YXZ*CDXCDK_KYY -
- & (CHR2_YXY + CHR2_ZXZ)*CDXCDK_KYZ - CHR2_ZXY*CDXCDK_KZZ
+ CDXCDK_CDXCDKXX = DXDK_DXDKXX - 2D0*(CHR2_XXX*CDXCDK_KXX \
+ + CHR2_YXX*CDXCDK_KXY + CHR2_ZXX*CDXCDK_KXZ)
+ CDXCDK_CDXCDKYY = DXDK_DXDKYY - 2D0*(CHR2_XXY*CDXCDK_KXY \
+ + CHR2_YXY*CDXCDK_KYY + CHR2_ZXY*CDXCDK_KYZ)
+ CDXCDK_CDXCDKZZ = DXDK_DXDKZZ - 2D0*(CHR2_XXZ*CDXCDK_KXZ \
+ + CHR2_YXZ*CDXCDK_KYZ + CHR2_ZXZ*CDXCDK_KZZ)
+
+ CDXCDK_CDXCDKXY = DXDK_DXDKXY - CHR2_XXY*CDXCDK_KXX - \
+ (CHR2_XXX + CHR2_YXY)*CDXCDK_KXY - CHR2_ZXY*CDXCDK_KXZ - \
+ CHR2_YXX*CDXCDK_KYY - CHR2_ZXX*CDXCDK_KYZ
+ CDXCDK_CDXCDKXZ = DXDK_DXDKXZ - CHR2_XXZ*CDXCDK_KXX - \
+ (CHR2_XXX + CHR2_ZXZ)*CDXCDK_KXZ - CHR2_YXZ*CDXCDK_KXY - \
+ CHR2_YXX*CDXCDK_KYZ - CHR2_ZXX*CDXCDK_KZZ
+ CDXCDK_CDXCDKYZ = DXDK_DXDKYZ - CHR2_XXZ*CDXCDK_KXY - \
+ CHR2_XXY*CDXCDK_KXZ - CHR2_YXZ*CDXCDK_KYY - \
+ (CHR2_YXY + CHR2_ZXZ)*CDXCDK_KYZ - CHR2_ZXY*CDXCDK_KZZ
#endif
diff --git a/src/macro/CDYCDK_guts.h b/src/macro/CDYCDK_guts.h
index 36d617d..601d366 100644
--- a/src/macro/CDYCDK_guts.h
+++ b/src/macro/CDYCDK_guts.h
@@ -16,26 +16,26 @@
#ifdef FCODE
- CDYCDK_CDYCDKXX = DYDK_DYDKXX - 2D0*(CHR2_XXY*CDYCDK_KXX +
- & CHR2_YXY*CDYCDK_KXY + CHR2_ZXY*CDYCDK_KXZ)
+ CDYCDK_CDYCDKXX = DYDK_DYDKXX - 2D0*(CHR2_XXY*CDYCDK_KXX + \
+ CHR2_YXY*CDYCDK_KXY + CHR2_ZXY*CDYCDK_KXZ)
- CDYCDK_CDYCDKYY = DYDK_DYDKYY - 2D0*(CHR2_XYY*CDYCDK_KXY +
- & CHR2_YYY*CDYCDK_KYY + CHR2_ZYY*CDYCDK_KYZ)
+ CDYCDK_CDYCDKYY = DYDK_DYDKYY - 2D0*(CHR2_XYY*CDYCDK_KXY + \
+ CHR2_YYY*CDYCDK_KYY + CHR2_ZYY*CDYCDK_KYZ)
- CDYCDK_CDYCDKZZ = DYDK_DYDKZZ - 2D0*(CHR2_XYZ*CDYCDK_KXZ +
- & CHR2_YYZ*CDYCDK_KYZ + CHR2_ZYZ*CDYCDK_KZZ)
+ CDYCDK_CDYCDKZZ = DYDK_DYDKZZ - 2D0*(CHR2_XYZ*CDYCDK_KXZ + \
+ CHR2_YYZ*CDYCDK_KYZ + CHR2_ZYZ*CDYCDK_KZZ)
- CDYCDK_CDYCDKXY = DYDK_DYDKXY - (CHR2_XYY*CDYCDK_KXX) -
- & (CHR2_XXY + CHR2_YYY)*CDYCDK_KXY - CHR2_ZYY*CDYCDK_KXZ -
- & CHR2_YXY*CDYCDK_KYY - CHR2_ZXY*CDYCDK_KYZ
+ CDYCDK_CDYCDKXY = DYDK_DYDKXY - (CHR2_XYY*CDYCDK_KXX) - \
+ (CHR2_XXY + CHR2_YYY)*CDYCDK_KXY - CHR2_ZYY*CDYCDK_KXZ - \
+ CHR2_YXY*CDYCDK_KYY - CHR2_ZXY*CDYCDK_KYZ
- CDYCDK_CDYCDKXZ = DYDK_DYDKXZ - (CHR2_XYZ*CDYCDK_KXX) -
- & CHR2_YYZ*CDYCDK_KXY - (CHR2_XXY + CHR2_ZYZ)*CDYCDK_KXZ -
- & CHR2_YXY*CDYCDK_KYZ - CHR2_ZXY*CDYCDK_KZZ
+ CDYCDK_CDYCDKXZ = DYDK_DYDKXZ - (CHR2_XYZ*CDYCDK_KXX) - \
+ CHR2_YYZ*CDYCDK_KXY - (CHR2_XXY + CHR2_ZYZ)*CDYCDK_KXZ - \
+ CHR2_YXY*CDYCDK_KYZ - CHR2_ZXY*CDYCDK_KZZ
- CDYCDK_CDYCDKYZ = DYDK_DYDKYZ -(CHR2_XYZ*CDYCDK_KXY) -
- & CHR2_XYY*CDYCDK_KXZ - CHR2_YYZ*CDYCDK_KYY -
- & (CHR2_YYY + CHR2_ZYZ)*CDYCDK_KYZ - CHR2_ZYY*CDYCDK_KZZ
+ CDYCDK_CDYCDKYZ = DYDK_DYDKYZ -(CHR2_XYZ*CDYCDK_KXY) - \
+ CHR2_XYY*CDYCDK_KXZ - CHR2_YYZ*CDYCDK_KYY - \
+ (CHR2_YYY + CHR2_ZYZ)*CDYCDK_KYZ - CHR2_ZYY*CDYCDK_KZZ
#endif
diff --git a/src/macro/CDZCDK_guts.h b/src/macro/CDZCDK_guts.h
index df119b9..fcfb0aa 100644
--- a/src/macro/CDZCDK_guts.h
+++ b/src/macro/CDZCDK_guts.h
@@ -16,26 +16,26 @@
#ifdef FCODE
- CDZCDK_CDZCDKXX = DZDK_DZDKXX - 2D0*(CHR2_XXZ*CDZCDK_KXX +
- & CHR2_YXZ*CDZCDK_KXY + CHR2_ZXZ*CDZCDK_KXZ)
+ CDZCDK_CDZCDKXX = DZDK_DZDKXX - 2D0*(CHR2_XXZ*CDZCDK_KXX + \
+ CHR2_YXZ*CDZCDK_KXY + CHR2_ZXZ*CDZCDK_KXZ)
- CDZCDK_CDZCDKYY = DZDK_DZDKYY - 2D0*(CHR2_XYZ*CDZCDK_KXY +
- & CHR2_YYZ*CDZCDK_KYY + CHR2_ZYZ*CDZCDK_KYZ)
+ CDZCDK_CDZCDKYY = DZDK_DZDKYY - 2D0*(CHR2_XYZ*CDZCDK_KXY + \
+ CHR2_YYZ*CDZCDK_KYY + CHR2_ZYZ*CDZCDK_KYZ)
- CDZCDK_CDZCDKZZ = DZDK_DZDKZZ - 2D0*(CHR2_XZZ*CDZCDK_KXZ +
- & CHR2_YZZ*CDZCDK_KYZ + CHR2_ZZZ*CDZCDK_KZZ)
+ CDZCDK_CDZCDKZZ = DZDK_DZDKZZ - 2D0*(CHR2_XZZ*CDZCDK_KXZ + \
+ CHR2_YZZ*CDZCDK_KYZ + CHR2_ZZZ*CDZCDK_KZZ)
- CDZCDK_CDZCDKXY = DZDK_DZDKXY-(CHR2_XYZ*CDZCDK_KXX) -
- & (CHR2_XXZ + CHR2_YYZ)*CDZCDK_KXY - CHR2_ZYZ*CDZCDK_KXZ -
- & CHR2_YXZ*CDZCDK_KYY - CHR2_ZXZ*CDZCDK_KYZ
+ CDZCDK_CDZCDKXY = DZDK_DZDKXY-(CHR2_XYZ*CDZCDK_KXX) - \
+ (CHR2_XXZ + CHR2_YYZ)*CDZCDK_KXY - CHR2_ZYZ*CDZCDK_KXZ - \
+ CHR2_YXZ*CDZCDK_KYY - CHR2_ZXZ*CDZCDK_KYZ
- CDZCDK_CDZCDKXZ = DZDK_DZDKXZ-(CHR2_XZZ*CDZCDK_KXX) -
- & CHR2_YZZ*CDZCDK_KXY - (CHR2_XXZ + CHR2_ZZZ)*CDZCDK_KXZ
- & - CHR2_YXZ*CDZCDK_KYZ - CHR2_ZXZ*CDZCDK_KZZ
+ CDZCDK_CDZCDKXZ = DZDK_DZDKXZ-(CHR2_XZZ*CDZCDK_KXX) - \
+ CHR2_YZZ*CDZCDK_KXY - (CHR2_XXZ + CHR2_ZZZ)*CDZCDK_KXZ \
+ - CHR2_YXZ*CDZCDK_KYZ - CHR2_ZXZ*CDZCDK_KZZ
- CDZCDK_CDZCDKYZ = DZDK_DZDKYZ-(CHR2_XZZ*CDZCDK_KXY) -
- & CHR2_XYZ*CDZCDK_KXZ - CHR2_YZZ*CDZCDK_KYY -
- & (CHR2_YYZ + CHR2_ZZZ)*CDZCDK_KYZ - CHR2_ZYZ*CDZCDK_KZZ
+ CDZCDK_CDZCDKYZ = DZDK_DZDKYZ-(CHR2_XZZ*CDZCDK_KXY) - \
+ CHR2_XYZ*CDZCDK_KXZ - CHR2_YZZ*CDZCDK_KYY - \
+ (CHR2_YYZ + CHR2_ZZZ)*CDZCDK_KYZ - CHR2_ZYZ*CDZCDK_KZZ
#endif
diff --git a/src/macro/DETG_guts.h b/src/macro/DETG_guts.h
index 7d836bd..e175125 100644
--- a/src/macro/DETG_guts.h
+++ b/src/macro/DETG_guts.h
@@ -27,8 +27,8 @@ Gabrielle Allen, 5th November 1998
DETG_TEMPZZ = DETG_GXX*DETG_GYY - DETG_GXY*DETG_GXY
/* This is the conformal determinant */
- DETG_DETCG = (DETG_TEMPXX*DETG_GXX +
- & DETG_TEMPXY*DETG_GXY + DETG_TEMPXZ*DETG_GXZ)
+ DETG_DETCG = (DETG_TEMPXX*DETG_GXX + \
+ DETG_TEMPXY*DETG_GXY + DETG_TEMPXZ*DETG_GXZ)
/* This is the physical determinat */
DETG_DETG = DETG_PSI4**3*DETG_DETCG
diff --git a/src/macro/DXXDG_guts.h b/src/macro/DXXDG_guts.h
index 0aad331..ae86e0c 100644
--- a/src/macro/DXXDG_guts.h
+++ b/src/macro/DXXDG_guts.h
@@ -30,23 +30,23 @@
ENDIF
/* Now calculate the second derivatives */
- DXXDG_DXXDGXX = 2*DXDCG_DXDCGXX*DXDG_FAC+DXXDG_FAC*DXDG_GXX+DXDG_PSI4
- & *DXXDG_OODX2*(DXDCG_GXX_IP-2*DXDG_GXX+DXDCG_GXX_IM)
+ DXXDG_DXXDGXX = 2*DXDCG_DXDCGXX*DXDG_FAC+DXXDG_FAC*DXDG_GXX+DXDG_PSI4 \
+ *DXXDG_OODX2*(DXDCG_GXX_IP-2*DXDG_GXX+DXDCG_GXX_IM)
- DXXDG_DXXDGXY = 2*DXDCG_DXDCGXY*DXDG_FAC+DXXDG_FAC*DXDG_GXY+DXDG_PSI4
- & *DXXDG_OODX2*(DXDCG_GXY_IP-2*DXDG_GXY+DXDCG_GXY_IM)
+ DXXDG_DXXDGXY = 2*DXDCG_DXDCGXY*DXDG_FAC+DXXDG_FAC*DXDG_GXY+DXDG_PSI4 \
+ *DXXDG_OODX2*(DXDCG_GXY_IP-2*DXDG_GXY+DXDCG_GXY_IM)
- DXXDG_DXXDGXZ = 2*DXDCG_DXDCGXZ*DXDG_FAC+DXXDG_FAC*DXDG_GXZ+DXDG_PSI4
- & *DXXDG_OODX2*(DXDCG_GXZ_IP-2*DXDG_GXZ+DXDCG_GXZ_IM)
+ DXXDG_DXXDGXZ = 2*DXDCG_DXDCGXZ*DXDG_FAC+DXXDG_FAC*DXDG_GXZ+DXDG_PSI4 \
+ *DXXDG_OODX2*(DXDCG_GXZ_IP-2*DXDG_GXZ+DXDCG_GXZ_IM)
- DXXDG_DXXDGYY = 2*DXDCG_DXDCGYY*DXDG_FAC+DXXDG_FAC*DXDG_GYY+DXDG_PSI4
- & *DXXDG_OODX2*(DXDCG_GYY_IP-2*DXDG_GYY+DXDCG_GYY_IM)
+ DXXDG_DXXDGYY = 2*DXDCG_DXDCGYY*DXDG_FAC+DXXDG_FAC*DXDG_GYY+DXDG_PSI4 \
+ *DXXDG_OODX2*(DXDCG_GYY_IP-2*DXDG_GYY+DXDCG_GYY_IM)
- DXXDG_DXXDGYZ = 2*DXDCG_DXDCGYZ*DXDG_FAC+DXXDG_FAC*DXDG_GYZ+DXDG_PSI4
- & *DXXDG_OODX2*(DXDCG_GYZ_IP-2*DXDG_GYZ+DXDCG_GYZ_IM)
+ DXXDG_DXXDGYZ = 2*DXDCG_DXDCGYZ*DXDG_FAC+DXXDG_FAC*DXDG_GYZ+DXDG_PSI4 \
+ *DXXDG_OODX2*(DXDCG_GYZ_IP-2*DXDG_GYZ+DXDCG_GYZ_IM)
- DXXDG_DXXDGZZ = 2*DXDCG_DXDCGZZ*DXDG_FAC+DXXDG_FAC*DXDG_GZZ+DXDG_PSI4
- & *DXXDG_OODX2*(DXDCG_GZZ_IP-2*DXDG_GZZ+DXDCG_GZZ_IM)
+ DXXDG_DXXDGZZ = 2*DXDCG_DXDCGZZ*DXDG_FAC+DXXDG_FAC*DXDG_GZZ+DXDG_PSI4 \
+ *DXXDG_OODX2*(DXDCG_GZZ_IP-2*DXDG_GZZ+DXDCG_GZZ_IM)
#endif
diff --git a/src/macro/DXYDG_guts.h b/src/macro/DXYDG_guts.h
index fac19cf..de1744e 100644
--- a/src/macro/DXYDG_guts.h
+++ b/src/macro/DXYDG_guts.h
@@ -32,29 +32,29 @@
ENDIF
/* Now calculate the second deriatives */
- DXYDG_DXYDGXX = DYDCG_DYDCGXX*DXDG_FAC+DXDCG_DXDCGXX*DYDG_FAC+DXYDG_FAC*DXDG_GXX
- &+DXDG_PSI4*DXYDG_OO4DXDY*
- &(DXYDG_GXX_IPJP-DXYDG_GXX_IPJM-DXYDG_GXX_IMJP+DXYDG_GXX_IMJM);
+ DXYDG_DXYDGXX = DYDCG_DYDCGXX*DXDG_FAC+DXDCG_DXDCGXX*DYDG_FAC+DXYDG_FAC*DXDG_GXX \
+ +DXDG_PSI4*DXYDG_OO4DXDY* \
+ (DXYDG_GXX_IPJP-DXYDG_GXX_IPJM-DXYDG_GXX_IMJP+DXYDG_GXX_IMJM);
- DXYDG_DXYDGXY = DYDCG_DYDCGXY*DXDG_FAC+DXDCG_DXDCGXY*DYDG_FAC+DXYDG_FAC*DXDG_GXY
- &+DXDG_PSI4*DXYDG_OO4DXDY*
- &(DXYDG_GXY_IPJP-DXYDG_GXY_IPJM-DXYDG_GXY_IMJP+DXYDG_GXY_IMJM);
+ DXYDG_DXYDGXY = DYDCG_DYDCGXY*DXDG_FAC+DXDCG_DXDCGXY*DYDG_FAC+DXYDG_FAC*DXDG_GXY \
+ +DXDG_PSI4*DXYDG_OO4DXDY* \
+ (DXYDG_GXY_IPJP-DXYDG_GXY_IPJM-DXYDG_GXY_IMJP+DXYDG_GXY_IMJM);
- DXYDG_DXYDGXZ = DYDCG_DYDCGXZ*DXDG_FAC+DXDCG_DXDCGXZ*DYDG_FAC+DXYDG_FAC*DXDG_GXZ
- &+DXDG_PSI4*DXYDG_OO4DXDY*
- &(DXYDG_GXZ_IPJP-DXYDG_GXZ_IPJM-DXYDG_GXZ_IMJP+DXYDG_GXZ_IMJM);
+ DXYDG_DXYDGXZ = DYDCG_DYDCGXZ*DXDG_FAC+DXDCG_DXDCGXZ*DYDG_FAC+DXYDG_FAC*DXDG_GXZ \
+ +DXDG_PSI4*DXYDG_OO4DXDY* \
+ (DXYDG_GXZ_IPJP-DXYDG_GXZ_IPJM-DXYDG_GXZ_IMJP+DXYDG_GXZ_IMJM);
- DXYDG_DXYDGYY = DYDCG_DYDCGYY*DXDG_FAC+DXDCG_DXDCGYY*DYDG_FAC+DXYDG_FAC*DXDG_GYY
- &+DXDG_PSI4*DXYDG_OO4DXDY*
- &(DXYDG_GYY_IPJP-DXYDG_GYY_IPJM-DXYDG_GYY_IMJP+DXYDG_GYY_IMJM);
+ DXYDG_DXYDGYY = DYDCG_DYDCGYY*DXDG_FAC+DXDCG_DXDCGYY*DYDG_FAC+DXYDG_FAC*DXDG_GYY \
+ +DXDG_PSI4*DXYDG_OO4DXDY* \
+ (DXYDG_GYY_IPJP-DXYDG_GYY_IPJM-DXYDG_GYY_IMJP+DXYDG_GYY_IMJM);
- DXYDG_DXYDGYZ = DYDCG_DYDCGYZ*DXDG_FAC+DXDCG_DXDCGYZ*DYDG_FAC+DXYDG_FAC*DXDG_GYZ
- &+DXDG_PSI4*DXYDG_OO4DXDY*
- &(DXYDG_GYZ_IPJP-DXYDG_GYZ_IPJM-DXYDG_GYZ_IMJP+DXYDG_GYZ_IMJM);
+ DXYDG_DXYDGYZ = DYDCG_DYDCGYZ*DXDG_FAC+DXDCG_DXDCGYZ*DYDG_FAC+DXYDG_FAC*DXDG_GYZ \
+ +DXDG_PSI4*DXYDG_OO4DXDY* \
+ (DXYDG_GYZ_IPJP-DXYDG_GYZ_IPJM-DXYDG_GYZ_IMJP+DXYDG_GYZ_IMJM);
- DXYDG_DXYDGZZ = DYDCG_DYDCGZZ*DXDG_FAC+DXDCG_DXDCGZZ*DYDG_FAC+DXYDG_FAC*DXDG_GZZ
- &+DXDG_PSI4*DXYDG_OO4DXDY*
- &(DXYDG_GZZ_IPJP-DXYDG_GZZ_IPJM-DXYDG_GZZ_IMJP+DXYDG_GZZ_IMJM);
+ DXYDG_DXYDGZZ = DYDCG_DYDCGZZ*DXDG_FAC+DXDCG_DXDCGZZ*DYDG_FAC+DXYDG_FAC*DXDG_GZZ \
+ +DXDG_PSI4*DXYDG_OO4DXDY* \
+ (DXYDG_GZZ_IPJP-DXYDG_GZZ_IPJM-DXYDG_GZZ_IMJP+DXYDG_GZZ_IMJM);
#endif
diff --git a/src/macro/DXZDG_guts.h b/src/macro/DXZDG_guts.h
index d68e200..4978507 100644
--- a/src/macro/DXZDG_guts.h
+++ b/src/macro/DXZDG_guts.h
@@ -32,29 +32,29 @@
ENDIF
/* Now calculate the second deriatives */
- DXZDG_DXZDGXX = DZDCG_DZDCGXX*DXDG_FAC+DXDCG_DXDCGXX*DZDG_FAC+DXZDG_FAC*DXDG_GXX+
- &DXDG_PSI4*DXZDG_OO4DXDZ*(DXZDG_GXX_IPKP-DXZDG_GXX_IPKM-DXZDG_GXX_IMKP+
- &DXZDG_GXX_IMKM)
+ DXZDG_DXZDGXX = DZDCG_DZDCGXX*DXDG_FAC+DXDCG_DXDCGXX*DZDG_FAC+DXZDG_FAC*DXDG_GXX+ \
+ DXDG_PSI4*DXZDG_OO4DXDZ*(DXZDG_GXX_IPKP-DXZDG_GXX_IPKM-DXZDG_GXX_IMKP+ \
+ DXZDG_GXX_IMKM)
- DXZDG_DXZDGXY = DZDCG_DZDCGXY*DXDG_FAC+DXDCG_DXDCGXY*DZDG_FAC+DXZDG_FAC*DXDG_GXY+
- &DXDG_PSI4*DXZDG_OO4DXDZ*(DXZDG_GXY_IPKP-DXZDG_GXY_IPKM-DXZDG_GXY_IMKP+
- &DXZDG_GXY_IMKM)
+ DXZDG_DXZDGXY = DZDCG_DZDCGXY*DXDG_FAC+DXDCG_DXDCGXY*DZDG_FAC+DXZDG_FAC*DXDG_GXY+ \
+ DXDG_PSI4*DXZDG_OO4DXDZ*(DXZDG_GXY_IPKP-DXZDG_GXY_IPKM-DXZDG_GXY_IMKP+ \
+ DXZDG_GXY_IMKM)
- DXZDG_DXZDGXZ = DZDCG_DZDCGXZ*DXDG_FAC+DXDCG_DXDCGXZ*DZDG_FAC+DXZDG_FAC*DXDG_GXZ+
- &DXDG_PSI4*DXZDG_OO4DXDZ*(DXZDG_GXZ_IPKP-DXZDG_GXZ_IPKM-DXZDG_GXZ_IMKP+
- &DXZDG_GXZ_IMKM)
+ DXZDG_DXZDGXZ = DZDCG_DZDCGXZ*DXDG_FAC+DXDCG_DXDCGXZ*DZDG_FAC+DXZDG_FAC*DXDG_GXZ+ \
+ DXDG_PSI4*DXZDG_OO4DXDZ*(DXZDG_GXZ_IPKP-DXZDG_GXZ_IPKM-DXZDG_GXZ_IMKP+ \
+ DXZDG_GXZ_IMKM)
- 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_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_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_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_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_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)
#endif
diff --git a/src/macro/DYYDG_guts.h b/src/macro/DYYDG_guts.h
index 8599263..1896229 100644
--- a/src/macro/DYYDG_guts.h
+++ b/src/macro/DYYDG_guts.h
@@ -30,23 +30,23 @@
ENDIF
/* Now calculate the second deriatives */
- DYYDG_DYYDGXX = 2*DYDCG_DYDCGXX*DYDG_FAC+DYYDG_FAC*DYDG_GXX+DYDG_PSI4
- &*DYYDG_OODY2*(DYDCG_GXX_JP-2*DYDG_GXX+DYDCG_GXX_JM)
+ DYYDG_DYYDGXX = 2*DYDCG_DYDCGXX*DYDG_FAC+DYYDG_FAC*DYDG_GXX+DYDG_PSI4 \
+ *DYYDG_OODY2*(DYDCG_GXX_JP-2*DYDG_GXX+DYDCG_GXX_JM)
- DYYDG_DYYDGXY = 2*DYDCG_DYDCGXY*DYDG_FAC+DYYDG_FAC*DYDG_GXY+DYDG_PSI4
- &*DYYDG_OODY2*(DYDCG_GXY_JP-2*DYDG_GXY+DYDCG_GXY_JM)
+ DYYDG_DYYDGXY = 2*DYDCG_DYDCGXY*DYDG_FAC+DYYDG_FAC*DYDG_GXY+DYDG_PSI4 \
+ *DYYDG_OODY2*(DYDCG_GXY_JP-2*DYDG_GXY+DYDCG_GXY_JM)
- DYYDG_DYYDGXZ = 2*DYDCG_DYDCGXZ*DYDG_FAC+DYYDG_FAC*DYDG_GXZ+DYDG_PSI4
- &*DYYDG_OODY2*(DYDCG_GXZ_JP-2*DYDG_GXZ+DYDCG_GXZ_JM)
+ DYYDG_DYYDGXZ = 2*DYDCG_DYDCGXZ*DYDG_FAC+DYYDG_FAC*DYDG_GXZ+DYDG_PSI4 \
+ *DYYDG_OODY2*(DYDCG_GXZ_JP-2*DYDG_GXZ+DYDCG_GXZ_JM)
- DYYDG_DYYDGYY = 2*DYDCG_DYDCGYY*DYDG_FAC+DYYDG_FAC*DYDG_GYY+DYDG_PSI4
- &*DYYDG_OODY2*(DYDCG_GYY_JP-2*DYDG_GYY+DYDCG_GYY_JM)
+ DYYDG_DYYDGYY = 2*DYDCG_DYDCGYY*DYDG_FAC+DYYDG_FAC*DYDG_GYY+DYDG_PSI4 \
+ *DYYDG_OODY2*(DYDCG_GYY_JP-2*DYDG_GYY+DYDCG_GYY_JM)
- DYYDG_DYYDGYZ = 2*DYDCG_DYDCGYZ*DYDG_FAC+DYYDG_FAC*DYDG_GYZ+DYDG_PSI4
- &*DYYDG_OODY2*(DYDCG_GYZ_JP-2*DYDG_GYZ+DYDCG_GYZ_JM)
+ DYYDG_DYYDGYZ = 2*DYDCG_DYDCGYZ*DYDG_FAC+DYYDG_FAC*DYDG_GYZ+DYDG_PSI4 \
+ *DYYDG_OODY2*(DYDCG_GYZ_JP-2*DYDG_GYZ+DYDCG_GYZ_JM)
- DYYDG_DYYDGZZ = 2*DYDCG_DYDCGZZ*DYDG_FAC+DYYDG_FAC*DYDG_GZZ+DYDG_PSI4
- &*DYYDG_OODY2*(DYDCG_GZZ_JP-2*DYDG_GZZ+DYDCG_GZZ_JM)
+ DYYDG_DYYDGZZ = 2*DYDCG_DYDCGZZ*DYDG_FAC+DYYDG_FAC*DYDG_GZZ+DYDG_PSI4 \
+ *DYYDG_OODY2*(DYDCG_GZZ_JP-2*DYDG_GZZ+DYDCG_GZZ_JM)
#endif
diff --git a/src/macro/DYZDG_guts.h b/src/macro/DYZDG_guts.h
index 41e0acd..80347ff 100644
--- a/src/macro/DYZDG_guts.h
+++ b/src/macro/DYZDG_guts.h
@@ -32,29 +32,29 @@
ENDIF
/* Now calculate the second deriatives */
- DYZDG_DYZDGXX = DZDCG_DZDCGXX*DYDG_FAC+DYDCG_DYDCGXX*DZDG_FAC+DYZDG_FAC*DYDG_GXX
- & +DYDG_PSI4*DYZDG_OO4DYDZ*(DYZDG_GXX_JPKP-DYZDG_GXX_JPKM-DYZDG_GXX_JMKP
- & +DYZDG_GXX_JMKM)
+ DYZDG_DYZDGXX = DZDCG_DZDCGXX*DYDG_FAC+DYDCG_DYDCGXX*DZDG_FAC+DYZDG_FAC*DYDG_GXX \
+ +DYDG_PSI4*DYZDG_OO4DYDZ*(DYZDG_GXX_JPKP-DYZDG_GXX_JPKM-DYZDG_GXX_JMKP \
+ +DYZDG_GXX_JMKM)
- DYZDG_DYZDGXY = DZDCG_DZDCGXY*DYDG_FAC+DYDCG_DYDCGXY*DZDG_FAC+DYZDG_FAC*DYDG_GXY
- & +DYDG_PSI4*DYZDG_OO4DYDZ*(DYZDG_GXY_JPKP-DYZDG_GXY_JPKM-DYZDG_GXY_JMKP
- & +DYZDG_GXY_JMKM)
+ DYZDG_DYZDGXY = DZDCG_DZDCGXY*DYDG_FAC+DYDCG_DYDCGXY*DZDG_FAC+DYZDG_FAC*DYDG_GXY \
+ +DYDG_PSI4*DYZDG_OO4DYDZ*(DYZDG_GXY_JPKP-DYZDG_GXY_JPKM-DYZDG_GXY_JMKP \
+ +DYZDG_GXY_JMKM)
- 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_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_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
- & +DYZDG_GYY_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 \
+ +DYZDG_GYY_JMKM)
- 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_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_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
- & +DYZDG_GZZ_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 \
+ +DYZDG_GZZ_JMKM)
#endif
diff --git a/src/macro/DZZDG_guts.h b/src/macro/DZZDG_guts.h
index c25656a..601589b 100644
--- a/src/macro/DZZDG_guts.h
+++ b/src/macro/DZZDG_guts.h
@@ -29,23 +29,23 @@
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)
+ DZZDG_DZZDGXX = 2*DZDCG_DZDCGXX*DZDG_FAC+DZZDG_FAC*DZDG_GXX+DZDG_PSI4 \
+ *DZZDG_OODZ2*(DZDCG_GXX_KP-2*DZDG_GXX+DZDCG_GXX_KM)
- 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 \
+ *DZZDG_OODZ2*(DZDCG_GXY_KP-2*DZDG_GXY+DZDCG_GXY_KM)
- 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 \
+ *DZZDG_OODZ2*(DZDCG_GXZ_KP-2*DZDG_GXZ+DZDCG_GXZ_KM)
- 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 \
+ *DZZDG_OODZ2*(DZDCG_GYY_KP-2*DZDG_GYY+DZDCG_GYY_KM)
- 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 \
+ *DZZDG_OODZ2*(DZDCG_GYZ_KP-2*DZDG_GYZ+DZDCG_GYZ_KM)
- 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 \
+ *DZZDG_OODZ2*(DZDCG_GZZ_KP-2*DZDG_GZZ+DZDCG_GZZ_KM)
#endif
diff --git a/src/macro/GAMMA_guts.h b/src/macro/GAMMA_guts.h
index bb642ab..dcd4838 100644
--- a/src/macro/GAMMA_guts.h
+++ b/src/macro/GAMMA_guts.h
@@ -18,17 +18,17 @@
#ifdef FCODE
- GAMMA_GAMMAX = UPPERMET_UXX*CHR2_XXX + 2D0*UPPERMET_UXY*CHR2_XXY
- & + 2D0*UPPERMET_UXZ*CHR2_XXZ + UPPERMET_UYY*CHR2_XYY
- & + 2D0*UPPERMET_UYZ*CHR2_XYZ + UPPERMET_UZZ*CHR2_XZZ
+ GAMMA_GAMMAX = UPPERMET_UXX*CHR2_XXX + 2D0*UPPERMET_UXY*CHR2_XXY \
+ + 2D0*UPPERMET_UXZ*CHR2_XXZ + UPPERMET_UYY*CHR2_XYY \
+ + 2D0*UPPERMET_UYZ*CHR2_XYZ + UPPERMET_UZZ*CHR2_XZZ
- GAMMA_GAMMAY = UPPERMET_UXX*CHR2_YXX + 2D0*UPPERMET_UXY*CHR2_YXY
- & + 2D0*UPPERMET_UXZ*CHR2_YXZ + UPPERMET_UYY*CHR2_YYY
- & + 2D0*UPPERMET_UYZ*CHR2_YYZ + UPPERMET_UZZ*CHR2_YZZ
+ GAMMA_GAMMAY = UPPERMET_UXX*CHR2_YXX + 2D0*UPPERMET_UXY*CHR2_YXY \
+ + 2D0*UPPERMET_UXZ*CHR2_YXZ + UPPERMET_UYY*CHR2_YYY \
+ + 2D0*UPPERMET_UYZ*CHR2_YYZ + UPPERMET_UZZ*CHR2_YZZ
- GAMMA_GAMMAZ = UPPERMET_UXX*CHR2_ZXX + 2D0*UPPERMET_UXY*CHR2_ZXY
- & + 2D0*UPPERMET_UXZ*CHR2_ZXZ + UPPERMET_UYY*CHR2_ZYY
- & + 2D0*UPPERMET_UYZ*CHR2_ZYZ + UPPERMET_UZZ*CHR2_ZZZ
+ GAMMA_GAMMAZ = UPPERMET_UXX*CHR2_ZXX + 2D0*UPPERMET_UXY*CHR2_ZXY \
+ + 2D0*UPPERMET_UXZ*CHR2_ZXZ + UPPERMET_UYY*CHR2_ZYY \
+ + 2D0*UPPERMET_UYZ*CHR2_ZYZ + UPPERMET_UZZ*CHR2_ZZZ
#endif
diff --git a/src/macro/KK_guts.h b/src/macro/KK_guts.h
index fe4dae3..44cf7db 100644
--- a/src/macro/KK_guts.h
+++ b/src/macro/KK_guts.h
@@ -24,32 +24,32 @@
#ifdef FCODE
- KK_KKXX = 2*(UPPERMET_UYZ*KK_HXY*KK_HXZ + KK_HXX*(UPPERMET_UXY*KK_HXY +
- &UPPERMET_UXZ*KK_HXZ)) + UPPERMET_UXX*KK_HXX*KK_HXX +
- &UPPERMET_UYY*KK_HXY*KK_HXY + UPPERMET_UZZ*KK_HXZ*KK_HXZ
-
- KK_KKXY = KK_HXY*(UPPERMET_UXX*KK_HXX + UPPERMET_UYY*KK_HYY) +
- &UPPERMET_UZZ*KK_HXZ*KK_HYZ + UPPERMET_UXZ*(KK_HXY*KK_HXZ +
- &KK_HXX*KK_HYZ) + UPPERMET_UYZ*(KK_HXZ*KK_HYY + KK_HXY*KK_HYZ) +
- &UPPERMET_UXY*(KK_HXX*KK_HYY + KK_HXY*KK_HXY)
-
- KK_KKXZ = UPPERMET_UYY*KK_HXY*KK_HYZ + UPPERMET_UXY*(KK_HXY*KK_HXZ +
- &KK_HXX*KK_HYZ) + KK_HXZ*(UPPERMET_UXX*KK_HXX + UPPERMET_UZZ*KK_HZZ) +
- &UPPERMET_UYZ*(KK_HXZ*KK_HYZ + KK_HXY*KK_HZZ) +
- &UPPERMET_UXZ*(KK_HXX*KK_HZZ + KK_HXZ*KK_HXZ)
-
- KK_KKYY = 2*(UPPERMET_UYZ*KK_HYY*KK_HYZ + KK_HXY*(UPPERMET_UXY*KK_HYY +
- &UPPERMET_UXZ*KK_HYZ)) + UPPERMET_UXX*KK_HXY*KK_HXY +
- &UPPERMET_UYY*KK_HYY*KK_HYY + UPPERMET_UZZ*KK_HYZ*KK_HYZ ;
-
- KK_KKYZ = UPPERMET_UXX*KK_HXY*KK_HXZ + UPPERMET_UXY*(KK_HXZ*KK_HYY +
- &KK_HXY*KK_HYZ) + KK_HYZ*(UPPERMET_UYY*KK_HYY + UPPERMET_UZZ*KK_HZZ) +
- &UPPERMET_UXZ*(KK_HXZ*KK_HYZ + KK_HXY*KK_HZZ) +
- &UPPERMET_UYZ*(KK_HYY*KK_HZZ + KK_HYZ*KK_HYZ)
-
- KK_KKZZ = 2*(UPPERMET_UYZ*KK_HYZ*KK_HZZ + KK_HXZ*(UPPERMET_UXY*KK_HYZ +
- &UPPERMET_UXZ*KK_HZZ)) + UPPERMET_UXX*KK_HXZ*KK_HXZ +
- &UPPERMET_UYY*KK_HYZ*KK_HYZ + UPPERMET_UZZ*KK_HZZ*KK_HZZ
+ KK_KKXX = 2*(UPPERMET_UYZ*KK_HXY*KK_HXZ + KK_HXX*(UPPERMET_UXY*KK_HXY + \
+ UPPERMET_UXZ*KK_HXZ)) + UPPERMET_UXX*KK_HXX*KK_HXX + \
+ UPPERMET_UYY*KK_HXY*KK_HXY + UPPERMET_UZZ*KK_HXZ*KK_HXZ
+
+ KK_KKXY = KK_HXY*(UPPERMET_UXX*KK_HXX + UPPERMET_UYY*KK_HYY) + \
+ UPPERMET_UZZ*KK_HXZ*KK_HYZ + UPPERMET_UXZ*(KK_HXY*KK_HXZ + \
+ KK_HXX*KK_HYZ) + UPPERMET_UYZ*(KK_HXZ*KK_HYY + KK_HXY*KK_HYZ) + \
+ UPPERMET_UXY*(KK_HXX*KK_HYY + KK_HXY*KK_HXY)
+
+ KK_KKXZ = UPPERMET_UYY*KK_HXY*KK_HYZ + UPPERMET_UXY*(KK_HXY*KK_HXZ + \
+ KK_HXX*KK_HYZ) + KK_HXZ*(UPPERMET_UXX*KK_HXX + UPPERMET_UZZ*KK_HZZ) + \
+ UPPERMET_UYZ*(KK_HXZ*KK_HYZ + KK_HXY*KK_HZZ) + \
+ UPPERMET_UXZ*(KK_HXX*KK_HZZ + KK_HXZ*KK_HXZ)
+
+ KK_KKYY = 2*(UPPERMET_UYZ*KK_HYY*KK_HYZ + KK_HXY*(UPPERMET_UXY*KK_HYY + \
+ UPPERMET_UXZ*KK_HYZ)) + UPPERMET_UXX*KK_HXY*KK_HXY + \
+ UPPERMET_UYY*KK_HYY*KK_HYY + UPPERMET_UZZ*KK_HYZ*KK_HYZ ;
+
+ KK_KKYZ = UPPERMET_UXX*KK_HXY*KK_HXZ + UPPERMET_UXY*(KK_HXZ*KK_HYY + \
+ KK_HXY*KK_HYZ) + KK_HYZ*(UPPERMET_UYY*KK_HYY + UPPERMET_UZZ*KK_HZZ) + \
+ UPPERMET_UXZ*(KK_HXZ*KK_HYZ + KK_HXY*KK_HZZ) + \
+ UPPERMET_UYZ*(KK_HYY*KK_HZZ + KK_HYZ*KK_HYZ)
+
+ KK_KKZZ = 2*(UPPERMET_UYZ*KK_HYZ*KK_HZZ + KK_HXZ*(UPPERMET_UXY*KK_HYZ + \
+ UPPERMET_UXZ*KK_HZZ)) + UPPERMET_UXX*KK_HXZ*KK_HXZ + \
+ UPPERMET_UYY*KK_HYZ*KK_HYZ + UPPERMET_UZZ*KK_HZZ*KK_HZZ
#endif
diff --git a/src/macro/LIEG_guts.h b/src/macro/LIEG_guts.h
index 544f067..f36c812 100644
--- a/src/macro/LIEG_guts.h
+++ b/src/macro/LIEG_guts.h
@@ -43,63 +43,63 @@
else if (admmacros_advectionx .eq. 1) then /* UPWIND1 */
- LIEG_LGXX = LIEG_LGXX + LIEG_BX
- & *(gxx(i+1,j,k) - gxx(i,j,k))/dx
- LIEG_LGYY = LIEG_LGYY + LIEG_BX
- & *(gyy(i+1,j,k) - gyy(i,j,k))/dx
- LIEG_LGZZ = LIEG_LGZZ + LIEG_BX
- & *(gzz(i+1,j,k) - gzz(i,j,k))/dx
- LIEG_LGXY = LIEG_LGXY + LIEG_BX
- & *(gxy(i+1,j,k) - gxy(i,j,k))/dx
- LIEG_LGXZ = LIEG_LGXZ + LIEG_BX
- & *(gxz(i+1,j,k) - gxz(i,j,k))/dx
- LIEG_LGYZ = LIEG_LGYZ + LIEG_BX
- & *(gyz(i+1,j,k) - gyz(i,j,k))/dx
+ LIEG_LGXX = LIEG_LGXX + LIEG_BX \
+ *(gxx(i+1,j,k) - gxx(i,j,k))/dx
+ LIEG_LGYY = LIEG_LGYY + LIEG_BX \
+ *(gyy(i+1,j,k) - gyy(i,j,k))/dx
+ LIEG_LGZZ = LIEG_LGZZ + LIEG_BX \
+ *(gzz(i+1,j,k) - gzz(i,j,k))/dx
+ LIEG_LGXY = LIEG_LGXY + LIEG_BX \
+ *(gxy(i+1,j,k) - gxy(i,j,k))/dx
+ LIEG_LGXZ = LIEG_LGXZ + LIEG_BX \
+ *(gxz(i+1,j,k) - gxz(i,j,k))/dx
+ LIEG_LGYZ = LIEG_LGYZ + LIEG_BX \
+ *(gyz(i+1,j,k) - gyz(i,j,k))/dx
else if (admmacros_advectionx .eq. -1) then /* UPWIND1 */
- LIEG_LGXX = LIEG_LGXX + LIEG_BX
- & *(gxx(i,j,k) - gxx(i-1,j,k))/dx
- LIEG_LGYY = LIEG_LGYY + LIEG_BX
- & *(gyy(i,j,k) - gyy(i-1,j,k))/dx
- LIEG_LGZZ = LIEG_LGZZ + LIEG_BX
- & *(gzz(i,j,k) - gzz(i-1,j,k))/dx
- LIEG_LGXY = LIEG_LGXY + LIEG_BX
- & *(gxy(i,j,k) - gxy(i-1,j,k))/dx
- LIEG_LGXZ = LIEG_LGXZ + LIEG_BX
- & *(gxz(i,j,k) - gxz(i-1,j,k))/dx
- LIEG_LGYZ = LIEG_LGYZ + LIEG_BX
- & *(gyz(i,j,k) - gyz(i-1,j,k))/dx
+ LIEG_LGXX = LIEG_LGXX + LIEG_BX \
+ *(gxx(i,j,k) - gxx(i-1,j,k))/dx
+ LIEG_LGYY = LIEG_LGYY + LIEG_BX \
+ *(gyy(i,j,k) - gyy(i-1,j,k))/dx
+ LIEG_LGZZ = LIEG_LGZZ + LIEG_BX \
+ *(gzz(i,j,k) - gzz(i-1,j,k))/dx
+ LIEG_LGXY = LIEG_LGXY + LIEG_BX \
+ *(gxy(i,j,k) - gxy(i-1,j,k))/dx
+ LIEG_LGXZ = LIEG_LGXZ + LIEG_BX \
+ *(gxz(i,j,k) - gxz(i-1,j,k))/dx
+ LIEG_LGYZ = LIEG_LGYZ + LIEG_BX \
+ *(gyz(i,j,k) - gyz(i-1,j,k))/dx
else if (admmacros_advectionx .eq. 2) then /* UPWIND2 */
- LIEG_LGXX = LIEG_LGXX - 0.5D0*LIEG_BX/dx
- & *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i+1,j,k) + gxx(i+2,j,k))
- LIEG_LGYY = LIEG_LGYY - 0.5D0*LIEG_BX/dx
- & *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i+1,j,k) + gyy(i+2,j,k))
- LIEG_LGZZ = LIEG_LGZZ - 0.5D0*LIEG_BX/dx
- & *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i+1,j,k) + gzz(i+2,j,k))
- LIEG_LGXY = LIEG_LGXY - 0.5D0*LIEG_BX/dx
- & *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i+1,j,k) + gxy(i+2,j,k))
- LIEG_LGXZ = LIEG_LGXZ - 0.5D0*LIEG_BX/dx
- & *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i+1,j,k) + gxz(i+2,j,k))
- LIEG_LGYZ = LIEG_LGYZ - 0.5D0*LIEG_BX/dx
- & *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i+1,j,k) + gyz(i+2,j,k))
+ LIEG_LGXX = LIEG_LGXX - 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i+1,j,k) + gxx(i+2,j,k))
+ LIEG_LGYY = LIEG_LGYY - 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i+1,j,k) + gyy(i+2,j,k))
+ LIEG_LGZZ = LIEG_LGZZ - 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i+1,j,k) + gzz(i+2,j,k))
+ LIEG_LGXY = LIEG_LGXY - 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i+1,j,k) + gxy(i+2,j,k))
+ LIEG_LGXZ = LIEG_LGXZ - 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i+1,j,k) + gxz(i+2,j,k))
+ LIEG_LGYZ = LIEG_LGYZ - 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i+1,j,k) + gyz(i+2,j,k))
else if (admmacros_advectionx .eq. -2) then /* UPWIND2 */
- LIEG_LGXX = LIEG_LGXX + 0.5D0*LIEG_BX/dx
- & *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i-1,j,k) + gxx(i-2,j,k))
- LIEG_LGYY = LIEG_LGYY + 0.5D0*LIEG_BX/dx
- & *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i-1,j,k) + gyy(i-2,j,k))
- LIEG_LGZZ = LIEG_LGZZ + 0.5D0*LIEG_BX/dx
- & *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i-1,j,k) + gzz(i-2,j,k))
- LIEG_LGXY = LIEG_LGXY + 0.5D0*LIEG_BX/dx
- & *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i-1,j,k) + gxy(i-2,j,k))
- LIEG_LGXZ = LIEG_LGXZ + 0.5D0*LIEG_BX/dx
- & *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i-1,j,k) + gxz(i-2,j,k))
- LIEG_LGYZ = LIEG_LGYZ + 0.5D0*LIEG_BX/dx
- & *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i-1,j,k) + gyz(i-2,j,k))
+ LIEG_LGXX = LIEG_LGXX + 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i-1,j,k) + gxx(i-2,j,k))
+ LIEG_LGYY = LIEG_LGYY + 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i-1,j,k) + gyy(i-2,j,k))
+ LIEG_LGZZ = LIEG_LGZZ + 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i-1,j,k) + gzz(i-2,j,k))
+ LIEG_LGXY = LIEG_LGXY + 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i-1,j,k) + gxy(i-2,j,k))
+ LIEG_LGXZ = LIEG_LGXZ + 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i-1,j,k) + gxz(i-2,j,k))
+ LIEG_LGYZ = LIEG_LGYZ + 0.5D0*LIEG_BX/dx \
+ *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i-1,j,k) + gyz(i-2,j,k))
end if
@@ -117,63 +117,63 @@
else if (admmacros_advectiony .eq. 1) then /* UPWIND1 */
- LIEG_LGXX = LIEG_LGXX + LIEG_BY
- & *(gxx(i,j+1,k) - gxx(i,j,k))/dy
- LIEG_LGYY = LIEG_LGYY + LIEG_BY
- & *(gyy(i,j+1,k) - gyy(i,j,k))/dy
- LIEG_LGZZ = LIEG_LGZZ + LIEG_BY
- & *(gzz(i,j+1,k) - gzz(i,j,k))/dy
- LIEG_LGXY = LIEG_LGXY + LIEG_BY
- & *(gxy(i,j+1,k) - gxy(i,j,k))/dy
- LIEG_LGXZ = LIEG_LGXZ + LIEG_BY
- & *(gxz(i,j+1,k) - gxz(i,j,k))/dy
- LIEG_LGYZ = LIEG_LGYZ + LIEG_BY
- & *(gyz(i,j+1,k) - gyz(i,j,k))/dy
+ LIEG_LGXX = LIEG_LGXX + LIEG_BY \
+ *(gxx(i,j+1,k) - gxx(i,j,k))/dy
+ LIEG_LGYY = LIEG_LGYY + LIEG_BY \
+ *(gyy(i,j+1,k) - gyy(i,j,k))/dy
+ LIEG_LGZZ = LIEG_LGZZ + LIEG_BY \
+ *(gzz(i,j+1,k) - gzz(i,j,k))/dy
+ LIEG_LGXY = LIEG_LGXY + LIEG_BY \
+ *(gxy(i,j+1,k) - gxy(i,j,k))/dy
+ LIEG_LGXZ = LIEG_LGXZ + LIEG_BY \
+ *(gxz(i,j+1,k) - gxz(i,j,k))/dy
+ LIEG_LGYZ = LIEG_LGYZ + LIEG_BY \
+ *(gyz(i,j+1,k) - gyz(i,j,k))/dy
else if (admmacros_advectiony .eq. -1) then /* UPWIND1 */
- LIEG_LGXX = LIEG_LGXX + LIEG_BY
- & *(gxx(i,j,k) - gxx(i,j-1,k))/dy
- LIEG_LGYY = LIEG_LGYY + LIEG_BY
- & *(gyy(i,j,k) - gyy(i,j-1,k))/dy
- LIEG_LGZZ = LIEG_LGZZ + LIEG_BY
- & *(gzz(i,j,k) - gzz(i,j-1,k))/dy
- LIEG_LGXY = LIEG_LGXY + LIEG_BY
- & *(gxy(i,j,k) - gxy(i,j-1,k))/dy
- LIEG_LGXZ = LIEG_LGXZ + LIEG_BY
- & *(gxz(i,j,k) - gxz(i,j-1,k))/dy
- LIEG_LGYZ = LIEG_LGYZ + LIEG_BY
- & *(gyz(i,j,k) - gyz(i,j-1,k))/dy
+ LIEG_LGXX = LIEG_LGXX + LIEG_BY \
+ *(gxx(i,j,k) - gxx(i,j-1,k))/dy
+ LIEG_LGYY = LIEG_LGYY + LIEG_BY \
+ *(gyy(i,j,k) - gyy(i,j-1,k))/dy
+ LIEG_LGZZ = LIEG_LGZZ + LIEG_BY \
+ *(gzz(i,j,k) - gzz(i,j-1,k))/dy
+ LIEG_LGXY = LIEG_LGXY + LIEG_BY \
+ *(gxy(i,j,k) - gxy(i,j-1,k))/dy
+ LIEG_LGXZ = LIEG_LGXZ + LIEG_BY \
+ *(gxz(i,j,k) - gxz(i,j-1,k))/dy
+ LIEG_LGYZ = LIEG_LGYZ + LIEG_BY \
+ *(gyz(i,j,k) - gyz(i,j-1,k))/dy
else if (admmacros_advectiony .eq. 2) then /* UPWIND2 */
- LIEG_LGXX = LIEG_LGXX - 0.5D0*LIEG_BY/dy
- & *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i,j+1,k) + gxx(i,j+2,k))
- LIEG_LGYY = LIEG_LGYY - 0.5D0*LIEG_BY/dy
- & *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i,j+1,k) + gyy(i,j+2,k))
- LIEG_LGZZ = LIEG_LGZZ - 0.5D0*LIEG_BY/dy
- & *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i,j+1,k) + gzz(i,j+2,k))
- LIEG_LGXY = LIEG_LGXY - 0.5D0*LIEG_BY/dy
- & *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i,j+1,k) + gxy(i,j+2,k))
- LIEG_LGXZ = LIEG_LGXZ - 0.5D0*LIEG_BY/dy
- & *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i,j+1,k) + gxz(i,j+2,k))
- LIEG_LGYZ = LIEG_LGYZ - 0.5D0*LIEG_BY/dy
- & *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i,j+1,k) + gyz(i,j+2,k))
+ LIEG_LGXX = LIEG_LGXX - 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i,j+1,k) + gxx(i,j+2,k))
+ LIEG_LGYY = LIEG_LGYY - 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i,j+1,k) + gyy(i,j+2,k))
+ LIEG_LGZZ = LIEG_LGZZ - 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i,j+1,k) + gzz(i,j+2,k))
+ LIEG_LGXY = LIEG_LGXY - 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i,j+1,k) + gxy(i,j+2,k))
+ LIEG_LGXZ = LIEG_LGXZ - 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i,j+1,k) + gxz(i,j+2,k))
+ LIEG_LGYZ = LIEG_LGYZ - 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i,j+1,k) + gyz(i,j+2,k))
else if (admmacros_advectiony .eq. -2) then /* UPWIND2 */
- LIEG_LGXX = LIEG_LGXX + 0.5D0*LIEG_BY/dy
- & *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i,j-1,k) + gxx(i,j-2,k))
- LIEG_LGYY = LIEG_LGYY + 0.5D0*LIEG_BY/dy
- & *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i,j-1,k) + gyy(i,j-2,k))
- LIEG_LGZZ = LIEG_LGZZ + 0.5D0*LIEG_BY/dy
- & *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i,j-1,k) + gzz(i,j-2,k))
- LIEG_LGXY = LIEG_LGXY + 0.5D0*LIEG_BY/dy
- & *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i,j-1,k) + gxy(i,j-2,k))
- LIEG_LGXZ = LIEG_LGXZ + 0.5D0*LIEG_BY/dy
- & *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i,j-1,k) + gxz(i,j-2,k))
- LIEG_LGYZ = LIEG_LGYZ + 0.5D0*LIEG_BY/dy
- & *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i,j-1,k) + gyz(i,j-2,k))
+ LIEG_LGXX = LIEG_LGXX + 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i,j-1,k) + gxx(i,j-2,k))
+ LIEG_LGYY = LIEG_LGYY + 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i,j-1,k) + gyy(i,j-2,k))
+ LIEG_LGZZ = LIEG_LGZZ + 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i,j-1,k) + gzz(i,j-2,k))
+ LIEG_LGXY = LIEG_LGXY + 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i,j-1,k) + gxy(i,j-2,k))
+ LIEG_LGXZ = LIEG_LGXZ + 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i,j-1,k) + gxz(i,j-2,k))
+ LIEG_LGYZ = LIEG_LGYZ + 0.5D0*LIEG_BY/dy \
+ *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i,j-1,k) + gyz(i,j-2,k))
end if
@@ -191,98 +191,98 @@
else if ((admmacros_advectionz .eq. 1)) then /* UPWIND1 */
- LIEG_LGXX = LIEG_LGXX + LIEG_BZ
- & *(gxx(i,j,k+1) - gxx(i,j,k))/dz
- LIEG_LGYY = LIEG_LGYY + LIEG_BZ
- & *(gyy(i,j,k+1) - gyy(i,j,k))/dz
- LIEG_LGZZ = LIEG_LGZZ + LIEG_BZ
- & *(gzz(i,j,k+1) - gzz(i,j,k))/dz
- LIEG_LGXY = LIEG_LGXY + LIEG_BZ
- & *(gxy(i,j,k+1) - gxy(i,j,k))/dz
- LIEG_LGXZ = LIEG_LGXZ + LIEG_BZ
- & *(gxz(i,j,k+1) - gxz(i,j,k))/dz
- LIEG_LGYZ = LIEG_LGYZ + LIEG_BZ
- & *(gyz(i,j,k+1) - gyz(i,j,k))/dz
+ LIEG_LGXX = LIEG_LGXX + LIEG_BZ \
+ *(gxx(i,j,k+1) - gxx(i,j,k))/dz
+ LIEG_LGYY = LIEG_LGYY + LIEG_BZ \
+ *(gyy(i,j,k+1) - gyy(i,j,k))/dz
+ LIEG_LGZZ = LIEG_LGZZ + LIEG_BZ \
+ *(gzz(i,j,k+1) - gzz(i,j,k))/dz
+ LIEG_LGXY = LIEG_LGXY + LIEG_BZ \
+ *(gxy(i,j,k+1) - gxy(i,j,k))/dz
+ LIEG_LGXZ = LIEG_LGXZ + LIEG_BZ \
+ *(gxz(i,j,k+1) - gxz(i,j,k))/dz
+ LIEG_LGYZ = LIEG_LGYZ + LIEG_BZ \
+ *(gyz(i,j,k+1) - gyz(i,j,k))/dz
else if ((admmacros_advectionz .eq. -1)) then /* UPWIND1 */
- LIEG_LGXX = LIEG_LGXX + LIEG_BZ
- & *(gxx(i,j,k) - gxx(i,j,k-1))/dz
- LIEG_LGYY = LIEG_LGYY + LIEG_BZ
- & *(gyy(i,j,k) - gyy(i,j,k-1))/dz
- LIEG_LGZZ = LIEG_LGZZ + LIEG_BZ
- & *(gzz(i,j,k) - gzz(i,j,k-1))/dz
- LIEG_LGXY = LIEG_LGXY + LIEG_BZ
- & *(gxy(i,j,k) - gxy(i,j,k-1))/dz
- LIEG_LGXZ = LIEG_LGXZ + LIEG_BZ
- & *(gxz(i,j,k) - gxz(i,j,k-1))/dz
- LIEG_LGYZ = LIEG_LGYZ + LIEG_BZ
- & *(gyz(i,j,k) - gyz(i,j,k-1))/dz
+ LIEG_LGXX = LIEG_LGXX + LIEG_BZ \
+ *(gxx(i,j,k) - gxx(i,j,k-1))/dz
+ LIEG_LGYY = LIEG_LGYY + LIEG_BZ \
+ *(gyy(i,j,k) - gyy(i,j,k-1))/dz
+ LIEG_LGZZ = LIEG_LGZZ + LIEG_BZ \
+ *(gzz(i,j,k) - gzz(i,j,k-1))/dz
+ LIEG_LGXY = LIEG_LGXY + LIEG_BZ \
+ *(gxy(i,j,k) - gxy(i,j,k-1))/dz
+ LIEG_LGXZ = LIEG_LGXZ + LIEG_BZ \
+ *(gxz(i,j,k) - gxz(i,j,k-1))/dz
+ LIEG_LGYZ = LIEG_LGYZ + LIEG_BZ \
+ *(gyz(i,j,k) - gyz(i,j,k-1))/dz
else if (admmacros_advectionz .eq. 2) then /* UPWIND2 */
- LIEG_LGXX = LIEG_LGXX - 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i,j,k+1) + gxx(i,j,k+2))
+ LIEG_LGXX = LIEG_LGXX - 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i,j,k+1) + gxx(i,j,k+2))
- LIEG_LGYY = LIEG_LGYY - 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i,j,k+1) + gyy(i,j,k+2))
+ LIEG_LGYY = LIEG_LGYY - 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i,j,k+1) + gyy(i,j,k+2))
- LIEG_LGZZ = LIEG_LGZZ - 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i,j,k+1) + gzz(i,j,k+2))
+ LIEG_LGZZ = LIEG_LGZZ - 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i,j,k+1) + gzz(i,j,k+2))
- LIEG_LGXY = LIEG_LGXY - 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i,j,k+1) + gxy(i,j,k+2))
+ LIEG_LGXY = LIEG_LGXY - 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i,j,k+1) + gxy(i,j,k+2))
- LIEG_LGXZ = LIEG_LGXZ - 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i,j,k+1) + gxz(i,j,k+2))
+ LIEG_LGXZ = LIEG_LGXZ - 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i,j,k+1) + gxz(i,j,k+2))
- LIEG_LGYZ = LIEG_LGYZ - 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i,j,k+1) + gyz(i,j,k+2))
+ LIEG_LGYZ = LIEG_LGYZ - 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i,j,k+1) + gyz(i,j,k+2))
else if (admmacros_advectionz .eq. -2) then /* UPWIND2 */
- LIEG_LGXX = LIEG_LGXX + 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i,j,k-1) + gxx(i,j,k-2))
+ LIEG_LGXX = LIEG_LGXX + 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gxx(i,j,k) - 4.0D0*gxx(i,j,k-1) + gxx(i,j,k-2))
- LIEG_LGYY = LIEG_LGYY + 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i,j,k-1) + gyy(i,j,k-2))
+ LIEG_LGYY = LIEG_LGYY + 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gyy(i,j,k) - 4.0D0*gyy(i,j,k-1) + gyy(i,j,k-2))
- LIEG_LGZZ = LIEG_LGZZ + 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i,j,k-1) + gzz(i,j,k-2))
+ LIEG_LGZZ = LIEG_LGZZ + 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gzz(i,j,k) - 4.0D0*gzz(i,j,k-1) + gzz(i,j,k-2))
- LIEG_LGXY = LIEG_LGXY + 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i,j,k-1) + gxy(i,j,k-2))
+ LIEG_LGXY = LIEG_LGXY + 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gxy(i,j,k) - 4.0D0*gxy(i,j,k-1) + gxy(i,j,k-2))
- LIEG_LGXZ = LIEG_LGXZ + 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i,j,k-1) + gxz(i,j,k-2))
+ LIEG_LGXZ = LIEG_LGXZ + 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gxz(i,j,k) - 4.0D0*gxz(i,j,k-1) + gxz(i,j,k-2))
- LIEG_LGYZ = LIEG_LGYZ + 0.5D0*LIEG_BZ/dz
- & *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i,j,k-1) + gyz(i,j,k-2))
+ LIEG_LGYZ = LIEG_LGYZ + 0.5D0*LIEG_BZ/dz \
+ *(3.0D0*gyz(i,j,k) - 4.0D0*gyz(i,j,k-1) + gyz(i,j,k-2))
end if
/* Extra terms in the Lie derivative. */
- LIEG_LGXX = LIEG_LGXX + 2.0D0*(DXDB_DXDBX*LIEG_GXX
- & + DXDB_DXDBY*LIEG_GXY + DXDB_DXDBZ*LIEG_GXZ)
+ LIEG_LGXX = LIEG_LGXX + 2.0D0*(DXDB_DXDBX*LIEG_GXX \
+ + DXDB_DXDBY*LIEG_GXY + DXDB_DXDBZ*LIEG_GXZ)
- LIEG_LGYY = LIEG_LGYY + 2.0D0*(DYDB_DYDBX*LIEG_GXY
- & + DYDB_DYDBY*LIEG_GYY + DYDB_DYDBZ*LIEG_GYZ)
+ LIEG_LGYY = LIEG_LGYY + 2.0D0*(DYDB_DYDBX*LIEG_GXY \
+ + DYDB_DYDBY*LIEG_GYY + DYDB_DYDBZ*LIEG_GYZ)
- LIEG_LGZZ = LIEG_LGZZ + 2.0D0*(DZDB_DZDBX*LIEG_GXZ
- & + DZDB_DZDBY*LIEG_GYZ + DZDB_DZDBZ*LIEG_GZZ)
+ LIEG_LGZZ = LIEG_LGZZ + 2.0D0*(DZDB_DZDBX*LIEG_GXZ \
+ + DZDB_DZDBY*LIEG_GYZ + DZDB_DZDBZ*LIEG_GZZ)
- LIEG_LGXY = LIEG_LGXY + DYDB_DYDBX*LIEG_GXX + DXDB_DXDBY*LIEG_GYY
- & + (DXDB_DXDBX + DYDB_DYDBY)*LIEG_GXY
- & + DYDB_DYDBZ*LIEG_GXZ + DXDB_DXDBZ*LIEG_GYZ
+ LIEG_LGXY = LIEG_LGXY + DYDB_DYDBX*LIEG_GXX + DXDB_DXDBY*LIEG_GYY \
+ + (DXDB_DXDBX + DYDB_DYDBY)*LIEG_GXY \
+ + DYDB_DYDBZ*LIEG_GXZ + DXDB_DXDBZ*LIEG_GYZ
- LIEG_LGXZ = LIEG_LGXZ + DZDB_DZDBX*LIEG_GXX + DXDB_DXDBZ*LIEG_GZZ
- & + (DXDB_DXDBX + DZDB_DZDBZ)*LIEG_GXZ
- & + DZDB_DZDBY*LIEG_GXY + DXDB_DXDBY*LIEG_GYZ
+ LIEG_LGXZ = LIEG_LGXZ + DZDB_DZDBX*LIEG_GXX + DXDB_DXDBZ*LIEG_GZZ \
+ + (DXDB_DXDBX + DZDB_DZDBZ)*LIEG_GXZ \
+ + DZDB_DZDBY*LIEG_GXY + DXDB_DXDBY*LIEG_GYZ
- LIEG_LGYZ = LIEG_LGYZ + DZDB_DZDBY*LIEG_GYY + DYDB_DYDBZ*LIEG_GZZ
- & + (DYDB_DYDBY + DZDB_DZDBZ)*LIEG_GYZ
- & + DZDB_DZDBX*LIEG_GXY + DYDB_DYDBX*LIEG_GXZ
+ LIEG_LGYZ = LIEG_LGYZ + DZDB_DZDBY*LIEG_GYY + DYDB_DYDBZ*LIEG_GZZ \
+ + (DYDB_DYDBY + DZDB_DZDBZ)*LIEG_GYZ \
+ + DZDB_DZDBX*LIEG_GXY + DYDB_DYDBX*LIEG_GXZ
#endif
diff --git a/src/macro/LIEK_guts.h b/src/macro/LIEK_guts.h
index 8d16541..dabbbf1 100644
--- a/src/macro/LIEK_guts.h
+++ b/src/macro/LIEK_guts.h
@@ -33,152 +33,152 @@
if (CCTK_Equals(advection,'center').eq.1) then
- LIEK_LKXX = DXDK_DXDKXX*LIEK_BX + DYDK_DYDKXX*LIEK_BY
- & + DZDK_DZDKXX*LIEK_BZ
+ LIEK_LKXX = DXDK_DXDKXX*LIEK_BX + DYDK_DYDKXX*LIEK_BY \
+ + DZDK_DZDKXX*LIEK_BZ
- LIEK_LKYY = DXDK_DXDKYY*LIEK_BX + DYDK_DYDKYY*LIEK_BY
- & + DZDK_DZDKYY*LIEK_BZ
+ LIEK_LKYY = DXDK_DXDKYY*LIEK_BX + DYDK_DYDKYY*LIEK_BY \
+ + DZDK_DZDKYY*LIEK_BZ
- LIEK_LKZZ = DXDK_DXDKZZ*LIEK_BX + DYDK_DYDKZZ*LIEK_BY
- & + DZDK_DZDKZZ*LIEK_BZ
+ LIEK_LKZZ = DXDK_DXDKZZ*LIEK_BX + DYDK_DYDKZZ*LIEK_BY \
+ + DZDK_DZDKZZ*LIEK_BZ
- LIEK_LKXY = DXDK_DXDKXY*LIEK_BX + DYDK_DYDKXY*LIEK_BY
- & + DZDK_DZDKXY*LIEK_BZ
+ LIEK_LKXY = DXDK_DXDKXY*LIEK_BX + DYDK_DYDKXY*LIEK_BY \
+ + DZDK_DZDKXY*LIEK_BZ
- LIEK_LKXZ = DXDK_DXDKXZ*LIEK_BX + DYDK_DYDKXZ*LIEK_BY
- & + DZDK_DZDKXZ*LIEK_BZ
+ LIEK_LKXZ = DXDK_DXDKXZ*LIEK_BX + DYDK_DYDKXZ*LIEK_BY \
+ + DZDK_DZDKXZ*LIEK_BZ
- LIEK_LKYZ = DXDK_DXDKYZ*LIEK_BX + DYDK_DYDKYZ*LIEK_BY
- & + DZDK_DZDKYZ*LIEK_BZ
+ LIEK_LKYZ = DXDK_DXDKYZ*LIEK_BX + DYDK_DYDKYZ*LIEK_BY \
+ + DZDK_DZDKYZ*LIEK_BZ
- else if ((CCTK_Equals(advection,'upwind1').eq.1).or.
- & (i.eq.2).or.(i.eq.cctk_lsh(1)-1).or.
- & (j.eq.2).or.(j.eq.cctk_lsh(2)-1).or.
- & (k.eq.2).or.(k.eq.cctk_lsh(3)-1)) then
+ else if ((CCTK_Equals(advection,'upwind1').eq.1).or. \
+ (i.eq.2).or.(i.eq.cctk_lsh(1)-1).or. \
+ (j.eq.2).or.(j.eq.cctk_lsh(2)-1).or. \
+ (k.eq.2).or.(k.eq.cctk_lsh(3)-1)) then
if (LIEK_BX.gt.0.0D0) then
- LIEK_LKXX = LIEK_LKXX + LIEK_BX
- & *(kxx(i+1,j,k) - kxx(i,j,k))/dx
+ LIEK_LKXX = LIEK_LKXX + LIEK_BX \
+ *(kxx(i+1,j,k) - kxx(i,j,k))/dx
- LIEK_LKYY = LIEK_LKYY + LIEK_BX
- & *(kyy(i+1,j,k) - kyy(i,j,k))/dx
+ LIEK_LKYY = LIEK_LKYY + LIEK_BX \
+ *(kyy(i+1,j,k) - kyy(i,j,k))/dx
- LIEK_LKZZ = LIEK_LKZZ + LIEK_BX
- & *(kzz(i+1,j,k) - kzz(i,j,k))/dx
+ LIEK_LKZZ = LIEK_LKZZ + LIEK_BX \
+ *(kzz(i+1,j,k) - kzz(i,j,k))/dx
- LIEK_LKXY = LIEK_LKXY + LIEK_BX
- & *(kxy(i+1,j,k) - kxy(i,j,k))/dx
+ LIEK_LKXY = LIEK_LKXY + LIEK_BX \
+ *(kxy(i+1,j,k) - kxy(i,j,k))/dx
- LIEK_LKXZ = LIEK_LKXZ + LIEK_BX
- & *(kxz(i+1,j,k) - kxz(i,j,k))/dx
+ LIEK_LKXZ = LIEK_LKXZ + LIEK_BX \
+ *(kxz(i+1,j,k) - kxz(i,j,k))/dx
- LIEK_LKYZ = LIEK_LKYZ + LIEK_BX
- & *(kyz(i+1,j,k) - kyz(i,j,k))/dx
+ LIEK_LKYZ = LIEK_LKYZ + LIEK_BX \
+ *(kyz(i+1,j,k) - kyz(i,j,k))/dx
else
- LIEK_LKXX = LIEK_LKXX + LIEK_BX
- & *(kxx(i,j,k) - kxx(i-1,j,k))/dx
+ LIEK_LKXX = LIEK_LKXX + LIEK_BX \
+ *(kxx(i,j,k) - kxx(i-1,j,k))/dx
- LIEK_LKYY = LIEK_LKYY + LIEK_BX
- & *(kyy(i,j,k) - kyy(i-1,j,k))/dx
+ LIEK_LKYY = LIEK_LKYY + LIEK_BX \
+ *(kyy(i,j,k) - kyy(i-1,j,k))/dx
- LIEK_LKZZ = LIEK_LKZZ + LIEK_BX
- & *(kzz(i,j,k) - kzz(i-1,j,k))/dx
+ LIEK_LKZZ = LIEK_LKZZ + LIEK_BX \
+ *(kzz(i,j,k) - kzz(i-1,j,k))/dx
- LIEK_LKXY = LIEK_LKXY + LIEK_BX
- & *(kxy(i,j,k) - kxy(i-1,j,k))/dx
+ LIEK_LKXY = LIEK_LKXY + LIEK_BX \
+ *(kxy(i,j,k) - kxy(i-1,j,k))/dx
- LIEK_LKXZ = LIEK_LKXZ + LIEK_BX
- & *(kxz(i,j,k) - kxz(i-1,j,k))/dx
+ LIEK_LKXZ = LIEK_LKXZ + LIEK_BX \
+ *(kxz(i,j,k) - kxz(i-1,j,k))/dx
- LIEK_LKYZ = LIEK_LKYZ + LIEK_BX
- & *(kyz(i,j,k) - kyz(i-1,j,k))/dx
+ LIEK_LKYZ = LIEK_LKYZ + LIEK_BX \
+ *(kyz(i,j,k) - kyz(i-1,j,k))/dx
end if
if (LIEK_BY.gt.0.0D0) then
- LIEK_LKXX = LIEK_LKXX + LIEK_BY
- & *(kxx(i,j+1,k) - kxx(i,j,k))/dy
+ LIEK_LKXX = LIEK_LKXX + LIEK_BY \
+ *(kxx(i,j+1,k) - kxx(i,j,k))/dy
- LIEK_LKYY = LIEK_LKYY + LIEK_BY
- & *(kyy(i,j+1,k) - kyy(i,j,k))/dy
+ LIEK_LKYY = LIEK_LKYY + LIEK_BY \
+ *(kyy(i,j+1,k) - kyy(i,j,k))/dy
- LIEK_LKZZ = LIEK_LKZZ + LIEK_BY
- & *(kzz(i,j+1,k) - kzz(i,j,k))/dy
+ LIEK_LKZZ = LIEK_LKZZ + LIEK_BY \
+ *(kzz(i,j+1,k) - kzz(i,j,k))/dy
- LIEK_LKXY = LIEK_LKXY + LIEK_BY
- & *(kxy(i,j+1,k) - kxy(i,j,k))/dy
+ LIEK_LKXY = LIEK_LKXY + LIEK_BY \
+ *(kxy(i,j+1,k) - kxy(i,j,k))/dy
- LIEK_LKXZ = LIEK_LKXZ + LIEK_BY
- & *(kxz(i,j+1,k) - kxz(i,j,k))/dy
+ LIEK_LKXZ = LIEK_LKXZ + LIEK_BY \
+ *(kxz(i,j+1,k) - kxz(i,j,k))/dy
- LIEK_LKYZ = LIEK_LKYZ + LIEK_BY
- & *(kyz(i,j+1,k) - kyz(i,j,k))/dy
+ LIEK_LKYZ = LIEK_LKYZ + LIEK_BY \
+ *(kyz(i,j+1,k) - kyz(i,j,k))/dy
else
- LIEK_LKXX = LIEK_LKXX + LIEK_BY
- & *(kxx(i,j,k) - kxx(i,j-1,k))/dy
+ LIEK_LKXX = LIEK_LKXX + LIEK_BY \
+ *(kxx(i,j,k) - kxx(i,j-1,k))/dy
- LIEK_LKYY = LIEK_LKYY + LIEK_BY
- & *(kyy(i,j,k) - kyy(i,j-1,k))/dy
+ LIEK_LKYY = LIEK_LKYY + LIEK_BY \
+ *(kyy(i,j,k) - kyy(i,j-1,k))/dy
- LIEK_LKZZ = LIEK_LKZZ + LIEK_BY
- & *(kzz(i,j,k) - kzz(i,j-1,k))/dy
+ LIEK_LKZZ = LIEK_LKZZ + LIEK_BY \
+ *(kzz(i,j,k) - kzz(i,j-1,k))/dy
- LIEK_LKXY = LIEK_LKXY + LIEK_BY
- & *(kxy(i,j,k) - kxy(i,j-1,k))/dy
+ LIEK_LKXY = LIEK_LKXY + LIEK_BY \
+ *(kxy(i,j,k) - kxy(i,j-1,k))/dy
- LIEK_LKXZ = LIEK_LKXZ + LIEK_BY
- & *(kxz(i,j,k) - kxz(i,j-1,k))/dy
+ LIEK_LKXZ = LIEK_LKXZ + LIEK_BY \
+ *(kxz(i,j,k) - kxz(i,j-1,k))/dy
- LIEK_LKYZ = LIEK_LKYZ + LIEK_BY
- & *(kyz(i,j,k) - kyz(i,j-1,k))/dy
+ LIEK_LKYZ = LIEK_LKYZ + LIEK_BY \
+ *(kyz(i,j,k) - kyz(i,j-1,k))/dy
end if
if (LIEK_BZ.gt.0.0D0) then
- LIEK_LKXX = LIEK_LKXX + LIEK_BZ
- & *(kxx(i,j,k+1) - kxx(i,j,k))/dz
+ LIEK_LKXX = LIEK_LKXX + LIEK_BZ \
+ *(kxx(i,j,k+1) - kxx(i,j,k))/dz
- LIEK_LKYY = LIEK_LKYY + LIEK_BZ
- & *(kyy(i,j,k+1) - kyy(i,j,k))/dz
+ LIEK_LKYY = LIEK_LKYY + LIEK_BZ \
+ *(kyy(i,j,k+1) - kyy(i,j,k))/dz
- LIEK_LKZZ = LIEK_LKZZ + LIEK_BZ
- & *(kzz(i,j,k+1) - kzz(i,j,k))/dz
+ LIEK_LKZZ = LIEK_LKZZ + LIEK_BZ \
+ *(kzz(i,j,k+1) - kzz(i,j,k))/dz
- LIEK_LKXY = LIEK_LKXY + LIEK_BZ
- & *(kxy(i,j,k+1) - kxy(i,j,k))/dz
+ LIEK_LKXY = LIEK_LKXY + LIEK_BZ \
+ *(kxy(i,j,k+1) - kxy(i,j,k))/dz
- LIEK_LKXZ = LIEK_LKXZ + LIEK_BZ
- & *(kxz(i,j,k+1) - kxz(i,j,k))/dz
+ LIEK_LKXZ = LIEK_LKXZ + LIEK_BZ \
+ *(kxz(i,j,k+1) - kxz(i,j,k))/dz
- LIEK_LKYZ = LIEK_LKYZ + LIEK_BZ
- & *(kyz(i,j,k+1) - kyz(i,j,k))/dz
+ LIEK_LKYZ = LIEK_LKYZ + LIEK_BZ \
+ *(kyz(i,j,k+1) - kyz(i,j,k))/dz
else
- LIEK_LKXX = LIEK_LKXX + LIEK_BZ
- & *(kxx(i,j,k) - kxx(i,j,k-1))/dz
+ LIEK_LKXX = LIEK_LKXX + LIEK_BZ \
+ *(kxx(i,j,k) - kxx(i,j,k-1))/dz
- LIEK_LKYY = LIEK_LKYY + LIEK_BZ
- & *(kyy(i,j,k) - kyy(i,j,k-1))/dz
+ LIEK_LKYY = LIEK_LKYY + LIEK_BZ \
+ *(kyy(i,j,k) - kyy(i,j,k-1))/dz
- LIEK_LKZZ = LIEK_LKZZ + LIEK_BZ
- & *(kzz(i,j,k) - kzz(i,j,k-1))/dz
+ LIEK_LKZZ = LIEK_LKZZ + LIEK_BZ \
+ *(kzz(i,j,k) - kzz(i,j,k-1))/dz
- LIEK_LKXY = LIEK_LKXY + LIEK_BZ
- & *(kxy(i,j,k) - kxy(i,j,k-1))/dz
+ LIEK_LKXY = LIEK_LKXY + LIEK_BZ \
+ *(kxy(i,j,k) - kxy(i,j,k-1))/dz
- LIEK_LKXZ = LIEK_LKXZ + LIEK_BZ
- & *(kxz(i,j,k) - kxz(i,j,k-1))/dz
+ LIEK_LKXZ = LIEK_LKXZ + LIEK_BZ \
+ *(kxz(i,j,k) - kxz(i,j,k-1))/dz
- LIEK_LKYZ = LIEK_LKYZ + LIEK_BZ
- & *(kyz(i,j,k) - kyz(i,j,k-1))/dz
+ LIEK_LKYZ = LIEK_LKYZ + LIEK_BZ \
+ *(kyz(i,j,k) - kyz(i,j,k-1))/dz
end if
@@ -186,127 +186,127 @@
if (LIEK_BX.gt.0.0D0) then
- LIEK_LKXX = LIEK_LKXX - 0.5D0*LIEK_BX/dx
- & *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i+1,j,k) + kxx(i+2,j,k))
+ LIEK_LKXX = LIEK_LKXX - 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i+1,j,k) + kxx(i+2,j,k))
- LIEK_LKYY = LIEK_LKYY - 0.5D0*LIEK_BX/dx
- & *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i+1,j,k) + kyy(i+2,j,k))
+ LIEK_LKYY = LIEK_LKYY - 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i+1,j,k) + kyy(i+2,j,k))
- LIEK_LKZZ = LIEK_LKZZ - 0.5D0*LIEK_BX/dx
- & *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i+1,j,k) + kzz(i+2,j,k))
+ LIEK_LKZZ = LIEK_LKZZ - 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i+1,j,k) + kzz(i+2,j,k))
- LIEK_LKXY = LIEK_LKXY - 0.5D0*LIEK_BX/dx
- & *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i+1,j,k) + kxy(i+2,j,k))
+ LIEK_LKXY = LIEK_LKXY - 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i+1,j,k) + kxy(i+2,j,k))
- LIEK_LKXZ = LIEK_LKXZ - 0.5D0*LIEK_BX/dx
- & *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i+1,j,k) + kxz(i+2,j,k))
+ LIEK_LKXZ = LIEK_LKXZ - 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i+1,j,k) + kxz(i+2,j,k))
- LIEK_LKYZ = LIEK_LKYZ - 0.5D0*LIEK_BX/dx
- & *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i+1,j,k) + kyz(i+2,j,k))
+ LIEK_LKYZ = LIEK_LKYZ - 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i+1,j,k) + kyz(i+2,j,k))
else
- LIEK_LKXX = LIEK_LKXX + 0.5D0*LIEK_BX/dx
- & *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i-1,j,k) + kxx(i-2,j,k))
+ LIEK_LKXX = LIEK_LKXX + 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i-1,j,k) + kxx(i-2,j,k))
- LIEK_LKYY = LIEK_LKYY + 0.5D0*LIEK_BX/dx
- & *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i-1,j,k) + kyy(i-2,j,k))
+ LIEK_LKYY = LIEK_LKYY + 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i-1,j,k) + kyy(i-2,j,k))
- LIEK_LKZZ = LIEK_LKZZ + 0.5D0*LIEK_BX/dx
- & *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i-1,j,k) + kzz(i-2,j,k))
+ LIEK_LKZZ = LIEK_LKZZ + 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i-1,j,k) + kzz(i-2,j,k))
- LIEK_LKXY = LIEK_LKXY + 0.5D0*LIEK_BX/dx
- & *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i-1,j,k) + kxy(i-2,j,k))
+ LIEK_LKXY = LIEK_LKXY + 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i-1,j,k) + kxy(i-2,j,k))
- LIEK_LKXZ = LIEK_LKXZ + 0.5D0*LIEK_BX/dx
- & *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i-1,j,k) + kxz(i-2,j,k))
+ LIEK_LKXZ = LIEK_LKXZ + 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i-1,j,k) + kxz(i-2,j,k))
- LIEK_LKYZ = LIEK_LKYZ + 0.5D0*LIEK_BX/dx
- & *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i-1,j,k) + kyz(i-2,j,k))
+ LIEK_LKYZ = LIEK_LKYZ + 0.5D0*LIEK_BX/dx \
+ *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i-1,j,k) + kyz(i-2,j,k))
end if
if (LIEK_BY.gt.0.0D0) then
- LIEK_LKXX = LIEK_LKXX - 0.5D0*LIEK_BY/dy
- & *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i,j+1,k) + kxx(i,j+2,k))
+ LIEK_LKXX = LIEK_LKXX - 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i,j+1,k) + kxx(i,j+2,k))
- LIEK_LKYY = LIEK_LKYY - 0.5D0*LIEK_BY/dy
- & *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i,j+1,k) + kyy(i,j+2,k))
+ LIEK_LKYY = LIEK_LKYY - 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i,j+1,k) + kyy(i,j+2,k))
- LIEK_LKZZ = LIEK_LKZZ - 0.5D0*LIEK_BY/dy
- & *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i,j+1,k) + kzz(i,j+2,k))
+ LIEK_LKZZ = LIEK_LKZZ - 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i,j+1,k) + kzz(i,j+2,k))
- LIEK_LKXY = LIEK_LKXY - 0.5D0*LIEK_BY/dy
- & *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i,j+1,k) + kxy(i,j+2,k))
+ LIEK_LKXY = LIEK_LKXY - 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i,j+1,k) + kxy(i,j+2,k))
- LIEK_LKXZ = LIEK_LKXZ - 0.5D0*LIEK_BY/dy
- & *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i,j+1,k) + kxz(i,j+2,k))
+ LIEK_LKXZ = LIEK_LKXZ - 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i,j+1,k) + kxz(i,j+2,k))
- LIEK_LKYZ = LIEK_LKYZ - 0.5D0*LIEK_BY/dy
- & *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i,j+1,k) + kyz(i,j+2,k))
+ LIEK_LKYZ = LIEK_LKYZ - 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i,j+1,k) + kyz(i,j+2,k))
else
- LIEK_LKXX = LIEK_LKXX + 0.5D0*LIEK_BY/dy
- & *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i,j-1,k) + kxx(i,j-2,k))
+ LIEK_LKXX = LIEK_LKXX + 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i,j-1,k) + kxx(i,j-2,k))
- LIEK_LKYY = LIEK_LKYY + 0.5D0*LIEK_BY/dy
- & *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i,j-1,k) + kyy(i,j-2,k))
+ LIEK_LKYY = LIEK_LKYY + 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i,j-1,k) + kyy(i,j-2,k))
- LIEK_LKZZ = LIEK_LKZZ + 0.5D0*LIEK_BY/dy
- & *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i,j-1,k) + kzz(i,j-2,k))
+ LIEK_LKZZ = LIEK_LKZZ + 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i,j-1,k) + kzz(i,j-2,k))
- LIEK_LKXY = LIEK_LKXY + 0.5D0*LIEK_BY/dy
- & *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i,j-1,k) + kxy(i,j-2,k))
+ LIEK_LKXY = LIEK_LKXY + 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i,j-1,k) + kxy(i,j-2,k))
- LIEK_LKXZ = LIEK_LKXZ + 0.5D0*LIEK_BY/dy
- & *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i,j-1,k) + kxz(i,j-2,k))
+ LIEK_LKXZ = LIEK_LKXZ + 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i,j-1,k) + kxz(i,j-2,k))
- LIEK_LKYZ = LIEK_LKYZ + 0.5D0*LIEK_BY/dy
- & *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i,j-1,k) + kyz(i,j-2,k))
+ LIEK_LKYZ = LIEK_LKYZ + 0.5D0*LIEK_BY/dy \
+ *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i,j-1,k) + kyz(i,j-2,k))
end if
if (LIEK_BZ.gt.0.0D0) then
- LIEK_LKXX = LIEK_LKXX - 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i,j,k+1) + kxx(i,j,k+2))
+ LIEK_LKXX = LIEK_LKXX - 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i,j,k+1) + kxx(i,j,k+2))
- LIEK_LKYY = LIEK_LKYY - 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i,j,k+1) + kyy(i,j,k+2))
+ LIEK_LKYY = LIEK_LKYY - 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i,j,k+1) + kyy(i,j,k+2))
- LIEK_LKZZ = LIEK_LKZZ - 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i,j,k+1) + kzz(i,j,k+2))
+ LIEK_LKZZ = LIEK_LKZZ - 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i,j,k+1) + kzz(i,j,k+2))
- LIEK_LKXY = LIEK_LKXY - 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i,j,k+1) + kxy(i,j,k+2))
+ LIEK_LKXY = LIEK_LKXY - 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i,j,k+1) + kxy(i,j,k+2))
- LIEK_LKXZ = LIEK_LKXZ - 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i,j,k+1) + kxz(i,j,k+2))
+ LIEK_LKXZ = LIEK_LKXZ - 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i,j,k+1) + kxz(i,j,k+2))
- LIEK_LKYZ = LIEK_LKYZ - 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i,j,k+1) + kyz(i,j,k+2))
+ LIEK_LKYZ = LIEK_LKYZ - 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i,j,k+1) + kyz(i,j,k+2))
else
- LIEK_LKXX = LIEK_LKXX + 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i,j,k-1) + kxx(i,j,k-2))
+ LIEK_LKXX = LIEK_LKXX + 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kxx(i,j,k) - 4.0D0*kxx(i,j,k-1) + kxx(i,j,k-2))
- LIEK_LKYY = LIEK_LKYY + 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i,j,k-1) + kyy(i,j,k-2))
+ LIEK_LKYY = LIEK_LKYY + 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kyy(i,j,k) - 4.0D0*kyy(i,j,k-1) + kyy(i,j,k-2))
- LIEK_LKZZ = LIEK_LKZZ + 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i,j,k-1) + kzz(i,j,k-2))
+ LIEK_LKZZ = LIEK_LKZZ + 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kzz(i,j,k) - 4.0D0*kzz(i,j,k-1) + kzz(i,j,k-2))
- LIEK_LKXY = LIEK_LKXY + 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i,j,k-1) + kxy(i,j,k-2))
+ LIEK_LKXY = LIEK_LKXY + 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kxy(i,j,k) - 4.0D0*kxy(i,j,k-1) + kxy(i,j,k-2))
- LIEK_LKXZ = LIEK_LKXZ + 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i,j,k-1) + kxz(i,j,k-2))
+ LIEK_LKXZ = LIEK_LKXZ + 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kxz(i,j,k) - 4.0D0*kxz(i,j,k-1) + kxz(i,j,k-2))
- LIEK_LKYZ = LIEK_LKYZ + 0.5D0*LIEK_BZ/dz
- & *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i,j,k-1) + kyz(i,j,k-2))
+ LIEK_LKYZ = LIEK_LKYZ + 0.5D0*LIEK_BZ/dz \
+ *(3.0D0*kyz(i,j,k) - 4.0D0*kyz(i,j,k-1) + kyz(i,j,k-2))
end if
@@ -314,26 +314,26 @@
/* Extra terms in the Lie derivative. */
- LIEK_LKXX = LIEK_LKXX + 2.0D0*(DXDB_DXDBX*LIEK_KXX
- & + DXDB_DXDBY*LIEK_KXY + DXDB_DXDBZ*LIEK_KXZ)
+ LIEK_LKXX = LIEK_LKXX + 2.0D0*(DXDB_DXDBX*LIEK_KXX \
+ + DXDB_DXDBY*LIEK_KXY + DXDB_DXDBZ*LIEK_KXZ)
- LIEK_LKYY = LIEK_LKYY + 2.0D0*(DYDB_DYDBX*LIEK_KXY
- & + DYDB_DYDBY*LIEK_KYY + DYDB_DYDBZ*LIEK_KYZ)
+ LIEK_LKYY = LIEK_LKYY + 2.0D0*(DYDB_DYDBX*LIEK_KXY \
+ + DYDB_DYDBY*LIEK_KYY + DYDB_DYDBZ*LIEK_KYZ)
- LIEK_LKZZ = LIEK_LKZZ + 2.0D0*(DZDB_DZDBX*LIEK_KXZ
- & + DZDB_DZDBY*LIEK_KYZ + DZDB_DZDBZ*LIEK_KZZ)
+ LIEK_LKZZ = LIEK_LKZZ + 2.0D0*(DZDB_DZDBX*LIEK_KXZ \
+ + DZDB_DZDBY*LIEK_KYZ + DZDB_DZDBZ*LIEK_KZZ)
- LIEK_LKXY = LIEK_LKXY + DYDB_DYDBX*LIEK_KXX + DXDB_DXDBY*LIEK_KYY
- & + (DXDB_DXDBX + DYDB_DYDBY)*LIEK_KXY
- & + DYDB_DYDBZ*LIEK_KXZ + DXDB_DXDBZ*LIEK_KYZ
+ LIEK_LKXY = LIEK_LKXY + DYDB_DYDBX*LIEK_KXX + DXDB_DXDBY*LIEK_KYY \
+ + (DXDB_DXDBX + DYDB_DYDBY)*LIEK_KXY \
+ + DYDB_DYDBZ*LIEK_KXZ + DXDB_DXDBZ*LIEK_KYZ
- LIEK_LKXZ = LIEK_LKXZ + DZDB_DZDBX*LIEK_KXX + DXDB_DXDBZ*LIEK_KZZ
- & + (DXDB_DXDBX + DZDB_DZDBZ)*LIEK_KXZ
- & + DZDB_DZDBY*LIEK_KXY + DXDB_DXDBY*LIEK_KYZ
+ LIEK_LKXZ = LIEK_LKXZ + DZDB_DZDBX*LIEK_KXX + DXDB_DXDBZ*LIEK_KZZ \
+ + (DXDB_DXDBX + DZDB_DZDBZ)*LIEK_KXZ \
+ + DZDB_DZDBY*LIEK_KXY + DXDB_DXDBY*LIEK_KYZ
- LIEK_LKYZ = LIEK_LKYZ + DZDB_DZDBY*LIEK_KYY + DYDB_DYDBZ*LIEK_KZZ
- & + (DYDB_DYDBY + DZDB_DZDBZ)*LIEK_KYZ
- & + DZDB_DZDBX*LIEK_KXY + DYDB_DYDBX*LIEK_KXZ
+ LIEK_LKYZ = LIEK_LKYZ + DZDB_DZDBY*LIEK_KYY + DYDB_DYDBZ*LIEK_KZZ \
+ + (DYDB_DYDBY + DZDB_DZDBZ)*LIEK_KYZ \
+ + DZDB_DZDBX*LIEK_KXY + DYDB_DYDBX*LIEK_KXZ
#endif
diff --git a/src/macro/MOMXADM_guts.h b/src/macro/MOMXADM_guts.h
index d8d79ef..6bff88e 100644
--- a/src/macro/MOMXADM_guts.h
+++ b/src/macro/MOMXADM_guts.h
@@ -19,11 +19,11 @@
#ifdef FCODE
- MOMXADM_MOMXADM = (-CDXCDK_CDXCDKXY + CDYCDK_CDYCDKXX)*UPPERMET_UXY
- & + (-CDXCDK_CDXCDKXZ + CDZCDK_CDZCDKXX)*UPPERMET_UXZ +
- & (-CDXCDK_CDXCDKYY + CDYCDK_CDYCDKXY)*UPPERMET_UYY +
- & (-2*CDXCDK_CDXCDKYZ + CDYCDK_CDYCDKXZ + CDZCDK_CDZCDKXY)*
- & UPPERMET_UYZ + (-CDXCDK_CDXCDKZZ + CDZCDK_CDZCDKXZ)*UPPERMET_UZZ
+ MOMXADM_MOMXADM = (-CDXCDK_CDXCDKXY + CDYCDK_CDYCDKXX)*UPPERMET_UXY \
+ + (-CDXCDK_CDXCDKXZ + CDZCDK_CDZCDKXX)*UPPERMET_UXZ + \
+ (-CDXCDK_CDXCDKYY + CDYCDK_CDYCDKXY)*UPPERMET_UYY + \
+ (-2*CDXCDK_CDXCDKYZ + CDYCDK_CDYCDKXZ + CDZCDK_CDZCDKXY)* \
+ UPPERMET_UYZ + (-CDXCDK_CDXCDKZZ + CDZCDK_CDZCDKXZ)*UPPERMET_UZZ
#endif
diff --git a/src/macro/MOMYADM_guts.h b/src/macro/MOMYADM_guts.h
index c2040f3..29fb2cf 100644
--- a/src/macro/MOMYADM_guts.h
+++ b/src/macro/MOMYADM_guts.h
@@ -19,11 +19,11 @@
#ifdef FCODE
- MOMYADM_MOMYADM = (CDXCDK_CDXCDKXY - CDYCDK_CDYCDKXX)*UPPERMET_UXX
- & + (CDXCDK_CDXCDKYY - CDYCDK_CDYCDKXY)*UPPERMET_UXY +
- & (CDXCDK_CDXCDKYZ - 2*CDYCDK_CDYCDKXZ + CDZCDK_CDZCDKXY)*UPPERMET_UXZ +
- & (-CDYCDK_CDYCDKYZ + CDZCDK_CDZCDKYY)*UPPERMET_UYZ +
- & (-CDYCDK_CDYCDKZZ + CDZCDK_CDZCDKYZ)*UPPERMET_UZZ
+ MOMYADM_MOMYADM = (CDXCDK_CDXCDKXY - CDYCDK_CDYCDKXX)*UPPERMET_UXX \
+ + (CDXCDK_CDXCDKYY - CDYCDK_CDYCDKXY)*UPPERMET_UXY + \
+ (CDXCDK_CDXCDKYZ - 2*CDYCDK_CDYCDKXZ + CDZCDK_CDZCDKXY)*UPPERMET_UXZ + \
+ (-CDYCDK_CDYCDKYZ + CDZCDK_CDZCDKYY)*UPPERMET_UYZ + \
+ (-CDYCDK_CDYCDKZZ + CDZCDK_CDZCDKYZ)*UPPERMET_UZZ
#endif
diff --git a/src/macro/MOMZADM_guts.h b/src/macro/MOMZADM_guts.h
index 0bb555b..28bfb09 100644
--- a/src/macro/MOMZADM_guts.h
+++ b/src/macro/MOMZADM_guts.h
@@ -19,10 +19,10 @@
#ifdef FCODE
- MOMZADM_MOMZADM = (CDXCDK_CDXCDKXZ - CDZCDK_CDZCDKXX)*UPPERMET_UXX +
- & (CDXCDK_CDXCDKYZ + CDYCDK_CDYCDKXZ - 2*CDZCDK_CDZCDKXY)*UPPERMET_UXY +
- & (CDXCDK_CDXCDKZZ - CDZCDK_CDZCDKXZ)*UPPERMET_UXZ + (CDYCDK_CDYCDKYZ -
- & CDZCDK_CDZCDKYY)*UPPERMET_UYY + (CDYCDK_CDYCDKZZ - CDZCDK_CDZCDKYZ)*UPPERMET_UYZ
+ MOMZADM_MOMZADM = (CDXCDK_CDXCDKXZ - CDZCDK_CDZCDKXX)*UPPERMET_UXX + \
+ (CDXCDK_CDXCDKYZ + CDYCDK_CDYCDKXZ - 2*CDZCDK_CDZCDKXY)*UPPERMET_UXY + \
+ (CDXCDK_CDXCDKZZ - CDZCDK_CDZCDKXZ)*UPPERMET_UXZ + (CDYCDK_CDYCDKYZ - \
+ CDZCDK_CDZCDKYY)*UPPERMET_UYY + (CDYCDK_CDYCDKZZ - CDZCDK_CDZCDKYZ)*UPPERMET_UYZ
#endif
diff --git a/src/macro/NABA_guts.h b/src/macro/NABA_guts.h
index 82cacbb..2b8da38 100644
--- a/src/macro/NABA_guts.h
+++ b/src/macro/NABA_guts.h
@@ -18,9 +18,9 @@
#ifdef FCODE
- NABA_NABA = UPPERMET_UXX*CDCDA_CDXXDA+UPPERMET_UYY*CDCDA_CDYYDA
- & +UPPERMET_UZZ*CDCDA_CDZZDA+2*(UPPERMET_UXY*CDCDA_CDXYDA+UPPERMET_UXZ*CDCDA_CDXZDA
- & +UPPERMET_UYZ*CDCDA_CDYZDA)
+ NABA_NABA = UPPERMET_UXX*CDCDA_CDXXDA+UPPERMET_UYY*CDCDA_CDYYDA \
+ +UPPERMET_UZZ*CDCDA_CDZZDA+2*(UPPERMET_UXY*CDCDA_CDXYDA+UPPERMET_UXZ*CDCDA_CDXZDA \
+ +UPPERMET_UYZ*CDCDA_CDYZDA)
#endif
diff --git a/src/macro/RICCI_guts.h b/src/macro/RICCI_guts.h
index 11a4aa3..4e1cc0b 100644
--- a/src/macro/RICCI_guts.h
+++ b/src/macro/RICCI_guts.h
@@ -25,82 +25,82 @@
#ifdef FCODE
- RICCI_RXX = (DXYDG_DXYDGXY+(-DXXDG_DXXDGYY-DYYDG_DYYDGXX)/2 -
- & CHR1_XYY*CHR2_XXX +CHR1_XXY*CHR2_XXY-CHR1_YYY*CHR2_YXX +
- & CHR1_YXY*CHR2_YXY - CHR1_ZYY*CHR2_ZXX +
- & CHR1_ZXY*CHR2_ZXY)*UPPERMET_UYY + (-DXXDG_DXXDGYZ + DXYDG_DXYDGXZ +
- & DXZDG_DXZDGXY - DYZDG_DYZDGXX - 2*(CHR1_YYZ*CHR2_YXX +
- & CHR1_ZYZ*CHR2_ZXX) + 2*(-(CHR1_XYZ*CHR2_XXX) + CHR1_XXZ*CHR2_XXY +
- & CHR1_YXZ*CHR2_YXY + CHR1_ZXZ*CHR2_ZXY))*UPPERMET_UYZ + (DXZDG_DXZDGXZ
- & + (-DXXDG_DXXDGZZ - DZZDG_DZZDGXX)/2 - CHR1_XZZ*CHR2_XXX +
- & CHR1_XXZ*CHR2_XXZ - CHR1_YZZ*CHR2_YXX + CHR1_YXZ*CHR2_YXZ -
- & CHR1_ZZZ*CHR2_ZXX + CHR1_ZXZ*CHR2_ZXZ)*UPPERMET_UZZ
-
- RICCI_RXY = (-DXYDG_DXYDGXY + (DXXDG_DXXDGYY + DYYDG_DYYDGXX)/2 +
- & CHR1_XYY*CHR2_XXX - CHR1_XXY*CHR2_XXY + CHR1_YYY*CHR2_YXX -
- & CHR1_YXY*CHR2_YXY + CHR1_ZYY*CHR2_ZXX -
- & CHR1_ZXY*CHR2_ZXY)*UPPERMET_UXY + ((DXXDG_DXXDGYZ - DXYDG_DXYDGXZ -
- & DXZDG_DXZDGXY + DYZDG_DYZDGXX)/2 + CHR1_XYZ*CHR2_XXX -
- & CHR1_XXZ*CHR2_XXY + CHR1_YYZ*CHR2_YXX - CHR1_YXZ*CHR2_YXY +
- & CHR1_ZYZ*CHR2_ZXX - CHR1_ZXZ*CHR2_ZXY)*UPPERMET_UXZ +
- & ((-DXYDG_DXYDGYZ + DXZDG_DXZDGYY + DYYDG_DYYDGXZ - DYZDG_DYZDGXY)/2 -
- & CHR1_XYZ*CHR2_XXY + CHR1_XYY*CHR2_XXZ - CHR1_YYZ*CHR2_YXY +
- & CHR1_YYY*CHR2_YXZ - CHR1_ZYZ*CHR2_ZXY +
- & CHR1_ZYY*CHR2_ZXZ)*UPPERMET_UYZ + ((-DXYDG_DXYDGZZ + DXZDG_DXZDGYZ +
- & DYZDG_DYZDGXZ - DZZDG_DZZDGXY)/2 - CHR1_XZZ*CHR2_XXY +
- & CHR1_XYZ*CHR2_XXZ - CHR1_YZZ*CHR2_YXY + CHR1_YYZ*CHR2_YXZ -
- & CHR1_ZZZ*CHR2_ZXY + CHR1_ZYZ*CHR2_ZXZ)*UPPERMET_UZZ ;
+ RICCI_RXX = (DXYDG_DXYDGXY+(-DXXDG_DXXDGYY-DYYDG_DYYDGXX)/2 - \
+ CHR1_XYY*CHR2_XXX +CHR1_XXY*CHR2_XXY-CHR1_YYY*CHR2_YXX + \
+ CHR1_YXY*CHR2_YXY - CHR1_ZYY*CHR2_ZXX + \
+ CHR1_ZXY*CHR2_ZXY)*UPPERMET_UYY + (-DXXDG_DXXDGYZ + DXYDG_DXYDGXZ + \
+ DXZDG_DXZDGXY - DYZDG_DYZDGXX - 2*(CHR1_YYZ*CHR2_YXX + \
+ CHR1_ZYZ*CHR2_ZXX) + 2*(-(CHR1_XYZ*CHR2_XXX) + CHR1_XXZ*CHR2_XXY + \
+ CHR1_YXZ*CHR2_YXY + CHR1_ZXZ*CHR2_ZXY))*UPPERMET_UYZ + (DXZDG_DXZDGXZ \
+ + (-DXXDG_DXXDGZZ - DZZDG_DZZDGXX)/2 - CHR1_XZZ*CHR2_XXX + \
+ CHR1_XXZ*CHR2_XXZ - CHR1_YZZ*CHR2_YXX + CHR1_YXZ*CHR2_YXZ - \
+ CHR1_ZZZ*CHR2_ZXX + CHR1_ZXZ*CHR2_ZXZ)*UPPERMET_UZZ
+
+ RICCI_RXY = (-DXYDG_DXYDGXY + (DXXDG_DXXDGYY + DYYDG_DYYDGXX)/2 + \
+ CHR1_XYY*CHR2_XXX - CHR1_XXY*CHR2_XXY + CHR1_YYY*CHR2_YXX - \
+ CHR1_YXY*CHR2_YXY + CHR1_ZYY*CHR2_ZXX - \
+ CHR1_ZXY*CHR2_ZXY)*UPPERMET_UXY + ((DXXDG_DXXDGYZ - DXYDG_DXYDGXZ - \
+ DXZDG_DXZDGXY + DYZDG_DYZDGXX)/2 + CHR1_XYZ*CHR2_XXX - \
+ CHR1_XXZ*CHR2_XXY + CHR1_YYZ*CHR2_YXX - CHR1_YXZ*CHR2_YXY + \
+ CHR1_ZYZ*CHR2_ZXX - CHR1_ZXZ*CHR2_ZXY)*UPPERMET_UXZ + \
+ ((-DXYDG_DXYDGYZ + DXZDG_DXZDGYY + DYYDG_DYYDGXZ - DYZDG_DYZDGXY)/2 - \
+ CHR1_XYZ*CHR2_XXY + CHR1_XYY*CHR2_XXZ - CHR1_YYZ*CHR2_YXY + \
+ CHR1_YYY*CHR2_YXZ - CHR1_ZYZ*CHR2_ZXY + \
+ CHR1_ZYY*CHR2_ZXZ)*UPPERMET_UYZ + ((-DXYDG_DXYDGZZ + DXZDG_DXZDGYZ + \
+ DYZDG_DYZDGXZ - DZZDG_DZZDGXY)/2 - CHR1_XZZ*CHR2_XXY + \
+ CHR1_XYZ*CHR2_XXZ - CHR1_YZZ*CHR2_YXY + CHR1_YYZ*CHR2_YXZ - \
+ CHR1_ZZZ*CHR2_ZXY + CHR1_ZYZ*CHR2_ZXZ)*UPPERMET_UZZ ;
- RICCI_RXZ = ((DXXDG_DXXDGYZ - DXYDG_DXYDGXZ - DXZDG_DXZDGXY +
- & DYZDG_DYZDGXX)/2 + CHR1_XYZ*CHR2_XXX - CHR1_XXZ*CHR2_XXY +
- & CHR1_YYZ*CHR2_YXX - CHR1_YXZ*CHR2_YXY + CHR1_ZYZ*CHR2_ZXX -
- & CHR1_ZXZ*CHR2_ZXY)*UPPERMET_UXY + (-DXZDG_DXZDGXZ + (DXXDG_DXXDGZZ +
- & DZZDG_DZZDGXX)/2 + CHR1_XZZ*CHR2_XXX - CHR1_XXZ*CHR2_XXZ +
- & CHR1_YZZ*CHR2_YXX - CHR1_YXZ*CHR2_YXZ + CHR1_ZZZ*CHR2_ZXX -
- & CHR1_ZXZ*CHR2_ZXZ)*UPPERMET_UXZ + ((DXYDG_DXYDGYZ - DXZDG_DXZDGYY -
- & DYYDG_DYYDGXZ + DYZDG_DYZDGXY)/2 + CHR1_XYZ*CHR2_XXY -
- & CHR1_XYY*CHR2_XXZ + CHR1_YYZ*CHR2_YXY - CHR1_YYY*CHR2_YXZ +
- & CHR1_ZYZ*CHR2_ZXY - CHR1_ZYY*CHR2_ZXZ)*UPPERMET_UYY + ((DXYDG_DXYDGZZ
- & - DXZDG_DXZDGYZ - DYZDG_DYZDGXZ + DZZDG_DZZDGXY)/2 + CHR1_XZZ*CHR2_XXY
- & - CHR1_XYZ*CHR2_XXZ + CHR1_YZZ*CHR2_YXY - CHR1_YYZ*CHR2_YXZ +
- & CHR1_ZZZ*CHR2_ZXY - CHR1_ZYZ*CHR2_ZXZ)*UPPERMET_UYZ ;
+ RICCI_RXZ = ((DXXDG_DXXDGYZ - DXYDG_DXYDGXZ - DXZDG_DXZDGXY + \
+ DYZDG_DYZDGXX)/2 + CHR1_XYZ*CHR2_XXX - CHR1_XXZ*CHR2_XXY + \
+ CHR1_YYZ*CHR2_YXX - CHR1_YXZ*CHR2_YXY + CHR1_ZYZ*CHR2_ZXX - \
+ CHR1_ZXZ*CHR2_ZXY)*UPPERMET_UXY + (-DXZDG_DXZDGXZ + (DXXDG_DXXDGZZ + \
+ DZZDG_DZZDGXX)/2 + CHR1_XZZ*CHR2_XXX - CHR1_XXZ*CHR2_XXZ + \
+ CHR1_YZZ*CHR2_YXX - CHR1_YXZ*CHR2_YXZ + CHR1_ZZZ*CHR2_ZXX - \
+ CHR1_ZXZ*CHR2_ZXZ)*UPPERMET_UXZ + ((DXYDG_DXYDGYZ - DXZDG_DXZDGYY - \
+ DYYDG_DYYDGXZ + DYZDG_DYZDGXY)/2 + CHR1_XYZ*CHR2_XXY - \
+ CHR1_XYY*CHR2_XXZ + CHR1_YYZ*CHR2_YXY - CHR1_YYY*CHR2_YXZ + \
+ CHR1_ZYZ*CHR2_ZXY - CHR1_ZYY*CHR2_ZXZ)*UPPERMET_UYY + ((DXYDG_DXYDGZZ \
+ - DXZDG_DXZDGYZ - DYZDG_DYZDGXZ + DZZDG_DZZDGXY)/2 + CHR1_XZZ*CHR2_XXY \
+ - CHR1_XYZ*CHR2_XXZ + CHR1_YZZ*CHR2_YXY - CHR1_YYZ*CHR2_YXZ + \
+ CHR1_ZZZ*CHR2_ZXY - CHR1_ZYZ*CHR2_ZXZ)*UPPERMET_UYZ ;
- RICCI_RYY = (DXYDG_DXYDGXY + (-DXXDG_DXXDGYY - DYYDG_DYYDGXX)/2 -
- & CHR1_XYY*CHR2_XXX + CHR1_XXY*CHR2_XXY - CHR1_YYY*CHR2_YXX +
- & CHR1_YXY*CHR2_YXY - CHR1_ZYY*CHR2_ZXX +
- & CHR1_ZXY*CHR2_ZXY)*UPPERMET_UXX + (DXYDG_DXYDGYZ - DXZDG_DXZDGYY -
- & DYYDG_DYYDGXZ + DYZDG_DYZDGXY + 2*(CHR1_XYZ*CHR2_XXY -
- & CHR1_XYY*CHR2_XXZ + CHR1_YYZ*CHR2_YXY + CHR1_ZYZ*CHR2_ZXY) -
- & 2*(CHR1_YYY*CHR2_YXZ + CHR1_ZYY*CHR2_ZXZ)) *UPPERMET_UXZ +
- & (DYZDG_DYZDGYZ + (-DYYDG_DYYDGZZ - DZZDG_DZZDGYY)/2 -
- & CHR1_XZZ*CHR2_XYY + CHR1_XYZ*CHR2_XYZ - CHR1_YZZ*CHR2_YYY +
- & CHR1_YYZ*CHR2_YYZ - CHR1_ZZZ*CHR2_ZYY +
- & CHR1_ZYZ*CHR2_ZYZ)*UPPERMET_UZZ ;
+ RICCI_RYY = (DXYDG_DXYDGXY + (-DXXDG_DXXDGYY - DYYDG_DYYDGXX)/2 - \
+ CHR1_XYY*CHR2_XXX + CHR1_XXY*CHR2_XXY - CHR1_YYY*CHR2_YXX + \
+ CHR1_YXY*CHR2_YXY - CHR1_ZYY*CHR2_ZXX + \
+ CHR1_ZXY*CHR2_ZXY)*UPPERMET_UXX + (DXYDG_DXYDGYZ - DXZDG_DXZDGYY - \
+ DYYDG_DYYDGXZ + DYZDG_DYZDGXY + 2*(CHR1_XYZ*CHR2_XXY - \
+ CHR1_XYY*CHR2_XXZ + CHR1_YYZ*CHR2_YXY + CHR1_ZYZ*CHR2_ZXY) - \
+ 2*(CHR1_YYY*CHR2_YXZ + CHR1_ZYY*CHR2_ZXZ)) *UPPERMET_UXZ + \
+ (DYZDG_DYZDGYZ + (-DYYDG_DYYDGZZ - DZZDG_DZZDGYY)/2 - \
+ CHR1_XZZ*CHR2_XYY + CHR1_XYZ*CHR2_XYZ - CHR1_YZZ*CHR2_YYY + \
+ CHR1_YYZ*CHR2_YYZ - CHR1_ZZZ*CHR2_ZYY + \
+ CHR1_ZYZ*CHR2_ZYZ)*UPPERMET_UZZ ;
- RICCI_RYZ = ((-DXXDG_DXXDGYZ + DXYDG_DXYDGXZ + DXZDG_DXZDGXY -
- & DYZDG_DYZDGXX)/2 - CHR1_XYZ*CHR2_XXX + CHR1_XXZ*CHR2_XXY -
- & CHR1_YYZ*CHR2_YXX + CHR1_YXZ*CHR2_YXY - CHR1_ZYZ*CHR2_ZXX +
- & CHR1_ZXZ*CHR2_ZXY)*UPPERMET_UXX + ((-DXYDG_DXYDGYZ + DXZDG_DXZDGYY +
- & DYYDG_DYYDGXZ - DYZDG_DYZDGXY)/2 - CHR1_XYZ*CHR2_XXY +
- & CHR1_XYY*CHR2_XXZ - CHR1_YYZ*CHR2_YXY + CHR1_YYY*CHR2_YXZ -
- & CHR1_ZYZ*CHR2_ZXY + CHR1_ZYY*CHR2_ZXZ)*UPPERMET_UXY + ((DXYDG_DXYDGZZ
- & - DXZDG_DXZDGYZ - DYZDG_DYZDGXZ + DZZDG_DZZDGXY)/2 + CHR1_XZZ*CHR2_XXY
- & - CHR1_XYZ*CHR2_XXZ + CHR1_YZZ*CHR2_YXY - CHR1_YYZ*CHR2_YXZ +
- & CHR1_ZZZ*CHR2_ZXY - CHR1_ZYZ*CHR2_ZXZ)*UPPERMET_UXZ + (-DYZDG_DYZDGYZ
- & + (DYYDG_DYYDGZZ + DZZDG_DZZDGYY)/2 + CHR1_XZZ*CHR2_XYY -
- & CHR1_XYZ*CHR2_XYZ + CHR1_YZZ*CHR2_YYY - CHR1_YYZ*CHR2_YYZ +
- & CHR1_ZZZ*CHR2_ZYY - CHR1_ZYZ*CHR2_ZYZ)*UPPERMET_UYZ ;
+ RICCI_RYZ = ((-DXXDG_DXXDGYZ + DXYDG_DXYDGXZ + DXZDG_DXZDGXY - \
+ DYZDG_DYZDGXX)/2 - CHR1_XYZ*CHR2_XXX + CHR1_XXZ*CHR2_XXY - \
+ CHR1_YYZ*CHR2_YXX + CHR1_YXZ*CHR2_YXY - CHR1_ZYZ*CHR2_ZXX + \
+ CHR1_ZXZ*CHR2_ZXY)*UPPERMET_UXX + ((-DXYDG_DXYDGYZ + DXZDG_DXZDGYY + \
+ DYYDG_DYYDGXZ - DYZDG_DYZDGXY)/2 - CHR1_XYZ*CHR2_XXY + \
+ CHR1_XYY*CHR2_XXZ - CHR1_YYZ*CHR2_YXY + CHR1_YYY*CHR2_YXZ - \
+ CHR1_ZYZ*CHR2_ZXY + CHR1_ZYY*CHR2_ZXZ)*UPPERMET_UXY + ((DXYDG_DXYDGZZ \
+ - DXZDG_DXZDGYZ - DYZDG_DYZDGXZ + DZZDG_DZZDGXY)/2 + CHR1_XZZ*CHR2_XXY \
+ - CHR1_XYZ*CHR2_XXZ + CHR1_YZZ*CHR2_YXY - CHR1_YYZ*CHR2_YXZ + \
+ CHR1_ZZZ*CHR2_ZXY - CHR1_ZYZ*CHR2_ZXZ)*UPPERMET_UXZ + (-DYZDG_DYZDGYZ \
+ + (DYYDG_DYYDGZZ + DZZDG_DZZDGYY)/2 + CHR1_XZZ*CHR2_XYY - \
+ CHR1_XYZ*CHR2_XYZ + CHR1_YZZ*CHR2_YYY - CHR1_YYZ*CHR2_YYZ + \
+ CHR1_ZZZ*CHR2_ZYY - CHR1_ZYZ*CHR2_ZYZ)*UPPERMET_UYZ ;
- RICCI_RZZ = (DXZDG_DXZDGXZ + (-DXXDG_DXXDGZZ - DZZDG_DZZDGXX)/2 -
- & CHR1_XZZ*CHR2_XXX + CHR1_XXZ*CHR2_XXZ - CHR1_YZZ*CHR2_YXX +
- & CHR1_YXZ*CHR2_YXZ - CHR1_ZZZ*CHR2_ZXX +
- & CHR1_ZXZ*CHR2_ZXZ)*UPPERMET_UXX + (-DXYDG_DXYDGZZ + DXZDG_DXZDGYZ +
- & DYZDG_DYZDGXZ - DZZDG_DZZDGXY - 2*(CHR1_YZZ*CHR2_YXY +
- & CHR1_ZZZ*CHR2_ZXY) + 2*(-(CHR1_XZZ*CHR2_XXY) + CHR1_XYZ*CHR2_XXZ +
- & CHR1_YYZ*CHR2_YXZ + CHR1_ZYZ*CHR2_ZXZ))*UPPERMET_UXY + (DYZDG_DYZDGYZ
- & + (-DYYDG_DYYDGZZ - DZZDG_DZZDGYY)/2 - CHR1_XZZ*CHR2_XYY +
- & CHR1_XYZ*CHR2_XYZ - CHR1_YZZ*CHR2_YYY + CHR1_YYZ*CHR2_YYZ -
- & CHR1_ZZZ*CHR2_ZYY + CHR1_ZYZ*CHR2_ZYZ)*UPPERMET_UYY ;
+ RICCI_RZZ = (DXZDG_DXZDGXZ + (-DXXDG_DXXDGZZ - DZZDG_DZZDGXX)/2 - \
+ CHR1_XZZ*CHR2_XXX + CHR1_XXZ*CHR2_XXZ - CHR1_YZZ*CHR2_YXX + \
+ CHR1_YXZ*CHR2_YXZ - CHR1_ZZZ*CHR2_ZXX + \
+ CHR1_ZXZ*CHR2_ZXZ)*UPPERMET_UXX + (-DXYDG_DXYDGZZ + DXZDG_DXZDGYZ + \
+ DYZDG_DYZDGXZ - DZZDG_DZZDGXY - 2*(CHR1_YZZ*CHR2_YXY + \
+ CHR1_ZZZ*CHR2_ZXY) + 2*(-(CHR1_XZZ*CHR2_XXY) + CHR1_XYZ*CHR2_XXZ + \
+ CHR1_YYZ*CHR2_YXZ + CHR1_ZYZ*CHR2_ZXZ))*UPPERMET_UXY + (DYZDG_DYZDGYZ \
+ + (-DYYDG_DYYDGZZ - DZZDG_DZZDGYY)/2 - CHR1_XZZ*CHR2_XYY + \
+ CHR1_XYZ*CHR2_XYZ - CHR1_YZZ*CHR2_YYY + CHR1_YYZ*CHR2_YYZ - \
+ CHR1_ZZZ*CHR2_ZYY + CHR1_ZYZ*CHR2_ZYZ)*UPPERMET_UYY ;
#endif
diff --git a/src/macro/TRKK_guts.h b/src/macro/TRKK_guts.h
index 1db75c4..68fb6e0 100644
--- a/src/macro/TRKK_guts.h
+++ b/src/macro/TRKK_guts.h
@@ -17,9 +17,9 @@
#ifdef FCODE
- TRKK_TRKK = UPPERMET_UXX*KK_KKXX + UPPERMET_UYY*KK_KKYY
- & + UPPERMET_UZZ*KK_KKZZ + 2D0*(UPPERMET_UXY*KK_KKXY
- & + UPPERMET_UXZ*KK_KKXZ + UPPERMET_UYZ*KK_KKYZ)
+ TRKK_TRKK = UPPERMET_UXX*KK_KKXX + UPPERMET_UYY*KK_KKYY \
+ + UPPERMET_UZZ*KK_KKZZ + 2D0*(UPPERMET_UXY*KK_KKXY \
+ + UPPERMET_UXZ*KK_KKXZ + UPPERMET_UYZ*KK_KKYZ)
#endif
diff --git a/src/macro/TRK_guts.h b/src/macro/TRK_guts.h
index e384ce1..90210f9 100644
--- a/src/macro/TRK_guts.h
+++ b/src/macro/TRK_guts.h
@@ -24,9 +24,9 @@
#ifdef FCODE
- TRK_TRK = UPPERMET_UXX*TRK_HXX + UPPERMET_UYY*TRK_HYY
- & + UPPERMET_UZZ*TRK_HZZ + 2D0*(UPPERMET_UXY*TRK_HXY
- & + UPPERMET_UXZ*TRK_HXZ + UPPERMET_UYZ*TRK_HYZ)
+ TRK_TRK = UPPERMET_UXX*TRK_HXX + UPPERMET_UYY*TRK_HYY \
+ + UPPERMET_UZZ*TRK_HZZ + 2D0*(UPPERMET_UXY*TRK_HXY \
+ + UPPERMET_UXZ*TRK_HXZ + UPPERMET_UYZ*TRK_HYZ)
#endif
diff --git a/src/macro/TRRICCI_guts.h b/src/macro/TRRICCI_guts.h
index f48fe74..b8348f3 100644
--- a/src/macro/TRRICCI_guts.h
+++ b/src/macro/TRRICCI_guts.h
@@ -17,9 +17,9 @@
#ifdef FCODE
- TRRICCI_TRRICCI = UPPERMET_UXX*RICCI_RXX + UPPERMET_UYY*RICCI_RYY
- & + UPPERMET_UZZ*RICCI_RZZ + 2D0*(UPPERMET_UXY*RICCI_RXY
- & + UPPERMET_UXZ*RICCI_RXZ + UPPERMET_UYZ*RICCI_RYZ)
+ TRRICCI_TRRICCI = UPPERMET_UXX*RICCI_RXX + UPPERMET_UYY*RICCI_RYY \
+ + UPPERMET_UZZ*RICCI_RZZ + 2D0*(UPPERMET_UXY*RICCI_RXY \
+ + UPPERMET_UXZ*RICCI_RXZ + UPPERMET_UYZ*RICCI_RYZ)
#endif
diff --git a/src/macro/TRT_guts.h b/src/macro/TRT_guts.h
index 7c18ae9..9eabc3e 100644
--- a/src/macro/TRT_guts.h
+++ b/src/macro/TRT_guts.h
@@ -18,19 +18,19 @@
TRT_IALP2 = 1D0/TRT_ALP**2
- TRT_TRT = -TRT_TTT*TRT_IALP2+TRT_TXX*UPPERMET_UXX+
- & TRT_TYY*UPPERMET_UYY+TRT_TZZ*UPPERMET_UZZ+2D0*(
- & TRT_TXY*UPPERMET_UXY+TRT_TXZ*UPPERMET_UXZ+TRT_TYZ*
- & UPPERMET_UYZ)
+ TRT_TRT = -TRT_TTT*TRT_IALP2+TRT_TXX*UPPERMET_UXX+ \
+ TRT_TYY*UPPERMET_UYY+TRT_TZZ*UPPERMET_UZZ+2D0*( \
+ TRT_TXY*UPPERMET_UXY+TRT_TXZ*UPPERMET_UXZ+TRT_TYZ* \
+ UPPERMET_UYZ)
if (shift_state .ne. 0) then
- TRT_TRT = TRT_TRT - TRT_IALP2*(TRT_TXX*TRT_BX*TRT_BX
- & + TRT_TYY*TRT_BY*TRT_BY + TRT_TZZ*TRT_BZ*TRT_BZ
- & + 2D0*(TRT_TXY*TRT_BX*TRT_BY + TRT_TXZ*TRT_BX*TRT_BZ
- & + TRT_TYZ*TRT_BY*TRT_BZ -TRT_TTX*TRT_BX -TRT_TTY*TRT_BY
- & -TRT_TTZ*TRT_BZ))
+ TRT_TRT = TRT_TRT - TRT_IALP2*(TRT_TXX*TRT_BX*TRT_BX \
+ + TRT_TYY*TRT_BY*TRT_BY + TRT_TZZ*TRT_BZ*TRT_BZ \
+ + 2D0*(TRT_TXY*TRT_BX*TRT_BY + TRT_TXZ*TRT_BX*TRT_BZ \
+ + TRT_TYZ*TRT_BY*TRT_BZ -TRT_TTX*TRT_BX -TRT_TTY*TRT_BY \
+ -TRT_TTZ*TRT_BZ))
endif
diff --git a/src/macro/WAVEG_guts.h b/src/macro/WAVEG_guts.h
index 2635ca9..3ed78c2 100644
--- a/src/macro/WAVEG_guts.h
+++ b/src/macro/WAVEG_guts.h
@@ -18,47 +18,47 @@
#ifdef FCODE
- WAVEG_DDGXX = UPPERMET_UXX*DDG_DXXDGXX +
- & 2D0*UPPERMET_UXY*DDG_DXYDGXX +
- & 2D0*UPPERMET_UXZ*DDG_DXZDGXX +
- & UPPERMET_UYY*DDG_DYYDGXX +
- & 2D0*UPPERMET_UYZ*DDG_DYZDGXX +
- & UPPERMET_UZZ*DDG_DZZDGXX
-
- WAVEG_DDGXY = UPPERMET_UXX*DDG_DXXDGXY +
- & 2D0*UPPERMET_UXY*DDG_DXYDGXY +
- & 2D0*UPPERMET_UXZ*DDG_DXZDGXY +
- & UPPERMET_UYY*DDG_DYYDGXY +
- & 2D0*UPPERMET_UYZ*DDG_DYZDGXY +
- & UPPERMET_UZZ*DDG_DZZDGXY
-
- WAVEG_DDGXZ = UPPERMET_UXX*DDG_DXXDGXZ +
- & 2D0*UPPERMET_UXY*DDG_DXYDGXZ +
- & 2D0*UPPERMET_UXZ*DDG_DXZDGXZ +
- & UPPERMET_UYY*DDG_DYYDGXZ +
- & 2D0*UPPERMET_UYZ*DDG_DYZDGXZ +
- & UPPERMET_UZZ*DDG_DZZDGXZ
-
- WAVEG_DDGYY = UPPERMET_UXX*DDG_DXXDGYY +
- & 2D0*UPPERMET_UXY*DDG_DXYDGYY +
- & 2D0*UPPERMET_UXZ*DDG_DXZDGYY +
- & UPPERMET_UYY*DDG_DYYDGYY +
- & 2D0*UPPERMET_UYZ*DDG_DYZDGYY +
- & UPPERMET_UZZ*DDG_DZZDGYY
-
- WAVEG_DDGYZ = UPPERMET_UXX*DDG_DXXDGYZ +
- & 2D0*UPPERMET_UXY*DDG_DXYDGYZ +
- & 2D0*UPPERMET_UXZ*DDG_DXZDGYZ +
- & UPPERMET_UYY*DDG_DYYDGYZ +
- & 2D0*UPPERMET_UYZ*DDG_DYZDGYZ +
- & UPPERMET_UZZ*DDG_DZZDGYZ
-
- WAVEG_DDGZZ = UPPERMET_UXX*DDG_DXXDGZZ +
- & 2D0*UPPERMET_UXY*DDG_DXYDGZZ +
- & 2D0*UPPERMET_UXZ*DDG_DXZDGZZ +
- & UPPERMET_UYY*DDG_DYYDGZZ +
- & 2D0*UPPERMET_UYZ*DDG_DYZDGZZ +
- & UPPERMET_UZZ*DDG_DZZDGZZ
+ WAVEG_DDGXX = UPPERMET_UXX*DDG_DXXDGXX + \
+ 2D0*UPPERMET_UXY*DDG_DXYDGXX + \
+ 2D0*UPPERMET_UXZ*DDG_DXZDGXX + \
+ UPPERMET_UYY*DDG_DYYDGXX + \
+ 2D0*UPPERMET_UYZ*DDG_DYZDGXX + \
+ UPPERMET_UZZ*DDG_DZZDGXX
+
+ WAVEG_DDGXY = UPPERMET_UXX*DDG_DXXDGXY + \
+ 2D0*UPPERMET_UXY*DDG_DXYDGXY + \
+ 2D0*UPPERMET_UXZ*DDG_DXZDGXY + \
+ UPPERMET_UYY*DDG_DYYDGXY + \
+ 2D0*UPPERMET_UYZ*DDG_DYZDGXY + \
+ UPPERMET_UZZ*DDG_DZZDGXY
+
+ WAVEG_DDGXZ = UPPERMET_UXX*DDG_DXXDGXZ + \
+ 2D0*UPPERMET_UXY*DDG_DXYDGXZ + \
+ 2D0*UPPERMET_UXZ*DDG_DXZDGXZ + \
+ UPPERMET_UYY*DDG_DYYDGXZ + \
+ 2D0*UPPERMET_UYZ*DDG_DYZDGXZ + \
+ UPPERMET_UZZ*DDG_DZZDGXZ
+
+ WAVEG_DDGYY = UPPERMET_UXX*DDG_DXXDGYY + \
+ 2D0*UPPERMET_UXY*DDG_DXYDGYY + \
+ 2D0*UPPERMET_UXZ*DDG_DXZDGYY + \
+ UPPERMET_UYY*DDG_DYYDGYY + \
+ 2D0*UPPERMET_UYZ*DDG_DYZDGYY + \
+ UPPERMET_UZZ*DDG_DZZDGYY
+
+ WAVEG_DDGYZ = UPPERMET_UXX*DDG_DXXDGYZ + \
+ 2D0*UPPERMET_UXY*DDG_DXYDGYZ + \
+ 2D0*UPPERMET_UXZ*DDG_DXZDGYZ + \
+ UPPERMET_UYY*DDG_DYYDGYZ + \
+ 2D0*UPPERMET_UYZ*DDG_DYZDGYZ + \
+ UPPERMET_UZZ*DDG_DZZDGYZ
+
+ WAVEG_DDGZZ = UPPERMET_UXX*DDG_DXXDGZZ + \
+ 2D0*UPPERMET_UXY*DDG_DXYDGZZ + \
+ 2D0*UPPERMET_UXZ*DDG_DXZDGZZ + \
+ UPPERMET_UYY*DDG_DYYDGZZ + \
+ 2D0*UPPERMET_UYZ*DDG_DYZDGZZ + \
+ UPPERMET_UZZ*DDG_DZZDGZZ
#endif
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-18 09:07:32 +0000