diff options
Diffstat (limited to 'CarpetExtra/CarpetIntegrateTest/src')
-rw-r--r-- | CarpetExtra/CarpetIntegrateTest/src/Global.cc | 9 | ||||
-rw-r--r-- | CarpetExtra/CarpetIntegrateTest/src/Local.cc | 7 |
2 files changed, 5 insertions, 11 deletions
diff --git a/CarpetExtra/CarpetIntegrateTest/src/Global.cc b/CarpetExtra/CarpetIntegrateTest/src/Global.cc index 7d5460d9c..0aa090e44 100644 --- a/CarpetExtra/CarpetIntegrateTest/src/Global.cc +++ b/CarpetExtra/CarpetIntegrateTest/src/Global.cc @@ -13,10 +13,9 @@ -extern "C" { CCTK_INT CarpetIntegrate_Global(CCTK_ARGUMENTS); -} +extern "C" void CarpetIntegrate_Global(CCTK_ARGUMENTS); -CCTK_INT CarpetIntegrate_Global(CCTK_ARGUMENTS) +void CarpetIntegrate_Global(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -40,7 +39,5 @@ CCTK_INT CarpetIntegrate_Global(CCTK_ARGUMENTS) CCTK_REAL d3x = cctk_delta_space[0]*cctk_delta_space[1]*cctk_delta_space[2]; integral *= d3x; - printf("Integral: %g\n", integral); - - return 0; + printf("Integral: %g\n", (double)integral); } diff --git a/CarpetExtra/CarpetIntegrateTest/src/Local.cc b/CarpetExtra/CarpetIntegrateTest/src/Local.cc index d616e7741..fcbd3af1d 100644 --- a/CarpetExtra/CarpetIntegrateTest/src/Local.cc +++ b/CarpetExtra/CarpetIntegrateTest/src/Local.cc @@ -4,10 +4,9 @@ -extern "C" { CCTK_INT CarpetIntegrate_Local(CCTK_ARGUMENTS); -} +extern "C" void CarpetIntegrate_Local(CCTK_ARGUMENTS); -CCTK_INT CarpetIntegrate_Local(CCTK_ARGUMENTS) +void CarpetIntegrate_Local(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -25,6 +24,4 @@ CCTK_INT CarpetIntegrate_Local(CCTK_ARGUMENTS) } } } - - return 0; } |