Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] NullEvolve/trunk/ (Rev. 10)
by rhaas＠tapir.caltech.edu 31 Jul '12

31 Jul '12

User: rhaas Date: 2012/07/31 03:04 PM Modified: /trunk/ param.ccl /trunk/src/ NullEvol_Evol.F90 Log: NullEvolve: fix offset in characteristic iniitial data make parameters steerable From: B?\195?\169la Szil?\195?\161gyi and Nick Taylor File Changes: Directory: /trunk/src/ ====================== File [modified]: NullEvol_Evol.F90 Delta lines: +48 -24 =================================================================== --- trunk/src/NullEvol_Evol.F90 2012-06-01 21:31:10 UTC (rev 9) +++ trunk/src/NullEvol_Evol.F90 2012-07-31 20:04:45 UTC (rev 10) @@ -346,42 +346,66 @@ CCTK_COMPLEX, dimension (lsh(1), lsh(2), nx), intent (in) :: jos CCTK_REAL, intent(in) :: dt - CCTK_REAL, dimension (lsh(1), lsh(2)) :: r_0o, r_1o, A, x_0o, x_1o, x_1n, r_1n, r_wt - CCTK_COMPLEX, dimension (lsh(1), lsh(2)) :: j_0o, j_1o, j_1n + CCTK_REAL :: r_0o, r_1o, A, x_0o, x_1o, x_1n, r_1n, r_wt, r_1h, x_1h, eta + CCTK_COMPLEX :: j_0o, j_1o, j_1n + character(len=500) :: message - integer B, i1, i2 + integer i1, i2, B B = i-1 - A = 1 + W * rwt * xc /( 1-xc) + ! write (message,*) "min. x_wt = ",minval(x_wt),"max. x_wt = ",maxval(x_wt),", xb(B+1) = ",xb(B+1),", dx = ",dx + ! call CCTK_INFO(trim(message)) + do i2 = 1, lsh(2) + do i1 = 1, lsh(1) - r_wt = rwt * x_wt / (1-x_wt) - r_0o = 0.5 * A * dt + r_wt + A = 1 + W(i1,i2) * rwt * xc(i1,i2) /( 1-xc(i1,i2)) - r_1o = +0.25 * A * dt + rb(B+1) - r_1n = -0.25 * A * dt + rb(B+1) + r_wt = rwt * x_wt(i1,i2) / (1-x_wt(i1,i2)) + r_0o = 0.5 * A * dt + r_wt - x_0o = r_0o/(rwt+r_0o) - x_1o = r_1o/(rwt+r_1o) - x_1n = r_1n/(rwt+r_1n) + x_1h = 0.5 * (x_wt(i1,i2) + xb(B+1)) + r_1h = rwt * x_1h/(1-x_1h) - j_0o = j_wt_o*(x_0o-xb(B+2))*(x_0o-xb(B+3))/(x_wt_o-xb(B+2))/(x_wt_o-xb(B+3)) & - + jos(:,:,B+2)*(x_0o-x_wt_o)*(x_0o-xb(B+3))/(xb(B+2)-x_wt_o)/(xb(B+2)-xb(B+3)) & - + jos(:,:,B+3)*(x_0o-x_wt_o)*(x_0o-xb(B+2))/(xb(B+3)-x_wt_o)/(xb(B+3)-xb(B+2)) + r_1n = -0.25 * A * dt + rb(B+1) + x_1n = r_1n/(rwt+r_1n) + if(r_1h .gt. r_1n) then + r_1n = r_1h + x_1n = x_1h + eta = 1 + else + eta = (xb(B+1)-x_1n)/(x_1n-x_wt(i1,i2)) + end if + ! r_1o = +0.25 * A * dt + rb(B+1) + r_1o = r_1n + 0.5 * A * dt - j_1o = j_wt_o*(x_1o-xb(B+2))*(x_1o-xb(B+3))/(x_wt_o-xb(B+2))/(x_wt_o-xb(B+3)) & - + jos(:,:,B+2)*(x_1o-x_wt_o)*(x_1o-xb(B+3))/(xb(B+2)-x_wt_o)/(xb(B+2)-xb(B+3)) & - + jos(:,:,B+3)*(x_1o-x_wt_o)*(x_1o-xb(B+2))/(xb(B+3)-x_wt_o)/(xb(B+3)-xb(B+2)) + x_0o = r_0o/(rwt+r_0o) + x_1o = r_1o/(rwt+r_1o) - j_1n = ( r_wt * j_wt - r_0o * j_0o + r_1o * j_1o& - + 0.5 * dt * (r_1n-r_wt) * (P_u+h_c) ) / r_1n + j_0o = j_wt_o(i1,i2)*(x_0o-xb(B+2))*(x_0o-xb(B+3))/(x_wt_o(i1,i2)-xb(B+2))/(x_wt_o(i1,i2)-xb(B+3)) & + + jos(i1,i2,B+2)*(x_0o-x_wt_o(i1,i2))*(x_0o-xb(B+3))/(xb(B+2)-x_wt_o(i1,i2))/(xb(B+2)-xb(B+3)) & + + jos(i1,i2,B+3)*(x_0o-x_wt_o(i1,i2))*(x_0o-xb(B+2))/(xb(B+3)-x_wt_o(i1,i2))/(xb(B+3)-xb(B+2)) - j_Bp1 = j_wt + (xb(B+1)-x_wt) * ( j_1n-j_wt ) / ( x_1n-x_wt ) + j_1o = j_wt_o(i1,i2)*(x_1o-xb(B+2))*(x_1o-xb(B+3))/(x_wt_o(i1,i2)-xb(B+2))/(x_wt_o(i1,i2)-xb(B+3)) & + + jos(i1,i2,B+2)*(x_1o-x_wt_o(i1,i2))*(x_1o-xb(B+3))/(xb(B+2)-x_wt_o(i1,i2))/(xb(B+2)-xb(B+3)) & + + jos(i1,i2,B+3)*(x_1o-x_wt_o(i1,i2))*(x_1o-xb(B+2))/(xb(B+3)-x_wt_o(i1,i2))/(xb(B+3)-xb(B+2)) - ! in case the WT is really near the point Bp1, we just copy the WT value - do i2 = 1, lsh(2) - do i1 = 1, lsh(1) - if(abs(xb(B+1)-x_wt(i1,i2)).lt.1.e-5*dx) j_Bp1(i1,i2) = j_wt(i1,i2) + j_1n = ( r_wt * j_wt(i1,i2) - r_0o * j_0o + r_1o * j_1o& + + 0.5 * dt * (r_1n-r_wt) * (P_u(i1,i2)+h_c(i1,i2)) ) / r_1n + + j_Bp1(i1,i2) = j_1n + (j_1n-j_wt(i1,i2)) * eta +! if(abs(xb(B+1)-x_wt(i1,i2)).lt.min_dx) then +! write(message,*)" this is it!: x_wt-xb=",xb(B+1)-x_wt(i1,i2),"x1n=",x_1n,"x_wt=",x_wt(i1,i2),"xBp1=",xb(B+1) +! call CCTK_WARN(0,trim(message)) +! j_Bp1(i1,i2) = j_wt(i1,i2) +! else +! j_Bp1(i1,i2) = j_wt(i1,i2) + (xb(B+1)-x_wt(i1,i2)) * ( j_1n-j_wt(i1,i2) ) / ( x_1n-x_wt(i1,i2) ) +! end if + + +! if(abs(xb(B+1)-x_wt(i1,i2)).lt.1.e-5*dx) then +! j_Bp1(i1,i2) = j_wt(i1,i2) +! end if end do end do Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +1 -1 =================================================================== --- trunk/param.ccl 2012-06-01 21:31:10 UTC (rev 9) +++ trunk/param.ccl 2012-07-31 20:04:45 UTC (rev 10) @@ -221,7 +221,7 @@ restricted: -CCTK_REAL Diagnostics_Coord_x "the coordinate x at which diagnostics are to be measured" +CCTK_REAL Diagnostics_Coord_x "the coordinate x at which diagnostics are to be measured" STEERABLE=ALWAYS { 0:1 :: "will test only for x >= NullGrid::null_xin." } 0.0

1 0

[svn:einsteintoolkit] NullDecomp/trunk/ (Rev. 9)
by rhaas＠tapir.caltech.edu 31 Jul '12

31 Jul '12

User: rhaas Date: 2012/07/31 03:02 PM Modified: /trunk/ param.ccl /trunk/src/ NullDecomp_IO.F90 Log: NullDecomp: make parameters steerable, respect Cactus truncate_files option From: Nick Taylor File Changes: Directory: /trunk/src/ ====================== File [modified]: NullDecomp_IO.F90 Delta lines: +7 -3 =================================================================== --- trunk/src/NullDecomp_IO.F90 2012-05-28 22:21:15 UTC (rev 8) +++ trunk/src/NullDecomp_IO.F90 2012-07-31 20:02:18 UTC (rev 9) @@ -19,6 +19,7 @@ character(1000) DirName, FileName, lName, mName integer :: flen, nchar, l, m + logical :: file_exists DECLARE_CCTK_PARAMETERS @@ -40,8 +41,9 @@ FileName = DirName(1:nchar) //'/' //FieldName& //'.L'//lName(1:2)//'M'//mName(1:3) // '.asc' - - if (TruncateFile) then + + inquire(FILE=FileName(1:flen), EXIST=file_exists) + if (TruncateFile .or. .not. file_exists) then open(10, FILE=FileName(1:flen), STATUS='REPLACE') else open(10, FILE=FileName(1:flen), STATUS='OLD', POSITION='APPEND') @@ -67,6 +69,7 @@ character(1000) DirName, FileName, lName, mName integer :: flen, nchar, l, m + logical :: file_exists DECLARE_CCTK_PARAMETERS @@ -89,7 +92,8 @@ FileName = DirName(1:nchar) //'/' //FieldName& //'.L'//lName(1:2)//'M'//mName(1:3) // '.asc' - if (TruncateFile) then + inquire(FILE=FileName(1:flen), EXIST=file_exists) + if (TruncateFile .or. .not. file_exists) then open(10, FILE=FileName(1:flen), STATUS='REPLACE') else open(10, FILE=FileName(1:flen), STATUS='OLD', POSITION='APPEND') Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +1 -1 =================================================================== --- trunk/param.ccl 2012-05-28 22:21:15 UTC (rev 8) +++ trunk/param.ccl 2012-07-31 20:02:18 UTC (rev 9) @@ -13,7 +13,7 @@ restricted: -CCTK_INT l_max "Decompose into spherical harmonics \ell = spin up to \ell = l_max" +CCTK_INT l_max "Decompose into spherical harmonics \ell = spin up to \ell = l_max" STEERABLE=ALWAYS { 2: :: "2 or greater " } 9

1 0

[svn:einsteintoolkit] SphericalHarmonicDecomp/trunk/src/ (Rev. 8)
by yosef＠astro.rit.edu 30 Jul '12

30 Jul '12

User: zlochower Date: 2012/07/30 03:43 PM Modified: /trunk/src/ ExtractMetric.cc Log: Removed debug printf's (should never have been committed). File Changes: Directory: /trunk/src/ ====================== File [modified]: ExtractMetric.cc Delta lines: +0 -3 =================================================================== --- trunk/src/ExtractMetric.cc 2012-07-30 18:57:20 UTC (rev 7) +++ trunk/src/ExtractMetric.cc 2012-07-30 20:43:41 UTC (rev 8) @@ -524,7 +524,6 @@ static int last_iter = -10000; -fprintf(stderr, "Entering Dump metric at %d\n", cctk_iteration); if ((!extract_spacetime_metric_every) || (cctk_iteration % extract_spacetime_metric_every)) @@ -532,14 +531,12 @@ return; } const int iter = cctk_iteration / extract_spacetime_metric_every; -fprintf(stderr, "survived first test\n"); if (iter <= last_iter) { return; } -fprintf(stderr, "survived second test\n"); if (CCTK_Equals(action_on_hdf5_error, "abort")) {

1 0

