Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 582)
by schnetter＠cct.lsu.edu 28 Oct '13

28 Oct '13

User: eschnett Date: 2013/10/28 11:36 AM Modified: /trunk/src/ GRHydro_BvecfromAvec.F90, GRHydro_MP5Reconstruct.F90 Log: Make some macros safer File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_BvecfromAvec.F90 Delta lines: +6 -6 =================================================================== --- trunk/src/GRHydro_BvecfromAvec.F90 2013-10-28 16:35:34 UTC (rev 581) +++ trunk/src/GRHydro_BvecfromAvec.F90 2013-10-28 16:36:15 UTC (rev 582) @@ -26,12 +26,12 @@ #define DIFF_Z_2(q) (0.5d0 * (q(i,j,k+1) - q(i,j,k-1)) * idz) ! Fourth order f.d. for volume-centered quantity from volume-centered quantity -#define DIFF_X_4(q) ((-q(i+2,j,k) + 8.d0 * q(i+1,j,k) - 8.d0 * q(i-1,j,k) + \ - q(i-2,j,k)) / 12.d0 * idx) -#define DIFF_Y_4(q) ((-q(i,j+2,k) + 8.d0 * q(i,j+1,k) - 8.d0 * q(i,j-1,k) + \ - q(i,j-2,k)) / 12.d0 * idy) -#define DIFF_Z_4(q) ((-q(i,j,k+2) + 8.d0 * q(i,j,k+1) - 8.d0 * q(i,j,k-1) + \ - q(i,j,k-2)) / 12.d0 * idz) +#define DIFF_X_4(q) ((- q(i+2,j,k) + 8.d0 * q(i+1,j,k) \ + - 8.d0 * q(i-1,j,k) + q(i-2,j,k)) / 12.d0 * idx) +#define DIFF_Y_4(q) ((- q(i,j+2,k) + 8.d0 * q(i,j+1,k) \ + - 8.d0 * q(i,j-1,k) + q(i,j-2,k)) / 12.d0 * idy) +#define DIFF_Z_4(q) ((- q(i,j,k+2) + 8.d0 * q(i,j,k+1) \ + - 8.d0 * q(i,j,k-1) + q(i,j,k-2)) / 12.d0 * idz) /*@@ @routine GRHydro_BvecfromAvec File [modified]: GRHydro_MP5Reconstruct.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_MP5Reconstruct.F90 2013-10-28 16:35:34 UTC (rev 581) +++ trunk/src/GRHydro_MP5Reconstruct.F90 2013-10-28 16:36:15 UTC (rev 582) @@ -93,10 +93,10 @@ vnorm = sqrt(v(i-2)**2 + v(i-1)**2 + v(i)**2 + v(i+1)**2 + v(i+2)**2) #define MINMOD(x,y) \ - 0.5d0*(sign(one,x) + sign(one,y)) * min(abs(x), abs(y)) + (0.5d0*(sign(one,x) + sign(one,y)) * min(abs(x), abs(y))) #define MINMOD4(w,x,y,z) \ - 0.125d0*( sign(one,w)+sign(one,x) )*abs( (sign(one,w)+sign(one,y)) * (sign(one,w)+sign(one,z)) )*min(abs(w), abs(x), abs(y), abs(z)) + (0.125d0*( sign(one,w)+sign(one,x) )*abs( (sign(one,w)+sign(one,y)) * (sign(one,w)+sign(one,z)) )*min(abs(w), abs(x), abs(y), abs(z))) #define MP5(am2, am1, a, ap1, ap2, arecon) \ vl = (2.0d0*am2 - 13.0d0*am1 + 47.0d0*a + 27.0d0*ap1 - 3.0d0*ap2)/60.0d0 &&\

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 581)
by schnetter＠cct.lsu.edu 28 Oct '13

28 Oct '13

User: eschnett Date: 2013/10/28 11:35 AM Modified: /trunk/src/ GRHydro_HLLE.F90 Log: Correct array indices in etaXYZ File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_HLLE.F90 Delta lines: +3 -3 =================================================================== --- trunk/src/GRHydro_HLLE.F90 2013-10-27 04:16:35 UTC (rev 580) +++ trunk/src/GRHydro_HLLE.F90 2013-10-28 16:35:34 UTC (rev 581) @@ -33,15 +33,15 @@ ! eta across face in x-direction #define etaX(i,j,k, v, c) \ - (0.5d0*(abs(v(i+1,j,k,0)-v(i,j,k,0)) + abs(c(i+1,j,k)-c(i,j,k)))) + (0.5d0*(abs(v((i)+1,j,k,1)-v(i,j,k,1)) + abs(c((i)+1,j,k)-c(i,j,k)))) ! eta across face in x-direction #define etaY(i,j,k, v, c) \ - (0.5d0*(abs(v(i,j+1,k,1)-v(i,j,k,1)) + abs(c(i,j+1,k)-c(i,j,k)))) + (0.5d0*(abs(v(i,(j)+1,k,2)-v(i,j,k,2)) + abs(c(i,(j)+1,k)-c(i,j,k)))) ! eta across face in x-direction #define etaZ(i,j,k, v, c) \ - (0.5d0*(abs(v(i,j,k+1,2)-v(i,j,k,2)) + abs(c(i,j,k+1)-c(i,j,k)))) + (0.5d0*(abs(v(i,j,(k)+1,3)-v(i,j,k,3)) + abs(c(i,j,(k)+1)-c(i,j,k))))

1 0

[Carpet] branch, master, updated. carpet-6-init-394-g5de40ca
by Carpet git repositories 28 Oct '13

28 Oct '13

1 0

[Carpet] branch, apply-after-release, created. carpet-6-init-395-g965a837
by Carpet git repositories 28 Oct '13

28 Oct '13

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 580)
by rhaas＠tapir.caltech.edu 26 Oct '13

26 Oct '13

User: rhaas Date: 2013/10/26 11:16 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Con2PrimAM.F90, GRHydro_Con2PrimHot.F90, GRHydro_Con2PrimM.F90, GRHydro_ENOReconstruct_drv.F90, GRHydro_EoSChangeGamma.F90, GRHydro_HLLE.F90, GRHydro_HLLEM.F90, GRHydro_HLLE_AM.F90, GRHydro_MP5Reconstruct_drv.F90, GRHydro_PPMMReconstruct_drv.F90, GRHydro_PPMReconstruct_drv.F90, GRHydro_PPMReconstruct_drv_opt.F90, GRHydro_Prim2Con.F90, GRHydro_Prim2ConAM.F90, GRHydro_Prim2ConM.F90, GRHydro_Reconstruct.F90, GRHydro_Source.F90, GRHydro_SourceAM.F90, GRHydro_SourceM.F90, GRHydro_TVDReconstruct_drv.F90, GRHydro_UpdateMask.F90, GRHydro_UpdateMaskM.F90, GRHydro_WENOReconstruct_drv.F90, Utils.F90 Log: GRHydro: replace Fortan pointers with Cray pointers Intel 12 seems to like these better. Otherwise GRHydro_Con2PrimM.F90 takes very long to compile. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Con2PrimAM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Con2PrimHot.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Con2PrimM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ENOReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_EoSChangeGamma.F90 Delta lines: <Unavailable> File [modified]: GRHydro_HLLE.F90 Delta lines: <Unavailable> File [modified]: GRHydro_HLLEM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_HLLE_AM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_MP5Reconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_PPMMReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_PPMReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_PPMReconstruct_drv_opt.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Prim2Con.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Prim2ConAM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Prim2ConM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Reconstruct.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Source.F90 Delta lines: <Unavailable> File [modified]: GRHydro_SourceAM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_SourceM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_TVDReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_UpdateMask.F90 Delta lines: <Unavailable> File [modified]: GRHydro_UpdateMaskM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_WENOReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: Utils.F90 Delta lines: <Unavailable>

1 0

[Carpet] branch, master, updated. carpet-6-init-391-g75dbdb9
by Carpet git repositories 26 Oct '13

26 Oct '13

1 0

[Carpet] branch, master, updated. carpet-6-init-390-gbb964e0
by Carpet git repositories 26 Oct '13

26 Oct '13

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 bb964e0e1c59599be04f41ed4fd7a9a0f251a8e0 (commit) via b2233aab187fae609b1e02f2f7ed8b37819f9762 (commit) via d4eaa6a1a47c834565024b8f6ee093b9f3f9273c (commit) via c33997058605f27f15bb4d3caf6859da38f50149 (commit) via cfaded9a3c86e20bda1e12de34da59e600801347 (commit) via 6a7fc6a508a64020bdd3dcd1618bc8a1c115037e (commit) from ae71ad5e952a892c7b4a326daa078bccf6e4393b (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 bb964e0e1c59599be04f41ed4fd7a9a0f251a8e0 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Fri Oct 25 16:14:15 2013 +0200 Carpet: Add a barrier between prolongation and sync controlled by sync_barriers parameter commit b2233aab187fae609b1e02f2f7ed8b37819f9762 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Wed Oct 23 17:07:08 2013 +0200 CarpetInterp2: Time only interpolation using Interpolate timer, and enable more timers for tracing commit d4eaa6a1a47c834565024b8f6ee093b9f3f9273c Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Wed Oct 23 17:05:48 2013 +0200 Timers: Output all clocks in XML timer tree files commit c33997058605f27f15bb4d3caf6859da38f50149 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Wed Oct 23 17:04:17 2013 +0200 CarpetInterp2: Add a barrier after interpolating commit cfaded9a3c86e20bda1e12de34da59e600801347 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Mon Oct 21 15:14:30 2013 +0200 CarpetInterp2: Add parameter "interp_barrier" to add a barrier before interpolating Interpolation is a global operation, so adding a barrier should not affect performance, and makes timers much more useful. commit 6a7fc6a508a64020bdd3dcd1618bc8a1c115037e Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Mon Oct 21 15:13:44 2013 +0200 CarpetInterp2: Add timers for fasterp interpolation ----------------------------------------------------------------------- Summary of changes: Carpet/Carpet/src/Comm.cc | 10 +++++++- Carpet/CarpetInterp2/interface.ccl | 1 + Carpet/CarpetInterp2/param.ccl | 5 ++++ Carpet/CarpetInterp2/src/fasterp.cc | 44 ++++++++++++++++++++++++++++++++++- Carpet/Timers/src/TimerTree.cc | 9 +++++++ 5 files changed, 67 insertions(+), 2 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, ianhinder/interptimers, created. carpet-6-init-390-gbb964e0
by Carpet git repositories 25 Oct '13

25 Oct '13

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, ianhinder/interptimers has been created at bb964e0e1c59599be04f41ed4fd7a9a0f251a8e0 (commit) - Log ----------------------------------------------------------------- commit bb964e0e1c59599be04f41ed4fd7a9a0f251a8e0 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Fri Oct 25 16:14:15 2013 +0200 Carpet: Add a barrier between prolongation and sync controlled by sync_barriers parameter commit b2233aab187fae609b1e02f2f7ed8b37819f9762 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Wed Oct 23 17:07:08 2013 +0200 CarpetInterp2: Time only interpolation using Interpolate timer, and enable more timers for tracing commit d4eaa6a1a47c834565024b8f6ee093b9f3f9273c Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Wed Oct 23 17:05:48 2013 +0200 Timers: Output all clocks in XML timer tree files commit c33997058605f27f15bb4d3caf6859da38f50149 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Wed Oct 23 17:04:17 2013 +0200 CarpetInterp2: Add a barrier after interpolating commit cfaded9a3c86e20bda1e12de34da59e600801347 Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Mon Oct 21 15:14:30 2013 +0200 CarpetInterp2: Add parameter "interp_barrier" to add a barrier before interpolating Interpolation is a global operation, so adding a barrier should not affect performance, and makes timers much more useful. commit 6a7fc6a508a64020bdd3dcd1618bc8a1c115037e Author: Ian Hinder <ian.hinder(a)aei.mpg.de> Date: Mon Oct 21 15:13:44 2013 +0200 CarpetInterp2: Add timers for fasterp interpolation ----------------------------------------------------------------------- hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconGen/ (Rev. 101)
by reisswig＠tapir.caltech.edu 24 Oct '13

24 Oct '13

User: reisswig Date: 2013/10/24 06:24 PM Modified: /PITTNullCode/SphericalHarmonicReconGen/ param.ccl /PITTNullCode/SphericalHarmonicReconGen/src/ sph_database.cc, startup.cc Log: Cache data in SpEC-HDF5-v2 format. Allow for single filename specificatioin in par-file. File Changes: Directory: /PITTNullCode/SphericalHarmonicReconGen/ =================================================== File [modified]: param.ccl Delta lines: +11 -0 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/param.ccl 2013-10-24 21:49:59 UTC (rev 100) +++ PITTNullCode/SphericalHarmonicReconGen/param.ccl 2013-10-24 23:24:22 UTC (rev 101) @@ -7,6 +7,7 @@ { ASCII :: "standard ASCII format: lm-modes and spheres are stored in a 2d array (gnuplot style) for a given timestep" DAT :: "optimized ASCII format: all variables and lm-modes are stored in one row for a given timestep" + DAT-v2 :: "optimized ASCII format: all variables and lm-modes are stored in one row for a given timestep. m-modes are in reverse order." SpEC-H5 :: "SpEC-HDF5 format: Data is stored in HDF5 files grouped according to SpEC output." SpEC-H5-v2 :: "SpEC-HDF5 format (v2): Data is stored in HDF5 files grouped according to new SpEC output." } "ASCII" @@ -68,6 +69,16 @@ } Goldberg67 +CCTK_REAL dt_tolerance "A minimum tolerance for which timesteps are considered being identical" +{ + 0:* :: "Small and positive" +} 1e-9 + +STRING file "The boundary data file. If this string is empty, we assume that the user provided files for each quantity individually (parameters below)" +{ + "" :: "a valid filename" +} "" + STRING path "the directory that contains the input files, leave blank if filenames contain directory paths already" { "" :: "a path name" Directory: /PITTNullCode/SphericalHarmonicReconGen/src/ ======================================================= File [modified]: sph_database.cc Delta lines: +65 -23 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc 2013-10-24 21:49:59 UTC (rev 100) +++ PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc 2013-10-24 23:24:22 UTC (rev 101) @@ -528,7 +528,7 @@ str << "Time-step not strictly monotonic: time[" << i-1 << "] = " << _times[i-1] << ", time[" << i << "] = " << _times[i]; CCTK_WARN(0, str.str().c_str()); } - if (fabs(_times[i] - _times[i-1] - _delta_t) >= 1e-8) + if (verbose && fabs(_times[i] - _times[i-1] - _delta_t) >= 1e-8) { _delta_t = _times[i]-_times[i-1]; cout << "SPH_db_DAT " << _fname << ": t = " << _times[i-1] << ", delta_t = " << _delta_t << endl; @@ -955,7 +955,7 @@ i -= remove_non_monotonic_steps(i); continue; } - if (fabs(_times[i] - _times[i-1] - _delta_t) >= 1e-8) + if (verbose && fabs(_times[i] - _times[i-1] - _delta_t) >= 1e-8) { _delta_t = _times[i]-_times[i-1]; cout << "SPH_db_SpEC_H5 " << _fname << ": t = " << _times[i-1] << ", delta_t = " << _delta_t << endl; @@ -1166,10 +1166,10 @@ i -= remove_non_monotonic_steps(i); continue; } - if (fabs(_times[i] - _times[i-1] - _delta_t) >= 1e-8) + if (verbose && fabs(_times[i] - _times[i-1] - _delta_t) >= 1e-8) { _delta_t = _times[i]-_times[i-1]; - cout << "SPH_db_SpEC_H5 " << _fname << ": t = " << _times[i-1] << ", delta_t = " << _delta_t << endl; + cout << "SPH_db_SpEC_H5_v2 " << _fname << ": t = " << _times[i-1] << ", delta_t = " << _delta_t << endl; } } // set _delta_t to correspond to initial delta_t @@ -1186,34 +1186,76 @@ CCTK_WARN(0, "Requested timestep not in worldtube data file. Stopping!"); } - hid_t dataset = H5Dopen(file, varname_table[varno].c_str());//, H5P_DEFAULT); - vector<double> buffer((_lmax+1)*(_lmax+1)*2); + // check cache if data is there and return it + if (is_in_cache(timestep, 2*varno+1, coeff)) return; + + // fill cache ------------------------------------- - hsize_t dimsm[1] = { buffer.size() }; - hid_t memspace = H5Screate_simple (1, dimsm, NULL); + cached_first_timestep = timestep; - hid_t dataspace = H5Dget_space(dataset); - hsize_t dims[2]; - H5Sget_simple_extent_dims (dataspace, dims, NULL); + // set up cache + if (setup_cache) { + for (size_t t=0; t < cache.size(); ++t) { + cache[t].resize(2*_n_variables); + for (int v=0; v < 2*_n_variables; ++v) { + cache[t][v].resize(_n_spheres); + for (int s=0; s < _n_spheres; ++s) { + cache[t][v][s].resize(_lmax+1); + for (int l=0; l <= _lmax; ++l) { + cache[t][v][s][l].resize(2*l+1); + } + } + } + } + // cache needs to be setup only at first time + setup_cache = false; + } + - hsize_t offset[2] = { timestep, 1 }; - hsize_t count[2] = { 1, buffer.size() }; - H5Sselect_hyperslab (dataspace, H5S_SELECT_SET, offset, NULL, + const int nsteps = timestep+cache.size() >= steps.size() ? steps.size()-timestep : cache.size(); + + for (int v=0; v < _n_variables; ++v) { + + hid_t dataset = H5Dopen(file, varname_table[v].c_str()); + const int nmodes = (_lmax+1)*(_lmax+1)*2; + vector<double> buffer(nmodes*nsteps); + + hsize_t dimsm[1] = { buffer.size() }; + hid_t memspace = H5Screate_simple (1, dimsm, NULL); + + hid_t dataspace = H5Dget_space(dataset); + hsize_t dims[2]; + H5Sget_simple_extent_dims (dataspace, dims, NULL); + + hsize_t offset[2] = { timestep, 1 }; + hsize_t count[2] = { nsteps, nmodes }; + H5Sselect_hyperslab (dataspace, H5S_SELECT_SET, offset, NULL, count, NULL); - H5Dread(dataset, H5T_NATIVE_DOUBLE, memspace, dataspace, H5P_DEFAULT, &buffer.front()); + H5Dread(dataset, H5T_NATIVE_DOUBLE, memspace, dataspace, H5P_DEFAULT, &buffer.front()); - H5Sclose(memspace); - H5Sclose(dataspace); - H5Dclose(dataset); + H5Sclose(memspace); + H5Sclose(dataspace); + H5Dclose(dataset); - int c = 0; - for (int l=0; l <= _lmax; ++l) { - for (int m=l; m >= -l; --m, ++c) { - //coeff[0][l][m+l] = CCTK_Cmplx(buffer[c], buffer[c + buffer.size()/2]); - coeff[0][l][m+l] = CCTK_Cmplx(buffer[2*c], buffer[2*c + 1]); + for (int t=0; t < nsteps; ++t) { + + int c = 0; + for (int l=0; l <= _lmax; ++l) { + for (int m=l; m >= -l; --m, ++c) { + //coeff[0][l][m+l] = CCTK_Cmplx(buffer[2*c], buffer[2*c + 1]); + cache[t][2*v ][0][l][m+l] = buffer[t*nmodes + 2*c]; + cache[t][2*v+1][0][l][m+l] = buffer[t*nmodes + 2*c + 1]; + } + } + } + } + + // finally set coeff array according to cache + if (!is_in_cache(timestep, 2*varno+1, coeff)) + CCTK_WARN(0, "Variable not in cache even though I have put it there!"); } File [modified]: startup.cc Delta lines: +36 -31 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/startup.cc 2013-10-24 21:49:59 UTC (rev 100) +++ PITTNullCode/SphericalHarmonicReconGen/src/startup.cc 2013-10-24 23:24:22 UTC (rev 101) @@ -71,39 +71,44 @@ // get all different databases-names vector<string> fnames; - fnames.push_back(file_gxx[0]); - fnames.push_back(file_gxy[0]); - fnames.push_back(file_gxz[0]); - fnames.push_back(file_gyy[0]); - fnames.push_back(file_gyz[0]); - fnames.push_back(file_gzz[0]); - fnames.push_back(file_shiftx[0]); - fnames.push_back(file_shifty[0]); - fnames.push_back(file_shiftz[0]); - fnames.push_back(file_lapse[0]); - fnames.push_back(file_gxx[1]); - fnames.push_back(file_gxy[1]); - fnames.push_back(file_gxz[1]); - fnames.push_back(file_gyy[1]); - fnames.push_back(file_gyz[1]); - fnames.push_back(file_gzz[1]); - fnames.push_back(file_shiftx[1]); - fnames.push_back(file_shifty[1]); - fnames.push_back(file_shiftz[1]); - fnames.push_back(file_lapse[1]); - fnames.push_back(file_gxx[2]); - fnames.push_back(file_gxy[2]); - fnames.push_back(file_gxz[2]); - fnames.push_back(file_gyy[2]); - fnames.push_back(file_gyz[2]); - fnames.push_back(file_gzz[2]); - fnames.push_back(file_shiftx[2]); - fnames.push_back(file_shifty[2]); - fnames.push_back(file_shiftz[2]); - fnames.push_back(file_lapse[2]); + if (!CCTK_EQUALS(file, "")) { + // we have a single file! + fnames.resize(30, file); + } else { + // we have multiple files! + fnames.push_back(file_gxx[0]); + fnames.push_back(file_gxy[0]); + fnames.push_back(file_gxz[0]); + fnames.push_back(file_gyy[0]); + fnames.push_back(file_gyz[0]); + fnames.push_back(file_gzz[0]); + fnames.push_back(file_shiftx[0]); + fnames.push_back(file_shifty[0]); + fnames.push_back(file_shiftz[0]); + fnames.push_back(file_lapse[0]); + fnames.push_back(file_gxx[1]); + fnames.push_back(file_gxy[1]); + fnames.push_back(file_gxz[1]); + fnames.push_back(file_gyy[1]); + fnames.push_back(file_gyz[1]); + fnames.push_back(file_gzz[1]); + fnames.push_back(file_shiftx[1]); + fnames.push_back(file_shifty[1]); + fnames.push_back(file_shiftz[1]); + fnames.push_back(file_lapse[1]); + fnames.push_back(file_gxx[2]); + fnames.push_back(file_gxy[2]); + fnames.push_back(file_gxz[2]); + fnames.push_back(file_gyy[2]); + fnames.push_back(file_gyz[2]); + fnames.push_back(file_gzz[2]); + fnames.push_back(file_shiftx[2]); + fnames.push_back(file_shifty[2]); + fnames.push_back(file_shiftz[2]); + fnames.push_back(file_lapse[2]); + } - for (int i=0; i < 3*NUM_METRIC_COMPONENTS; ++i) { int found = -1;

1 0

[svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconGen/src/ (Rev. 100)
by reisswig＠tapir.caltech.edu 24 Oct '13

24 Oct '13

User: reisswig Date: 2013/10/24 04:49 PM Modified: /PITTNullCode/SphericalHarmonicReconGen/src/ sph_database.cc, sph_database.hh, startup.cc Log: PITTNullCode/SphericalHarmonicReconGen: dat-v2 format. File Changes: Directory: /PITTNullCode/SphericalHarmonicReconGen/src/ ======================================================= File [modified]: sph_database.cc Delta lines: +5 -4 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc 2013-10-24 21:33:14 UTC (rev 99) +++ PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc 2013-10-24 21:49:59 UTC (rev 100) @@ -479,10 +479,11 @@ const int col_radius_, const int col_lmax_, const int col_n_variables_, - const int col_data_) + const int col_data_, + const bool inverse_m_) : SPH_database(cached_timesteps, verbose_), _fname(fname_), _col_time(col_time_), _col_iteration(col_iteration_), _col_radius(col_radius_), _col_lmax(col_lmax_), - _col_n_variables(col_n_variables_), _col_data(col_data_), columns_assigned(0) + _col_n_variables(col_n_variables_), _col_data(col_data_), columns_assigned(0), inverse_m(inverse_m_) { _lmax = lmax_; _n_spheres = 1; @@ -658,10 +659,10 @@ }*/ if (this_line_num_columns == column) // real part - cache[t][v][sphere][l][m] = (CCTK_REAL) val; + cache[t][v][sphere][l][inverse_m ? 2*l-m : m] = (CCTK_REAL) val; if (this_line_num_columns == column+1) { // imaginary-part - cache[t][v+1][sphere][l][m] = (CCTK_REAL) val; + cache[t][v+1][sphere][l][inverse_m ? 2*l-m : m] = (CCTK_REAL) val; column += 2; // next lm-mode m++; File [modified]: sph_database.hh Delta lines: +4 -1 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/sph_database.hh 2013-10-24 21:33:14 UTC (rev 99) +++ PITTNullCode/SphericalHarmonicReconGen/src/sph_database.hh 2013-10-24 21:49:59 UTC (rev 100) @@ -213,7 +213,8 @@ const int col_radius_, const int col_lmax_, const int col_n_variables_, - const int col_data_); + const int col_data_, + const bool inverse_m_); virtual ~SPH_db_DAT(); @@ -259,6 +260,8 @@ int num_columns; int columns_assigned; + bool inverse_m; + void scan_dat_file(); File [modified]: startup.cc Delta lines: +3 -1 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/startup.cc 2013-10-24 21:33:14 UTC (rev 99) +++ PITTNullCode/SphericalHarmonicReconGen/src/startup.cc 2013-10-24 21:49:59 UTC (rev 100) @@ -121,7 +121,9 @@ if (CCTK_EQUALS(format, "ASCII")) SHR::db[i] = new SHR::SPH_db_ASCII(pathname+fnames[i], verbose, cached_timesteps+1, column_time, column_iteration, column_radius); if (CCTK_EQUALS(format, "DAT")) - SHR::db[i] = new SHR::SPH_db_DAT(pathname+fnames[i], verbose, cached_timesteps+1, lmaxInFile, column_time, column_iteration, column_radius, column_lmax, column_n_variables, column_data); + SHR::db[i] = new SHR::SPH_db_DAT(pathname+fnames[i], verbose, cached_timesteps+1, lmaxInFile, column_time, column_iteration, column_radius, column_lmax, column_n_variables, column_data, false); + if (CCTK_EQUALS(format, "DAT-v2")) + SHR::db[i] = new SHR::SPH_db_DAT(pathname+fnames[i], verbose, cached_timesteps+1, lmaxInFile, column_time, column_iteration, column_radius, column_lmax, column_n_variables, column_data, true); if (CCTK_EQUALS(format, "SpEC-H5")) SHR::db[i] = new SHR::SPH_db_SpEC_H5(pathname+fnames[i], verbose, cached_timesteps+1); if (CCTK_EQUALS(format, "SpEC-H5-v2"))

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits