From 948ce995e5d8976df0b5a69d7f4c3cb63a3448da Mon Sep 17 00:00:00 2001 From: dorband Date: Thu, 6 Mar 2003 09:20:57 +0000 Subject: changes in HAMADM macro needed for calculation of normalized hamiltonian constraint in ADMConstraints git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@51 b1d164ef-f17a-46e7-89d4-021c7118ef4e --- src/macro/HAMADM_declare.h | 8 ++++++++ src/macro/HAMADM_guts.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/src/macro/HAMADM_declare.h b/src/macro/HAMADM_declare.h index 5c4c01b..946a794 100644 --- a/src/macro/HAMADM_declare.h +++ b/src/macro/HAMADM_declare.h @@ -22,8 +22,12 @@ #undef HAMADM_HAMADM #define HAMADM_HAMADM hamadm_ham_adm +#undef HAMADM_HAMADMABS +#define HAMADM_HAMADMABS hamadm_ham_adm_abs + /* Declare output variables */ CCTK_REAL HAMADM_HAMADM + CCTK_REAL HAMADM_HAMADMABS #endif @@ -34,8 +38,12 @@ #undef HAMADM_HAMADM #define HAMADM_HAMADM hamadm_ham_adm +#undef HAMADM_HAMADMABS +#define HAMADM_HAMADMABS hamadm_ham_adm_abs + /* Declare output variables */ double HAMADM_HAMADM; + double HAMADM_HAMADMABS; #endif diff --git a/src/macro/HAMADM_guts.h b/src/macro/HAMADM_guts.h index 9c87ccb..523d0d5 100644 --- a/src/macro/HAMADM_guts.h +++ b/src/macro/HAMADM_guts.h @@ -21,12 +21,14 @@ #ifdef FCODE HAMADM_HAMADM = TRRICCI_TRRICCI - TRKK_TRKK + TRK_TRK**2 + HAMADM_HAMADMABS = abs(TRRICCI_TRRICCI) + abs(TRKK_TRKK) + TRK_TRK**2 #endif #ifdef CCODE HAMADM_HAMADM = TRRICCI_TRRICCI - TRKK_TRKK + TRK_TRK**2 + HAMADM_HAMADMABS = fabs(TRRICCI_TRRICCI) + fabs(TRKK_TRKK) + TRK_TRK**2 #endif -- cgit v1.2.3