diff options
-rw-r--r-- | src/loop.c | 6 | ||||
-rw-r--r-- | src/surface_integral.c | 19 | ||||
-rw-r--r-- | src/volume_integral.c | 7 |
3 files changed, 29 insertions, 3 deletions
@@ -2,6 +2,12 @@ #include <cctk_Arguments.h> #include <cctk_Parameters.h> +void ADMMass_InitLoopCounter(CCTK_ARGUMENTS); + +void ADMMass_SetLoopCounter(CCTK_ARGUMENTS); + +void ADMMass_Loop(CCTK_ARGUMENTS); + /* Initialise the loop counter */ void ADMMass_InitLoopCounter(CCTK_ARGUMENTS) diff --git a/src/surface_integral.c b/src/surface_integral.c index 28a407c..83490d0 100644 --- a/src/surface_integral.c +++ b/src/surface_integral.c @@ -21,6 +21,21 @@ CCTK_INT find_closest(const cGH *cctkGH, CCTK_INT *cctk_lsh, CCTK_REAL *cctk_delta_space, CCTK_INT ghost, + CCTK_REAL *coord, CCTK_REAL coord_min, CCTK_INT dir); + +void ADMMass_Surface(CCTK_ARGUMENTS); + +void ADMMass_Surface_Global(CCTK_ARGUMENTS); + +void ADMMass_Surface_Lapse(CCTK_ARGUMENTS); + +void ADMMass_Surface_Lapse_Global(CCTK_ARGUMENTS); + + + + +CCTK_INT find_closest(const cGH *cctkGH, CCTK_INT *cctk_lsh, + CCTK_REAL *cctk_delta_space, CCTK_INT ghost, CCTK_REAL *coord, CCTK_REAL coord_min, CCTK_INT dir) { CCTK_INT i, ijk, min_i = -1; @@ -87,7 +102,7 @@ void ADMMass_Surface(CCTK_ARGUMENTS) { if (!CCTK_EQUALS(CCTK_ParameterValString("type", "cartgrid3d"), "coordbase")) - CCTK_WARN(0,"This thorn used with the ADMMass_distance_from_grid_boundar parameter requires to set coordinates through coordbase."); + CCTK_WARN(0,"This thorn used with the ADMMass_distance_from_grid_boundary parameter requires to set coordinates through coordbase."); /* Find the physical coordinates of the boundaries */ ierr = GetDomainSpecification( 3, physical_min, physical_max, @@ -356,7 +371,7 @@ void ADMMass_Surface_Lapse_Global(CCTK_ARGUMENTS) reduction_handle = CCTK_ReductionHandle("sum"); if (reduction_handle < 0) - CCTK_WARN(0, "Unable to ge reduction handle."); + CCTK_WARN(0, "Unable to get reduction handle."); if (CCTK_Reduce(cctkGH, -1, reduction_handle, 1, CCTK_VARIABLE_REAL, diff --git a/src/volume_integral.c b/src/volume_integral.c index 47374b3..a4d3748 100644 --- a/src/volume_integral.c +++ b/src/volume_integral.c @@ -20,6 +20,11 @@ #define PI 3.1415926535897932384626433832795028841971693993751058209749445923 +void ADMMass_Volume(CCTK_ARGUMENTS); + +void ADMMass_Volume_Global(CCTK_ARGUMENTS); + + void ADMMass_Volume(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS @@ -30,7 +35,7 @@ void ADMMass_Volume(CCTK_ARGUMENTS) CCTK_REAL u[3][3], dg[3][3][3]; CCTK_REAL radius; - CCTK_INT mask_descriptor, state_descriptor_outside; + CCTK_INT mask_descriptor = -1, state_descriptor_outside = -1; int avoid_origin_parameter; |