[svn:einsteintoolkit] SphericalHarmonicRecon/trunk/src/ (Rev. 14)
by yosef＠astro.rit.edu 30 Jul '12

30 Jul '12

User: zlochower Date: 2012/07/30 01:58 PM Modified: /trunk/src/ Recon.cc Log: check for hdf5 IO errors and abort File Changes: Directory: /trunk/src/ ====================== File [modified]: Recon.cc Delta lines: +28 -9 =================================================================== --- trunk/src/Recon.cc 2012-07-21 10:47:40 UTC (rev 13) +++ trunk/src/Recon.cc 2012-07-30 18:58:53 UTC (rev 14) @@ -16,6 +16,22 @@ #include <hdf5.h> #include <hdf5_hl.h> +static int hdf5_warn_level = CCTK_WARN_ABORT; + +#define HDF5_ERROR(fn_call) \ + do { \ + int _error_code = fn_call; \ + \ + \ + if (_error_code < 0) \ + { \ + CCTK_VWarn (hdf5_warn_level, __LINE__, __FILE__, CCTK_THORNSTRING, \ + "HDF5 call '%s' returned error code %d", \ + #fn_call, _error_code); \ + } \ + } while (0) + + #undef SPHERICALHARMONICRECON_DEBUG #define BUFFSIZE 1024 @@ -197,23 +213,22 @@ } else { - status = H5LTget_attribute_int(file_id,"/metadata/","spin",&spin); - status = H5LTget_attribute_int(file_id,"/metadata/","dim",dim); - status = H5LTget_attribute_double(file_id,"/metadata/","Rin",&Rin); - status = H5LTget_attribute_double(file_id,"/metadata/","Rout",&Rout); + HDF5_ERROR(status = H5LTget_attribute_int(file_id,"/metadata/","spin",&spin)); + HDF5_ERROR(status = H5LTget_attribute_int(file_id,"/metadata/","dim",dim)); + HDF5_ERROR(status = H5LTget_attribute_double(file_id,"/metadata/","Rin",&Rin)); + HDF5_ERROR(status = H5LTget_attribute_double(file_id,"/metadata/","Rout",&Rout)); } nn = dim[0]; na = dim[1]; nl = static_cast<int>(round(sqrt(double(na+spin*spin))-abs(double(spin)))); - status = H5LTget_attribute_double(file_id,"/0/", "Time", &time0); - status = H5LTget_attribute_double(file_id,"/1/", "Time", &dtime); - + HDF5_ERROR(status = H5LTget_attribute_double(file_id,"/0/", "Time", &time0)); + HDF5_ERROR(status = H5LTget_attribute_double(file_id,"/1/", "Time", &dtime)); dtime -= time0; - status = H5Fclose(file_id); + HDF5_ERROR(status = H5Fclose(file_id)); } const int root = 0; /* proc 0 sends the data to everyone else */ @@ -314,7 +329,7 @@ CCTK_WARN(CCTK_WARN_ABORT, "order not implemented"); } - status = H5Fclose(file_id); + HDF5_ERROR(status = H5Fclose(file_id)); } @@ -597,6 +612,7 @@ if (status) { cerr << "Could not read data from " << buff << endl; + CCTK_WARN(CCTK_WARN_ABORT, "Dataset read failure"); } snprintf(buff, BUFFSIZE-1, "/%d/%s/im", it, gfname[comp]); @@ -605,6 +621,7 @@ if (status) { cerr << "Could not read data from " << buff << endl; + CCTK_WARN(CCTK_WARN_ABORT, "Dataset read failure"); } if (read_dt) @@ -614,6 +631,7 @@ if (status) { cerr << "Could not read data from " << buff << endl; + CCTK_WARN(CCTK_WARN_ABORT, "Dataset read failure"); } snprintf(buff, BUFFSIZE-1, "/%d/%s/dt_im", it, gfname[comp]); @@ -622,6 +640,7 @@ if (status) { cerr << "Could not read data from " << buff << endl; + CCTK_WARN(CCTK_WARN_ABORT, "Dataset read failure"); } }

