From f5ba8ce77c8c3eb9f32d7174e725b8adb730d9bc Mon Sep 17 00:00:00 2001 From: knarf Date: Fri, 23 Apr 2010 07:27:19 +0000 Subject: reflect thorn name change, also change implementation name, file, parameter and function names, make testsuites work by also applying the necessary name changes git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/Hydro_InitExcision/trunk@106 55d78c69-0c5c-4738-8e60-d8a2776539f3 --- src/Hydro_InitExcision.c | 253 ++++++++++++++++++++++++++++++++++++++++++++++ src/Whisky_InitExcision.c | 253 ---------------------------------------------- src/make.code.defn | 6 +- 3 files changed, 254 insertions(+), 258 deletions(-) create mode 100644 src/Hydro_InitExcision.c delete mode 100644 src/Whisky_InitExcision.c (limited to 'src') diff --git a/src/Hydro_InitExcision.c b/src/Hydro_InitExcision.c new file mode 100644 index 0000000..c9e7b08 --- /dev/null +++ b/src/Hydro_InitExcision.c @@ -0,0 +1,253 @@ + /*@@ + @file Hydro_InitExcisionMask.c + @date Wed Mar 13 14:18:38 2002 + @author Andrea Nerozzi, Frank Loeffler + @desc + Creates the mask for an excision region + @enddesc + @@*/ + +#include "cctk.h" +#include "cctk_Parameters.h" +#include "cctk_Arguments.h" +#include +#include + + /*@@ + @routine Excision Mask + @date Mon Apr 7 14:18:38 2003 + @author Andrea Nerozzi + @desc + Sets up the excision region + @enddesc + @calls + @calledby + @history added 'sphere' and rewrote to be multi-processor-safe + + @endhistory + +@@*/ + +void Hydro_InitExcisionMask(CCTK_ARGUMENTS) +{ + + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; + + CCTK_INT i,j,k, nx, ny, nz, point; + CCTK_INT excised, normal; + CCTK_REAL emask_excised, emask_normal; + CCTK_REAL x_min, x_max, y_min, y_max, z_min, z_max; + CCTK_REAL x_size, y_size, z_size; + CCTK_REAL x_frac, y_frac, z_frac; + + if (hydro_initexcision) + { + CCTK_INFO("Setting up Hydro Initial Excision region."); + } + + nx = cctk_lsh[0]; + ny = cctk_lsh[1]; + nz = cctk_lsh[2]; + + CCTK_CoordRange(cctkGH, &x_min, &x_max, 1, NULL, "cart3d"); + CCTK_CoordRange(cctkGH, &y_min, &y_max, 2, NULL, "cart3d"); + CCTK_CoordRange(cctkGH, &z_min, &z_max, 3, NULL, "cart3d"); + x_size = x_max - x_min; + y_size = y_max - y_min; + z_size = z_max - z_min; + + excised=1; + normal =0; + emask_excised=0.0; + emask_normal=1.0; + if (hydro_initexcision_flip) + { + excised=0; + normal =1; + emask_excised=1.0; + emask_normal=0.0; + } + + for (k=0 ; k 0.5 - hydro_initexcision_fraction) && + ( x_frac < 0.5 + hydro_initexcision_fraction) && + ( y_frac > 0.5 - hydro_initexcision_fraction) && + ( y_frac < 0.5 + hydro_initexcision_fraction) && + ( z_frac > 0.5 - hydro_initexcision_fraction) && + ( z_frac < 0.5 + hydro_initexcision_fraction) + ) || + ( (hydro_initexcision_coordinate_length > 0.0) && + ( fabs(x[point]-hydro_initexcision_position_x) <= + hydro_initexcision_coordinate_length*0.5) && + ( fabs(y[point]-hydro_initexcision_position_y) <= + hydro_initexcision_coordinate_length*0.5) && + ( fabs(z[point]-hydro_initexcision_position_z) <= + hydro_initexcision_coordinate_length*0.5) + ) + ) + { + hydro_excision_mask[point] = excised; + if (hydro_initexcision_old_mask) + emask[point]=emask_excised; + } + else + { + hydro_excision_mask[point] = normal; + } + } + else if (CCTK_Equals(domain,"octant")) + { + if ( ( (hydro_initexcision_coordinate_length <= 0.0) && + ( x_frac < hydro_initexcision_fraction) && + ( y_frac < hydro_initexcision_fraction) && + ( z_frac < hydro_initexcision_fraction) + ) || + ( (hydro_initexcision_coordinate_length > 0.0) && + ( fabs(x[point]-hydro_initexcision_position_x) <= + hydro_initexcision_coordinate_length*0.5) && + ( fabs(y[point]-hydro_initexcision_position_y) <= + hydro_initexcision_coordinate_length*0.5) && + ( fabs(z[point]-hydro_initexcision_position_z) <= + hydro_initexcision_coordinate_length*0.5) + ) + ) + { + hydro_excision_mask[point] = excised; + if (hydro_initexcision_old_mask) + emask[point]=emask_excised; + } + else + { + hydro_excision_mask[point] = normal; + } + } + } + else if (CCTK_Equals(hydro_initexcision_type,"x-axis")) + { + if ( x_frac < 1.0-hydro_initexcision_fraction ) + { + hydro_excision_mask[point] = normal; + } + else + { + hydro_excision_mask[point] = excised; + if (hydro_initexcision_old_mask) + emask[point]=emask_excised; + } + } + else if (CCTK_Equals(hydro_initexcision_type,"y-axis")) + { + if ( y_frac < 1.0-hydro_initexcision_fraction ) + { + hydro_excision_mask[point] = normal; + } + else + { + hydro_excision_mask[point] = excised; + if (hydro_initexcision_old_mask) + emask[point]=emask_excised; + } + } + else if (CCTK_Equals(hydro_initexcision_type,"z-axis")) + { + if ( z_frac < 1.0-hydro_initexcision_fraction ) + { + hydro_excision_mask[point] = normal; + } + else + { + hydro_excision_mask[point] = excised; + if (hydro_initexcision_old_mask) + emask[point]=emask_excised; + } + } + else if (CCTK_Equals(hydro_initexcision_type,"diagonal")) + { + if ( x_frac + y_frac + z_frac < + 3.0*(1.0-hydro_initexcision_fraction) ) + { + hydro_excision_mask[point] = normal; + } + else + { + hydro_excision_mask[point] = excised; + if (hydro_initexcision_old_mask) + emask[point]=emask_excised; + } + } + else if (CCTK_Equals(hydro_initexcision_type,"sphere")) + { + if ( (hydro_initexcision_coordinate_length <= 0.0) && + ( ( (x[point]-hydro_initexcision_position_x) * + (x[point]-hydro_initexcision_position_x) + + (y[point]-hydro_initexcision_position_y) * + (y[point]-hydro_initexcision_position_y) + + (z[point]-hydro_initexcision_position_z) * + (z[point]-hydro_initexcision_position_z) ) * 4.0 + > (hydro_initexcision_fraction * x_size * + hydro_initexcision_fraction * x_size) ) || + ( (hydro_initexcision_coordinate_length > 0) && + ( (hydro_initexcision_coordinate_length < + cctkGH->cctk_delta_space[0]* + hydro_initexcision_min_points) || + ( (x[point]-hydro_initexcision_position_x) * + (x[point]-hydro_initexcision_position_x) + + (y[point]-hydro_initexcision_position_y) * + (y[point]-hydro_initexcision_position_y) + + (z[point]-hydro_initexcision_position_z) * + (z[point]-hydro_initexcision_position_z) + > hydro_initexcision_coordinate_length* + hydro_initexcision_coordinate_length) ) ) ) + { + hydro_excision_mask[point] = normal; + } + else + { + hydro_excision_mask[point] = excised; + if (hydro_initexcision_old_mask) + { + emask[point]=emask_excised; + } + } + } + } + else + { + hydro_excision_mask[point] = normal; + if (hydro_initexcision_old_mask) + emask[point]=emask_normal; + } + } + } + } + return; +} + +void Hydro_InitExcisionMask_poststep(CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; + if (hydro_initexcision_poststep) + Hydro_InitExcisionMask(CCTK_PASS_CTOC); +} + diff --git a/src/Whisky_InitExcision.c b/src/Whisky_InitExcision.c deleted file mode 100644 index 787fade..0000000 --- a/src/Whisky_InitExcision.c +++ /dev/null @@ -1,253 +0,0 @@ - /*@@ - @file Whisky_ExcisionMask.c - @date Wed Mar 13 14:18:38 2002 - @author Andrea Nerozzi, Frank Loeffler - @desc - Creates the mask for an excision region - @enddesc - @@*/ - -#include "cctk.h" -#include "cctk_Parameters.h" -#include "cctk_Arguments.h" -#include -#include - - /*@@ - @routine Excision Mask - @date Mon Apr 7 14:18:38 2003 - @author Andrea Nerozzi - @desc - Sets up the excision region - @enddesc - @calls - @calledby - @history added 'sphere' and rewrote to be multi-processor-safe - - @endhistory - -@@*/ - -void Whisky_InitExcisionMask(CCTK_ARGUMENTS) -{ - - DECLARE_CCTK_ARGUMENTS; - DECLARE_CCTK_PARAMETERS; - - CCTK_INT i,j,k, nx, ny, nz, point; - CCTK_INT excised, normal; - CCTK_REAL emask_excised, emask_normal; - CCTK_REAL x_min, x_max, y_min, y_max, z_min, z_max; - CCTK_REAL x_size, y_size, z_size; - CCTK_REAL x_frac, y_frac, z_frac; - - if (whisky_initexcision) - { - CCTK_INFO("Setting up Whisky Initial Excision region."); - } - - nx = cctk_lsh[0]; - ny = cctk_lsh[1]; - nz = cctk_lsh[2]; - - CCTK_CoordRange(cctkGH, &x_min, &x_max, 1, NULL, "cart3d"); - CCTK_CoordRange(cctkGH, &y_min, &y_max, 2, NULL, "cart3d"); - CCTK_CoordRange(cctkGH, &z_min, &z_max, 3, NULL, "cart3d"); - x_size = x_max - x_min; - y_size = y_max - y_min; - z_size = z_max - z_min; - - excised=1; - normal =0; - emask_excised=0.0; - emask_normal=1.0; - if (whisky_initexcision_flip) - { - excised=0; - normal =1; - emask_excised=1.0; - emask_normal=0.0; - } - - for (k=0 ; k 0.5 - whisky_initexcision_fraction) && - ( x_frac < 0.5 + whisky_initexcision_fraction) && - ( y_frac > 0.5 - whisky_initexcision_fraction) && - ( y_frac < 0.5 + whisky_initexcision_fraction) && - ( z_frac > 0.5 - whisky_initexcision_fraction) && - ( z_frac < 0.5 + whisky_initexcision_fraction) - ) || - ( (whisky_initexcision_coordinate_length > 0.0) && - ( fabs(x[point]-whisky_initexcision_position_x) <= - whisky_initexcision_coordinate_length*0.5) && - ( fabs(y[point]-whisky_initexcision_position_y) <= - whisky_initexcision_coordinate_length*0.5) && - ( fabs(z[point]-whisky_initexcision_position_z) <= - whisky_initexcision_coordinate_length*0.5) - ) - ) - { - hydro_excision_mask[point] = excised; - if (whisky_initexcision_old_mask) - emask[point]=emask_excised; - } - else - { - hydro_excision_mask[point] = normal; - } - } - else if (CCTK_Equals(domain,"octant")) - { - if ( ( (whisky_initexcision_coordinate_length <= 0.0) && - ( x_frac < whisky_initexcision_fraction) && - ( y_frac < whisky_initexcision_fraction) && - ( z_frac < whisky_initexcision_fraction) - ) || - ( (whisky_initexcision_coordinate_length > 0.0) && - ( fabs(x[point]-whisky_initexcision_position_x) <= - whisky_initexcision_coordinate_length*0.5) && - ( fabs(y[point]-whisky_initexcision_position_y) <= - whisky_initexcision_coordinate_length*0.5) && - ( fabs(z[point]-whisky_initexcision_position_z) <= - whisky_initexcision_coordinate_length*0.5) - ) - ) - { - hydro_excision_mask[point] = excised; - if (whisky_initexcision_old_mask) - emask[point]=emask_excised; - } - else - { - hydro_excision_mask[point] = normal; - } - } - } - else if (CCTK_Equals(whisky_initexcision_type,"x-axis")) - { - if ( x_frac < 1.0-whisky_initexcision_fraction ) - { - hydro_excision_mask[point] = normal; - } - else - { - hydro_excision_mask[point] = excised; - if (whisky_initexcision_old_mask) - emask[point]=emask_excised; - } - } - else if (CCTK_Equals(whisky_initexcision_type,"y-axis")) - { - if ( y_frac < 1.0-whisky_initexcision_fraction ) - { - hydro_excision_mask[point] = normal; - } - else - { - hydro_excision_mask[point] = excised; - if (whisky_initexcision_old_mask) - emask[point]=emask_excised; - } - } - else if (CCTK_Equals(whisky_initexcision_type,"z-axis")) - { - if ( z_frac < 1.0-whisky_initexcision_fraction ) - { - hydro_excision_mask[point] = normal; - } - else - { - hydro_excision_mask[point] = excised; - if (whisky_initexcision_old_mask) - emask[point]=emask_excised; - } - } - else if (CCTK_Equals(whisky_initexcision_type,"diagonal")) - { - if ( x_frac + y_frac + z_frac < - 3.0*(1.0-whisky_initexcision_fraction) ) - { - hydro_excision_mask[point] = normal; - } - else - { - hydro_excision_mask[point] = excised; - if (whisky_initexcision_old_mask) - emask[point]=emask_excised; - } - } - else if (CCTK_Equals(whisky_initexcision_type,"sphere")) - { - if ( (whisky_initexcision_coordinate_length <= 0.0) && - ( ( (x[point]-whisky_initexcision_position_x) * - (x[point]-whisky_initexcision_position_x) + - (y[point]-whisky_initexcision_position_y) * - (y[point]-whisky_initexcision_position_y) + - (z[point]-whisky_initexcision_position_z) * - (z[point]-whisky_initexcision_position_z) ) * 4.0 - > (whisky_initexcision_fraction * x_size * - whisky_initexcision_fraction * x_size) ) || - ( (whisky_initexcision_coordinate_length > 0) && - ( (whisky_initexcision_coordinate_length < - cctkGH->cctk_delta_space[0]* - whisky_initexcision_min_points) || - ( (x[point]-whisky_initexcision_position_x) * - (x[point]-whisky_initexcision_position_x) + - (y[point]-whisky_initexcision_position_y) * - (y[point]-whisky_initexcision_position_y) + - (z[point]-whisky_initexcision_position_z) * - (z[point]-whisky_initexcision_position_z) - > whisky_initexcision_coordinate_length* - whisky_initexcision_coordinate_length) ) ) ) - { - hydro_excision_mask[point] = normal; - } - else - { - hydro_excision_mask[point] = excised; - if (whisky_initexcision_old_mask) - { - emask[point]=emask_excised; - } - } - } - } - else - { - hydro_excision_mask[point] = normal; - if (whisky_initexcision_old_mask) - emask[point]=emask_normal; - } - } - } - } - return; -} - -void Whisky_InitExcisionMask_poststep(CCTK_ARGUMENTS) -{ - DECLARE_CCTK_ARGUMENTS; - DECLARE_CCTK_PARAMETERS; - if (whisky_initexcision_poststep) - Whisky_InitExcisionMask(CCTK_PASS_CTOC); -} - diff --git a/src/make.code.defn b/src/make.code.defn index df9cf14..0c9bcc5 100644 --- a/src/make.code.defn +++ b/src/make.code.defn @@ -1,9 +1,5 @@ -# Main make.code.defn file for thorn Hydra -# $Header$ - # Source files in this directory - -SRCS = Whisky_InitExcision.c +SRCS = Hydro_InitExcision.c # Subdirectories containing source files SUBDIRS = -- cgit v1.2.3