diff options
| author | Erik Schnetter <schnetter@aei.mpg.de> | 2004-09-21 18:55:00 +0000 |
|---|---|---|
| committer | Erik Schnetter <schnetter@aei.mpg.de> | 2004-09-21 18:55:00 +0000 |
| commit | acd391386acb46a7a0536d54cd30da3eee5c8eb1 (patch) | |
| tree | 5dcc51031c8a822f09541bd6b661ac277b65a3b4 /CarpetExtra | |
| parent | 57f76d29c8a70165fe6a6d699aad2423bc4597cc (diff) | |
Allow time-dependent integrands in CarpetIntegrateTest
darcs-hash:20040921185550-891bb-824c338b0b0a9d6fdf49b2a489b279b53d39e786.gz
Diffstat (limited to 'CarpetExtra')
| -rw-r--r-- | CarpetExtra/CarpetIntegrateTest/param.ccl | 10 | ||||
| -rw-r--r-- | CarpetExtra/CarpetIntegrateTest/src/Local.cc | 13 |
2 files changed, 11 insertions, 12 deletions
diff --git a/CarpetExtra/CarpetIntegrateTest/param.ccl b/CarpetExtra/CarpetIntegrateTest/param.ccl index c77f113a2..f184cd96d 100644 --- a/CarpetExtra/CarpetIntegrateTest/param.ccl +++ b/CarpetExtra/CarpetIntegrateTest/param.ccl @@ -1 +1,11 @@ # $Header:$ + +REAL constant "Integrand constant" +{ + *:* :: "" +} 1.0 + +REAL timefact "Time dependence of integrand" +{ + *:* :: "" +} 0.0 diff --git a/CarpetExtra/CarpetIntegrateTest/src/Local.cc b/CarpetExtra/CarpetIntegrateTest/src/Local.cc index bc66f5883..02041b9e7 100644 --- a/CarpetExtra/CarpetIntegrateTest/src/Local.cc +++ b/CarpetExtra/CarpetIntegrateTest/src/Local.cc @@ -1,17 +1,9 @@ // $Header:$ -#include <math.h> - #include "cctk.h" #include "cctk_Parameters.h" #include "cctk_Arguments.h" -#include "carpet.hh" -#include "defs.hh" -#include "vect.hh" - -#include "util_Table.h" - extern "C" { CCTK_INT CarpetIntegrate_Local(CCTK_ARGUMENTS); @@ -22,9 +14,6 @@ CCTK_INT CarpetIntegrate_Local(CCTK_ARGUMENTS) DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - using namespace std; - using namespace Carpet; - int nx = cctk_lsh[0]; int ny = cctk_lsh[1]; int nz = cctk_lsh[2]; @@ -34,7 +23,7 @@ CCTK_INT CarpetIntegrate_Local(CCTK_ARGUMENTS) for (int i=0;i<nx;i++) { int index = CCTK_GFINDEX3D(cctkGH,i,j,k); - integrand[index] = 1; + integrand[index] = constant + timefact * cctk_time; } } } |