1 0

[svn:einsteintoolkit] SphericalHarmonicDecomp/trunk/ (Rev. 7)
by yosef＠astro.rit.edu 30 Jul '12

30 Jul '12

User: zlochower Date: 2012/07/30 01:57 PM Modified: /trunk/ param.ccl /trunk/src/ ExtractMetric.cc, SphericalHarmonicDecomp.h Log: Check status of hdf5 IO operations and optionally kill run if they fail (not default) File Changes: Directory: /trunk/src/ ====================== File [modified]: ExtractMetric.cc Delta lines: +124 -77 =================================================================== --- trunk/src/ExtractMetric.cc 2012-05-28 22:22:18 UTC (rev 6) +++ trunk/src/ExtractMetric.cc 2012-07-30 18:57:20 UTC (rev 7) @@ -12,6 +12,22 @@ #include <complex> #include "sYlm.hh" +static int hdf5_warn_level = CCTK_WARN_ALERT; + +#define HDF5_ERROR(fn_call) \ + do { \ + int _error_code = fn_call; \ + \ + \ + if (_error_code < 0) \ + { \ + CCTK_VWarn (hdf5_warn_level, __LINE__, __FILE__, CCTK_THORNSTRING, \ + "HDF5 call '%s' returned error code %d", \ + #fn_call, _error_code); \ + error_count++; \ + } \ + } while (0) + #ifdef USE_LEGENDRE # include "Legendre.hh" #endif @@ -248,10 +264,12 @@ dims[0] = nn; dims[1] = nlmmodes; + int error_count = 0; static int FirstCall = 1; static int last_dump[MAX_RADII]; const int dump_it = iter; + hid_t dataset_id, attribute_id, dataspace_id, group_id; if (FirstCall) { @@ -262,107 +280,122 @@ } } + bool file_exists = false; + H5E_BEGIN_TRY { + file_exists = H5Fis_hdf5(filename) > 0; + } H5E_END_TRY; + + if(file_exists) { - /* OK there must be a better to test if the file exists */ - FILE *file = fopen(filename, "rb"); - - if (!file) + file_id = H5Fopen (filename, H5F_ACC_RDWR, H5P_DEFAULT); + if (file_id < 0) { - file_id = H5Fcreate (filename, H5F_ACC_TRUNC, + CCTK_WARN(hdf5_warn_level, "Failed to open hdf5 file"); + } + } + else + { + file_id = H5Fcreate (filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT); + if (file_id < 0) + { + CCTK_WARN(hdf5_warn_level, "Failed to create hdf5 file"); + } - { - hid_t dataset_id, attribute_id, dataspace_id, group_id; - char name[]="/metadata"; - group_id = H5Gcreate(file_id, name, 0); + char name[]="/metadata"; + HDF5_ERROR(group_id = H5Gcreate(file_id, name, 0)); - int ds[2] = {nn, nlmmodes}; - hsize_t oD2 = 2; - hsize_t oD1 = 1; + int ds[2] = {nn, nlmmodes}; + hsize_t oD2 = 2; + hsize_t oD1 = 1; - dataspace_id = H5Screate_simple(1, &oD2, NULL); - attribute_id = H5Acreate(group_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); + HDF5_ERROR(dataspace_id = H5Screate_simple(1, &oD2, NULL)); + HDF5_ERROR(attribute_id = H5Acreate(group_id, "dim", H5T_NATIVE_INT, + dataspace_id, H5P_DEFAULT)); + HDF5_ERROR(status = H5Awrite(attribute_id, H5T_NATIVE_INT, ds)); + HDF5_ERROR(status = H5Aclose(attribute_id)); + HDF5_ERROR(status = H5Sclose(dataspace_id)); - dataspace_id = H5Screate_simple(1, &oD1, NULL); - attribute_id = H5Acreate(group_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); + HDF5_ERROR(dataspace_id = H5Screate_simple(1, &oD1, NULL)); + HDF5_ERROR(attribute_id = H5Acreate(group_id, "spin", H5T_NATIVE_INT, + dataspace_id, H5P_DEFAULT)); + HDF5_ERROR(status = H5Awrite(attribute_id, H5T_NATIVE_INT, &s)); + HDF5_ERROR(status = H5Aclose(attribute_id)); + HDF5_ERROR(status = H5Sclose(dataspace_id)); - dataspace_id = H5Screate_simple(1, &oD1, NULL); - attribute_id = H5Acreate(group_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); + HDF5_ERROR(dataspace_id = H5Screate_simple(1, &oD1, NULL)); + HDF5_ERROR(attribute_id = H5Acreate(group_id, "Rin", H5T_NATIVE_DOUBLE, + dataspace_id, H5P_DEFAULT)); + HDF5_ERROR(status = H5Awrite(attribute_id, H5T_NATIVE_DOUBLE, &rin)); + HDF5_ERROR(status = H5Aclose(attribute_id)); + HDF5_ERROR(status = H5Sclose(dataspace_id)); - dataspace_id = H5Screate_simple(1, &oD1, NULL); - attribute_id = H5Acreate(group_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); + HDF5_ERROR(dataspace_id = H5Screate_simple(1, &oD1, NULL)); + HDF5_ERROR(attribute_id = H5Acreate(group_id, "Rout", H5T_NATIVE_DOUBLE, + dataspace_id, H5P_DEFAULT)); + HDF5_ERROR(status = H5Awrite(attribute_id, H5T_NATIVE_DOUBLE, &rout)); + HDF5_ERROR(status = H5Aclose(attribute_id)); + HDF5_ERROR(status = H5Sclose(dataspace_id)); - H5Gclose(group_id); + HDF5_ERROR(H5Gclose(group_id)); - } - } - else + if (error_count > 0) { - fclose(file); - file_id = H5Fopen (filename, H5F_ACC_RDWR, H5P_DEFAULT); + CCTK_WARN(hdf5_warn_level, "Failed to initialize hdf5 file"); } } + char buff[BUFFSIZE]; + if (dump_it > last_dump[obs]) { - hid_t group_id, dataset_id, attribute_id, dataspace_id; - char buff[BUFFSIZE]; - if (dump_it > last_dump[obs]) + hsize_t oneD = 1; + snprintf(buff, sizeof buff, "/%d", dump_it); + HDF5_ERROR(group_id = H5Gcreate(file_id, buff, 0)); + HDF5_ERROR(dataspace_id = H5Screate_simple(1, &oneD, NULL)); + HDF5_ERROR(attribute_id = H5Acreate(group_id, "Time", H5T_NATIVE_DOUBLE, + dataspace_id, H5P_DEFAULT)); + HDF5_ERROR(status = H5Awrite(attribute_id, H5T_NATIVE_DOUBLE, &time)); + HDF5_ERROR(status = H5Aclose(attribute_id)); + HDF5_ERROR(status = H5Sclose(dataspace_id)); + HDF5_ERROR(H5Gclose(group_id)); + + if (error_count > 0) { - hsize_t oneD = 1; - snprintf(buff, sizeof buff, "/%d", dump_it); - group_id = H5Gcreate(file_id, buff, 0); - 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); - H5Gclose(group_id); + CCTK_WARN(hdf5_warn_level, "Failed to write to hdf5 file"); } - last_dump[obs] = dump_it; + } + last_dump[obs] = dump_it; - snprintf(buff, sizeof buff, "/%d/%s", dump_it, name); - group_id = H5Gcreate(file_id, buff, 0); - H5Gclose(group_id); + snprintf(buff, sizeof buff, "/%d/%s", dump_it, name); + HDF5_ERROR(group_id = H5Gcreate(file_id, buff, 0)); + HDF5_ERROR(H5Gclose(group_id)); - snprintf(buff, sizeof buff, "/%d/%s/re", dump_it, name); - 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); + snprintf(buff, sizeof buff, "/%d/%s/re", dump_it, name); + HDF5_ERROR(dataspace_id = H5Screate_simple(2, dims, NULL)); + HDF5_ERROR(dataset_id = H5Dcreate(file_id, buff, H5T_NATIVE_DOUBLE, + dataspace_id, H5P_DEFAULT)); + HDF5_ERROR(status = H5Dwrite(dataset_id, H5T_NATIVE_DOUBLE, H5S_ALL, + H5S_ALL, H5P_DEFAULT, re)); + HDF5_ERROR(status = H5Dclose(dataset_id)); + HDF5_ERROR(status = H5Sclose(dataspace_id)); - - snprintf(buff, sizeof buff, "/%d/%s/im", dump_it, name); - 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); + + snprintf(buff, sizeof buff, "/%d/%s/im", dump_it, name); + HDF5_ERROR(dataspace_id = H5Screate_simple(2, dims, NULL)); + HDF5_ERROR(dataset_id = H5Dcreate(file_id, buff, H5T_NATIVE_DOUBLE, + dataspace_id, H5P_DEFAULT)); + HDF5_ERROR(status = H5Dwrite(dataset_id, H5T_NATIVE_DOUBLE, H5S_ALL, + H5S_ALL, H5P_DEFAULT, im)); + HDF5_ERROR(status = H5Dclose(dataset_id)); + HDF5_ERROR(status = H5Sclose(dataspace_id)); + HDF5_ERROR(H5Fclose(file_id)); + + if (error_count>0) + { + CCTK_WARN(hdf5_warn_level, "Failed to write data to hdf5 file"); } - H5Fclose(file_id); return 0; } @@ -491,18 +524,32 @@ static int last_iter = -10000; +fprintf(stderr, "Entering Dump metric at %d\n", cctk_iteration); + if ((!extract_spacetime_metric_every) || (cctk_iteration % extract_spacetime_metric_every)) { return; } const int iter = cctk_iteration / extract_spacetime_metric_every; +fprintf(stderr, "survived first test\n"); if (iter <= last_iter) { return; } + +fprintf(stderr, "survived second test\n"); + if (CCTK_Equals(action_on_hdf5_error, "abort")) + { + hdf5_warn_level = CCTK_WARN_ABORT; + } + else if (CCTK_Equals(action_on_hdf5_error, "alert")) + { + hdf5_warn_level = CCTK_WARN_ALERT; + } + Decompose3D(cctkGH, "gxx", CCTK_VarIndex("ADMBase::gxx"), iter); Decompose3D(cctkGH, "gxy", CCTK_VarIndex("ADMBase::gxy"), iter); Decompose3D(cctkGH, "gxz", CCTK_VarIndex("ADMBase::gxz"), iter); File [modified]: SphericalHarmonicDecomp.h Delta lines: +3 -0 =================================================================== --- trunk/src/SphericalHarmonicDecomp.h 2012-05-28 22:22:18 UTC (rev 6) +++ trunk/src/SphericalHarmonicDecomp.h 2012-07-30 18:57:20 UTC (rev 7) @@ -18,4 +18,7 @@ CCTK_REAL **p_im); } +#ifdef USE_LEGENDRE +# ERROR: Don't activate this option #endif +#endif Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +6 -0 =================================================================== --- trunk/param.ccl 2012-05-28 22:22:18 UTC (rev 6) +++ trunk/param.ccl 2012-07-30 18:57:20 UTC (rev 7) @@ -97,3 +97,9 @@ { 0:* :: "0 or positive. 0 means never" } 0 + +CCTK_KEYWORD action_on_hdf5_error "What to do" STEERABLE=ALWAYS +{ + "abort" :: "stop the run." + "alert" :: "only alert the user" +} "alert"

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 25 Jul '12

