From 53719c534c23739dcc01e6b936e53441bb74012d Mon Sep 17 00:00:00 2001 From: tradke Date: Mon, 29 Sep 2003 14:20:02 +0000 Subject: Some optimizations: substituted divs by mults. git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinBase/ADMMacros/trunk@64 b1d164ef-f17a-46e7-89d4-021c7118ef4e --- src/macro/CHR1_guts.h | 72 ++++++++++++++++++++++---------------------- src/macro/UPPERMET_declare.h | 12 ++++---- src/macro/UPPERMET_guts.h | 28 ++++++++--------- 3 files changed, 56 insertions(+), 56 deletions(-) diff --git a/src/macro/CHR1_guts.h b/src/macro/CHR1_guts.h index aa565d6..834957b 100644 --- a/src/macro/CHR1_guts.h +++ b/src/macro/CHR1_guts.h @@ -17,47 +17,47 @@ #ifdef FCODE - CHR1_XXX = DXDG_DXDGXX/2D0 - CHR1_XXY = DYDG_DYDGXX/2D0 - CHR1_XXZ = DZDG_DZDGXX/2D0 - CHR1_XYY = -DXDG_DXDGYY/2D0 + DYDG_DYDGXY - CHR1_XYZ = (-DXDG_DXDGYZ + DYDG_DYDGXZ + DZDG_DZDGXY)/2D0 - CHR1_XZZ = -DXDG_DXDGZZ/2D0 + DZDG_DZDGXZ - CHR1_YXX = DXDG_DXDGXY - DYDG_DYDGXX/2D0 - CHR1_YXY = DXDG_DXDGYY/2D0 - CHR1_YXZ = ( DXDG_DXDGYZ - DYDG_DYDGXZ + DZDG_DZDGXY)/2D0 - CHR1_YYY = DYDG_DYDGYY/2D0 - CHR1_YYZ = DZDG_DZDGYY/2D0 - CHR1_YZZ = -DYDG_DYDGZZ/2D0 + DZDG_DZDGYZ - CHR1_ZXX = DXDG_DXDGXZ - DZDG_DZDGXX/2D0 - CHR1_ZXY = ( DXDG_DXDGYZ + DYDG_DYDGXZ - DZDG_DZDGXY)/2D0 - CHR1_ZXZ = DXDG_DXDGZZ/2D0 - CHR1_ZYY = DYDG_DYDGYZ - DZDG_DZDGYY/2D0 - CHR1_ZYZ = DYDG_DYDGZZ/2D0 - CHR1_ZZZ = DZDG_DZDGZZ/2D0 + CHR1_XXX = DXDG_DXDGXX*0.5 + CHR1_XXY = DYDG_DYDGXX*0.5 + CHR1_XXZ = DZDG_DZDGXX*0.5 + CHR1_XYY = -DXDG_DXDGYY*0.5 + DYDG_DYDGXY + CHR1_XYZ = (-DXDG_DXDGYZ + DYDG_DYDGXZ + DZDG_DZDGXY)*0.5 + CHR1_XZZ = -DXDG_DXDGZZ*0.5 + DZDG_DZDGXZ + CHR1_YXX = DXDG_DXDGXY - DYDG_DYDGXX*0.5 + CHR1_YXY = DXDG_DXDGYY*0.5 + CHR1_YXZ = ( DXDG_DXDGYZ - DYDG_DYDGXZ + DZDG_DZDGXY)*0.5 + CHR1_YYY = DYDG_DYDGYY*0.5 + CHR1_YYZ = DZDG_DZDGYY*0.5 + CHR1_YZZ = -DYDG_DYDGZZ*0.5 + DZDG_DZDGYZ + CHR1_ZXX = DXDG_DXDGXZ - DZDG_DZDGXX*0.5 + CHR1_ZXY = ( DXDG_DXDGYZ + DYDG_DYDGXZ - DZDG_DZDGXY)*0.5 + CHR1_ZXZ = DXDG_DXDGZZ*0.5 + CHR1_ZYY = DYDG_DYDGYZ - DZDG_DZDGYY*0.5 + CHR1_ZYZ = DYDG_DYDGZZ*0.5 + CHR1_ZZZ = DZDG_DZDGZZ*0.5 #endif #ifdef CCODE - CHR1_XXX = DXDG_DXDGXX/2; - CHR1_XXY = DYDG_DYDGXX/2; - CHR1_XXZ = DZDG_DZDGXX/2; - CHR1_XYY = -DXDG_DXDGYY/2 + DYDG_DYDGXY; - CHR1_XYZ = (-DXDG_DXDGYZ + DYDG_DYDGXZ + DZDG_DZDGXY)/2; - CHR1_XZZ = -DXDG_DXDGZZ/2 + DZDG_DZDGXZ; - CHR1_YXX = DXDG_DXDGXY - DYDG_DYDGXX/2; - CHR1_YXY = DXDG_DXDGYY/2; - CHR1_YXZ = ( DXDG_DXDGYZ - DYDG_DYDGXZ + DZDG_DZDGXY)/2; - CHR1_YYY = DYDG_DYDGYY/2; - CHR1_YYZ = DZDG_DZDGYY/2; - CHR1_YZZ = -DYDG_DYDGZZ/2 + DZDG_DZDGYZ; - CHR1_ZXX = DXDG_DXDGXZ - DZDG_DZDGXX/2; - CHR1_ZXY = ( DXDG_DXDGYZ + DYDG_DYDGXZ - DZDG_DZDGXY)/2; - CHR1_ZXZ = DXDG_DXDGZZ/2; - CHR1_ZYY = DYDG_DYDGYZ - DZDG_DZDGYY/2; - CHR1_ZYZ = DYDG_DYDGZZ/2; - CHR1_ZZZ = DZDG_DZDGZZ/2; + CHR1_XXX = DXDG_DXDGXX*0.5; + CHR1_XXY = DYDG_DYDGXX*0.5; + CHR1_XXZ = DZDG_DZDGXX*0.5; + CHR1_XYY = -DXDG_DXDGYY*0.5 + DYDG_DYDGXY; + CHR1_XYZ = (-DXDG_DXDGYZ + DYDG_DYDGXZ + DZDG_DZDGXY)*0.5; + CHR1_XZZ = -DXDG_DXDGZZ*0.5 + DZDG_DZDGXZ; + CHR1_YXX = DXDG_DXDGXY - DYDG_DYDGXX*0.5; + CHR1_YXY = DXDG_DXDGYY*0.5; + CHR1_YXZ = ( DXDG_DXDGYZ - DYDG_DYDGXZ + DZDG_DZDGXY)*0.5; + CHR1_YYY = DYDG_DYDGYY*0.5; + CHR1_YYZ = DZDG_DZDGYY*0.5; + CHR1_YZZ = -DYDG_DYDGZZ*0.5 + DZDG_DZDGYZ; + CHR1_ZXX = DXDG_DXDGXZ - DZDG_DZDGXX*0.5; + CHR1_ZXY = ( DXDG_DXDGYZ + DYDG_DYDGXZ - DZDG_DZDGXY)*0.5; + CHR1_ZXZ = DXDG_DXDGZZ*0.5; + CHR1_ZYY = DYDG_DYDGYZ - DZDG_DZDGYY*0.5; + CHR1_ZYZ = DYDG_DYDGZZ*0.5; + CHR1_ZZZ = DZDG_DZDGZZ*0.5; #endif diff --git a/src/macro/UPPERMET_declare.h b/src/macro/UPPERMET_declare.h index 18f7f8a..965e918 100644 --- a/src/macro/UPPERMET_declare.h +++ b/src/macro/UPPERMET_declare.h @@ -31,11 +31,11 @@ /* Temporary variables */ -#undef UPPERMET_PSI4DET -#define UPPERMET_PSI4DET uppermet_fdet +#undef IUPPERMET_PSI4DET +#define IUPPERMET_PSI4DET iuppermet_fdet /* Declare internal variables */ - CCTK_REAL UPPERMET_PSI4DET + CCTK_REAL IUPPERMET_PSI4DET /* Declare output variables */ CCTK_REAL UPPERMET_UXX, UPPERMET_UXY, UPPERMET_UXZ @@ -63,11 +63,11 @@ #define UPPERMET_UZZ uppermet_uzz /* Internal variables */ -#undef UPPERMET_PSI4DET -#define UPPERMET_PSI4DET uppermet_psi4detg +#undef IUPPERMET_PSI4DET +#define IUPPERMET_PSI4DET iuppermet_psi4detg /* Declare internal variables */ -CCTK_REAL UPPERMET_PSI4DET; +CCTK_REAL IUPPERMET_PSI4DET; /* Declare output variables */ CCTK_REAL UPPERMET_UXX; diff --git a/src/macro/UPPERMET_guts.h b/src/macro/UPPERMET_guts.h index 238e919..3562b1c 100644 --- a/src/macro/UPPERMET_guts.h +++ b/src/macro/UPPERMET_guts.h @@ -15,27 +15,27 @@ Gabrielle Allen, 11th June 1998 #ifdef FCODE - UPPERMET_PSI4DET = DETG_PSI4*DETG_DETCG + IUPPERMET_PSI4DET = 1.d0 / (DETG_PSI4*DETG_DETCG) - UPPERMET_UXX = DETG_TEMPXX/UPPERMET_PSI4DET - UPPERMET_UXY = DETG_TEMPXY/UPPERMET_PSI4DET - UPPERMET_UXZ = DETG_TEMPXZ/UPPERMET_PSI4DET - UPPERMET_UYY = DETG_TEMPYY/UPPERMET_PSI4DET - UPPERMET_UYZ = DETG_TEMPYZ/UPPERMET_PSI4DET - UPPERMET_UZZ = DETG_TEMPZZ/UPPERMET_PSI4DET + UPPERMET_UXX = DETG_TEMPXX*IUPPERMET_PSI4DET + UPPERMET_UXY = DETG_TEMPXY*IUPPERMET_PSI4DET + UPPERMET_UXZ = DETG_TEMPXZ*IUPPERMET_PSI4DET + UPPERMET_UYY = DETG_TEMPYY*IUPPERMET_PSI4DET + UPPERMET_UYZ = DETG_TEMPYZ*IUPPERMET_PSI4DET + UPPERMET_UZZ = DETG_TEMPZZ*IUPPERMET_PSI4DET #endif #ifdef CCODE -UPPERMET_PSI4DET = DETG_PSI4*DETG_DETCG; +IUPPERMET_PSI4DET = 1.0 / (DETG_PSI4*DETG_DETCG); -UPPERMET_UXX = DETG_TEMPXX/UPPERMET_PSI4DET; -UPPERMET_UXY = DETG_TEMPXY/UPPERMET_PSI4DET; -UPPERMET_UXZ = DETG_TEMPXZ/UPPERMET_PSI4DET; -UPPERMET_UYY = DETG_TEMPYY/UPPERMET_PSI4DET; -UPPERMET_UYZ = DETG_TEMPYZ/UPPERMET_PSI4DET; -UPPERMET_UZZ = DETG_TEMPZZ/UPPERMET_PSI4DET; +UPPERMET_UXX = DETG_TEMPXX*IUPPERMET_PSI4DET; +UPPERMET_UXY = DETG_TEMPXY*IUPPERMET_PSI4DET; +UPPERMET_UXZ = DETG_TEMPXZ*IUPPERMET_PSI4DET; +UPPERMET_UYY = DETG_TEMPYY*IUPPERMET_PSI4DET; +UPPERMET_UYZ = DETG_TEMPYZ*IUPPERMET_PSI4DET; +UPPERMET_UZZ = DETG_TEMPZZ*IUPPERMET_PSI4DET; #endif -- cgit v1.2.3