Commits November 2012

commits@lists.einsteintoolkit.org

9 participants
90 discussions

Start a nNew thread

[Carpet] branch, master, updated. carpet-6-init-73-g532e873
by Carpet git repositories 29 Nov '12

29 Nov '12

1 0

[svn:einsteintoolkit] Hydro_Analysis/trunk/src/ (Rev. 126)
by rhaas＠tapir.caltech.edu 28 Nov '12

28 Nov '12

User: rhaas Date: 2012/11/29 12:49 AM Modified: /trunk/src/ Hydro_Analysis.c Log: Hydro_Analysis: fiddle with when to warn about multiple identical maxima File Changes: Directory: /trunk/src/ ====================== File [modified]: Hydro_Analysis.c Delta lines: +5 -4 =================================================================== --- trunk/src/Hydro_Analysis.c 2012-11-29 06:44:54 UTC (rev 125) +++ trunk/src/Hydro_Analysis.c 2012-11-29 06:49:19 UTC (rev 126) @@ -90,6 +90,8 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + static int have_warned_about_multiple_maxima = 0; + int set_maximum_location, warned_about_multiple_local_maxima = 0; /* Initialized MPI-local quantities */ @@ -118,7 +120,8 @@ // have to already warn here when we still have the actual coordinates around if (verbosity_level >= 1 && round(local_rho_max_loc[3]) >= 1.) { - CCTK_WARN(1, "Found more than one identical maximum in single patch."); + if(!have_warned_about_multiple_maxima && !warned_about_multiple_local_maxima) + CCTK_WARN(1, "Found more than one identical maximum in single patch."); if (verbosity_level >= 2) { if (round(local_rho_max_loc[3]) == 1.) { // once we detect the second maximum, output the first as well @@ -131,8 +134,8 @@ "my candidate: (%g,%g,%g) with value %g.", x[i3D], y[i3D], z[i3D], *Hydro_Analysis_rho_max); - warned_about_multiple_local_maxima = 1; } + warned_about_multiple_local_maxima = 1; } local_rho_max_loc[0] += x[i3D]; local_rho_max_loc[1] += y[i3D]; @@ -162,8 +165,6 @@ } else { if (Hydro_Analysis_average_multiple_maxima_locations) { - static int have_warned_about_multiple_maxima = 0; - level_rho_max_loc[0] /= level_rho_max_loc[3]; level_rho_max_loc[1] /= level_rho_max_loc[3]; level_rho_max_loc[2] /= level_rho_max_loc[3];

1 0

[svn:einsteintoolkit] Hydro_Analysis/trunk/ (Rev. 125)
by rhaas＠tapir.caltech.edu 28 Nov '12

28 Nov '12

User: rhaas Date: 2012/11/29 12:44 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Separation.F90 Log: Hydro_Analysis: add parameters to control which interpolator is used in GRHydro_Separation File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Separation.F90 Delta lines: +30 -3 =================================================================== --- trunk/src/GRHydro_Separation.F90 2012-11-29 06:42:10 UTC (rev 124) +++ trunk/src/GRHydro_Separation.F90 2012-11-29 06:44:54 UTC (rev 125) @@ -48,6 +48,15 @@ CCTK_POINTER, dimension(6) :: out_arrays CCTK_INT, dimension(6) :: out_array_type_codes + ! Fortran copies of the Cactus CCTK_STRING parameters controllin the + ! interpolator + integer, parameter:: max_string_length = 500 + integer :: string_length + character(len=max_string_length) :: Hydro_Analysis_interpolator_options_fstring + character(len=max_string_length) :: Hydro_Analysis_interpolator_name_fstring + character(len=max_string_length) :: Hydro_Analysis_interpolator_coordinates_fstring + + !!$ Proper separation requires interpolation allocate(separation_x(Hydro_Analysis_rho_max_origin_distance_npoints), & @@ -57,6 +66,23 @@ if (ierr .ne. 0) then call CCTK_WARN(0, "Failed to allocate separation coordinate arrays") end if + + call CCTK_FortranString(string_length, Hydro_Analysis_interpolator_options, & + Hydro_Analysis_interpolator_options_fstring) + if (string_length .gt. max_string_length) then + call CCTK_WARN(CCTK_WARN_ALERT, "'Hydro_Analysis_interpolator_options' string too long!") + end if + call CCTK_FortranString(string_length, Hydro_Analysis_interpolator_name, & + Hydro_Analysis_interpolator_name_fstring) + if (string_length .gt. max_string_length) then + call CCTK_WARN(CCTK_WARN_ALERT, "'Hydro_Analysis_interpolator_name' string too long!") + end if + call CCTK_FortranString(string_length, Hydro_Analysis_interpolator_coordinates, & + Hydro_Analysis_interpolator_coordinates_fstring) + if (string_length .gt. max_string_length) then + call CCTK_WARN(CCTK_WARN_ALERT, "'Hydro_Analysis_interpolator_coordinates' string too long!") + end if + separation_dx = Hydro_Analysis_rho_max_loc(1) / dble(Hydro_Analysis_rho_max_origin_distance_npoints) separation_dy = Hydro_Analysis_rho_max_loc(2) / dble(Hydro_Analysis_rho_max_origin_distance_npoints) @@ -86,17 +112,18 @@ interp_handle = -1 coord_system_handle = -1 - call Util_TableCreateFromString (param_table_handle, "order = 2") + call Util_TableCreateFromString (param_table_handle, & + Hydro_Analysis_interpolator_options_fstring) if (param_table_handle .lt. 0) then call CCTK_WARN(0,"Cannot create parameter table for interpolator") endif - call CCTK_InterpHandle (interp_handle, "uniform cartesian") + call CCTK_InterpHandle (interp_handle, Hydro_Analysis_interpolator_name_fstring) if (interp_handle.lt.0) then call CCTK_WARN(0,"Cannot get handle for interpolation ! Forgot to activate an implementation providing interpolation operators (e.g. LocalInterp)?") endif - call CCTK_CoordSystemHandle (coord_system_handle, "cart3d") + call CCTK_CoordSystemHandle (coord_system_handle, Hydro_Analysis_interpolator_coordinates_fstring) if (coord_system_handle .lt. 0) then call CCTK_WARN(0,"Cannot get handle for cart3d coordinate system ! Forgot to activate an implementation providing coordinates (e.g. LocalInterp)?") endif Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +20 -0 =================================================================== --- trunk/param.ccl 2012-11-29 06:42:10 UTC (rev 124) +++ trunk/param.ccl 2012-11-29 06:44:54 UTC (rev 125) @@ -36,3 +36,23 @@ 1:* :: "Any positive number" } 100 +# Parameters for the interpolator in Hydro_Analysis_comp_rho_max_origin_distance + +STRING Hydro_Analysis_interpolator_name "Name of the interpolator" STEERABLE=always +{ + "Lagrange polynomial interpolation (tensor product)" :: "from AEILocalInterp" + "Lagrange polynomial interpolation (maximum degree)" :: "from AEILocalInterp" + "Hermite polynomial interpolation" :: "from AEILocalInterp" + "uniform cartesian" :: "from LocalInterp" + ".*" :: "must be a registered interpolator" +} "uniform cartesian" + +STRING Hydro_Analysis_interpolator_options "Options for the interpolator" STEERABLE=always +{ + ".*" :: "must be a valid option specification" +} "order=2" + +STRING Hydro_Analysis_interpolator_coordinates "Coordinate system" STEERABLE=always +{ + ".*" :: "must be a registered coordinate system" +} "cart3d"

1 0

[svn:einsteintoolkit] Hydro_Analysis/trunk/ (Rev. 124)
by rhaas＠tapir.caltech.edu 28 Nov '12

28 Nov '12

User: rhaas Date: 2012/11/29 12:42 AM Modified: /trunk/ configuration.ccl /trunk/src/ GRHydro_Separation.F90 Log: Hydro_Analysis: use Fortran modules for prototypes if available File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Separation.F90 Delta lines: +4 -0 =================================================================== --- trunk/src/GRHydro_Separation.F90 2012-11-27 23:47:44 UTC (rev 123) +++ trunk/src/GRHydro_Separation.F90 2012-11-29 06:42:10 UTC (rev 124) @@ -24,6 +24,10 @@ subroutine Hydro_Analysis_FindSeparation(CCTK_ARGUMENTS) +#ifdef HAVE_CAPABILITY_Fortran + use util_Table +#endif + implicit none DECLARE_CCTK_ARGUMENTS Directory: /trunk/ ================== File [modified]: configuration.ccl Delta lines: +3 -0 =================================================================== --- trunk/configuration.ccl 2012-11-27 23:47:44 UTC (rev 123) +++ trunk/configuration.ccl 2012-11-29 06:42:10 UTC (rev 124) @@ -2,3 +2,6 @@ REQUIRES LoopControl +OPTIONAL Fortran +{ +}

1 0

[svn:einsteintoolkit] Hydro_Analysis/trunk/ (Rev. 123)
by rhaas＠tapir.caltech.edu 27 Nov '12

27 Nov '12

User: rhaas Date: 2012/11/27 05:47 PM Modified: /trunk/ param.ccl /trunk/src/ Hydro_Analysis.c Log: Hydro_Analysis: add verbosity_level option to control how much data to output to stdout File Changes: Directory: /trunk/src/ ====================== File [modified]: Hydro_Analysis.c Delta lines: +42 -4 =================================================================== --- trunk/src/Hydro_Analysis.c 2012-11-27 23:47:09 UTC (rev 122) +++ trunk/src/Hydro_Analysis.c 2012-11-27 23:47:44 UTC (rev 123) @@ -90,7 +90,7 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - int set_maximum_location; + int set_maximum_location, warned_about_multiple_local_maxima = 0; /* Initialized MPI-local quantities */ CCTK_REAL local_rho_max_loc[4], level_rho_max_loc[4]; @@ -115,6 +115,25 @@ { #pragma omp critical { + // have to already warn here when we still have the actual coordinates around + if (verbosity_level >= 1 && round(local_rho_max_loc[3]) >= 1.) + { + CCTK_WARN(1, "Found more than one identical maximum in single patch."); + if (verbosity_level >= 2) + { + if (round(local_rho_max_loc[3]) == 1.) { // once we detect the second maximum, output the first as well + CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, + "my candidate: (%g,%g,%g) with value %g.", + local_rho_max_loc[0],local_rho_max_loc[1],local_rho_max_loc[2], + *Hydro_Analysis_rho_max); + } + CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, + "my candidate: (%g,%g,%g) with value %g.", + x[i3D], y[i3D], z[i3D], + *Hydro_Analysis_rho_max); + warned_about_multiple_local_maxima = 1; + } + } local_rho_max_loc[0] += x[i3D]; local_rho_max_loc[1] += y[i3D]; local_rho_max_loc[2] += z[i3D]; @@ -149,11 +168,30 @@ level_rho_max_loc[1] /= level_rho_max_loc[3]; level_rho_max_loc[2] /= level_rho_max_loc[3]; + if (verbosity_level >= 1 && !have_warned_about_multiple_maxima) + { + CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, + "Found more than one (%d) identical maximum, using average location (%g,%g,%g).", + (int)round(level_rho_max_loc[3]), + level_rho_max_loc[0], level_rho_max_loc[1], + level_rho_max_loc[2]); + have_warned_about_multiple_maxima = 1; + } + set_maximum_location = 1; } else { - CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, - "Found more than one (%d) identical maximum, not setting anything.", - (int)round(level_rho_max_loc[3])); + if (verbosity_level >= 1) + { + CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, + "Found more than one (%d) identical maximum, not setting anything.", + (int)round(level_rho_max_loc[3])); + if (verbosity_level >= 2 && !warned_about_multiple_local_maxima) + { + CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, + "my candidate: (%g,%g,%g) with value %g.", + local_rho_max_loc[0],local_rho_max_loc[1],local_rho_max_loc[2], + *Hydro_Analysis_rho_max); + } } set_maximum_location = 0; } Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +7 -0 =================================================================== --- trunk/param.ccl 2012-11-27 23:47:09 UTC (rev 122) +++ trunk/param.ccl 2012-11-27 23:47:44 UTC (rev 123) @@ -11,6 +11,13 @@ { } "false" +INT verbosity_level "how much information to ouptut to the logs" STEERABLE = always +{ + 0 :: "Output nothing" + 1 :: "warn when finding multiple maxima" + 2 :: "also output location of maxima" +} 1 + BOOLEAN Hydro_Analysis_rho_max_loc_only_positive_x "Restrict location search for density maximum to positive values of x" { } "false"

1 0

[svn:einsteintoolkit] Hydro_Analysis/trunk/ (Rev. 122)
by rhaas＠tapir.caltech.edu 27 Nov '12

27 Nov '12

User: rhaas Date: 2012/11/27 05:47 PM Modified: /trunk/ param.ccl /trunk/src/ Hydro_Analysis.c Log: Hydro_Analysis: add option to average the location of multiple identical maxima this is useful for cell centering where intially there might be several points with precisely the same density around the center of a star File Changes: Directory: /trunk/src/ ====================== File [modified]: Hydro_Analysis.c Delta lines: +41 -10 =================================================================== --- trunk/src/Hydro_Analysis.c 2012-11-05 14:45:02 UTC (rev 121) +++ trunk/src/Hydro_Analysis.c 2012-11-27 23:47:09 UTC (rev 122) @@ -1,3 +1,5 @@ +#include <math.h> + #include <cctk.h> #include <cctk_Arguments.h> #include <cctk_Parameters.h> @@ -81,11 +83,15 @@ } /* Look for the location of the density maximum */ +/* RH: this is scheduled global loop-local but does MPI calls. It will hang if + * some processors have more components than others. */ void Hydro_Analysis_LocationSearch(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + int set_maximum_location; + /* Initialized MPI-local quantities */ CCTK_REAL local_rho_max_loc[4], level_rho_max_loc[4]; local_rho_max_loc[0] = 0.0; @@ -109,10 +115,10 @@ { #pragma omp critical { - local_rho_max_loc[0] = x[i3D]; - local_rho_max_loc[1] = y[i3D]; - local_rho_max_loc[2] = z[i3D]; - local_rho_max_loc[3] = 1.; + local_rho_max_loc[0] += x[i3D]; + local_rho_max_loc[1] += y[i3D]; + local_rho_max_loc[2] += z[i3D]; + local_rho_max_loc[3] += 1.; } } } @@ -122,25 +128,50 @@ * The others should have a value of 0.0, so that the sum reduction * gives the value on each MPI process. This however is not true sometimes * and this is the point where the algorithm can fail. */ + /* RH: this assumption is false if a processor owns more than a single patch + * */ CCTK_INT handle_sum = CCTK_LocalArrayReductionHandle("sum"); if (handle_sum < 0) CCTK_WARN(0, "Unable to get reduction handle 'sum'."); if (CCTK_ReduceLocArrayToArray1D(cctkGH, -1, handle_sum, &local_rho_max_loc, level_rho_max_loc, 4, CCTK_VARIABLE_REAL)) CCTK_WARN(0, "Error while reducing local_rho_max_loc"); - if (fabs(level_rho_max_loc[3]) > 1.e-14) { - if (fabs(level_rho_max_loc[3]-1.) < 1.e-14) + if (round(level_rho_max_loc[3]) > 0.) { + if (round(level_rho_max_loc[3]) == 1.) { + set_maximum_location = 1; + } else { + if (Hydro_Analysis_average_multiple_maxima_locations) + { + static int have_warned_about_multiple_maxima = 0; + + level_rho_max_loc[0] /= level_rho_max_loc[3]; + level_rho_max_loc[1] /= level_rho_max_loc[3]; + level_rho_max_loc[2] /= level_rho_max_loc[3]; + + set_maximum_location = 1; + } else { + CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, + "Found more than one (%d) identical maximum, not setting anything.", + (int)round(level_rho_max_loc[3])); + } + set_maximum_location = 0; + } + } + + } else { + set_maximum_location = 0; + } + + + if (set_maximum_location) + { Hydro_Analysis_rho_max_loc[0] = level_rho_max_loc[0]; Hydro_Analysis_rho_max_loc[1] = level_rho_max_loc[1]; Hydro_Analysis_rho_max_loc[2] = level_rho_max_loc[2]; - } else - CCTK_WARN(1, "Found more than one identical maximum, not setting anything."); - } /* CCTK_VInfo(CCTK_THORNSTRING, "New location: %g,%g,%g", Hydro_Analysis_rho_max_loc[0], Hydro_Analysis_rho_max_loc[1], Hydro_Analysis_rho_max_loc[2]); */ } - Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +7 -0 =================================================================== --- trunk/param.ccl 2012-11-05 14:45:02 UTC (rev 121) +++ trunk/param.ccl 2012-11-27 23:47:09 UTC (rev 122) @@ -4,6 +4,13 @@ { } "false" +# the following is useful eg. when using cell-centering where there might not +# be a grid point at the centre of the star and initially several equally valid +# maxima might be clustered around it. +BOOLEAN Hydro_Analysis_average_multiple_maxima_locations "when finding more than one global maximum location, average position and use result" STEERABLE = always +{ +} "false" + BOOLEAN Hydro_Analysis_rho_max_loc_only_positive_x "Restrict location search for density maximum to positive values of x" { } "false"

1 0

[svn:einsteintoolkit] Exact/trunk/ (Rev. 284)
by rhaas＠tapir.caltech.edu 27 Nov '12

27 Nov '12

User: rhaas Date: 2012/11/27 11:52 AM Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ gauge.F77 Log: add dtlapse_evolution and dtshift_evolution method options This attached patch actually does two things: 1. adds dtlapse_evolution method and dtshift_evolution method options 'exact' to the respective ADMBase keywords 2. schedules metric initialization in MoL_PostStep (in addition to CCTK_PRESTEP) which is in line with what the current gauge initialization routine does File Changes: Directory: /trunk/src/ ====================== File [modified]: gauge.F77 Delta lines: +2 -2 =================================================================== --- trunk/src/gauge.F77 2012-11-21 20:10:41 UTC (rev 283) +++ trunk/src/gauge.F77 2012-11-27 17:52:52 UTC (rev 284) @@ -82,8 +82,8 @@ if ( is_later_slice ) then set_lapse = CCTK_Equals(lapse_evolution_method, "exact").ne.0 set_shift = CCTK_Equals(shift_evolution_method, "exact").ne.0 - set_dtlapse = .false. - set_dtshift = .false. + set_dtlapse = CCTK_Equals(dtlapse_evolution_method, "exact").ne.0 + set_dtshift = CCTK_Equals(dtshift_evolution_method, "exact").ne.0 end if if ( set_lapse .or. set_shift .or. set_dtlapse .or. set_dtshift) then Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +9 -0 =================================================================== --- trunk/param.ccl 2012-11-21 20:10:41 UTC (rev 283) +++ trunk/param.ccl 2012-11-27 17:52:52 UTC (rev 284) @@ -24,6 +24,15 @@ "exact" :: "Use shift from exact solution" } +EXTENDS KEYWORD dtlapse_evolution_method +{ + "exact" :: "Use lapse from exact solution" +} +EXTENDS KEYWORD dtshift_evolution_method +{ + "exact" :: "Use shift from exact solution" +} + EXTENDS KEYWORD initial_lapse { "exact" :: "Initial lapse from exact solution" File [modified]: schedule.ccl Delta lines: +6 -1 =================================================================== --- trunk/schedule.ccl 2012-11-21 20:10:41 UTC (rev 283) +++ trunk/schedule.ccl 2012-11-27 17:52:52 UTC (rev 284) @@ -74,7 +74,7 @@ # During the evolution: -if ( (CCTK_Equals(lapse_evolution_method,"exact")) || (CCTK_Equals(shift_evolution_method,"exact")) ) +if ( (CCTK_Equals(lapse_evolution_method,"exact")) || (CCTK_Equals(shift_evolution_method,"exact")) || (CCTK_Equals(dtlapse_evolution_method,"exact")) || (CCTK_Equals(dtshift_evolution_method,"exact")) ) { schedule Exact__RegisterSlicing at CCTK_STARTUP { @@ -132,6 +132,11 @@ { LANG: Fortran } "Set data from exact solution on an exact slice" + # Necessary if MoL is used + schedule Exact__initialize in MoL_PostStep + { + LANG: Fortran + } "Set data from exact solution on an exact slice" } #######################################################################

1 0

[svn:einsteintoolkit] WeylScal4/trunk/test/teukolsky/ (Rev. 129)
by rhaas＠tapir.caltech.edu 26 Nov '12

26 Nov '12

User: rhaas Date: 2012/11/27 01:39 AM Modified: /trunk/test/teukolsky/ Psi4i.d.asc, Psi4i.x.asc, Psi4i.y.asc, Psi4i.z.asc, Psi4r.d.asc, Psi4r.x.asc, Psi4r.y.asc, Psi4r.z.asc Log: WeylScal4: regenerate test data after Carpet change Carpet's 6b5c318bb1057851d0ee1b5bba6e633c5cf31ca6 which re-copies init_fill_timelevels after initial restriction affects the ID we see and hence the final answer File Changes: Directory: /trunk/test/teukolsky/ ================================= File [modified]: Psi4i.d.asc Delta lines: <Unavailable> File [modified]: Psi4i.x.asc Delta lines: <Unavailable> File [modified]: Psi4i.y.asc Delta lines: <Unavailable> File [modified]: Psi4i.z.asc Delta lines: <Unavailable> File [modified]: Psi4r.d.asc Delta lines: <Unavailable> File [modified]: Psi4r.x.asc Delta lines: <Unavailable> File [modified]: Psi4r.y.asc Delta lines: <Unavailable> File [modified]: Psi4r.z.asc Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] SphericalHarmonicDecomp/trunk/src/ (Rev. 10)
by knarf＠cct.lsu.edu 25 Nov '12

25 Nov '12

User: knarf Date: 2012/11/25 09:24 PM Modified: /trunk/src/ ExtractMetric.cc, SphericalHarmonicDecomp.h, alias.cc, h5read.cc, matrix.cc Log: remove a few compiler warnings File Changes: Directory: /trunk/src/ ====================== File [modified]: ExtractMetric.cc Delta lines: +9 -6 =================================================================== --- trunk/src/ExtractMetric.cc 2012-11-05 16:05:48 UTC (rev 9) +++ trunk/src/ExtractMetric.cc 2012-11-26 03:24:14 UTC (rev 10) @@ -46,10 +46,12 @@ +#ifdef TEST_DECOMP static void fill_in_data(CCTK_REAL time, int s, int nl, int nn, int npoints, CCTK_REAL Rin, CCTK_REAL Rout, const CCTK_REAL xb[], const CCTK_REAL yb[], const CCTK_REAL zb[], CCTK_REAL re[], CCTK_REAL im[]); +#endif static int interp_fields(const cGH* cctkGH, @@ -92,7 +94,6 @@ static CCTK_REAL *yb[MAX_RADII]; static CCTK_REAL *zb[MAX_RADII]; static double *radius[MAX_RADII]; - static double *X = NULL; static CCTK_REAL *re_f = NULL; static CCTK_REAL *im_f = NULL; @@ -108,7 +109,7 @@ myassert (ABS(spin) <= max_spin); - myassert (num_radii <= sizeof(radius) / sizeof(*radius)); + myassert (num_radii <= CCTK_INT(sizeof(radius) / sizeof(*radius))); static int MyProc = CCTK_MyProc(cctkGH); const char *outdir = *out_dir ? out_dir : io_out_dir; @@ -118,7 +119,7 @@ if (FirstTime) { - for (int i=0; i < sizeof(radius) / sizeof(*radius); i++) + for (unsigned int i=0; i < sizeof(radius) / sizeof(*radius); i++) { xb[i] = NULL; yb[i] = NULL; @@ -274,7 +275,7 @@ if (FirstCall) { FirstCall = 0; - for (int i=0; i < sizeof(last_dump) / sizeof(*last_dump); i++) + for (unsigned int i=0; i < sizeof(last_dump) / sizeof(*last_dump); i++) { last_dump[i] = -1000; } @@ -302,8 +303,8 @@ CCTK_WARN(hdf5_warn_level, "Failed to create hdf5 file"); } - char name[]="/metadata"; - HDF5_ERROR(group_id = H5Gcreate(file_id, name, 0)); + char metaname[]="/metadata"; + HDF5_ERROR(group_id = H5Gcreate(file_id, metaname, 0)); int ds[2] = {nn, nlmmodes}; hsize_t oD2 = 2; @@ -471,6 +472,7 @@ return 0; } +#ifdef TEST_DECOMP static void fill_in_data(CCTK_REAL time, int s, int nl, int nn, int npoints, CCTK_REAL Rin, CCTK_REAL Rout, const CCTK_REAL xb[], const CCTK_REAL yb[], @@ -514,6 +516,7 @@ im[i] = val.imag(); } } +#endif extern "C" { File [modified]: SphericalHarmonicDecomp.h Delta lines: +1 -1 =================================================================== --- trunk/src/SphericalHarmonicDecomp.h 2012-11-05 16:05:48 UTC (rev 9) +++ trunk/src/SphericalHarmonicDecomp.h 2012-11-26 03:24:14 UTC (rev 10) @@ -19,6 +19,6 @@ } #ifdef USE_LEGENDRE -# ERROR: Don't activate this option +# ERROR: Do not activate this option #endif #endif File [modified]: alias.cc Delta lines: +26 -25 =================================================================== --- trunk/src/alias.cc 2012-11-05 16:05:48 UTC (rev 9) +++ trunk/src/alias.cc 2012-11-26 03:24:14 UTC (rev 10) @@ -30,10 +30,12 @@ +#ifdef TEST_DECOMP static void fill_in_data(int s, int nl, int nn, int npoints, CCTK_REAL Rin, CCTK_REAL Rout, const CCTK_REAL xb[], const CCTK_REAL yb[], const CCTK_REAL zb[], CCTK_REAL re[], CCTK_REAL im[]); +#endif static int interp_fields(const cGH* cctkGH, @@ -416,7 +418,6 @@ char filename[BUFFSIZE]; hid_t file_id; hsize_t dims[2]; - herr_t status; DECLARE_CCTK_PARAMETERS; @@ -437,7 +438,7 @@ H5P_DEFAULT, H5P_DEFAULT); { - hid_t dataset_id, attribute_id, dataspace_id;; + hid_t attribute_id, dataspace_id;; int ds[2] = {nn, nlmmodes}; hsize_t oD2 = 2; hsize_t oD1 = 1; @@ -445,30 +446,30 @@ dataspace_id = H5Screate_simple(1, &oD2, NULL); attribute_id = H5Acreate(file_id, "dim", H5T_NATIVE_INT, dataspace_id, H5P_DEFAULT); - status = H5Awrite(attribute_id, H5T_NATIVE_INT, ds); - status = H5Aclose(attribute_id); - status = H5Sclose(dataspace_id); + H5Awrite(attribute_id, H5T_NATIVE_INT, ds); + H5Aclose(attribute_id); + H5Sclose(dataspace_id); dataspace_id = H5Screate_simple(1, &oD1, NULL); attribute_id = H5Acreate(file_id, "spin", H5T_NATIVE_INT, dataspace_id, H5P_DEFAULT); - status = H5Awrite(attribute_id, H5T_NATIVE_INT, &s); - status = H5Aclose(attribute_id); - status = H5Sclose(dataspace_id); + H5Awrite(attribute_id, H5T_NATIVE_INT, &s); + H5Aclose(attribute_id); + H5Sclose(dataspace_id); dataspace_id = H5Screate_simple(1, &oD1, NULL); attribute_id = H5Acreate(file_id, "Rin", H5T_NATIVE_DOUBLE, dataspace_id, H5P_DEFAULT); - status = H5Awrite(attribute_id, H5T_NATIVE_DOUBLE, &Rin); - status = H5Aclose(attribute_id); - status = H5Sclose(dataspace_id); + H5Awrite(attribute_id, H5T_NATIVE_DOUBLE, &Rin); + H5Aclose(attribute_id); + H5Sclose(dataspace_id); dataspace_id = H5Screate_simple(1, &oD1, NULL); attribute_id = H5Acreate(file_id, "Rout", H5T_NATIVE_DOUBLE, dataspace_id, H5P_DEFAULT); - status = H5Awrite(attribute_id, H5T_NATIVE_DOUBLE, &Rout); - status = H5Aclose(attribute_id); - status = H5Sclose(dataspace_id); + H5Awrite(attribute_id, H5T_NATIVE_DOUBLE, &Rout); + H5Aclose(attribute_id); + H5Sclose(dataspace_id); } } @@ -488,29 +489,27 @@ dataspace_id = H5Screate_simple(1, &oneD, NULL); attribute_id = H5Acreate(group_id, "Time", H5T_NATIVE_DOUBLE, dataspace_id, H5P_DEFAULT); - status = H5Awrite(attribute_id, H5T_NATIVE_DOUBLE, &time); - status = H5Aclose(attribute_id); - status = H5Sclose(dataspace_id); + H5Awrite(attribute_id, H5T_NATIVE_DOUBLE, &time); + H5Aclose(attribute_id); + H5Sclose(dataspace_id); H5Gclose(group_id); snprintf(buff, BUFFSIZE-1, "/%d/re", it); dataspace_id = H5Screate_simple(2, dims, NULL); dataset_id = H5Dcreate(file_id, buff, H5T_NATIVE_DOUBLE, dataspace_id, H5P_DEFAULT); - status = H5Dwrite(dataset_id, H5T_NATIVE_DOUBLE, H5S_ALL, - H5S_ALL, H5P_DEFAULT, re); - status = H5Dclose(dataset_id); - status = H5Sclose(dataspace_id); + H5Dwrite(dataset_id, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, re); + H5Dclose(dataset_id); + H5Sclose(dataspace_id); snprintf(buff, BUFFSIZE-1, "/%d/im", it); dataspace_id = H5Screate_simple(2, dims, NULL); dataset_id = H5Dcreate(file_id, buff, H5T_NATIVE_DOUBLE, dataspace_id, H5P_DEFAULT); - status = H5Dwrite(dataset_id, H5T_NATIVE_DOUBLE, H5S_ALL, - H5S_ALL, H5P_DEFAULT, im); - status = H5Dclose(dataset_id); - status = H5Sclose(dataspace_id); + H5Dwrite(dataset_id, H5T_NATIVE_DOUBLE, H5S_ALL, H5S_ALL, H5P_DEFAULT, im); + H5Dclose(dataset_id); + H5Sclose(dataspace_id); } H5Fclose(file_id); @@ -589,6 +588,7 @@ return 0; } +#ifdef TEST_DECOMP static void fill_in_data(int s, int nl, int nn, int npoints, CCTK_REAL Rin, CCTK_REAL Rout, const CCTK_REAL xb[], const CCTK_REAL yb[], @@ -632,3 +632,4 @@ im[i] = val.imag(); } } +#endif File [modified]: h5read.cc Delta lines: +7 -8 =================================================================== --- trunk/src/h5read.cc 2012-11-05 16:05:48 UTC (rev 9) +++ trunk/src/h5read.cc 2012-11-26 03:24:14 UTC (rev 10) @@ -31,15 +31,14 @@ int spin; int dim[2]; - hid_t file_id, dataset_id; - herr_t status; + hid_t file_id; file_id = H5Fopen(name, H5F_ACC_RDONLY, H5P_DEFAULT); - status = H5LTget_attribute_int(file_id,"/","spin",&spin); - status = H5LTget_attribute_int(file_id,"/","dim",dim); - status = H5LTget_attribute_double(file_id,"/","Rin",&Rin); - status = H5LTget_attribute_double(file_id,"/","Rout",&Rout); + H5LTget_attribute_int(file_id,"/","spin",&spin); + H5LTget_attribute_int(file_id,"/","dim",dim); + H5LTget_attribute_double(file_id,"/","Rin",&Rin); + H5LTget_attribute_double(file_id,"/","Rout",&Rout); /* the order of the dimensions has changed to C so dim[0] = nn @@ -58,7 +57,7 @@ snprintf(buff, BUFFSIZE-1, "/%d", iteration); - status = H5LTget_attribute_double(file_id,buff, "Time", p_time); + H5LTget_attribute_double(file_id,buff, "Time", p_time); cout << "# Time = " << *p_time << endl; if (!*p_re) @@ -73,7 +72,7 @@ snprintf(buff, BUFFSIZE-1, "/%d/im", iteration); H5LTread_dataset_double(file_id, buff, *p_im); - status = H5Fclose(file_id); + H5Fclose(file_id); for (int n=0; n < nn; n++) { File [modified]: matrix.cc Delta lines: +1 -1 =================================================================== --- trunk/src/matrix.cc 2012-11-05 16:05:48 UTC (rev 9) +++ trunk/src/matrix.cc 2012-11-26 03:24:14 UTC (rev 10) @@ -342,7 +342,7 @@ for (int j = 0; j < ncolumns; j++) { complex<double> v = get_val(i,j); - gsl_complex val = {v.real(), v.imag()}; + gsl_complex val = {{v.real(), v.imag()}}; gsl_matrix_complex_set(mat, i, j, val); } }

1 0

[Carpet] branch, master, updated. carpet-6-init-71-g2358073
by Carpet git repositories 25 Nov '12

25 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 2358073604a80bf41c42624ce2272314221ac947 (commit) via eacf0e1822fdeaf6ab1fa9101d08e301cae4674f (commit) via cec0300747391fadd836334d6f8c81ff83821ce8 (commit) via db3bdfe06cd913749368c71fba8dff7d5cca357a (commit) via 4236197781bcfa9214d7f81596dbae20b19cafc7 (commit) from c4ca3950eea5b679e8fda9a8c643601b2299c95e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 2358073604a80bf41c42624ce2272314221ac947 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Nov 25 11:19:10 2012 -0500 CarpetRegrid2: More verbose info output during regridding commit eacf0e1822fdeaf6ab1fa9101d08e301cae4674f Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Nov 25 11:18:45 2012 -0500 CarpetRegrid2: Correct output of refinement level during AMR commit cec0300747391fadd836334d6f8c81ff83821ce8 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Nov 25 11:18:13 2012 -0500 Carpet: Check return value of dup() commit db3bdfe06cd913749368c71fba8dff7d5cca357a Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Nov 25 11:17:57 2012 -0500 Carpet: Avoid unused and uninitialised variables commit 4236197781bcfa9214d7f81596dbae20b19cafc7 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Nov 25 11:17:31 2012 -0500 Carpet: Initialise TimerNode fields in correct order ----------------------------------------------------------------------- Summary of changes: Carpet/Carpet/src/CarpetParamCheck.cc | 6 ++++-- Carpet/Carpet/src/Recompose.cc | 3 ++- Carpet/Carpet/src/SetupGH.cc | 2 ++ Carpet/Carpet/src/TimerNode.cc | 4 ++-- Carpet/Carpet/src/TimerSet.cc | 6 ++++-- Carpet/CarpetRegrid2/src/amr.cc | 2 +- Carpet/CarpetRegrid2/src/regrid.cc | 7 ++++++- 7 files changed, 21 insertions(+), 9 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits November 2012