25 Jul '12

changeset: 3606:7d81a4009dd9 user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 22:20:34 2012 +0200 summary: CarpetLib: Remove redefinition of restrict qualifier changeset: 3607:2ac3b62d0478 user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 22:21:03 2012 +0200 summary: LoopControl: Remove redefinition of restrict qualifier changeset: 3608:895f8e01dc63 user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 22:21:24 2012 +0200 summary: CarpetCG: Remove redefinition of restrict qualifier changeset: 3609:e21f04f875b7 user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 22:21:48 2012 +0200 summary: CarpetJacobi: Remove redefinition of restrict qualifier changeset: 3610:77d4211416eb user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 22:22:04 2012 +0200 summary: CarpetMG: Remove redefinition of restrict qualifier changeset: 3611:c2559ecfbc90 user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 22:22:44 2012 +0200 summary: CarpetIOF5: Limit number of I/O processes changeset: 3612:276141c62699 user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 22:23:52 2012 +0200 summary: LoopControl: Modify code to please PGI compiler changeset: 3613:5e20e2cb4119 tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 22:24:42 2012 +0200 summary: Carpet: Introduce more timers to measure communication time

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 25 Jul '12

25 Jul '12

changeset: 3605:2603268cfbe8 tag: tip parent: 3599:4e81d4832958 user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 22:18:46 2012 +0200 summary: Carpet: Break long lines

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 25 Jul '12

25 Jul '12

changeset: 3604:bf2225028a26 branch: cakernel tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 21:23:33 2012 +0200 summary: Carpet: Ensure all required points are copied to the host before syncing

1 0

[McLachlan]McLachlan branch, cakernel, updated. cffb85f6fbc94f27f4f903e3d1c970444023fca8
by Carpet git repositories 25 Jul '12

25 Jul '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 "McLachlan". The branch, cakernel has been updated via cffb85f6fbc94f27f4f903e3d1c970444023fca8 (commit) via b6ce42c191e8c27ba87da9bdd82668f68d7a49e0 (commit) from cba07e9789b2cd27c44ab88e755bcb80bcb5b00d (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 cffb85f6fbc94f27f4f903e3d1c970444023fca8 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Wed Jul 25 18:15:50 2012 +0200 Add 2 level, 2 proc CaKernel test data CaKernel data is symlink to host data commit b6ce42c191e8c27ba87da9bdd82668f68d7a49e0 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Wed Jul 25 18:15:07 2012 +0200 Add 2 proc, 2 level CaKernel tests ----------------------------------------------------------------------- Summary of changes: ML_BSSN_Test/test/ML_BSSN_2lev_2proc | 1 + ML_BSSN_Test/test/ML_BSSN_2lev_2proc.par | 1 + ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc.par | 1 + ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/A.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/At11.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/At12.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/At13.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/At22.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/At23.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/At33.x.asc | 128 ++++++++++++++++++++ ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/B1.x.asc | 128 ++++++++++++++++++++ ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/B2.x.asc | 128 ++++++++++++++++++++ ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/B3.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/Xt1.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/Xt2.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/Xt3.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/alpha.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/beta1.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/beta2.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/beta3.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/gt11.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/gt12.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/gt13.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/gt22.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/gt23.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/gt33.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/gxx.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/kxx.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/phi.x.asc | 128 ++++++++++++++++++++ .../test/ML_BSSN_Host_2lev_2proc/trK.x.asc | 128 ++++++++++++++++++++ ML_BSSN_Test/test/test.ccl | 10 ++ 31 files changed, 3469 insertions(+), 0 deletions(-) create mode 120000 ML_BSSN_Test/test/ML_BSSN_2lev_2proc create mode 120000 ML_BSSN_Test/test/ML_BSSN_2lev_2proc.par create mode 120000 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc.par create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/A.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/At11.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/At12.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/At13.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/At22.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/At23.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/At33.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/B1.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/B2.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/B3.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/Xt1.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/Xt2.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/Xt3.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/alpha.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/beta1.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/beta2.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/beta3.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/gt11.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/gt12.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/gt13.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/gt22.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/gt23.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/gt33.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/gxx.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/kxx.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/phi.x.asc create mode 100644 ML_BSSN_Test/test/ML_BSSN_Host_2lev_2proc/trK.x.asc hooks/post-receive -- McLachlan

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 25 Jul '12

25 Jul '12

changeset: 3602:93b4ae64010c branch: cakernel user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 18:02:50 2012 +0200 summary: CarpetRegrid2: Correct error message changeset: 3603:1827947dd73a branch: cakernel tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Jul 25 18:03:22 2012 +0200 summary: Carpet: Notify accelerator when prolongating and restricting

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits