From 99067b9abd552218c84be2ffcd68e93708ead4f1 Mon Sep 17 00:00:00 2001 From: goodale Date: Fri, 26 Apr 2002 10:00:40 +0000 Subject: Cnverted to new syntax for conformal_state, and also removed dependency on having a SHIFT_ACTIVE/SHIFT_INACTIVE parameter. Tom git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@33 b1d164ef-f17a-46e7-89d4-021c7118ef4e --- src/macro/DCGDT_guts.h | 8 ++++---- src/macro/DETG_guts.h | 4 ++-- src/macro/DKDT_guts.h | 4 ++-- src/macro/DXDG_guts.h | 6 +++--- src/macro/DXXDG_guts.h | 4 ++-- src/macro/DXYDG_guts.h | 4 ++-- src/macro/DXZDG_guts.h | 4 ++-- src/macro/DYDG_guts.h | 6 +++--- src/macro/DYYDG_guts.h | 4 ++-- src/macro/DYZDG_guts.h | 4 ++-- src/macro/DZDG_guts.h | 6 +++--- src/macro/DZZDG_guts.h | 4 ++-- src/macro/TRT_guts.h | 4 ++-- 13 files changed, 31 insertions(+), 31 deletions(-) (limited to 'src') diff --git a/src/macro/DCGDT_guts.h b/src/macro/DCGDT_guts.h index e950f3e..04417cf 100644 --- a/src/macro/DCGDT_guts.h +++ b/src/macro/DCGDT_guts.h @@ -25,7 +25,7 @@ DCGDT_DCGYZDT = - 2*DCGDT_A*DCGDT_KYZ DCGDT_DCGZZDT = - 2*DCGDT_A*DCGDT_KZZ - IF (conformal_state .eq. CONFORMAL_METRIC) THEN + IF (conformal_state .gt. 0) THEN DCGDT_IPSI4 = 1D0/(DCGDT_PSI**4) @@ -38,7 +38,7 @@ END IF - IF (shift_state .ne. SHIFT_INACTIVE) THEN + IF (shift_state .ne. 0) THEN #include "CactusEinstein/Einstein/src/macro/LIEG_guts.h" @@ -62,7 +62,7 @@ DCGDT_DCGYZDT = - 2*DCGDT_A*DCGDT_KYZ; DCGDT_DCGZZDT = - 2*DCGDT_A*DCGDT_KZZ; - if (*conformal_state == CONFORMAL_METRIC) + if (*conformal_state > 0) { DCGDT_IPSI4 = 1/(DCGDT_PSI*DCGDT_PSI*DCGDT_PSI*DCGDT_PSI); @@ -76,7 +76,7 @@ } - if (*shift_state != SHIFT_INACTIVE) + if (*shift_state != 0) { #include "CactusEinstein/Einstein/src/macro/LIEG_guts.h" diff --git a/src/macro/DETG_guts.h b/src/macro/DETG_guts.h index dfa0fca..7d836bd 100644 --- a/src/macro/DETG_guts.h +++ b/src/macro/DETG_guts.h @@ -13,7 +13,7 @@ Gabrielle Allen, 5th November 1998 #ifdef FCODE - IF (conformal_state /= CONFORMAL_METRIC) THEN + IF (conformal_state .eq. 0) THEN DETG_PSI4 = 1.0d0 ELSE DETG_PSI4 = DETG_PSI**4 @@ -40,7 +40,7 @@ Gabrielle Allen, 5th November 1998 #define Cal(x,y,z) ((x)?(y):(z)) #define Power(x,y) (pow((CCTK_REAL) (x), (CCTK_REAL) (y))) -DETG_PSI4 = ((*conformal_state != CONFORMAL_METRIC)?1:DETG_PSI*DETG_PSI*DETG_PSI*DETG_PSI); +DETG_PSI4 = ((*conformal_state == 0)?1:DETG_PSI*DETG_PSI*DETG_PSI*DETG_PSI); DETG_TEMPXX = DETG_GYY*DETG_GZZ - DETG_GYZ*DETG_GYZ; DETG_TEMPXY = DETG_GXZ*DETG_GYZ - DETG_GXY*DETG_GZZ; diff --git a/src/macro/DKDT_guts.h b/src/macro/DKDT_guts.h index ca363a6..304205a 100644 --- a/src/macro/DKDT_guts.h +++ b/src/macro/DKDT_guts.h @@ -30,7 +30,7 @@ DKDT_DKYZDT = DKDT_A*(RICCI_RYZ-2*KK_KKYZ+DKDT_KYZ*TRK_TRK)-CDCDA_CDYZDA DKDT_DKZZDT = DKDT_A*(RICCI_RZZ-2*KK_KKZZ+DKDT_KZZ*TRK_TRK)-CDCDA_CDZZDA - IF (shift_state .ne. SHIFT_INACTIVE) THEN + IF (shift_state .ne. 0) THEN #include "CactusEinstein/Einstein/src/macro/LIEK_guts.h" @@ -55,7 +55,7 @@ DKDT_DKYZDT = DKDT_A*(RICCI_RYZ-2*KK_KKYZ+DKDT_KYZ*TRK_TRK)-CDCDA_CDYZDA; DKDT_DKZZDT = DKDT_A*(RICCI_RZZ-2*KK_KKZZ+DKDT_KZZ*TRK_TRK)-CDCDA_CDZZDA; - if (*shift_state != SHIFT_INACTIVE) + if (*shift_state != 0) { #include "CactusEinstein/Einstein/src/macro/LIEK_guts.h" diff --git a/src/macro/DXDG_guts.h b/src/macro/DXDG_guts.h index 7716841..1a36303 100644 --- a/src/macro/DXDG_guts.h +++ b/src/macro/DXDG_guts.h @@ -18,7 +18,7 @@ #ifdef FCODE - IF (conformal_state /= CONFORMAL_METRIC) THEN + IF (conformal_state .eq. 0) THEN DXDG_PSI4 = 1 DXDG_FAC = 0 ELSE @@ -37,9 +37,9 @@ #ifdef CCODE - DXDG_PSI4 = ((*conformal_state != CONFORMAL_METRIC)?1:DXDG_PSI*DXDG_PSI*DXDG_PSI*DXDG_PSI); + DXDG_PSI4 = ((*conformal_state == 0)?1:DXDG_PSI*DXDG_PSI*DXDG_PSI*DXDG_PSI); - DXDG_FAC = ((*conformal_state != CONFORMAL_METRIC)?0:4*DXDG_PSI4*DXDG_DXDPSI_O_PSI); + DXDG_FAC = ((*conformal_state == 0)?0:4*DXDG_PSI4*DXDG_DXDPSI_O_PSI); DXDG_DXDGXX = DXDCG_DXDCGXX*DXDG_PSI4 + DXDG_FAC*DXDG_GXX; DXDG_DXDGXY = DXDCG_DXDCGXY*DXDG_PSI4 + DXDG_FAC*DXDG_GXY; diff --git a/src/macro/DXXDG_guts.h b/src/macro/DXXDG_guts.h index 6e34a24..09074ca 100644 --- a/src/macro/DXXDG_guts.h +++ b/src/macro/DXXDG_guts.h @@ -23,7 +23,7 @@ DXXDG_OODX2 = 1D0/(cctk_delta_space(1)*cctk_delta_space(1)) /* Factor involving 2nd derivative of conformal factor */ - IF (conformal_state /= CONFORMAL_METRIC) THEN + IF (conformal_state .eq. 0) THEN DXXDG_FAC = 0 ELSE DXXDG_FAC = DXDG_PSI4*(4*DXXDG_DXXDPSI_O_PSI + 12*DXDG_DXDPSI_O_PSI*DXDG_DXDPSI_O_PSI) @@ -53,7 +53,7 @@ #ifdef CCODE /* Factor involving 2nd derivative of conformal factor */ -DXXDG_FAC = ((*conformal_state != CONFORMAL_METRIC)?0: +DXXDG_FAC = ((*conformal_state == 0)?0: DXDG_PSI4*(4*DXXDG_DXXDPSI_O_PSI + 12*DXDG_DXDPSI_O_PSI*DXDG_DXDPSI_O_PSI)); /* Now calculate the second derivatives */ diff --git a/src/macro/DXYDG_guts.h b/src/macro/DXYDG_guts.h index 084c4a9..5c5b7cb 100644 --- a/src/macro/DXYDG_guts.h +++ b/src/macro/DXYDG_guts.h @@ -25,7 +25,7 @@ DXYDG_OO4DXDY = 1D0/(4D0*dx*dy) /* Factor involving 2nd derivative of conformal factor */ - IF (conformal_state /= CONFORMAL_METRIC) THEN + IF (conformal_state .eq. 0) THEN DXYDG_FAC = 0 ELSE DXYDG_FAC = DXDG_PSI4*(4*DXYDG_DXYDPSI_O_PSI + 12*DXDG_DXDPSI_O_PSI*DYDG_DYDPSI_O_PSI) @@ -61,7 +61,7 @@ #ifdef CCODE /* Factor involving 2nd derivative of conformal factor */ - DXYDG_FAC = ((*conformal_state != CONFORMAL_METRIC)?0: + DXYDG_FAC = ((*conformal_state == 0)?0: DXDG_PSI4*(4*DXYDG_DXYDPSI_O_PSI + 12*DXDG_DXDPSI_O_PSI*DYDG_DYDPSI_O_PSI)); /* Now calculate the second deriatives */ diff --git a/src/macro/DXZDG_guts.h b/src/macro/DXZDG_guts.h index d301847..7515e96 100644 --- a/src/macro/DXZDG_guts.h +++ b/src/macro/DXZDG_guts.h @@ -25,7 +25,7 @@ DXZDG_OO4DXDZ = 1D0/(4D0*dx*dz) /* Factor involving 2nd derivative of conformal factor */ - IF (conformal_state /= CONFORMAL_METRIC) THEN + IF (conformal_state .eq. 0) THEN DXZDG_FAC = 0 ELSE DXZDG_FAC = DXDG_PSI4*(4*DXZDG_DXZDPSI_O_PSI + 12*DXDG_DXDPSI_O_PSI*DZDG_DZDPSI_O_PSI) @@ -62,7 +62,7 @@ #ifdef CCODE /* Factor involving 2nd derivative of conformal factor */ - DXZDG_FAC = ((*conformal_state != CONFORMAL_METRIC)?0: + DXZDG_FAC = ((*conformal_state == 0)?0: DXDG_PSI4*(4*DXZDG_DXZDPSI_O_PSI + 12*DXDG_DXDPSI_O_PSI*DZDG_DZDPSI_O_PSI)); /* Now calculate the second deriatives */ diff --git a/src/macro/DYDG_guts.h b/src/macro/DYDG_guts.h index 3aaae66..a95cd95 100644 --- a/src/macro/DYDG_guts.h +++ b/src/macro/DYDG_guts.h @@ -18,7 +18,7 @@ #ifdef FCODE - IF (conformal_state /= CONFORMAL_METRIC) THEN + IF (conformal_state .eq. 0) THEN DYDG_PSI4 = 1 DYDG_FAC = 0 ELSE @@ -37,9 +37,9 @@ #ifdef CCODE - DYDG_PSI4 = ((*conformal_state != CONFORMAL_METRIC)?1:DYDG_PSI*DYDG_PSI*DYDG_PSI*DYDG_PSI); + DYDG_PSI4 = ((*conformal_state == 0)?1:DYDG_PSI*DYDG_PSI*DYDG_PSI*DYDG_PSI); - DYDG_FAC = ((*conformal_state != CONFORMAL_METRIC)?0:4*DYDG_PSI4*DYDG_DYDPSI_O_PSI); + DYDG_FAC = ((*conformal_state == 0)?0:4*DYDG_PSI4*DYDG_DYDPSI_O_PSI); DYDG_DYDGXX = DYDCG_DYDCGXX*DYDG_PSI4 + DYDG_FAC*DYDG_GXX; DYDG_DYDGXY = DYDCG_DYDCGXY*DYDG_PSI4 + DYDG_FAC*DYDG_GXY; diff --git a/src/macro/DYYDG_guts.h b/src/macro/DYYDG_guts.h index f969866..7f4895a 100644 --- a/src/macro/DYYDG_guts.h +++ b/src/macro/DYYDG_guts.h @@ -23,7 +23,7 @@ DYYDG_OODY2 = 1D0/(dy*dy) /* Factor involving 2nd derivative of conformal factor */ - IF (conformal_state /= CONFORMAL_METRIC) THEN + IF (conformal_state .eq. 0) THEN DYYDG_FAC = 0 ELSE DYYDG_FAC = DYDG_PSI4*(4*DYYDG_DYYDPSI_O_PSI + 12*DYDG_DYDPSI_O_PSI*DYDG_DYDPSI_O_PSI) @@ -53,7 +53,7 @@ #ifdef CCODE /* Factor involving 2nd derivative of conformal factor */ - DYYDG_FAC = ((*conformal_state != CONFORMAL_METRIC)?0: + DYYDG_FAC = ((*conformal_state == 0)?0: DYDG_PSI4*(4*DYYDG_DYYDPSI_O_PSI + 12*DYDG_DYDPSI_O_PSI*DYDG_DYDPSI_O_PSI)); /* Now calculate the second deriatives */ diff --git a/src/macro/DYZDG_guts.h b/src/macro/DYZDG_guts.h index d380626..4cf3d45 100644 --- a/src/macro/DYZDG_guts.h +++ b/src/macro/DYZDG_guts.h @@ -25,7 +25,7 @@ DYZDG_OO4DYDZ = 1D0/(4D0*dy*dz) /* Factor involving 2nd derivative of conformal factor */ - IF (conformal_state /= CONFORMAL_METRIC) THEN + IF (conformal_state .eq. 0) THEN DYZDG_FAC = 0 ELSE DYZDG_FAC = DYDG_PSI4*(4*DYZDG_DYZDPSI_O_PSI + 12*DYDG_DYDPSI_O_PSI*DZDG_DZDPSI_O_PSI) @@ -61,7 +61,7 @@ #ifdef CCODE /* Factor involving 2nd derivative of conformal factor */ - DYZDG_FAC = ((*conformal_state != CONFORMAL_METRIC)?0: + DYZDG_FAC = ((*conformal_state == 0)?0: DYDG_PSI4*(4*DYZDG_DYZDPSI_O_PSI + 12*DYDG_DYDPSI_O_PSI*DZDG_DZDPSI_O_PSI)); /* Now calculate the second deriatives */ diff --git a/src/macro/DZDG_guts.h b/src/macro/DZDG_guts.h index f1ef272..d093d17 100644 --- a/src/macro/DZDG_guts.h +++ b/src/macro/DZDG_guts.h @@ -18,7 +18,7 @@ #ifdef FCODE - IF (conformal_state /= CONFORMAL_METRIC) THEN + IF (conformal_state .eq. 0) THEN DZDG_PSI4 = 1 DZDG_FAC = 0 ELSE @@ -37,9 +37,9 @@ #ifdef CCODE - DZDG_PSI4 = ((*conformal_state != CONFORMAL_METRIC)?1:DZDG_PSI*DZDG_PSI*DZDG_PSI*DZDG_PSI); + DZDG_PSI4 = ((*conformal_state == 0)?1:DZDG_PSI*DZDG_PSI*DZDG_PSI*DZDG_PSI); - DZDG_FAC = ((*conformal_state != CONFORMAL_METRIC)?0:4*DZDG_PSI4*DZDG_DZDPSI_O_PSI); + DZDG_FAC = ((*conformal_state == 0)?0:4*DZDG_PSI4*DZDG_DZDPSI_O_PSI); DZDG_DZDGXX = DZDCG_DZDCGXX*DZDG_PSI4 + DZDG_FAC*DZDG_GXX; DZDG_DZDGXY = DZDCG_DZDCGXY*DZDG_PSI4 + DZDG_FAC*DZDG_GXY; diff --git a/src/macro/DZZDG_guts.h b/src/macro/DZZDG_guts.h index 55098d3..b53da00 100644 --- a/src/macro/DZZDG_guts.h +++ b/src/macro/DZZDG_guts.h @@ -23,7 +23,7 @@ DZZDG_OODZ2 = 1D0/(dz*dz) /* Factor involving 2nd derivative of conformal factor */ - IF (conformal_state /= CONFORMAL_METRIC) THEN + 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) @@ -52,7 +52,7 @@ #ifdef CCODE /* Factor involving 2nd derivative of conformal factor */ - DZZDG_FAC = ((*conformal_state != CONFORMAL_METRIC)?0: + DZZDG_FAC = ((*conformal_state == 0)?0: DZDG_PSI4*(4*DZZDG_DZZDPSI_O_PSI + 12*DZDG_DZDPSI_O_PSI*DZDG_DZDPSI_O_PSI)); /* Now calculate the second deriatives */ diff --git a/src/macro/TRT_guts.h b/src/macro/TRT_guts.h index 1424ba8..0a27f17 100644 --- a/src/macro/TRT_guts.h +++ b/src/macro/TRT_guts.h @@ -24,7 +24,7 @@ & UPPERMET_UYZ) - if (shift_state /= SHIFT_INACTIVE) then + 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 @@ -46,7 +46,7 @@ UPPERMET_UYZ) - if (shift) + if (shift_state != 0) { TRT_TRT = TRT_TRT - TRT_IALP2*(TRT_TXX*TRT_BX*TRT_BX + TRT_TYY*TRT_BY*TRT_BY + TRT_TZZ*TRT_BZ*TRT_BZ -- cgit v1.2.3