diff options
Diffstat (limited to 'CarpetExtra/CarpetIntegrateTest/src')
-rw-r--r-- | CarpetExtra/CarpetIntegrateTest/src/Global.cc | 10 | ||||
-rw-r--r-- | CarpetExtra/CarpetIntegrateTest/src/Local.cc | 47 |
2 files changed, 16 insertions, 41 deletions
diff --git a/CarpetExtra/CarpetIntegrateTest/src/Global.cc b/CarpetExtra/CarpetIntegrateTest/src/Global.cc index 11053f584..be799c89e 100644 --- a/CarpetExtra/CarpetIntegrateTest/src/Global.cc +++ b/CarpetExtra/CarpetIntegrateTest/src/Global.cc @@ -1,5 +1,8 @@ // $Header:$ +#include <assert.h> +#include <stdio.h> + #include "cctk.h" #include "cctk_Parameters.h" #include "cctk_Arguments.h" @@ -8,10 +11,10 @@ #include "defs.hh" #include "vect.hh" - #include "util_Table.h" + extern "C" { CCTK_INT CarpetIntegrate_Global(CCTK_ARGUMENTS); } @@ -30,7 +33,7 @@ CCTK_INT CarpetIntegrate_Global(CCTK_ARGUMENTS) int reduction_handle = CCTK_ReductionHandle("sum"); - varindex = CCTK_VarIndex("CarpetIntegrate::integrand"); + varindex = CCTK_VarIndex("CarpetIntegrateTest::integrand"); assert(varindex>=0); ierr = CCTK_Reduce(cctkGH, -1, reduction_handle, 1, CCTK_VARIABLE_REAL, &integral, 1, varindex); @@ -39,8 +42,7 @@ CCTK_INT CarpetIntegrate_Global(CCTK_ARGUMENTS) CCTK_REAL d3x = cctk_delta_space[0]*cctk_delta_space[1]*cctk_delta_space[2]; integral *= d3x; - if (CCTK_MyProc(cctkGH)==0) printf("Integral: %f\n", integral); + printf("Integral: %g\n", integral); return 0; } - diff --git a/CarpetExtra/CarpetIntegrateTest/src/Local.cc b/CarpetExtra/CarpetIntegrateTest/src/Local.cc index 56f759c66..bc66f5883 100644 --- a/CarpetExtra/CarpetIntegrateTest/src/Local.cc +++ b/CarpetExtra/CarpetIntegrateTest/src/Local.cc @@ -1,5 +1,7 @@ // $Header:$ +#include <math.h> + #include "cctk.h" #include "cctk_Parameters.h" #include "cctk_Arguments.h" @@ -8,21 +10,13 @@ #include "defs.hh" #include "vect.hh" - #include "util_Table.h" -#include "math.h" + + extern "C" { CCTK_INT CarpetIntegrate_Local(CCTK_ARGUMENTS); } -static void SpatialDeterminant(CCTK_REAL gxx, - CCTK_REAL gxy, - CCTK_REAL gxz, - CCTK_REAL gyy, - CCTK_REAL gyz, - CCTK_REAL gzz, - CCTK_REAL *detg); - CCTK_INT CarpetIntegrate_Local(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; @@ -35,36 +29,15 @@ CCTK_INT CarpetIntegrate_Local(CCTK_ARGUMENTS) int ny = cctk_lsh[1]; int nz = cctk_lsh[2]; - for (int k=0;k<nz;k++) - for (int j=0;j<ny;j++) + for (int k=0;k<nz;k++) { + for (int j=0;j<ny;j++) { for (int i=0;i<nx;i++) { int index = CCTK_GFINDEX3D(cctkGH,i,j,k); - - /* - SpatialDeterminant(gxx[index],gxy[index],gxz[index], - gyy[index],gyz[index],gzz[index], - &detg); - */ - + integrand[index] = 1; - } - + } + } + return 0; } - - -void SpatialDeterminant(CCTK_REAL gxx, - CCTK_REAL gxy, - CCTK_REAL gxz, - CCTK_REAL gyy, - CCTK_REAL gyz, - CCTK_REAL gzz, - CCTK_REAL *detg) -{ - - *detg = -gxz*gxz*gyy + 2.0*gxy*gxz*gyz - - gxx*gyz*gyz - gxy*gxy*gzz + gxx*gyy*gzz; - - return; -} |