Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] www/release-info/ (Rev. 1045)
by ian.hinder＠aei.mpg.de 06 Nov '13

06 Nov '13

User: hinder Date: 2013/11/06 05:23 AM Removed: /release-info/ datura__1_16.log, datura__2_8.log Log: Remove old datura results For some reason the filenames indicate 8 and 16 threads, which is not correct for datura. File Changes: Directory: /release-info/ ========================= File [removed]: datura__1_16.log Delta lines: <Unavailable> File [removed]: datura__2_8.log Delta lines: <Unavailable>

1 0

[Carpet] branch, master, updated. carpet-6-init-400-g390fe95
by Carpet git repositories 05 Nov '13

05 Nov '13

1 0

[Carpet] branch, master, updated. carpet-6-init-398-g15fc353
by Carpet git repositories 31 Oct '13

31 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 15fc3538a066846c30b0525103af56c3d87a4d95 (commit) via 9c7f841c2afad5ef8a1e1c8294d487f38885a377 (commit) via d43e472044d51790713abd2c50e2389eee366843 (commit) via 7c18b11f9a014731b63415bfde936c7f9d9be999 (commit) from 5de40cab297db3f809e1ee97f7c3d32bf736df0d (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 15fc3538a066846c30b0525103af56c3d87a4d95 Author: Roland Haas <rhaas(a)tapir.caltech.edu> Date: Thu Oct 31 18:40:33 2013 -0700 Carpet: use gdata::fence_is_energized to query electric_fence commit 9c7f841c2afad5ef8a1e1c8294d487f38885a377 Author: Roland Haas <rhaas(a)tapir.caltech.edu> Date: Thu Oct 31 18:39:39 2013 -0700 CarpetLib: introduce accessor in gdata to query electric_fence this function effectively exposes the CarpetLib parameter to Carpet without explicit parameter sharing commit d43e472044d51790713abd2c50e2389eee366843 Author: Roland Haas <rhaas(a)tapir.caltech.edu> Date: Thu Oct 31 18:39:00 2013 -0700 Revert "CarpetLib: make electric_fence parameter restricted" This reverts commit be2bd96c56aa6dd5b1fb6654b130f3e44e049e8e. Sharing parameters between CarpetLib and Carpet can apparantly cause problems. commit 7c18b11f9a014731b63415bfde936c7f9d9be999 Author: Roland Haas <rhaas(a)tapir.caltech.edu> Date: Tue Oct 15 14:26:20 2013 -0700 CarpetLib: code layout changes when using map for allgfs ----------------------------------------------------------------------- Summary of changes: Carpet/Carpet/param.ccl | 4 ---- Carpet/Carpet/src/CallFunction.cc | 2 +- Carpet/CarpetLib/param.ccl | 8 ++++---- Carpet/CarpetLib/src/dh.cc | 4 ++-- Carpet/CarpetLib/src/dh.hh | 2 +- Carpet/CarpetLib/src/gdata.cc | 8 ++++++++ Carpet/CarpetLib/src/gdata.hh | 2 ++ 7 files changed, 18 insertions(+), 12 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] NullSHRExtract/branches/tapir/src/ (Rev. 18)
by bela＠caltech.edu 31 Oct '13

31 Oct '13

User: szilagyi Date: 2013/10/31 04:25 PM Modified: /branches/tapir/src/ NullSHRE_WTSphHarm.F90 Log: tweak debugging output File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullSHRE_WTSphHarm.F90 Delta lines: +26 -1 =================================================================== --- branches/tapir/src/NullSHRE_WTSphHarm.F90 2013-10-31 02:17:59 UTC (rev 17) +++ branches/tapir/src/NullSHRE_WTSphHarm.F90 2013-10-31 21:25:34 UTC (rev 18) @@ -66,7 +66,7 @@ null_lsh, zeta, alpha_n%d, alpha_s%d, cctk_time) - ! null vector + ! null vector and parts of it call NullDecomp_WriteCoefsForRealFunc('ell_x_wt', cctkGH, truncate, & null_lsh, zeta, ell_n(1)%d, ell_s(1)%d, cctk_time) @@ -80,6 +80,31 @@ null_lsh, zeta, ell_n(4)%d, ell_s(4)%d, cctk_time) + call NullDecomp_WriteCoefsForRealFunc('s_x_wt', cctkGH, truncate, & + null_lsh, zeta, sa_n(1)%d, sa_s(1)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('s_y_wt', cctkGH, truncate, & + null_lsh, zeta, sa_n(2)%d, sa_s(2)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('s_z_wt', cctkGH, truncate, & + null_lsh, zeta, sa_n(3)%d, sa_s(3)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('n_x_wt', cctkGH, truncate, & + null_lsh, zeta, na_n(1)%d, na_s(1)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('n_y_wt', cctkGH, truncate, & + null_lsh, zeta, na_n(2)%d, na_s(2)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('n_z_wt', cctkGH, truncate, & + null_lsh, zeta, na_n(3)%d, na_s(3)%d, cctk_time) + + call NullDecomp_WriteCoefsForRealFunc('n_t_wt', cctkGH, truncate, & + null_lsh, zeta, na_n(4)%d, na_s(4)%d, cctk_time) + + + call NullDecomp_WriteCoefsForRealFunc('elldenom_wt', cctkGH, truncate, & + null_lsh, zeta, elld_n%d, elld_s%d, cctk_time) + ! xb, rb, r_l, r_t call NullDecomp_WriteCoefsForRealFunc('X_wt', cctkGH, truncate, & null_lsh, zeta, x_wt_n%d, x_wt_s%d, cctk_time)

1 0

[svn:einsteintoolkit] NullSHRExtract/branches/tapir/ (Rev. 17)
by bela＠caltech.edu 30 Oct '13

30 Oct '13

User: szilagyi Date: 2013/10/30 09:17 PM Modified: /branches/tapir/ schedule.ccl /branches/tapir/src/ NullSHRE_WTSphHarm.F90 Log: work on debugging output File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullSHRE_WTSphHarm.F90 Delta lines: +72 -104 =================================================================== --- branches/tapir/src/NullSHRE_WTSphHarm.F90 2013-10-31 02:17:42 UTC (rev 16) +++ branches/tapir/src/NullSHRE_WTSphHarm.F90 2013-10-31 02:17:59 UTC (rev 17) @@ -7,153 +7,121 @@ subroutine NullSHRE_WTSphHarm(CCTK_ARGUMENTS) use NullInterp - use NullDecomp_Vars, only: lmax - use NullDecomp_SpinDecomp, only: SpinDecompCoefs use NullDecomp_IO + use NullSHRE_modVars implicit none !variable of interest on the WorldTube x_wt, j_wt, j_l, beta_wt, beta_l, u_wt, u_l - CCTK_COMPLEX, dimension (:,:,:), allocatable:: cmplxtmp - CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: JwtSphCoeff - CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: Jwt_lSphCoeff + logical, save :: first_time = .TRUE. + logical :: truncate - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: QwtSphCoeff - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: UwtSphCoeff - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: Uwt_lSphCoeff + DECLARE_CCTK_FUNCTIONS + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS - CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: BwtSphCoeff - CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: Bwt_lSphCoeff + truncate = (IO_TruncateOutputFiles(cctkGH) .ne. 0) .and. first_time + first_time = .FALSE. - CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: WwtSphCoeff - CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: Wwt_lSphCoeff + ! detg + call NullDecomp_WriteCoefsForRealFunc('detg_wt', cctkGH, truncate, & + null_lsh, zeta, detg_n%d, detg_s%d, cctk_time) - CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: XwtSphCoeff - CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: detgwtSphCoeff - CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: r0wtSphCoeff + ! g_ij - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: CBwtSphCoeff - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: CBwt_xSphCoeff + call NullDecomp_WriteCoefsForRealFunc('gD_xx_wt', cctkGH, truncate, & + null_lsh, zeta, g_n(1,1)%d, g_s(1,1)%d, cctk_time) - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: CKwtSphCoeff - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: CKwt_xSphCoeff + call NullDecomp_WriteCoefsForRealFunc('gD_xy_wt', cctkGH, truncate, & + null_lsh, zeta, g_n(1,2)%d, g_s(1,2)%d, cctk_time) - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: NUwtSphCoeff - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: NUwt_xSphCoeff + call NullDecomp_WriteCoefsForRealFunc('gD_xz_wt', cctkGH, truncate, & + null_lsh, zeta, g_n(1,3)%d, g_s(1,3)%d, cctk_time) - logical, save :: first_time = .TRUE. - logical :: truncate + call NullDecomp_WriteCoefsForRealFunc('gD_yy_wt', cctkGH, truncate, & + null_lsh, zeta, g_n(2,2)%d, g_s(2,2)%d, cctk_time) - DECLARE_CCTK_FUNCTIONS - DECLARE_CCTK_ARGUMENTS - DECLARE_CCTK_PARAMETERS + call NullDecomp_WriteCoefsForRealFunc('gD_yz_wt', cctkGH, truncate, & + null_lsh, zeta, g_n(2,3)%d, g_s(2,3)%d, cctk_time) -! do the spherical harmonic decomposition - - allocate(cmplxtmp(null_lsh(1), null_lsh(2), 2)) - - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & - zeta, j_wt, JwtSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & - zeta, j_l, Jwt_lSphCoeff) + call NullDecomp_WriteCoefsForRealFunc('gD_zz_wt', cctkGH, truncate, & + null_lsh, zeta, g_n(3,3)%d, g_s(3,3)%d, cctk_time) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & - zeta, u_wt, UwtSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & - zeta, u_l, Uwt_lSphCoeff) + ! beta^i - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & - zeta, q_wt, QwtSphCoeff) + call NullDecomp_WriteCoefsForRealFunc('shiftU_x_wt', cctkGH, truncate, & + null_lsh, zeta, beta_n(1)%d, beta_s(1)%d, cctk_time) - cmplxtmp = beta_wt - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, BwtSphCoeff) + call NullDecomp_WriteCoefsForRealFunc('shiftU_y_wt', cctkGH, truncate, & + null_lsh, zeta, beta_n(2)%d, beta_s(2)%d, cctk_time) - cmplxtmp = beta_l - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, Bwt_lSphCoeff) + call NullDecomp_WriteCoefsForRealFunc('shiftU_z_wt', cctkGH, truncate, & + null_lsh, zeta, beta_n(3)%d, beta_s(3)%d, cctk_time) - cmplxtmp = w_wt - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, WwtSphCoeff) - cmplxtmp = w_l - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, Wwt_lSphCoeff) + ! alpha - cmplxtmp = x_wt - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, XwtSphCoeff) + call NullDecomp_WriteCoefsForRealFunc('alpha_wt', cctkGH, truncate, & + null_lsh, zeta, alpha_n%d, alpha_s%d, cctk_time) - cmplxtmp = WT_r0 - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, r0wtSphCoeff) - cmplxtmp = WT_detg - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, detgwtSphCoeff) - - deallocate(cmplxtmp) + ! null vector + call NullDecomp_WriteCoefsForRealFunc('ell_x_wt', cctkGH, truncate, & + null_lsh, zeta, ell_n(1)%d, ell_s(1)%d, cctk_time) + call NullDecomp_WriteCoefsForRealFunc('ell_y_wt', cctkGH, truncate, & + null_lsh, zeta, ell_n(2)%d, ell_s(2)%d, cctk_time) -! call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & -! zeta, cb_wt, CBwtSphCoeff) -! call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & -! zeta, cb_x, CBwt_xSphCoeff) + call NullDecomp_WriteCoefsForRealFunc('ell_z_wt', cctkGH, truncate, & + null_lsh, zeta, ell_n(3)%d, ell_s(3)%d, cctk_time) -! call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & -! zeta, ck_wt, CKwtSphCoeff) -! call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & -! zeta, ck_x, CKwt_xSphCoeff) + call NullDecomp_WriteCoefsForRealFunc('ell_t_wt', cctkGH, truncate, & + null_lsh, zeta, ell_n(4)%d, ell_s(4)%d, cctk_time) -! call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & -! zeta, nu_wt, NUwtSphCoeff) -! call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & -! zeta, nu_x, NUwt_xSphCoeff) -! Only output if this is processor 0 -! if (MyProc /= 0) return - if (CCTK_MyProc(cctkGH) .gt. 0) then - return - endif + ! xb, rb, r_l, r_t + call NullDecomp_WriteCoefsForRealFunc('X_wt', cctkGH, truncate, & + null_lsh, zeta, x_wt_n%d, x_wt_s%d, cctk_time) - ! NullDecomp_WriteCoefFile(FieldName, TruncateFile, Lmin, Lmax, YlmCoef, time) + call NullDecomp_WriteCoefsForRealFunc('r0_wt', cctkGH, truncate, & + null_lsh, zeta, r0_n%d, r0_s%d, cctk_time) - truncate = (IO_TruncateOutputFiles(cctkGH) .ne. 0) .and. first_time + call NullDecomp_WriteCoefsForRealFunc('r_l_wt', cctkGH, truncate, & + null_lsh, zeta, dr0_n(1)%d, dr0_s(1)%d, cctk_time) - call NullDecomp_WriteCoefFile('J_wt', truncate, 2, Lmax, JwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('Jl_wt', truncate, 2, Lmax, Jwt_lSphCoeff, cctk_time) + call NullDecomp_WriteCoefsForRealFunc('r_t_wt', cctkGH, truncate, & + null_lsh, zeta, dr0_n(4)%d, dr0_s(4)%d, cctk_time) - call NullDecomp_WriteCoefFile('Q_wt', truncate, 1, Lmax, QwtSphCoeff, cctk_time) + ! J, beta, U, Q, W - call NullDecomp_WriteCoefFile('U_wt', truncate, 1, Lmax, UwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('Ul_wt', truncate, 1, Lmax, Uwt_lSphCoeff, cctk_time) + call NullDecomp_WriteCoefsForComplexFunc('J_wt', cctkGH, truncate, & + null_lsh, 2, zeta, j_wt_n%d, j_wt_s%d, cctk_time) - call NullDecomp_WriteCoefFile('B_wt', truncate, 0, Lmax, BwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('Bl_wt', truncate, 0, Lmax, Bwt_lSphCoeff, cctk_time) + call NullDecomp_WriteCoefsForComplexFunc('Jl_wt', cctkGH, truncate, & + null_lsh, 2, zeta, j_l_n%d, j_l_s%d, cctk_time) - call NullDecomp_WriteCoefFile('W_wt', truncate, 0, Lmax, WwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('Wl_wt', truncate, 0, Lmax, Wwt_lSphCoeff, cctk_time) + call NullDecomp_WriteCoefsForComplexFunc('Q_wt', cctkGH, truncate, & + null_lsh, 1, zeta, q_wt_n%d, q_wt_s%d, cctk_time) -! if(first_order_scheme.ne.0) then -! call NullDecomp_WriteCoefFile('NU_wt', cctk_iteration.eq.0, 1, Lmax, NUwtSphCoeff, cctk_time) -! write (*,*) 'NUwtSphCoeff=',maxval(abs(NUwtSphCoeff)) -! call NullDecomp_WriteCoefFile('NUx_wt', cctk_iteration.eq.0, 1, Lmax, NUwt_xSphCoeff, cctk_time) + call NullDecomp_WriteCoefsForComplexFunc('U_wt', cctkGH, truncate, & + null_lsh, 1, zeta, u_wt_n%d, u_wt_s%d, cctk_time) -! call NullDecomp_WriteCoefFile('CK_wt', cctk_iteration.eq.0, 1, Lmax, CKwtSphCoeff, cctk_time) -! call NullDecomp_WriteCoefFile('CKx_wt', cctk_iteration.eq.0, 1, Lmax, CKwt_xSphCoeff, cctk_time) + call NullDecomp_WriteCoefsForComplexFunc('Ul_wt', cctkGH, truncate, & + null_lsh, 2, zeta, u_l_n%d, u_l_s%d, cctk_time) -! call NullDecomp_WriteCoefFile('CB_wt', cctk_iteration.eq.0, 1, Lmax, CBwtSphCoeff, cctk_time) -! call NullDecomp_WriteCoefFile('CBx_wt', cctk_iteration.eq.0, 1, Lmax, CBwt_xSphCoeff, cctk_time) -! end if + call NullDecomp_WriteCoefsForRealFunc('B_wt', cctkGH, truncate, & + null_lsh, zeta, beta_wt_n%d, beta_wt_s%d, cctk_time) - call NullDecomp_WriteCoefFile('X_wt', truncate, 0, Lmax, XwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('r0_wt', truncate, 0, Lmax, r0wtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('detg_wt', truncate, 0, Lmax, detgwtSphCoeff, cctk_time) + call NullDecomp_WriteCoefsForRealFunc('Bl_wt', cctkGH, truncate, & + null_lsh, zeta, beta_l_n%d, beta_l_s%d, cctk_time) - first_time = .FALSE. + call NullDecomp_WriteCoefsForRealFunc('W_wt', cctkGH, truncate, & + null_lsh, zeta, w_wt_n%d, w_wt_s%d, cctk_time) + call NullDecomp_WriteCoefsForRealFunc('Wl_wt', cctkGH, truncate, & + null_lsh, zeta, w_l_n%d, w_l_s%d, cctk_time) + end subroutine NullSHRE_WTSphHarm Directory: /branches/tapir/ =========================== File [modified]: schedule.ccl Delta lines: +6 -0 =================================================================== --- branches/tapir/schedule.ccl 2013-10-31 02:17:42 UTC (rev 16) +++ branches/tapir/schedule.ccl 2013-10-31 02:17:59 UTC (rev 17) @@ -243,6 +243,12 @@ if (WT_spherical_harmonics) { + schedule NullSHRE_Pointing AT ANALYSIS \ + BEFORE NullSHRE_WTSphHarm + { + LANG: Fortran + OPTIONS: global + }"Gives the target variables for the pointers used in extraction" schedule NullSHRE_WTSphHarm AT ANALYSIS {

1 0

[svn:einsteintoolkit] NullSHRExtract/branches/tapir/src/ (Rev. 16)
by bela＠caltech.edu 30 Oct '13

30 Oct '13

User: szilagyi Date: 2013/10/30 09:17 PM Modified: /branches/tapir/src/ NullSHRE_ExtractWT.F90 Log: reduce verbosity File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullSHRE_ExtractWT.F90 Delta lines: +4 -2 =================================================================== --- branches/tapir/src/NullSHRE_ExtractWT.F90 2013-10-22 18:27:05 UTC (rev 15) +++ branches/tapir/src/NullSHRE_ExtractWT.F90 2013-10-31 02:17:42 UTC (rev 16) @@ -242,8 +242,10 @@ endif - write(message,*) "CCE world-tube index range is", gi_min, gi_max, null_rb(gi_min), null_rb(gi_max) - call CCTK_INFO(trim(message)) + if (cctk_iteration.le.2) then + write(message,*) "CCE world-tube index range is", gi_min, gi_max, null_rb(gi_min), null_rb(gi_max) + call CCTK_INFO(trim(message)) + end if gi_max = gi_max + 4 ! fill up an extra 4 points outside the world-tube

1 0

[svn:einsteintoolkit] NullDecomp/branches/tapir/src/ (Rev. 14)
by bela＠caltech.edu 30 Oct '13

30 Oct '13

User: szilagyi Date: 2013/10/30 09:15 PM Modified: /branches/tapir/src/ NullDecomp_IO.F90 Log: add new function combining IO with ylm projection File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullDecomp_IO.F90 Delta lines: +67 -0 =================================================================== --- branches/tapir/src/NullDecomp_IO.F90 2013-10-22 18:26:16 UTC (rev 13) +++ branches/tapir/src/NullDecomp_IO.F90 2013-10-31 02:15:48 UTC (rev 14) @@ -3,12 +3,79 @@ #include "cctk.h" #include "cctk_Parameters.h" #include "cctk_Functions.h" +!include "cctk.h" +!include "cctk_Arguments.h" +!include "cctk_Parameters.h" +!include "cctk_Functions.h" module NullDecomp_IO implicit none contains +! CCTK_POINTER, intent(in) :: GH +subroutine NullDecomp_WriteCoefsForComplexFunc( & + FieldName, GH, TruncateFile, lsh, spin, zeta, f_n, f_s, time) + use NullDecomp_Vars, only: lmax + use NullDecomp_SpinDecomp, only: SpinDecompCoefs + + character(*), intent(in) :: FieldName + CCTK_POINTER, intent(in) :: GH + logical, intent(in) :: TruncateFile + integer, dimension(2), intent(in) :: lsh + integer, intent(in) :: spin + CCTK_COMPLEX, dimension(lsh(1),lsh(2)), intent(in) :: zeta + CCTK_COMPLEX, dimension(lsh(1),lsh(2)), intent(in) :: f_n, f_s + CCTK_REAL, intent(in) :: time + + CCTK_COMPLEX, dimension(spin:lmax, -lmax:lmax) :: YlmCoef + CCTK_COMPLEX, dimension(lsh(1),lsh(2),2) :: temp + DECLARE_CCTK_FUNCTIONS + + temp(:,:,1) = f_n + temp(:,:,2) = f_s + + call SpinDecompCoefs(GH, lsh(1), lsh(2), spin, zeta, temp, YlmCoef) + + if (CCTK_MyProc(GH) .gt. 0) then + return + endif + + call NullDecomp_WriteCoefFile(FieldName, TruncateFile, spin, lmax, YlmCoef, time) + +end subroutine NullDecomp_WriteCoefsForComplexFunc + + +subroutine NullDecomp_WriteCoefsForRealFunc( & + FieldName, GH, TruncateFile, lsh, zeta, f_n, f_s, time) + use NullDecomp_Vars, only: lmax + use NullDecomp_SpinDecomp, only: SpinDecompCoefs + + character(*), intent(in) :: FieldName + CCTK_POINTER, intent(in) :: GH + logical, intent(in) :: TruncateFile + integer, dimension(2), intent(in) :: lsh + CCTK_COMPLEX, dimension(lsh(1),lsh(2)), intent(in) :: zeta + CCTK_REAL, dimension(lsh(1),lsh(2)), intent(in) :: f_n, f_s + CCTK_REAL, intent(in) :: time + + CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: YlmCoef + CCTK_COMPLEX, dimension(lsh(1),lsh(2),2) :: temp + DECLARE_CCTK_FUNCTIONS + + temp(:,:,1) = f_n + temp(:,:,2) = f_s + + call SpinDecompCoefs(GH, lsh(1), lsh(2), 0, zeta, temp, YlmCoef) + + if (CCTK_MyProc(GH) .gt. 0) then + return + endif + + call NullDecomp_WriteCoefFile(FieldName, TruncateFile, 0, lmax, YlmCoef, time) + +end subroutine NullDecomp_WriteCoefsForRealFunc + subroutine NullDecomp_WriteCoefFile(FieldName, TruncateFile, Lmin, Lmax, YlmCoef, time) character(*), intent(in) :: FieldName logical, intent(in) :: TruncateFile

1 0

[svn:einsteintoolkit] TwoPunctures/trunk/src/ (Rev. 136)
by schnetter＠cct.lsu.edu 30 Oct '13

30 Oct '13

User: eschnett Date: 2013/10/30 10:38 AM Modified: /trunk/src/ TP_utilities.c Log: Use CCTK_ERROR for errors File Changes: Directory: /trunk/src/ ====================== File [modified]: TP_utilities.c Delta lines: +10 -10 =================================================================== --- trunk/src/TP_utilities.c 2013-10-23 16:00:15 UTC (rev 135) +++ trunk/src/TP_utilities.c 2013-10-30 15:38:58 UTC (rev 136) @@ -18,7 +18,7 @@ retval = malloc(sizeof(int)*(nh-nl+1)); if(retval == NULL) - CCTK_WARN (CCTK_WARN_ABORT, "allocation failure in ivector()"); + CCTK_ERROR ("allocation failure in ivector()"); return retval - nl; } @@ -32,7 +32,7 @@ retval = malloc(sizeof(CCTK_REAL)*(nh-nl+1)); if(retval == NULL) - CCTK_WARN (CCTK_WARN_ABORT, "allocation failure in dvector()"); + CCTK_ERROR ("allocation failure in dvector()"); return retval - nl; } @@ -46,12 +46,12 @@ retval = malloc(sizeof(int *)*(nrh-nrl+1)); if(retval == NULL) - CCTK_WARN (CCTK_WARN_ABORT, "allocation failure (1) in imatrix()"); + CCTK_ERROR ("allocation failure (1) in imatrix()"); /* get all memory for the matrix in on chunk */ retval[0] = malloc(sizeof(int)*(nrh-nrl+1)*(nch-ncl+1)); if(retval[0] == NULL) - CCTK_WARN (CCTK_WARN_ABORT, "allocation failure (2) in imatrix()"); + CCTK_ERROR ("allocation failure (2) in imatrix()"); /* apply column and row offsets */ retval[0] -= ncl; @@ -75,12 +75,12 @@ retval = malloc(sizeof(CCTK_REAL *)*(nrh-nrl+1)); if(retval == NULL) - CCTK_WARN (CCTK_WARN_ABORT, "allocation failure (1) in dmatrix()"); + CCTK_ERROR ("allocation failure (1) in dmatrix()"); /* get all memory for the matrix in on chunk */ retval[0] = malloc(sizeof(CCTK_REAL)*(nrh-nrl+1)*(nch-ncl+1)); if(retval[0] == NULL) - CCTK_WARN (CCTK_WARN_ABORT, "allocation failure (2) in dmatrix()"); + CCTK_ERROR ("allocation failure (2) in dmatrix()"); /* apply column and row offsets */ retval[0] -= ncl; @@ -105,16 +105,16 @@ /* get memory for index structures */ retval = malloc(sizeof(CCTK_REAL **)*(nrh-nrl+1)); if(retval == NULL) - CCTK_WARN (CCTK_WARN_ABORT, "allocation failure (1) in dmatrix()"); + CCTK_ERROR ("allocation failure (1) in d3tensor()"); retval[0] = malloc(sizeof(CCTK_REAL *)*(nrh-nrl+1)*(nch-ncl+1)); if(retval[0] == NULL) - CCTK_WARN (CCTK_WARN_ABORT, "allocation failure (2) in dmatrix()"); + CCTK_ERROR ("allocation failure (2) in d3tensor()"); /* get all memory for the tensor in on chunk */ retval[0][0] = malloc(sizeof(CCTK_REAL)*(nrh-nrl+1)*(nch-ncl+1)*(ndh-ndl+1)); if(retval[0][0] == NULL) - CCTK_WARN (CCTK_WARN_ABORT, "allocation failure (3) in dmatrix()"); + CCTK_ERROR ("allocation failure (3) in d3tensor()"); /* apply all offsets */ retval[0][0] -= ndl; @@ -180,7 +180,7 @@ void free_d3tensor (CCTK_REAL ***t, long nrl, long nrh, long ncl, long nch, long ndl, long ndh) -/* free a CCTK_REAL f3tensor allocated by f3tensor() */ +/* free a CCTK_REAL d3tensor allocated by d3tensor() */ { free(t[nrl][ncl]+ndl); free(t[nrl]+ncl);

1 0

[svn:einsteintoolkit] RotatingDBHIVP/trunk/src/ (Rev. 58)
by schnetter＠cct.lsu.edu 30 Oct '13

30 Oct '13

User: eschnett Date: 2013/10/30 10:21 AM Modified: /trunk/src/ RotatingDBHIVP.F Log: Make code compile when CCTK_REAL is real*4 File Changes: Directory: /trunk/src/ ====================== File [modified]: RotatingDBHIVP.F Delta lines: +3 -3 =================================================================== --- trunk/src/RotatingDBHIVP.F 2013-05-27 22:33:03 UTC (rev 57) +++ trunk/src/RotatingDBHIVP.F 2013-10-30 15:21:02 UTC (rev 58) @@ -652,10 +652,10 @@ c Compute eta,q,phi at the each points of cartesian grid c - eta = 0.5d0 * dlog (x**2 + y**2 + z**2) + eta = 0.5d0 * log (x**2 + y**2 + z**2) abseta = abs (eta) - q = datan2 (sqrt (x**2 + y**2), z) - phi = datan2 (y, x) + q = atan2 (sqrt (x**2 + y**2), z) + phi = atan2 (y, x) do k = 1,nz do j = 1,ny

1 0

[svn:einsteintoolkit] IDBrillData/trunk/src/ (Rev. 129)
by schnetter＠cct.lsu.edu 30 Oct '13

30 Oct '13

User: eschnett Date: 2013/10/30 10:20 AM Modified: /trunk/src/ finishbrilldata.F, setupbrilldata2D.F, setupbrilldata3D.F Log: Make code compile when CCTK_REAL is real*4 File Changes: Directory: /trunk/src/ ====================== File [modified]: finishbrilldata.F Delta lines: +3 -3 =================================================================== --- trunk/src/finishbrilldata.F 2013-05-27 22:32:47 UTC (rev 128) +++ trunk/src/finishbrilldata.F 2013-10-30 15:20:38 UTC (rev 129) @@ -31,8 +31,8 @@ c Numbers. - zero = 0.0D0 - one = 1.0D0 + zero = 0.0 + one = 1.0 c Replace flat metric left over from elliptic solve by c Brill metric calculated from q and Psi. @@ -50,7 +50,7 @@ phi = phif(x1,y1) - e2q = exp(2.d0*brillq(rho1,z1,phi)) + e2q = exp(2.0*brillq(rho1,z1,phi)) c Fudge division by rho^2 on axis. (Physically, y^/rho^2, c x^2/rho^2 and xy/rho^2 are of course regular.) File [modified]: setupbrilldata2D.F Delta lines: +2 -3 =================================================================== --- trunk/src/setupbrilldata2D.F 2013-05-27 22:32:47 UTC (rev 128) +++ trunk/src/setupbrilldata2D.F 2013-10-30 15:20:38 UTC (rev 129) @@ -33,7 +33,6 @@ DECLARE_CCTK_PARAMETERS integer i,j,k - integer ierr CCTK_REAL x1,y1,z1,rho1 CCTK_REAL brillq,eps @@ -87,12 +86,12 @@ rhop = rho1 + eps rhom = rho1 - eps - brillMlinear(i,j,k) = 0.25D0 + brillMlinear(i,j,k) = 0.25 . *(brillq(rho1,zp,zero) . + brillq(rho1,zm,zero) . + brillq(rhop,z1,zero) . + brillq(rhom,z1,zero) - . - 4.0D0*brillq(rho1,z1,zero))/eps**2 + . - 4.0*brillq(rho1,z1,zero))/eps**2 brillNsource(i,j,k) = zero File [modified]: setupbrilldata3D.F Delta lines: +5 -5 =================================================================== --- trunk/src/setupbrilldata3D.F 2013-05-27 22:32:47 UTC (rev 128) +++ trunk/src/setupbrilldata3D.F 2013-10-30 15:20:38 UTC (rev 129) @@ -100,16 +100,16 @@ gzz(i,j,k) = e2q gxy(i,j,k) = - (one - e2q)*x1*y1/rho2 - brillMlinear(i,j,k) = 0.25D0/e2q + brillMlinear(i,j,k) = 0.25/e2q . *(brillq(rho1,z1+eps,phi) . + brillq(rho1,z1-eps,phi) . + brillq(rho1+eps,z1,phi) . + brillq(rho1-eps,z1,phi) - . - 4.0D0*brillq(rho1,z1,phi)) + . - 4.0*brillq(rho1,z1,phi)) . / eps**2 - brillMlinear(i,j,k) = brillMlinear(i,j,k) + 0.25D0/rho2 - . *(three*0.25D0*(brillq(rho1,z1,phi+eps) + brillMlinear(i,j,k) = brillMlinear(i,j,k) + 0.25/rho2 + . *(three*0.25*(brillq(rho1,z1,phi+eps) . - brillq(rho1,z1,phi-eps))**2 . + two*(brillq(rho1,z1,phi+eps) . - two*brillq(rho1,z1,phi) @@ -122,7 +122,7 @@ gzz(i,j,k) = one gxy(i,j,k) = zero - brillMlinear(i,j,k) = 0.25D0/e2q + brillMlinear(i,j,k) = 0.25/e2q . *(brillq(rho1,z1+eps,phi) . + brillq(rho1,z1-eps,phi) . + two*brillq(eps,z1,phi)

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits