Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] TwoPunctures/trunk/src/ (Rev. 133)
by rhaas＠tapir.caltech.edu 11 Jun '13

11 Jun '13

User: rhaas Date: 2013/06/11 12:44 AM Modified: /trunk/src/ FuncAndJacobian.c, TwoPunctures.c, TwoPunctures.h Log: implement UIUC's speed-up in "evaluation" of spectral solution The accompanying svn patch applies the recently released refinement of TwoPunctures by Vasileios Paschalidis and Zach Etienne at UIUC, greatly reducing the time taken to properly apply the solution of the spectral solve to all grid points. From the abstract of the notes in arXiv:1304.0457: TwoPunctures is perhaps the most widely-adopted code for generating binary black hole "puncture" initial data and interpolating these (spectral) data onto evolution grids. In typical usage, the bulk of this code's run time is spent in its spectral interpolation routine. We announce a new publicly-available spectral interpolation routine that improves the performance of the original interpolation routine by a factor of ~100, yielding results consistent with the original spectral interpolation routine to roundoff precision. This note serves as a guide for installing this routine both in the original standalone TwoPunctures code and the Einstein Toolkit supported version of this code. Patch kindly provided by Bernard Kelly Original code by Vasileios Paschalidis and Zach Etienne File Changes: Directory: /trunk/src/ ====================== File [modified]: FuncAndJacobian.c Delta lines: +143 -0 =================================================================== --- trunk/src/FuncAndJacobian.c 2013-05-27 22:33:08 UTC (rev 132) +++ trunk/src/FuncAndJacobian.c 2013-06-11 05:44:21 UTC (rev 133) @@ -841,4 +841,147 @@ return Ui; } + +////////////////////////////////////////////////////// +/// Fast Spectral Interpolation Routine Stuff +////////////////////////////////////////////////////// + + +/* Calculates the value of v at an arbitrary position (A,B,phi)* using the fast routine */ +CCTK_REAL +PunctEvalAtArbitPositionFast (CCTK_REAL *v, int ivar, CCTK_REAL A, CCTK_REAL B, CCTK_REAL phi, int nvar, int n1, int n2, int n3) +{ + int i, j, k, N; + CCTK_REAL *p, *values1, **values2, result; + // VASILIS: Nothing should be changed in this routine. This is used by PunctIntPolAtArbitPositionFast + + N = maximum3 (n1, n2, n3); + + p = dvector (0, N); + values1 = dvector (0, N); + values2 = dmatrix (0, N, 0, N); + + for (k = 0; k < n3; k++) + { + for (j = 0; j < n2; j++) + { + for (i = 0; i < n1; i++) p[i] = v[ivar + nvar * (i + n1 * (j + n2 * k))]; + // chebft_Zeros (p, n1, 0); + values2[j][k] = chebev (-1, 1, p, n1, A); + } + } + + for (k = 0; k < n3; k++) + { + for (j = 0; j < n2; j++) p[j] = values2[j][k]; + // chebft_Zeros (p, n2, 0); + values1[k] = chebev (-1, 1, p, n2, B); + } + + // fourft (values1, n3, 0); + result = fourev (values1, n3, phi); + + free_dvector (p, 0, N); + free_dvector (values1, 0, N); + free_dmatrix (values2, 0, N, 0, N); + + return result; + // */ + // return 0.; +} + + +// --------------------------------------------------------------------------*/ +// Calculates the value of v at an arbitrary position (x,y,z) if the spectral coefficients are known // /* --------------------------------------------------------------------------*/ +CCTK_REAL +PunctIntPolAtArbitPositionFast (int ivar, int nvar, int n1, + int n2, int n3, derivs v, CCTK_REAL x, CCTK_REAL y, + CCTK_REAL z) +{ + DECLARE_CCTK_PARAMETERS; + CCTK_REAL xs, ys, zs, rs2, phi, X, R, A, B, aux1, aux2, result, Ui; + // VASILIS: Here the struct derivs v refers to the spectral coeffiecients of variable v not the variable v itself + + xs = x / par_b; + ys = y / par_b; + zs = z / par_b; + rs2 = ys * ys + zs * zs; + phi = atan2 (z, y); + if (phi < 0) + phi += 2 * Pi; + + aux1 = 0.5 * (xs * xs + rs2 - 1); + aux2 = sqrt (aux1 * aux1 + rs2); + X = asinh (sqrt (aux1 + aux2)); + R = asin (min(1.0, sqrt (-aux1 + aux2))); + if (x < 0) + R = Pi - R; + + A = 2 * tanh (0.5 * X) - 1; + B = tan (0.5 * R - Piq); + + result = PunctEvalAtArbitPositionFast (v.d0, ivar, A, B, phi, nvar, n1, n2, n3); + + Ui = (A - 1) * result; + + return Ui; +} + +// Evaluates the spectral expansion coefficients of v +void SpecCoef(int n1, int n2, int n3, int ivar, CCTK_REAL *v, CCTK_REAL *cf) +{ + DECLARE_CCTK_PARAMETERS; + // VASILIS: Here v is a pointer to the values of the variable v at the collocation points and cf_v a pointer to the spectral coefficients that this routine calculates + + int i, j, k, N, n, l, m; + double *p, ***values3, ***values4; + + N=maximum3(n1,n2,n3); + p=dvector(0,N); + values3=d3tensor(0,n1,0,n2,0,n3); + values4=d3tensor(0,n1,0,n2,0,n3); + + + + // Caclulate values3[n,j,k] = a_n^{j,k} = (sum_i^(n1-1) f(A_i,B_j,phi_k) Tn(-A_i))/k_n , k_n = N/2 or N + for(k=0;k<n3;k++) { + for(j=0;j<n2;j++) { + + for(i=0;i<n1;i++) p[i]=v[ivar + (i + n1 * (j + n2 * k))]; + + chebft_Zeros(p,n1,0); + for (n=0;n<n1;n++) { + values3[n][j][k] = p[n]; + } + } + } + + // Caclulate values4[n,l,k] = a_{n,l}^{k} = (sum_j^(n2-1) a_n^{j,k} Tn(B_j))/k_l , k_l = N/2 or N + + for (n = 0; n < n1; n++){ + for(k=0;k<n3;k++) { + for(j=0;j<n2;j++) p[j]=values3[n][j][k]; + chebft_Zeros(p,n2,0); + for (l = 0; l < n2; l++){ + values4[n][l][k] = p[l]; + } + } + } + + // Caclulate coefficients a_{n,l,m} = (sum_k^(n3-1) a_{n,m}^{k} fourier(phi_k))/k_m , k_m = N/2 or N + for (i = 0; i < n1; i++){ + for (j = 0; j < n2; j++){ + for(k=0;k<n3;k++) p[k]=values4[i][j][k]; + fourft(p,n3,0); + for (k = 0; k<n3; k++){ + cf[ivar + (i + n1 * (j + n2 * k))] = p[k]; + } + } + } + + free_dvector(p,0,N); + free_d3tensor(values3,0,n1,0,n2,0,n3); + free_d3tensor(values4,0,n1,0,n2,0,n3); + +} File [modified]: TwoPunctures.c Delta lines: +21 -8 =================================================================== --- trunk/src/TwoPunctures.c 2013-05-27 22:33:08 UTC (rev 132) +++ trunk/src/TwoPunctures.c 2013-06-11 05:44:21 UTC (rev 133) @@ -216,7 +216,7 @@ int percent10 = 0; #endif static CCTK_REAL *F = NULL; - static derivs u, v; + static derivs u, v, cf_v; CCTK_REAL admMass; if (! F) { @@ -225,6 +225,7 @@ F = dvector (0, ntotal - 1); allocate_derivs (&u, ntotal); allocate_derivs (&v, ntotal); + allocate_derivs (&cf_v, ntotal); if (use_sources) { CCTK_INFO ("Solving puncture equation for BH-NS/NS-NS system"); @@ -236,6 +237,16 @@ /* initialise to 0 */ for (int j = 0; j < ntotal; j++) { + cf_v.d0[j] = 0.0; + cf_v.d1[j] = 0.0; + cf_v.d2[j] = 0.0; + cf_v.d3[j] = 0.0; + cf_v.d11[j] = 0.0; + cf_v.d12[j] = 0.0; + cf_v.d13[j] = 0.0; + cf_v.d22[j] = 0.0; + cf_v.d23[j] = 0.0; + cf_v.d33[j] = 0.0; v.d0[j] = 0.0; v.d1[j] = 0.0; v.d2[j] = 0.0; @@ -270,7 +281,7 @@ /* Loop until both ADM masses are within adm_tol of their target */ do { - CCTK_VInfo (CCTK_THORNSTRING, "Bare masses: mp=%g, mm=%g", + CCTK_VInfo (CCTK_THORNSTRING, "Bare masses: mp=%.15g, mm=%.15g", (double)*mp, (double)*mm); Newton (cctkGH, nvar, n1, n2, n3, v, Newton_tol, 1); @@ -286,8 +297,8 @@ /* Check how far the current ADM masses are from the target */ mp_adm_err = fabs(M_p-*mp_adm); mm_adm_err = fabs(M_m-*mm_adm); - CCTK_VInfo (CCTK_THORNSTRING, "ADM mass error: M_p_err=%.4g, M_m_err=%.4g", - (double) mp_adm_err, (double) mm_adm_err); + CCTK_VInfo (CCTK_THORNSTRING, "ADM mass error: M_p_err=%.15g, M_m_err=%.15g", + (double)mp_adm_err, (double)mm_adm_err); /* Invert the ADM mass equation and update the bare mass guess so that it gives the correct target ADM masses */ @@ -299,10 +310,10 @@ /* Set the par_m_plus and par_m_minus parameters */ sprintf (valbuf,"%.17g", (double) *mp); - CCTK_ParameterSet ("par_m_plus", "twopunctures", valbuf); + CCTK_ParameterSet ("par_m_plus", "TwoPunctures", valbuf); sprintf (valbuf,"%.17g", (double) *mm); - CCTK_ParameterSet ("par_m_minus", "twopunctures", valbuf); + CCTK_ParameterSet ("par_m_minus", "TwoPunctures", valbuf); } while ( (mp_adm_err > adm_tol) || (mm_adm_err > adm_tol) ); @@ -314,6 +325,8 @@ F_of_v (cctkGH, nvar, n1, n2, n3, v, F, u); + SpecCoef(n1, n2, n3, 0, v.d0, cf_v.d0); + CCTK_VInfo (CCTK_THORNSTRING, "The two puncture masses are mp=%.17g and mm=%.17g", (double) *mp, (double) *mm); @@ -456,8 +469,7 @@ (0, nvar, n1, n2, n3, v, xx, yy, zz); break; case GSM_evaluation: - U = PunctIntPolAtArbitPosition - (0, nvar, n1, n2, n3, v, xx, yy, zz); + U = PunctIntPolAtArbitPositionFast(0, nvar, n1, n2, n3, cf_v, xx, yy, zz); break; default: assert (0); @@ -664,6 +676,7 @@ free_dvector (F, 0, ntotal - 1); free_derivs (&u, ntotal); free_derivs (&v, ntotal); + free_derivs (&cf_v, ntotal); } } File [modified]: TwoPunctures.h Delta lines: +7 -0 =================================================================== --- trunk/src/TwoPunctures.h 2013-05-27 22:33:08 UTC (rev 132) +++ trunk/src/TwoPunctures.h 2013-06-11 05:44:21 UTC (rev 133) @@ -50,7 +50,14 @@ CCTK_REAL PunctIntPolAtArbitPosition (int ivar, int nvar, int n1, int n2, int n3, derivs v, CCTK_REAL x, CCTK_REAL y, CCTK_REAL z); +void SpecCoef(int n1, int n2, int n3, int ivar, CCTK_REAL *v, CCTK_REAL *cf); +CCTK_REAL PunctEvalAtArbitPositionFast (CCTK_REAL *v, int ivar, CCTK_REAL A, CCTK_REAL B, CCTK_REAL phi, + int nvar, int n1, int n2, int n3); +CCTK_REAL PunctIntPolAtArbitPositionFast (int ivar, int nvar, int n1, + int n2, int n3, derivs v, CCTK_REAL x, + CCTK_REAL y, CCTK_REAL z); + /* Routines in "CoordTransf.c"*/ void AB_To_XR (int nvar, CCTK_REAL A, CCTK_REAL B, CCTK_REAL *X, CCTK_REAL *R, derivs U);

1 0

[Carpet] branch, master, updated. carpet-6-init-280-ga0b09d7
by Carpet git repositories 10 Jun '13

10 Jun '13

1 0

[Carpet] branch, master, updated. carpet-6-init-279-g06a8991
by Carpet git repositories 08 Jun '13

08 Jun '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 06a89914bc22f1e2ae10bd5b867b4f913a878ae8 (commit) via 9567d21faa3b33940c272875ec9a242c5db81f60 (commit) via 5f14fc0a63987a0c28bdaedc91732ad556bef160 (commit) via 60104ff59ad8d8c75b8fa789acb6628b5addb220 (commit) via d72f38ca4a92993314000f905358f7163517d695 (commit) via 3554187cb190c2c7035e3bfe1d3b99bda1ab8301 (commit) via 55513a20c041ef782bbd5f74b0c011673cc9b32e (commit) via 2cebe8a689c57817408a2ebf61e5ed0105b9c436 (commit) via 9d7bb2dc1d90a03dee83dc999fe2798999b4b27d (commit) via 4acaa0d0d3e59d6e618815515871f1f1115a6789 (commit) via 3f3b57db6d8238c2b94502e278d71ffbc186d3d8 (commit) via 2f34a3bc2b28761ffc9772446b54b4dbf29a065b (commit) via b0835c11c078d7b578fdf7fd65ef954b91e2afda (commit) via 11c68fa9fd9652963249df7e094a38dca33c2217 (commit) via 13856c1d4fec72939f4e829863e085741505d4b8 (commit) via faf812847c85a1f0744a322810abfb418a0a811c (commit) via e88bf8ce164c15cce86da04b486383443c21073b (commit) via cce526ef043dda6115818e54120e8d1410d2d7c5 (commit) via 9791222a06c996805b3509be67f30aa731fcae10 (commit) via 606c70ba30488ae8b5bf9384bbe85dc94e0cc522 (commit) via 7183bf5dff80a6f7ed563f633598fd1fa84d77fe (commit) via 2f745fb7afac7abc616f64e2592594e7a87bbef2 (commit) via 95fcc84d481e21c97833054a78ff38d544c7117f (commit) via 339b60e63c9a837d7165339818e61b93716b64e7 (commit) via fa57059414919bea3cd6d7d62b69dc733f8b8f6d (commit) via 62d962f1a5140c37b494ab08174d1d5f42a52e8a (commit) via c26ba5c83e55a782c6f3e277f5845f20fd47aa10 (commit) via 84e390d73ab7148814b19d4758ff90564c3f1c5d (commit) from 9748e3a83336a9ccae73a66481530f8049e8c78d (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 06a89914bc22f1e2ae10bd5b867b4f913a878ae8 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sat Jun 8 11:53:34 2013 -0400 CarpetLib: Re-implement part of bboxset2 for pre-C++11 compilers Provide alternative, less elegant implementations of some of bboxset2 that is accepted by pre-C++11 compilers. commit 9567d21faa3b33940c272875ec9a242c5db81f60 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sat Jun 8 11:52:41 2013 -0400 CarpetLib: Whitespace change commit 5f14fc0a63987a0c28bdaedc91732ad556bef160 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sat Jun 8 11:52:19 2013 -0400 CarpetLib: Don't use run-together right angle brackets in templates commit 60104ff59ad8d8c75b8fa789acb6628b5addb220 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sat Jun 8 11:51:36 2013 -0400 CarpetLib: Instantiate some templates that are necessary on some systems commit d72f38ca4a92993314000f905358f7163517d695 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sat Jun 8 11:50:49 2013 -0400 CarpetLib: Provide manual look-alikes for certain C++11 features Provide "forall" based on Boost's FOREACH. Provide shared_ptr based on Boost's shared_ptr. commit 3554187cb190c2c7035e3bfe1d3b99bda1ab8301 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 17:53:55 2013 -0400 Requirements: Do not mark current timelevel as invalid after time level cycling The current time level retains its current value during time level cycling. commit 55513a20c041ef782bbd5f74b0c011673cc9b32e Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 17:12:12 2013 -0400 CarpetLib: Disable bboxset2 by default Change from CARPET_NO_BBOXSET2 and CARPET_BBOXSET2 to CARPET_ENABLE_BBOXSET2 (build it) and CARPET_USE_BBOXSET2 (use it). commit 2cebe8a689c57817408a2ebf61e5ed0105b9c436 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:51:25 2013 -0400 Carpet: Output list of compute nodes only in verbose mode commit 9d7bb2dc1d90a03dee83dc999fe2798999b4b27d Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:51:08 2013 -0400 Carpet: Remove unused, broken code commit 4acaa0d0d3e59d6e618815515871f1f1115a6789 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:50:34 2013 -0400 Carpet: Disable automatic synchronisation after restriction Restricted grid functions have boundary conditions applied anyway (if used correctly), which involves synchronisation (if done correctly). An explicit synchronisation is thus only overhead. commit 3f3b57db6d8238c2b94502e278d71ffbc186d3d8 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:41:45 2013 -0400 Carpet: Provide global instead of process-local timer output Reduce timer values across all processes before output, reporting both maximum and average. TimerNode::getGlobalTime: new function commit 2f34a3bc2b28761ffc9772446b54b4dbf29a065b Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:38:01 2013 -0400 Carpet: Use fabs() instead of abs() Some compilers don't like abs() for floating point numbers. commit b0835c11c078d7b578fdf7fd65ef954b91e2afda Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:36:48 2013 -0400 CarpetIOF5: Implement lower-dimensional output (i.e. 1d lines, 2d slices) commit 11c68fa9fd9652963249df7e094a38dca33c2217 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:35:59 2013 -0400 Requirements: Check return value of CCTK_TraverseString commit 13856c1d4fec72939f4e829863e085741505d4b8 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:35:35 2013 -0400 Requirements: Enforce 80 character line length limit commit faf812847c85a1f0744a322810abfb418a0a811c Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:35:16 2013 -0400 Requirements: Re-order #include statements commit e88bf8ce164c15cce86da04b486383443c21073b Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:33:19 2013 -0400 TestBBoxSet2: New thorn commit cce526ef043dda6115818e54120e8d1410d2d7c5 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:32:43 2013 -0400 LoopControl: Implement automatic performance improvements Redesigned internal data structures. This touches many parts of the code. Keep statistics about past loop iterations. Output statistics when terminating. Use these statistics to dynamically choose looping parameters. Allow disabling this feature, e.g. for benchmarks. commit 9791222a06c996805b3509be67f30aa731fcae10 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:25:12 2013 -0400 CarpetLib: New class bboxset2 Rename bboxset to bboxset1. Implement new class bboxset2, which uses a different internal datastructure than bboxset1. Make bboxset a typedef for either bboxset1 (default) or bboxset2, as selected by the compile-time macro CARPET_BBOXSET2. Disable all bboxset2 code if CARPET_NO_BBOXSET2 is given, since bboxset2 uses newer C++ constructs not available on some older compilers. commit 606c70ba30488ae8b5bf9384bbe85dc94e0cc522 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:22:04 2013 -0400 CarpetLib: New function bbox::anti_contracted_for anti_contracted_for is the exact opposite of contracted for. It is similar to expanded_for, but may return different results in corner cases. commit 7183bf5dff80a6f7ed563f633598fd1fa84d77fe Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:21:00 2013 -0400 CarpetLib: Replace more uses of operator% by calls to imod commit 2f745fb7afac7abc616f64e2592594e7a87bbef2 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:20:21 2013 -0400 CarpetLib: New function bbox::is_poison to check for poison commit 95fcc84d481e21c97833054a78ff38d544c7117f Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:19:38 2013 -0400 CarpetLib: Remove superfluous check that all indices are non-negative commit 339b60e63c9a837d7165339818e61b93716b64e7 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:18:47 2013 -0400 CarpetLib: Use imod instead of % operator in bbox class This avoids rounding problems near zero. commit fa57059414919bea3cd6d7d62b69dc733f8b8f6d Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:15:36 2013 -0400 CarpetLib: Use C++ standard methods to compare containers Remove CarpetLib's "equals" method. Implement equal_to, less, greater, greater_equal, less_equal, not_equal for vect and bbox classes. commit 62d962f1a5140c37b494ab08174d1d5f42a52e8a Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:13:15 2013 -0400 CarpetLib: Correct vect::count commit c26ba5c83e55a782c6f3e277f5845f20fd47aa10 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 16:12:56 2013 -0400 CarpetLib: Provide rint, round, trunc, and lrint for vectors commit 84e390d73ab7148814b19d4758ff90564c3f1c5d Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun May 26 15:55:33 2013 -0400 CarpetIO*: New parameter CarpetIO*::out_group_separator out_group_separator chooses the string by which thorn name and group name are separated in file names. The default is "::" for backward compatibility. This parameter only affects output where CarpetIO*::one_file_per_group is set; otherwise, the thorn name does not appear in the file name. ----------------------------------------------------------------------- Summary of changes: Carpet/Carpet/src/CactusTimer.cc | 56 +- Carpet/Carpet/src/CactusTimer.hh | 7 +- Carpet/Carpet/src/Evolve.cc | 7 +- Carpet/Carpet/src/Initialise.cc | 4 +- Carpet/Carpet/src/Restrict.cc | 5 + Carpet/Carpet/src/SetupGH.cc | 11 +- Carpet/Carpet/src/Shutdown.cc | 7 +- Carpet/Carpet/src/TimerNode.cc | 116 +- Carpet/Carpet/src/TimerNode.hh | 1 + Carpet/Carpet/src/Timing.cc | 2 +- Carpet/CarpetIOASCII/param.ccl | 5 + Carpet/CarpetIOASCII/src/ioascii.cc | 13 +- Carpet/CarpetIOASCII/test/newsep.par | 63 + .../grid.coordinates..asc} | 0 .../grid.coordinates.d.asc} | 0 .../grid.coordinates.x.asc} | 0 .../grid.coordinates.xy.asc} | 0 .../grid.coordinates.xyz.asc} | 0 .../grid.coordinates.xz.asc} | 0 .../grid.coordinates.y.asc} | 0 .../grid.coordinates.yz.asc} | 0 .../grid.coordinates.z.asc} | 0 .../interptoarray.arrays1d..asc} | 0 .../interptoarray.arrays1d.x.asc} | 0 .../interptoarray.arrays1d.y.asc} | 0 .../interptoarray.arrays2d..asc} | 0 .../interptoarray.arrays2d.x.asc} | 0 .../interptoarray.arrays2d.xy.asc} | 0 .../interptoarray.arrays2d.y.asc} | 0 .../interptoarray.arrays2d.z.asc} | 0 .../interptoarray.arrays3d..asc} | 0 .../interptoarray.arrays3d.d.asc} | 0 .../interptoarray.arrays3d.x.asc} | 0 .../interptoarray.arrays3d.xy.asc} | 0 .../interptoarray.arrays3d.xyz.asc} | 0 .../interptoarray.arrays3d.xz.asc} | 0 .../interptoarray.arrays3d.y.asc} | 0 .../interptoarray.arrays3d.yz.asc} | 0 .../interptoarray.arrays3d.z.asc} | 0 .../interptoarray.scalars..asc} | 0 Carpet/CarpetIOHDF5/param.ccl | 5 + Carpet/CarpetIOHDF5/src/CarpetIOHDF5.cc | 13 +- Carpet/CarpetIOHDF5/src/OutputSlice.cc | 13 +- Carpet/CarpetIOHDF5/test/newsep.par | 65 + .../CarpetIOHDF5/test/newsep/grid.coordinates..h5 | Bin 0 -> 135384 bytes .../CarpetIOHDF5/test/newsep/grid.coordinates.d.h5 | Bin 0 -> 69488 bytes .../test/newsep/grid.coordinates.file_0.h5 | Bin 0 -> 188264 bytes .../test/newsep/grid.coordinates.file_1.h5 | Bin 0 -> 168552 bytes .../CarpetIOHDF5/test/newsep/grid.coordinates.x.h5 | Bin 0 -> 137432 bytes .../test/newsep/grid.coordinates.xy.h5 | Bin 0 -> 164336 bytes .../test/newsep/grid.coordinates.xyz.file_0.h5 | Bin 0 -> 186856 bytes .../test/newsep/grid.coordinates.xyz.file_1.h5 | Bin 0 -> 167144 bytes .../test/newsep/grid.coordinates.xz.h5 | Bin 0 -> 164144 bytes .../CarpetIOHDF5/test/newsep/grid.coordinates.y.h5 | Bin 0 -> 137464 bytes .../test/newsep/grid.coordinates.yz.h5 | Bin 0 -> 164096 bytes .../CarpetIOHDF5/test/newsep/grid.coordinates.z.h5 | Bin 0 -> 137432 bytes .../test/newsep/interptoarray.arrays1d..h5 | Bin 0 -> 27168 bytes .../test/newsep/interptoarray.arrays1d.x.h5 | Bin 0 -> 27728 bytes .../test/newsep/interptoarray.arrays1d.y.h5 | Bin 0 -> 27168 bytes .../test/newsep/interptoarray.arrays2d..h5 | Bin 0 -> 27168 bytes .../test/newsep/interptoarray.arrays2d.x.h5 | Bin 0 -> 27648 bytes .../test/newsep/interptoarray.arrays2d.xy.h5 | Bin 0 -> 31208 bytes .../test/newsep/interptoarray.arrays2d.y.h5 | Bin 0 -> 27568 bytes .../test/newsep/interptoarray.arrays2d.z.h5 | Bin 0 -> 27168 bytes .../test/newsep/interptoarray.arrays3d..h5 | Bin 0 -> 27168 bytes .../test/newsep/interptoarray.arrays3d.d.h5 | Bin 0 -> 26520 bytes .../test/newsep/interptoarray.arrays3d.x.h5 | Bin 0 -> 27488 bytes .../test/newsep/interptoarray.arrays3d.xy.h5 | Bin 0 -> 28728 bytes .../newsep/interptoarray.arrays3d.xyz.file_0.h5 | Bin 0 -> 32792 bytes .../newsep/interptoarray.arrays3d.xyz.file_1.h5 | Bin 0 -> 5528 bytes .../test/newsep/interptoarray.arrays3d.xz.h5 | Bin 0 -> 28328 bytes .../test/newsep/interptoarray.arrays3d.y.h5 | Bin 0 -> 27408 bytes .../test/newsep/interptoarray.arrays3d.yz.h5 | Bin 0 -> 28088 bytes .../test/newsep/interptoarray.arrays3d.z.h5 | Bin 0 -> 27328 bytes .../test/newsep/interptoarray.scalars..h5 | Bin 0 -> 27168 bytes Carpet/CarpetIOHDF5/test/newsep/newsep.par | 65 + Carpet/CarpetIOHDF5/test/test.ccl | 1 - Carpet/CarpetIOScalar/param.ccl | 5 + Carpet/CarpetIOScalar/src/ioscalar.cc | 14 +- Carpet/CarpetIOScalar/test/newsep.par | 32 + .../grid.coordinates.scalars.asc} | 0 Carpet/CarpetLib/src/bbox.cc | 80 +- Carpet/CarpetLib/src/bbox.hh | 77 +- Carpet/CarpetLib/src/bboxset.cc | 793 --------- Carpet/CarpetLib/src/bboxset.hh | 383 +----- Carpet/CarpetLib/src/bboxset1.cc | 55 + Carpet/CarpetLib/src/bboxset1.hh | 1189 ++++++++++++++ Carpet/CarpetLib/src/bboxset2.cc | 38 + Carpet/CarpetLib/src/bboxset2.hh | 1714 ++++++++++++++++++++ Carpet/CarpetLib/src/defs.cc | 140 +- Carpet/CarpetLib/src/defs.hh | 71 +- Carpet/CarpetLib/src/dh.cc | 3 +- Carpet/CarpetLib/src/make.code.defn | 2 + Carpet/CarpetLib/src/region.hh | 1 + Carpet/CarpetLib/src/vect.hh | 84 +- Carpet/LoopControl/interface.ccl | 3 + Carpet/LoopControl/param.ccl | 14 +- Carpet/LoopControl/src/loopcontrol.F90 | 14 +- Carpet/LoopControl/src/loopcontrol.cc | 873 ++++++++--- Carpet/LoopControl/src/loopcontrol.h | 204 ++- Carpet/LoopControl/src/loopcontrol_fortran.h | 8 +- Carpet/Requirements/src/Requirements.cc | 20 +- Carpet/Requirements/src/all_clauses.cc | 10 +- Carpet/Requirements/src/all_clauses.hh | 4 +- Carpet/Requirements/src/all_state.cc | 19 +- Carpet/Requirements/src/all_state.hh | 11 +- Carpet/Requirements/src/clause.cc | 6 +- Carpet/Requirements/src/clause.hh | 1 + Carpet/Requirements/src/clauses.cc | 10 +- Carpet/Requirements/src/clauses.hh | 4 +- Carpet/Requirements/src/gridpoint.cc | 8 +- Carpet/Requirements/src/gridpoint.hh | 6 +- Carpet/Requirements/src/location.cc | 6 +- Carpet/Requirements/src/location.hh | 1 + Carpet/Requirements/src/util.cc | 2 +- CarpetDev/CarpetIOF5/param.ccl | 41 +- CarpetDev/CarpetIOF5/src/iof5.cc | 8 +- CarpetDev/CarpetIOF5/src/iof5.hh | 16 +- CarpetDev/CarpetIOF5/src/output.cc | 176 ++- CarpetDev/CarpetIOF5/src/util.cc | 45 +- CarpetExtra/TestBBoxSet2/README | 10 + CarpetExtra/TestBBoxSet2/configuration.ccl | 3 + CarpetExtra/TestBBoxSet2/doc/documentation.tex | 144 ++ CarpetExtra/TestBBoxSet2/interface.ccl | 7 + CarpetExtra/TestBBoxSet2/param.ccl | 10 + CarpetExtra/TestBBoxSet2/schedule.ccl | 7 + CarpetExtra/TestBBoxSet2/src/make.code.defn | 7 + CarpetExtra/TestBBoxSet2/src/test.cc | 786 +++++++++ CarpetExtra/TestBBoxSet2/test/bboxset2.par | 6 + 129 files changed, 5869 insertions(+), 1761 deletions(-) create mode 100644 Carpet/CarpetIOASCII/test/newsep.par copy Carpet/CarpetIOASCII/test/{compact/grid::coordinates..asc => newsep/grid.coordinates..asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/grid::coordinates.d.asc => newsep/grid.coordinates.d.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/grid::coordinates.x.asc => newsep/grid.coordinates.x.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/grid::coordinates.xy.asc => newsep/grid.coordinates.xy.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/grid::coordinates.xyz.asc => newsep/grid.coordinates.xyz.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/grid::coordinates.xz.asc => newsep/grid.coordinates.xz.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/grid::coordinates.y.asc => newsep/grid.coordinates.y.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/grid::coordinates.yz.asc => newsep/grid.coordinates.yz.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/grid::coordinates.z.asc => newsep/grid.coordinates.z.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays1d..asc => newsep/interptoarray.arrays1d..asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays1d.x.asc => newsep/interptoarray.arrays1d.x.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays1d.y.asc => newsep/interptoarray.arrays1d.y.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays2d..asc => newsep/interptoarray.arrays2d..asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays2d.x.asc => newsep/interptoarray.arrays2d.x.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays2d.xy.asc => newsep/interptoarray.arrays2d.xy.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays2d.y.asc => newsep/interptoarray.arrays2d.y.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays2d.z.asc => newsep/interptoarray.arrays2d.z.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays3d..asc => newsep/interptoarray.arrays3d..asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays3d.d.asc => newsep/interptoarray.arrays3d.d.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays3d.x.asc => newsep/interptoarray.arrays3d.x.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays3d.xy.asc => newsep/interptoarray.arrays3d.xy.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays3d.xyz.asc => newsep/interptoarray.arrays3d.xyz.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays3d.xz.asc => newsep/interptoarray.arrays3d.xz.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays3d.y.asc => newsep/interptoarray.arrays3d.y.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays3d.yz.asc => newsep/interptoarray.arrays3d.yz.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::arrays3d.z.asc => newsep/interptoarray.arrays3d.z.asc} (100%) copy Carpet/CarpetIOASCII/test/{compact/interptoarray::scalars..asc => newsep/interptoarray.scalars..asc} (100%) create mode 100644 Carpet/CarpetIOHDF5/test/newsep.par create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates..h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.d.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.file_0.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.file_1.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.x.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.xy.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.xyz.file_0.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.xyz.file_1.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.xz.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.y.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.yz.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/grid.coordinates.z.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays1d..h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays1d.x.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays1d.y.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays2d..h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays2d.x.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays2d.xy.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays2d.y.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays2d.z.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays3d..h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays3d.d.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays3d.x.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays3d.xy.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays3d.xyz.file_0.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays3d.xyz.file_1.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays3d.xz.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays3d.y.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays3d.yz.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.arrays3d.z.h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/interptoarray.scalars..h5 create mode 100644 Carpet/CarpetIOHDF5/test/newsep/newsep.par create mode 100644 Carpet/CarpetIOScalar/test/newsep.par copy Carpet/CarpetIOScalar/test/{coords4/grid::coordinates.scalars.asc => newsep/grid.coordinates.scalars.asc} (100%) create mode 100644 Carpet/CarpetLib/src/bboxset1.cc create mode 100644 Carpet/CarpetLib/src/bboxset1.hh create mode 100644 Carpet/CarpetLib/src/bboxset2.cc create mode 100644 Carpet/CarpetLib/src/bboxset2.hh create mode 100644 CarpetExtra/TestBBoxSet2/README create mode 100644 CarpetExtra/TestBBoxSet2/configuration.ccl create mode 100644 CarpetExtra/TestBBoxSet2/doc/documentation.tex create mode 100644 CarpetExtra/TestBBoxSet2/interface.ccl create mode 100644 CarpetExtra/TestBBoxSet2/param.ccl create mode 100644 CarpetExtra/TestBBoxSet2/schedule.ccl create mode 100644 CarpetExtra/TestBBoxSet2/src/make.code.defn create mode 100644 CarpetExtra/TestBBoxSet2/src/test.cc create mode 100644 CarpetExtra/TestBBoxSet2/test/bboxset2.par hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/ (Rev. 83)
by cott＠tapir.caltech.edu 07 Jun '13

07 Jun '13

User: cott Date: 2013/06/07 07:23 PM Modified: /trunk/src/ EOS_Omni_MultiVarCalls.F90, EOS_Omni_SingleVarCalls.F90 Log: * add OMP pragmas to EOSOmni routines File Changes: Directory: /trunk/src/ ====================== File [modified]: EOS_Omni_MultiVarCalls.F90 Delta lines: +31 -2 =================================================================== --- trunk/src/EOS_Omni_MultiVarCalls.F90 2013-05-27 22:32:23 UTC (rev 82) +++ trunk/src/EOS_Omni_MultiVarCalls.F90 2013-06-08 00:23:17 UTC (rev 83) @@ -46,7 +46,9 @@ anyerr = 0 keyerr(:) = 0 - + + !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xent,xcs2,& + !$OMP xdedt,xdpderho,xdpdrhoe,xmunu) do i=1,npoints xrho = rho(i) * inv_rho_gf @@ -59,7 +61,9 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then + !$OMP CRITICAL anyerr = 1 + !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -80,6 +84,7 @@ munu(i) = xmunu enddo + !$OMP END PARALLEL DO end subroutine EOS_Omni_EOS_short @@ -111,7 +116,6 @@ real*8 :: xprs,xmunu,xcs2 real*8 :: xdedt,xdpderho,xdpdrhoe - anyerr = 0 keyerr(:) = 0 @@ -119,35 +123,45 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints dpdrhoe(i) = poly_k * & poly_gamma * & rho(i) ** (poly_gamma - 1.d0) dpderho(i) = 0.0d0 enddo + !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints dpdrhoe(i) = (gl_gamma-1.0d0) * & eps(i) dpderho(i) = (gl_gamma - 1.0d0) * & rho(i) enddo + !$OMP END PARALLEL DO case (3) ! hybrid EOS + !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k,& + !$OMP hybrid_dp_poly,hybrid_dp_th1,hybrid_dp_th2) do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 @@ -173,7 +187,9 @@ dpdrhoe(i) = hybrid_dp_poly + hybrid_dp_th1 + hybrid_dp_th2 dpderho(i) = (hybrid_gamma_th - 1.0d0) * rho(i) enddo + !$OMP END PARALLEL DO case (4) + !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xdpderho,xdpdrhoe) do i=1,npoints xrho = rho(i) * inv_rho_gf xtemp = temp(i) @@ -184,7 +200,9 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then + !$OMP CRITICAL anyerr = 1 + !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -239,34 +257,45 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints depsdpress(i) = 1.0d0/(poly_gamma - 1.0d0)/rho(i) depsdrho(i) = depsdpress(i) * poly_k * & poly_gamma * & rho(i) ** (poly_gamma - 1.d0) enddo + !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints depsdpress(i) = 1.0/( (gl_gamma - 1.0d0) * & rho(i)) depsdrho(i) = -eps(i)/rho(i) enddo + !$OMP END PARALLEL DO case (3) ! hybrid EOS + !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k,& + !$OMP hybrid_dp_poly,hybrid_dp_th1,& + !$OMP hybrid_dp_th2,xdpdrhoe,xdpderho) do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +84 -13 =================================================================== --- trunk/src/EOS_Omni_SingleVarCalls.F90 2013-05-27 22:32:23 UTC (rev 82) +++ trunk/src/EOS_Omni_SingleVarCalls.F90 2013-06-08 00:23:17 UTC (rev 83) @@ -47,31 +47,41 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints press(i) = poly_k * & rho(i)**poly_gamma enddo + !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints press(i) = (gl_gamma - 1.0d0) * rho(i) * eps(i) enddo + !$OMP END PARALLEL DO case (3) ! hybrid EOS + !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k,& + !$OMP hybrid_p_poly, hybrid_p_th) do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 @@ -92,11 +102,12 @@ hybrid_p_th = max(zero, hybrid_p_th) press(i) = hybrid_p_poly + hybrid_p_th enddo + !$OMP END PARALLEL DO case (4) ! nuc eos + !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xprs) do i=1,npoints - xrho = rho(i) * inv_rho_gf xtemp = temp(i) xye = ye(i) @@ -105,7 +116,9 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then + !$OMP CRITICAL anyerr = 1 + !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -115,11 +128,13 @@ endif press(i) = xprs * press_gf - enddo + !$OMP END PARALLEL DO case (5) ! cold tabular EOS with gamma law + !$OMP PARALLEL DO PRIVATE(xrho,ir,gamma,eps_cold,eps_th, & + !$OMP press_cold,press_th) do i=1,npoints if(rho(i).lt.coldeos_rhomin) then press(i) = coldeos_low_kappa * rho(i)**coldeos_low_gamma @@ -127,7 +142,9 @@ cycle else if(rho(i).gt.coldeos_rhomax) then keyerr(i) = 103 + !$OMP CRITICAL anyerr = 1 + !$OMP END CRITICAL else xrho = log10(rho(i)) ir = 2 + INT( (xrho - coldeos_logrho(1) - 1.0d-10) * coldeos_dlrhoi ) @@ -153,6 +170,7 @@ press_th = coldeos_thfac*(coldeos_gammath - 1.0d0)*rho(i)*eps_th press(i) = press_cold + press_th enddo + !$OMP END PARALLEL DO case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" @@ -201,32 +219,43 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints dpdrhoe(i) = poly_k * & poly_gamma * & rho(i) ** (poly_gamma - 1.d0) enddo + !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints dpdrhoe(i) = (gl_gamma-1.0d0) * & eps(i) enddo + !$OMP END PARALLEL DO case (3) ! hybrid EOS + !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k,& + !$OMP hybrid_dp_poly, hybrid_dp_th1, & + !$OMP hybrid_dp_th2) do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 @@ -252,8 +281,10 @@ dpdrhoe(i) = hybrid_dp_poly + max(0.0d0,hybrid_dp_th1 + hybrid_dp_th2) enddo - + !$OMP END PARALLEL DO case (4) + !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xprs,xent,xcs2,xdedt,& + !$OMP xdpderho,xdpdrhoe,xmunu,h) do i=1,npoints xrho = rho(i) * inv_rho_gf xtemp = temp(i) @@ -264,7 +295,9 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then + !$OMP CRITICAL anyerr = 1 + !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -275,11 +308,13 @@ dpdrhoe(i) = xdpdrhoe * press_gf * inv_rho_gf enddo - + !$OMP END PARALLEL DO case (5) ! with the cold eos we have to assume P = P(rho), so ! by definition dPdrho is at constant internal energy ! and entropy (the latter, because T=0) + !$OMP PARALLEL DO PRIVATE(xrho,ir,gamma,eps_cold,eps_th, & + !$OMP cs2,press_cold,press_th) do i=1,npoints if(rho(i).lt.coldeos_rhomin) then dpdrhoe(i) = coldeos_low_kappa * coldeos_low_gamma * & @@ -287,7 +322,9 @@ cycle else if(rho(i).gt.coldeos_rhomax) then keyerr(i) = 103 + !$OMP CRITICAL anyerr = 1 + !$OMP END CRITICAL else xrho = log10(rho(i)) ir = 2 + INT( (xrho - coldeos_logrho(1) - 1.0d-10) * coldeos_dlrhoi ) @@ -364,38 +401,49 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints dpdepsrho(i) = 0.0d0 enddo + !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints dpdepsrho(i) = (gl_gamma - 1.0d0) * & rho(i) enddo + !$OMP END PARALLEL DO case (3) ! hybrid EOS + !$OMP PARALLEL DO do i=1,npoints dpdepsrho(i) = (hybrid_gamma_th - 1.0d0) * rho(i) enddo - + !$OMP END PARALLEL DO case (4) ! nuc_eos + !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xprs,& + !$OMP xent,xcs2,xdedt,xdpderho,xdpdrhoe,& + !$OMP xmunu) do i=1,npoints - xrho = rho(i) * inv_rho_gf xtemp = temp(i) xye = ye(i) @@ -405,7 +453,9 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then + !$OMP CRITICAL anyerr = 1 + !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -417,17 +467,20 @@ dpdepsrho(i) = xdpderho * press_gf * inv_eps_gf enddo - + !$OMP END PARALLEL DO case (5) ! with the cold eos we have to assume P = P(rho), so ! only the gamma law has non-zero dPdeps + !$OMP PARALLEL DO PRIVATE(xrho,ir,eps_cold,eps_th) do i=1,npoints if(rho(i).lt.coldeos_rhomin) then dpdepsrho(i) = 0.0d0 cycle else if(rho(i).gt.coldeos_rhomax) then keyerr(i) = 103 + !$OMP CRITICAL anyerr = 1 + !$OMP END CRITICAL else xrho = log10(rho(i)) ir = 2 + INT( (xrho - coldeos_logrho(1) - 1.0d-10) * coldeos_dlrhoi ) @@ -494,27 +547,34 @@ case (1) ! polytropic EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = poly_k * & rho(i)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO do i=1,npoints xpress = poly_k * & rho(i)**(poly_gamma) cs2(i) = poly_gamma * xpress / rho(i) / & (1 + eps(i) + xpress/rho(i)) enddo + !$OMP END PARALLEL DO case (2) ! gamma-law EOS if(keytemp.eq.1) then + !$OMP PARALLEL DO do i=1,npoints eps(i) = gl_k * & rho(i)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo + !$OMP END PARALLEL DO endif + !$OMP PARALLEL DO PRIVATE(xpress,xdpdrhoe,xdpderho) do i=1,npoints xpress = (gl_gamma-1.0d0)*rho(i)*eps(i) xdpdrhoe = (gl_gamma-1.0d0)*eps(i) @@ -522,8 +582,12 @@ cs2(i) = (xdpdrhoe + xpress * xdpderho / (rho(i)**2)) / & (1.0d0 + eps(i) + xpress/rho(i)) enddo + !$OMP END PARALLEL DO case(3) ! hybrid EOS + !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k,& + !$OMP hybrid_p_poly,hybrid_p_th,& + !$OMP xpress) do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 @@ -547,11 +611,12 @@ cs2(i) = (hybrid_local_gamma * hybrid_p_poly + hybrid_gamma_th * hybrid_p_th) / & rho(i) / (1.0d0 + eps(i) + xpress/rho(i)) enddo + !$OMP END PARALLEL DO case(4) ! nuc_eos - + !$OMP PARALLEL DO PRIVATE(xrho,xtemp,xye,xenr,xprs,xent,xcs2,& + !$OMP xdedt,xdpderho,xdpdrhoe,xmunu) do i=1,npoints - xrho = rho(i) * inv_rho_gf xtemp = temp(i) xye = ye(i) @@ -561,7 +626,9 @@ keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then + !$OMP CRITICAL anyerr = 1 + !$OMP END CRITICAL endif if(keytemp.eq.1) then @@ -572,12 +639,15 @@ cs2(i) = xcs2 * cliteinv2 / & (1.0d0 + eps(i) + xprs * press_gf / rho(i)) - enddo + !$OMP END PARALLEL DO case (5) ! with the cold eos we have to assume P = P(rho), so ! by definition dPdrho is at constant internal energy ! and entropy (the latter, because T=0) + !$OMP PARALLEL DO PRIVATE(xprs,xrho,ir,gamma,cs2_cold,& + !$OMP eps_cold,eps_th,press_cold,press_th,& + !$OMP xdpdrhoe,xdpderho,cs2_th,h,h_cold) do i=1,npoints if(rho(i).lt.coldeos_rhomin) then xprs = coldeos_low_kappa * rho(i)**coldeos_low_gamma @@ -588,8 +658,10 @@ cycle else if(rho(i).gt.coldeos_rhomax) then keyerr(i) = 103 + !$OMP CRITICAL anyerr = 1 - else + !$OMP END CRITICAL + else xrho = log10(rho(i)) ir = 2 + INT( (xrho - coldeos_logrho(1) - 1.0d-10) * coldeos_dlrhoi ) endif @@ -614,7 +686,6 @@ eps_th = 0.0d0 eps(i) = eps_cold endif - press_cold = coldeos_kappa * rho(i)**gamma press_th = coldeos_thfac*(coldeos_gammath - 1.0d0)*rho(i)*eps_th @@ -627,7 +698,7 @@ cs2(i) = (cs2_cold * h_cold + cs2_th) / h enddo - + !$OMP END PARALLEL DO case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" call CCTK_WARN(0,warnstring)

1 0

[svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconGen/src/ (Rev. 86)
by reisswig＠tapir.caltech.edu 06 Jun '13

06 Jun '13

User: reisswig Date: 2013/06/06 12:45 PM Modified: /PITTNullCode/SphericalHarmonicReconGen/src/ sph_database.cc Log: Fixed a bug. File Changes: Directory: /PITTNullCode/SphericalHarmonicReconGen/src/ ======================================================= File [modified]: sph_database.cc Delta lines: +3 -9 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc 2013-06-04 20:40:27 UTC (rev 85) +++ PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc 2013-06-06 17:45:00 UTC (rev 86) @@ -1077,16 +1077,10 @@ -/*const string SPH_db_SpEC_H5_v2::time_attrib_name = "Time"; -const string SPH_db_SpEC_H5_v2::step_basename = "Step"; -*/ - // table of varibale names: this maps a column number to a group. - // The first entry per varibale is the main group, the second is a possible subgroup, e.g. - // /g/Step00001/xx - // for SpEC +// table of varibale names: this maps a column number to a dataset name. const string SPH_db_SpEC_H5_v2::varname_table[30] = { "Lapse.dat", - "Shiftx.dat" , "Shifty.dat", "Shiftz.dat", + "Shiftx.dat", "Shifty.dat", "Shiftz.dat", "gxx.dat", "gxy.dat", "gxz.dat", "gyy.dat", "gyz.dat", "gzz.dat", @@ -1098,7 +1092,7 @@ "Drgzz.dat", "DtLapse.dat", - "DtShiftx.dat", "DtShifty.dat" "DtShiftz.dat", + "DtShiftx.dat", "DtShifty.dat", "DtShiftz.dat", "Dtgxx.dat", "Dtgxy.dat", "Dtgxz.dat", "Dtgyy.dat", "Dtgyz.dat", "Dtgzz.dat" };

1 0

[svn:einsteintoolkit] NullNews/trunk/ (Rev. 15)
by reisswig＠tapir.caltech.edu 05 Jun '13

05 Jun '13

User: reisswig Date: 2013/06/05 02:58 AM Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ NullNews_GetNews.F90, NullNews_SphHarmDecomp.F90, NullNews_interp_to_constant_uBondi.cc, set_pointers.h Log: Implementation of lin. strain computation. File Changes: Directory: /trunk/src/ ====================== File [modified]: NullNews_GetNews.F90 Delta lines: +18 -2 =================================================================== --- trunk/src/NullNews_GetNews.F90 2013-05-27 22:33:26 UTC (rev 14) +++ trunk/src/NullNews_GetNews.F90 2013-06-05 07:58:20 UTC (rev 15) @@ -19,10 +19,10 @@ CCTK_COMPLEX, dimension (:,:,:), allocatable, save::& J, J_u, J_l, J_l_u, cB, U, comega, eth_J,& - beth_J, eth_U, beth_U, U_u, U_l, U_l_l + beth_J, eth_U, beth_U, U_u, U_l, U_l_l, etheth_u0 CCTK_REAL, dimension (:,:,:), allocatable, save::& - beta, omega, beta_u + beta, omega, beta_u, u0 CCTK_REAL, dimension(3) :: BUF logical, save :: FirstTime = .True. @@ -62,6 +62,12 @@ eth_J=0; beth_J=0; eth_U=0; beth_U=0; beta=0; omega=0 beta_u = 0; U_u=0; U_l=0; U_l_l=0 + if (compute_lin_strain .ne. 0) then + allocate(u0(null_lsh(1), null_lsh(2), 2), etheth_u0(null_lsh(1), null_lsh(2), 2)) + u0=0 + etheth_u0=0 + endif + if (minval(abs(zeta - dcmplx(1,1))) < 1.0d-10) then ThisProc = .true. Tarr = minloc(abs(stereo_q(:,1)-1.)) @@ -196,6 +202,16 @@ end do end if + if (compute_lin_strain .ne. 0) then + u0 = uBondi + call NullInterp_d2 (etheth_u0(:,:,1), dcmplx(u0(:,:,1)), 0, 1, 1) + call NullInterp_d2 (etheth_u0(:,:,2), dcmplx(u0(:,:,2)), 0, 1, 1) + call NullInterp_cinterp(cctkGH, tmp_cgfn, tmp_cgfs, etheth_u0(:,:,1), etheth_u0(:,:,2), 1) + call NullNews_ResetInactive(null_lsh, etheth_u0) + linStrain(:,:,1) = J_l(:,:,1) + tmp_cgfn + linStrain(:,:,2) = J_l(:,:,2) + tmp_cgfs + endif + !! at this point its counterproductive to change spin-basis ! ! La definicion es z=\tan(\theta/2) e^{i\phi}, asi que aca le ! ! sacamos el z/zb que le pusimos en Spheroid_RJ. File [modified]: NullNews_SphHarmDecomp.F90 Delta lines: +15 -0 =================================================================== --- trunk/src/NullNews_SphHarmDecomp.F90 2013-05-27 22:33:26 UTC (rev 14) +++ trunk/src/NullNews_SphHarmDecomp.F90 2013-06-05 07:58:20 UTC (rev 15) @@ -31,6 +31,7 @@ CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: betanSphCoeff CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: WnSphCoeff CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: uBondiSphCoeff + CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: linStrainSphCoeff CCTK_REAL :: NewsNorm CCTK_INT :: spin, lmode, nchar character(len=256) :: io_out_dir, filestring_re, filestring_im, filestring, tmp @@ -83,6 +84,11 @@ zeta, NewsB, NewsBSphCoeff) call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & zeta, Psi4, Psi4SphCoeff) + + if (compute_lin_strain .ne. 0) then + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + zeta, linStrain, linStrainSphCoeff) + endif else time = constant_uBondi @@ -93,6 +99,11 @@ zeta, NewsB_uBondi, NewsBSphCoeff) call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & zeta, Psi4_uBondi, Psi4SphCoeff) + + if (compute_lin_strain .ne. 0) then + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + zeta, linStrain_uBondi, linStrainSphCoeff) + endif endif if (debug_output == 1) then @@ -138,6 +149,10 @@ call NullDecomp_WriteCoefFile('NewsB_scri', truncate, 2, lmax, NewsBSphCoeff, time) call NullDecomp_WriteCoefFile('Psi4_scri', truncate, 2, lmax, Psi4SphCoeff, time) + if (compute_lin_strain .ne. 0) then + call NullDecomp_WriteCoefFile('linStrain_scri', truncate, 2, lmax, linStrainSphCoeff, time) + endif + if (debug_output == 1) then call NullDecomp_WriteCoefFile('J_scri', truncate, 2, lmax, JnSphCoeff, time) File [modified]: NullNews_interp_to_constant_uBondi.cc Delta lines: +15 -0 =================================================================== --- trunk/src/NullNews_interp_to_constant_uBondi.cc 2013-05-27 22:33:26 UTC (rev 14) +++ trunk/src/NullNews_interp_to_constant_uBondi.cc 2013-06-05 07:58:20 UTC (rev 15) @@ -159,6 +159,16 @@ NewsBP[tl-2][ij].imag(), NewsBP[tl-1][ij].imag(), NewsBP[tl][ij].imag(), NewsBP[tl+1][ij].imag(), NewsBP[tl+2][ij].imag(), uBondiP[tl-2][ij], uBondiP[tl-1][ij], uBondiP[tl][ij], uBondiP[tl+1][ij], uBondiP[tl+2][ij]); NewsB_uBondi[ij] = CCTK_Cmplx(real, imag); + + if (compute_lin_strain) { + real = interpolant(*constant_uBondi, + linStrainP[tl-2][ij].real(), linStrainP[tl-1][ij].real(), linStrainP[tl][ij].real(), linStrainP[tl+1][ij].real(), linStrainP[tl+2][ij].real(), + uBondiP[tl-2][ij], uBondiP[tl-1][ij], uBondiP[tl][ij], uBondiP[tl+1][ij], uBondiP[tl+2][ij]); + imag = interpolant(*constant_uBondi, + linStrainP[tl-2][ij].imag(), linStrainP[tl-1][ij].imag(), linStrainP[tl][ij].imag(), linStrainP[tl+1][ij].imag(), linStrainP[tl+2][ij].imag(), + uBondiP[tl-2][ij], uBondiP[tl-1][ij], uBondiP[tl][ij], uBondiP[tl+1][ij], uBondiP[tl+2][ij]); + linStrain_uBondi[ij] = CCTK_Cmplx(real, imag); + } } } @@ -187,6 +197,9 @@ NewsP[tl][ij] = CCTK_Cmplx(0,0); NewsBP[tl][ij] = CCTK_Cmplx(0,0); + + if (compute_lin_strain) + linStrainP[tl][ij] = CCTK_Cmplx(0,0); } *constant_uBondi = uBondiP[2][0]; @@ -215,6 +228,8 @@ Psi4P[tl+1][ij] = Psi4P[tl][ij]; NewsP[tl+1][ij] = NewsP[tl][ij]; NewsBP[tl+1][ij] = NewsBP[tl][ij]; + if (compute_lin_strain) + linStrainP[tl+1][ij] = linStrainP[tl][ij]; } } File [modified]: set_pointers.h Delta lines: +15 -0 =================================================================== --- trunk/src/set_pointers.h 2013-05-27 22:33:26 UTC (rev 14) +++ trunk/src/set_pointers.h 2013-06-05 07:58:20 UTC (rev 15) @@ -4,6 +4,7 @@ vector<CCTK_COMPLEX*> Psi4P(max_timelevels, (CCTK_COMPLEX*)NULL); vector<CCTK_COMPLEX*> NewsP(max_timelevels, (CCTK_COMPLEX*)NULL); vector<CCTK_COMPLEX*> NewsBP(max_timelevels, (CCTK_COMPLEX*)NULL); + vector<CCTK_COMPLEX*> linStrainP(max_timelevels, (CCTK_COMPLEX*)NULL); // Get current timelevel... // We assume here that the two vars uBondi[0] amd uBondi[1] are right next to each @@ -12,15 +13,22 @@ const int varindex_Psi4 = CCTK_VarIndex("NullNews::Psi4[0]"); const int varindex_News = CCTK_VarIndex("NullNews::News[0]"); const int varindex_NewsB = CCTK_VarIndex("NullNews::NewsB[0]"); + const int varindex_linStrain = CCTK_VarIndex("NullNews::linStrain[0]"); if (varindex_uBondi < 0 || varindex_Psi4 < 0 || varindex_News < 0 || varindex_NewsB < 0) CCTK_WARN(0, "Error getting variable index!"); + if (compute_lin_strain && varindex_linStrain < 0) + CCTK_WARN(0, "Error getting variable index!"); + uBondiP[0] = (CCTK_REAL*) CCTK_VarDataPtrI(cctkGH, 0, varindex_uBondi); Psi4P[0] = (CCTK_COMPLEX*) CCTK_VarDataPtrI(cctkGH, 0, varindex_Psi4); NewsP[0] = (CCTK_COMPLEX*) CCTK_VarDataPtrI(cctkGH, 0, varindex_News); NewsBP[0] = (CCTK_COMPLEX*) CCTK_VarDataPtrI(cctkGH, 0, varindex_NewsB); + if (compute_lin_strain) + linStrainP[0] = (CCTK_COMPLEX*) CCTK_VarDataPtrI(cctkGH, 0, varindex_linStrain); + // Get past timelevels... // We assume here that the two vars uBondi[0] amd uBondi[1] are right next to each // other in memory, i.e. the pointer to uBondi[0] can be used to access uBondi[1] as well! @@ -28,10 +36,14 @@ const int varindex_Psi4_past = CCTK_VarIndex("NullNews::Psi4_past[0]"); const int varindex_News_past = CCTK_VarIndex("NullNews::News_past[0]"); const int varindex_NewsB_past = CCTK_VarIndex("NullNews::NewsB_past[0]"); + const int varindex_linStrain_past = CCTK_VarIndex("NullNews::linStrain_past[0]"); if (varindex_uBondi_past < 0 || varindex_Psi4_past < 0 || varindex_News_past < 0 || varindex_NewsB_past < 0) CCTK_WARN(0, "Error getting variable index!"); + if (compute_lin_strain && varindex_linStrain_past < 0) + CCTK_WARN(0, "Error getting variable index!"); + const int offset = 2*null_lsh[0]*null_lsh[1]; for (int tl=1; tl < max_timelevels; ++tl) @@ -40,4 +52,7 @@ Psi4P[tl] = &((CCTK_COMPLEX*) CCTK_VarDataPtrI(cctkGH, 0, varindex_Psi4_past))[offset*(tl-1)]; NewsP[tl] = &((CCTK_COMPLEX*) CCTK_VarDataPtrI(cctkGH, 0, varindex_News_past))[offset*(tl-1)]; NewsBP[tl] = &((CCTK_COMPLEX*) CCTK_VarDataPtrI(cctkGH, 0, varindex_NewsB_past))[offset*(tl-1)]; + + if (compute_lin_strain) + linStrainP[tl] = &((CCTK_COMPLEX*) CCTK_VarDataPtrI(cctkGH, 0, varindex_linStrain_past))[offset*(tl-1)]; } Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +19 -0 =================================================================== --- trunk/interface.ccl 2013-05-27 22:33:26 UTC (rev 14) +++ trunk/interface.ccl 2013-06-05 07:58:20 UTC (rev 15) @@ -49,7 +49,20 @@ "Psi4 at constant Bondi time" +cctk_complex linStrain[2] Type=ARRAY dim=2 size=\ +(NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)),\ +(NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)) \ + GHOSTSIZE=NullGrid::N_ang_ghost_pts,NullGrid::N_ang_ghost_pts \ +"linearized strain h" +cctk_complex linStrain_uBondi[2] Type=ARRAY dim=2 size=\ +(NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)),\ +(NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)) \ + GHOSTSIZE=NullGrid::N_ang_ghost_pts,NullGrid::N_ang_ghost_pts \ +"linearized strain h at constant Bondi time" + + + cctk_real uBondi[2] timelevels=1 Type=ARRAY dim=2 size=\ (NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)),\ (NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)) \ @@ -81,8 +94,14 @@ GHOSTSIZE=NullGrid::N_ang_ghost_pts,NullGrid::N_ang_ghost_pts \ "past levels of Bondi time" +cctk_complex linStrain_past[2*max_timelevels] Type=ARRAY timelevels=1 dim=2 size=\ +(NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)),\ +(NullGrid::N_ang_pts_inside_eq+2*(NullGrid::N_ang_ev_outside_eq+NullGrid::N_ang_stencil_size)) \ + GHOSTSIZE=NullGrid::N_ang_ghost_pts,NullGrid::N_ang_ghost_pts \ +"past levels of lin. strain" + cctk_real constant_uBondi TYPE=SCALAR "constant Bondi-time to which we interpolate" cctk_real time_of_news TYPE=SCALAR "time of news" File [modified]: param.ccl Delta lines: +5 -0 =================================================================== --- trunk/param.ccl 2013-05-27 22:33:26 UTC (rev 14) +++ trunk/param.ccl 2013-06-05 07:58:20 UTC (rev 15) @@ -105,3 +105,8 @@ *:* :: "must be between -l and +l" } 0 +BOOLEAN compute_lin_strain "Compute linearized strain?" +{ +} no + + File [modified]: schedule.ccl Delta lines: +11 -0 =================================================================== --- trunk/schedule.ccl 2013-05-27 22:33:26 UTC (rev 14) +++ trunk/schedule.ccl 2013-06-05 07:58:20 UTC (rev 15) @@ -14,11 +14,22 @@ storage: constant_uBondi storage: uBondi_past News_past NewsB_past Psi4_past + if (compute_lin_strain) + { + storage: linStrain_uBondi + storage: linStrain_past + } } storage: uBondi[1] NewsB[1] News[1] Psi4[1] +if (compute_lin_strain) +{ + storage: linStrain[1] +} + + schedule NullNews_Init at PostInitial after NullEvol_Initial { LANG: Fortran

1 0

[svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconGen/ (Rev. 85)
by reisswig＠tapir.caltech.edu 04 Jun '13

04 Jun '13

User: reisswig Date: 2013/06/04 03:40 PM Modified: /PITTNullCode/SphericalHarmonicReconGen/ param.ccl /PITTNullCode/SphericalHarmonicReconGen/src/ sph_database.cc, sph_database.hh, startup.cc Log: SphericalHarmonicReconGen: Now supports SpEC hdf5-v2 format File Changes: Directory: /PITTNullCode/SphericalHarmonicReconGen/ =================================================== File [modified]: param.ccl Delta lines: +4 -3 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/param.ccl 2013-05-27 17:02:26 UTC (rev 84) +++ PITTNullCode/SphericalHarmonicReconGen/param.ccl 2013-06-04 20:40:27 UTC (rev 85) @@ -5,9 +5,10 @@ KEYWORD format "Boundary data file format" { - 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" - SpEC-H5 :: "SpEC-HDF5 format: Data is stored in HDF5 files grouped according to SpEC output." + 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" + 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" CCTK_INT sphere_number "the sphere number (if multiple spheres are present in one file) that corresponds to the worldtube radius NullSHRExtract::cr" Directory: /PITTNullCode/SphericalHarmonicReconGen/src/ ======================================================= File [modified]: sph_database.cc Delta lines: +224 -0 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc 2013-05-27 17:02:26 UTC (rev 84) +++ PITTNullCode/SphericalHarmonicReconGen/src/sph_database.cc 2013-06-04 20:40:27 UTC (rev 85) @@ -1066,7 +1066,231 @@ +//------------------------------------------------------------------------------------------- +// +// +// SpEC-H5-v2 format goes here........... +// +// +//------------------------------------------------------------------------------------------ + +/*const string SPH_db_SpEC_H5_v2::time_attrib_name = "Time"; +const string SPH_db_SpEC_H5_v2::step_basename = "Step"; +*/ + // table of varibale names: this maps a column number to a group. + // The first entry per varibale is the main group, the second is a possible subgroup, e.g. + // /g/Step00001/xx + // for SpEC +const string SPH_db_SpEC_H5_v2::varname_table[30] = + { "Lapse.dat", + "Shiftx.dat" , "Shifty.dat", "Shiftz.dat", + "gxx.dat", "gxy.dat", "gxz.dat", + "gyy.dat", "gyz.dat", + "gzz.dat", + + "DrLapse.dat", + "DrShiftx.dat", "DrShifty.dat", "DrShiftz.dat", + "Drgxx.dat", "Drgxy.dat", "Drgxz.dat", + "Drgyy.dat", "Drgyz.dat", + "Drgzz.dat", + + "DtLapse.dat", + "DtShiftx.dat", "DtShifty.dat" "DtShiftz.dat", + "Dtgxx.dat", "Dtgxy.dat", "Dtgxz.dat", + "Dtgyy.dat", "Dtgyz.dat", + "Dtgzz.dat" }; + + + +SPH_db_SpEC_H5_v2::SPH_db_SpEC_H5_v2(const string& fname_, + const int cached_timesteps) + : SPH_database(cached_timesteps), _fname(fname_) +{ + // open file + file = H5Fopen(_fname.c_str(), H5F_ACC_RDONLY, H5P_DEFAULT); + + scan(); } + + +SPH_db_SpEC_H5_v2::~SPH_db_SpEC_H5_v2() +{ + // close file + H5Fclose(file); +} + + +int SPH_db_SpEC_H5_v2::remove_non_monotonic_steps(const int k) +{ + // go backwards from k and remove until we get monotonicity + const double time = steps[k]; + const int size = steps.size(); + int c = 1; + for (int i=k-1; i >= 0; --i) { + if (time > steps[i]) { + break; + } + ++c; + } + + steps.erase(steps.begin()+k-c, steps.begin()+k); + _times.erase(_times.begin()+k-c, _times.begin()+k); + _iterations.erase(_iterations.begin()+k-c, _iterations.begin()+k); + + // return the number of steps that were removed + return size-steps.size(); +} + + + +void SPH_db_SpEC_H5_v2::scan() +{ + + // scan datasets + scan_HDF5(); + + + // check continuity and delta_t of timesteps + if (_times.size() > 1) + { + cout << "SPH_db_SpEC_H5 " << _fname << ": t_0 = " << _times[0] << ", t_final = " << _times.back() << endl; + _delta_t = 0; + for (size_t i=1; i < _times.size(); ++i) + { + if (fabs(_times[i] - _times[i-1]) < 1e-8 || _times[i] < _times[i-1]) { + ostringstream str; + str << "Removing non-monotonic timesteps: time[" << i-1 << "] = " << _times[i-1] << ", time[" << i << "] = " << _times[i]; + CCTK_WARN(1, str.str().c_str()); + i -= remove_non_monotonic_steps(i); + continue; + } + if (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; + } + } + // set _delta_t to correspond to initial delta_t + _delta_t = _times[1]-_times[0]; + } + +} + + +void SPH_db_SpEC_H5_v2::read(const size_t timestep, const size_t varno, + vector<vector<vector<CCTK_COMPLEX> > >& coeff) const +{ + if (timestep >= steps.size()) { + 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); + + 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] = { 1, buffer.size() }; + H5Sselect_hyperslab (dataspace, H5S_SELECT_SET, offset, NULL, + count, NULL); + + H5Dread(dataset, H5T_NATIVE_DOUBLE, memspace, dataspace, H5P_DEFAULT, &buffer.front()); + + 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]); + } + } +} + + + +void SPH_db_SpEC_H5_v2::scan_HDF5() +{/* + // pick one variable and browse through entire file + // to find out how many (and what) cycles and times there are + // (assuming that all variables are present at the same timesteps) + H5Literate_by_name (file, varname_table[0][0].c_str(), H5_INDEX_NAME, H5_ITER_NATIVE, NULL, H5iter, this, H5P_DEFAULT); + + // sort 'steps' vector + //sort(steps.begin(), steps.end()); + _iterations.resize(steps.size()); + _times.resize(steps.size()); + for (size_t i=0; i < steps.size(); ++i) { + //cout << steps[i].name << " " << steps[i].time << endl; + _iterations[i] = i; + _times[i] = steps[i].time; + } +*/ + + // get lmax from first variable and timestep + hid_t dataset = H5Dopen(file, "gxx.dat"); //, H5P_DEFAULT); + //cout << (varname_table[0][0]+"/"+steps[0].name+"/"+varname_table[0][1]) << endl; + hid_t dataspace = H5Dget_space(dataset); + hsize_t dims[2]; + H5Sget_simple_extent_dims (dataspace, dims, NULL); + + // first dim is number of timesteps + steps.resize(dims[0]); + // second dim is the number of lmodes + _lmax = sqrt(dims[1]/2)-1; + + // select hyperslab in dataset + hsize_t offset[2] = { 0, 0 }; + hsize_t count[2] = { dims[0], 1 }; + H5Sselect_hyperslab (dataspace, H5S_SELECT_SET, offset, NULL, + count, NULL); + + // define dataspace of memory + hsize_t dimsm[1] = { steps.size() }; + hid_t memspace = H5Screate_simple (1, dimsm, NULL); + + // read "times" + H5Dread (dataset, H5T_NATIVE_DOUBLE, memspace, dataspace, + H5P_DEFAULT, &steps.front()); + + H5Sclose(memspace); + H5Sclose(dataspace); + H5Dclose(dataset); + + _n_variables = 30; + _n_spheres = 1; + + _iterations.resize(steps.size()); + _times.resize(steps.size()); + for (size_t i=0; i < steps.size(); ++i) { + //cout << steps[i].name << " " << steps[i].time << endl; + _iterations[i] = i; + _times[i] = steps[i]; + } + + // cross-check that all expected variables are present + + + // display some info + cout << "SPH_db_SpEC_H5_v2 " << _fname << ": n_spheres = " << _n_spheres << endl; + cout << "SPH_db_SpEC_H5_v2 " << _fname << ": n_variables = " << _n_variables << endl; + cout << "SPH_db_SpEC_H5_v2 " << _fname << ": lmax = " << _lmax << endl; + cout << "SPH_db_SpEC_H5_v2 " << _fname << ": timesteps = " << _iterations.size() << endl; + +} + + + + + +} File [modified]: sph_database.hh Delta lines: +42 -1 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/sph_database.hh 2013-05-27 17:02:26 UTC (rev 84) +++ PITTNullCode/SphericalHarmonicReconGen/src/sph_database.hh 2013-06-04 20:40:27 UTC (rev 85) @@ -314,7 +314,7 @@ // the hdf5 file handle hid_t file; - + static const string time_attrib_name; static const string step_basename; @@ -340,9 +340,50 @@ }; +/** + A SpEC-HDF5-v2 database +*/ +class SPH_db_SpEC_H5_v2 : public SPH_database +{ + public : + SPH_db_SpEC_H5_v2(const string& fname_, + const int cached_timesteps); + + virtual ~SPH_db_SpEC_H5_v2(); + + // scans the input file + virtual void scan(); + + // read all modes on all extraction spheres for a given timestep and variable number into array + virtual void read(const size_t timestep, const size_t varno, + vector<vector<vector<CCTK_COMPLEX> > >& coeff) const; + + private : + int remove_non_monotonic_steps(const int k); + void scan_HDF5(); + + + // table of varibale names: this maps a column number to a group. + // The first entry per varibale is the main group, the second is a possible subgroup, e.g. + // /g/Step00001/xx + // for SpEC + static const string varname_table[30]; + + string _fname; + + // the hdf5 file handle + hid_t file; + + + vector<CCTK_REAL> steps; + +}; + + + /** This class represents a set of spherical coefficients for one variable and over all extraction spheres. It can read-in the coefficients from a database and reconstruct the angular dependence by File [modified]: startup.cc Delta lines: +2 -0 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/startup.cc 2013-05-27 17:02:26 UTC (rev 84) +++ PITTNullCode/SphericalHarmonicReconGen/src/startup.cc 2013-06-04 20:40:27 UTC (rev 85) @@ -124,6 +124,8 @@ SHR::db[i] = new SHR::SPH_db_DAT(pathname+fnames[i], cached_timesteps+1, lmaxInFile, column_time, column_iteration, column_radius, column_lmax, column_n_variables, column_data); if (CCTK_EQUALS(format, "SpEC-H5")) SHR::db[i] = new SHR::SPH_db_SpEC_H5(pathname+fnames[i], cached_timesteps+1); + if (CCTK_EQUALS(format, "SpEC-H5-v2")) + SHR::db[i] = new SHR::SPH_db_SpEC_H5_v2(pathname+fnames[i], cached_timesteps+1); // check if timestep-size found in file matches characteristic timestep! if (fabs(SHR::db[i]->delta_t()-CCTK_DELTA_TIME) > 1e-8)

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 241)
by knarf＠cct.lsu.edu 03 Jun '13

03 Jun '13

User: knarf Date: 2013/06/03 12:36 AM Modified: /trunk/ einsteintoolkit.bib Log: add Piraha paper File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.bib Delta lines: +10 -0 =================================================================== --- trunk/einsteintoolkit.bib 2013-05-27 22:29:07 UTC (rev 240) +++ trunk/einsteintoolkit.bib 2013-06-03 05:36:55 UTC (rev 241) @@ -789,6 +789,16 @@ SLACcitation = "%%CITATION = GR-QC/9703066;%%" } +@inproceedings{Brandt:2010pi, + title={{P}iraha: {A} simplified grammar parser for component little languages}, + author={Brandt, Steven R and Allen, Gabrielle}, + booktitle={Grid Computing (GRID), 2010 11th IEEE/ACM International Conference on}, + pages={379--382}, + year={2010}, + doi={10.1109/GRID.2010.5698011}, + organization={IEEE} +} + @Article{Brill:1959zz, author = "Brill, Dieter R.", title = "{On the positive definite mass of the

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 535)
by rhaas＠tapir.caltech.edu 29 May '13

29 May '13

User: rhaas Date: 2013/05/29 11:35 AM Modified: /trunk/src/ GRHydro_ParamCheck.F90 /trunk/test/ GRHydro_test_shock_mp5.par /trunk/test/GRHydro_test_shock_mp5/ dens_3D_diagonal.xg, dens_x_[7][7].xg, dens_y_[7][7].xg, dens_z_[7][7].xg, eps_3D_diagonal.xg, eps_x_[7][7].xg, eps_y_[7][7].xg, eps_z_[7][7].xg, press_3D_diagonal.xg, press_x_[7][7].xg, press_y_[7][7].xg, press_z_[7][7].xg, rho_3D_diagonal.xg, rho_x_[7][7].xg, rho_y_[7][7].xg, rho_z_[7][7].xg, scon[0]_3D_diagonal.xg, scon[0]_x_[7][7].xg, scon[0]_y_[7][7].xg, scon[0]_z_[7][7].xg, scon[1]_3D_diagonal.xg, scon[1]_x_[7][7].xg, scon[1]_y_[7][7].xg, scon[1]_z_[7][7].xg, scon[2]_3D_diagonal.xg, scon[2]_x_[7][7].xg, scon[2]_y_[7][7].xg, scon[2]_z_[7][7].xg, tau_3D_diagonal.xg, tau_x_[7][7].xg, tau_y_[7][7].xg, tau_z_[7][7].xg, vel[0]_3D_diagonal.xg, vel[0]_x_[7][7].xg, vel[0]_y_[7][7].xg, vel[0]_z_[7][7].xg, vel[1]_3D_diagonal.xg, vel[1]_x_[7][7].xg, vel[1]_y_[7][7].xg, vel[1]_z_[7][7].xg, vel[2]_3D_diagonal.xg, vel[2]_x_[7][7].xg, vel[2]_y_[7][7].xg, vel[2]_z_[7][7].xg, w_lorentz_3D_diagonal.xg, w_lorentz_x_[7][7].xg, w_lorentz_y_[7][7].xg, w_lorentz_z_[7][7].xg Log: GRHydro: add check for stencil width for MP5 regenerate test that was using wrong stencil before From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/test/GRHydro_test_shock_mp5/ ============================================== File [modified]: dens_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: dens_x_[7][7].xg Delta lines: <Unavailable> File [modified]: dens_y_[7][7].xg Delta lines: <Unavailable> File [modified]: dens_z_[7][7].xg Delta lines: <Unavailable> File [modified]: eps_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: eps_x_[7][7].xg Delta lines: <Unavailable> File [modified]: eps_y_[7][7].xg Delta lines: <Unavailable> File [modified]: eps_z_[7][7].xg Delta lines: <Unavailable> File [modified]: press_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: press_x_[7][7].xg Delta lines: <Unavailable> File [modified]: press_y_[7][7].xg Delta lines: <Unavailable> File [modified]: press_z_[7][7].xg Delta lines: <Unavailable> File [modified]: rho_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: rho_x_[7][7].xg Delta lines: <Unavailable> File [modified]: rho_y_[7][7].xg Delta lines: <Unavailable> File [modified]: rho_z_[7][7].xg Delta lines: <Unavailable> File [modified]: scon[0]_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: scon[0]_x_[7][7].xg Delta lines: <Unavailable> File [modified]: scon[0]_y_[7][7].xg Delta lines: <Unavailable> File [modified]: scon[0]_z_[7][7].xg Delta lines: <Unavailable> File [modified]: scon[1]_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: scon[1]_x_[7][7].xg Delta lines: <Unavailable> File [modified]: scon[1]_y_[7][7].xg Delta lines: <Unavailable> File [modified]: scon[1]_z_[7][7].xg Delta lines: <Unavailable> File [modified]: scon[2]_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: scon[2]_x_[7][7].xg Delta lines: <Unavailable> File [modified]: scon[2]_y_[7][7].xg Delta lines: <Unavailable> File [modified]: scon[2]_z_[7][7].xg Delta lines: <Unavailable> File [modified]: tau_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: tau_x_[7][7].xg Delta lines: <Unavailable> File [modified]: tau_y_[7][7].xg Delta lines: <Unavailable> File [modified]: tau_z_[7][7].xg Delta lines: <Unavailable> File [modified]: vel[0]_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: vel[0]_x_[7][7].xg Delta lines: <Unavailable> File [modified]: vel[0]_y_[7][7].xg Delta lines: <Unavailable> File [modified]: vel[0]_z_[7][7].xg Delta lines: <Unavailable> File [modified]: vel[1]_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: vel[1]_x_[7][7].xg Delta lines: <Unavailable> File [modified]: vel[1]_y_[7][7].xg Delta lines: <Unavailable> File [modified]: vel[1]_z_[7][7].xg Delta lines: <Unavailable> File [modified]: vel[2]_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: vel[2]_x_[7][7].xg Delta lines: <Unavailable> File [modified]: vel[2]_y_[7][7].xg Delta lines: <Unavailable> File [modified]: vel[2]_z_[7][7].xg Delta lines: <Unavailable> File [modified]: w_lorentz_3D_diagonal.xg Delta lines: <Unavailable> File [modified]: w_lorentz_x_[7][7].xg Delta lines: <Unavailable> File [modified]: w_lorentz_y_[7][7].xg Delta lines: <Unavailable> File [modified]: w_lorentz_z_[7][7].xg Delta lines: <Unavailable> Directory: /trunk/src/ ====================== File [modified]: GRHydro_ParamCheck.F90 Delta lines: <Unavailable> Directory: /trunk/test/ ======================= File [modified]: GRHydro_test_shock_mp5.par Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 534)
by rhaas＠tapir.caltech.edu 29 May '13

29 May '13

User: rhaas Date: 2013/05/29 11:35 AM Modified: /trunk/src/ GRHydro_Boundaries.F90 Log: GRHydro: avoid implict save for ierr in boundary registration From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +11 -5 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2013-05-29 16:35:18 UTC (rev 533) +++ trunk/src/GRHydro_Boundaries.F90 2013-05-29 16:35:22 UTC (rev 534) @@ -40,9 +40,10 @@ DECLARE_CCTK_FUNCTIONS integer, dimension(3) :: sym - integer :: ierr = 0 + integer :: ierr CCTK_INT :: GRHydro_UseGeneralCoordinates, general_coordinates + ierr = 0 sym(1) = 1 sym(2) = 1 sym(3) = 1 @@ -173,12 +174,14 @@ DECLARE_CCTK_FUNCTIONS integer, dimension(3) :: sw - integer :: ierr = 0 + integer :: ierr CCTK_INT :: GRHydro_UseGeneralCoordinates, general_coordinates CCTK_INT, parameter :: faces=CCTK_ALL_FACES CCTK_INT, parameter :: ione=1 + ierr = 0 + sw = GRHydro_stencil general_coordinates = GRHydro_UseGeneralCoordinates(cctkGH) @@ -375,12 +378,13 @@ DECLARE_CCTK_FUNCTIONS integer, dimension(3) :: sw - integer :: ierr = 0 + integer :: ierr CCTK_INT :: GRHydro_UseGeneralCoordinates, general_coordinates CCTK_INT, parameter :: faces=CCTK_ALL_FACES CCTK_INT, parameter :: ione=1 + ierr = 0 sw = GRHydro_stencil general_coordinates = GRHydro_UseGeneralCoordinates(cctkGH) @@ -513,12 +517,13 @@ DECLARE_CCTK_FUNCTIONS integer, dimension(3) :: sw - integer :: ierr = 0 + integer :: ierr CCTK_INT :: GRHydro_UseGeneralCoordinates, general_coordinates CCTK_INT, parameter :: faces=CCTK_ALL_FACES CCTK_INT, parameter :: ione=1 + ierr = 0 sw = GRHydro_stencil general_coordinates = GRHydro_UseGeneralCoordinates(cctkGH) @@ -648,11 +653,12 @@ DECLARE_CCTK_FUNCTIONS integer, dimension(3) :: sw - integer :: ierr = 0 + integer :: ierr CCTK_INT, parameter :: faces=CCTK_ALL_FACES CCTK_INT, parameter :: ione=1 + ierr = 0 sw = GRHydro_stencil

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits