User: szilagyi Date: 2014/01/03 04:35 PM
Modified: /branches/tapir/ interface.ccl, param.ccl, schedule.ccl /branches/tapir/src/ NullNews_SphHarmDecomp.F90, make.code.defn
Log: remove some of the debugging code
File Changes:
Directory: /branches/tapir/src/ ===============================
File [modified]: NullNews_SphHarmDecomp.F90 Delta lines: +32 -30 =================================================================== --- branches/tapir/src/NullNews_SphHarmDecomp.F90 2014-01-03 03:45:42 UTC (rev 20) +++ branches/tapir/src/NullNews_SphHarmDecomp.F90 2014-01-03 22:35:37 UTC (rev 21) @@ -17,7 +17,7 @@ implicit none
CCTK_COMPLEX, dimension (:,:,:), allocatable:: cmplxtmp - CCTK_COMPLEX, dimension (:,:,:), allocatable:: NewsError + ! CCTK_COMPLEX, dimension (:,:,:), allocatable:: NewsError CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: NewsSphCoeff CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: NewsBSphCoeff CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: Psi4SphCoeff @@ -48,29 +48,29 @@
! write (*,*) "computing ylm coefs: time=", cctk_time, ", J=", maxval(abs(Jn)) ! fill the waveforms with Ylm at Scri before decomposition - if (Ylm_at_Scri == 1) then +! if (Ylm_at_Scri == 1) then
- News = YlmScri_2 - NewsB = YlmScri_2 - Psi4 = YlmScri_2 - News_uBondi = YlmScri_2 - NewsB_uBondi = YlmScri_2 - Psi4_uBondi = YlmScri_2 - Jn = YlmScri_2 - Jn_l = YlmScri_2 - Qn = YlmScri_1 - Qn_l = YlmScri_1 - Un = YlmScri_1 - Un_l = YlmScri_1 - omegan = YlmScri_0 - deltan = YlmScri_0 - betan = YlmScri_0 - uBondi = YlmScri_0 +! News = YlmScri_2 +! NewsB = YlmScri_2 +! Psi4 = YlmScri_2 +! News_uBondi = YlmScri_2 +! NewsB_uBondi = YlmScri_2 +! Psi4_uBondi = YlmScri_2 +! Jn = YlmScri_2 +! Jn_l = YlmScri_2 +! Qn = YlmScri_1 +! Qn_l = YlmScri_1 +! Un = YlmScri_1 +! Un_l = YlmScri_1 +! omegan = YlmScri_0 +! deltan = YlmScri_0 +! betan = YlmScri_0 +! uBondi = YlmScri_0
- end if +! end if
- allocate(NewsError(null_lsh(1), null_lsh(2), 2) ) + ! allocate(NewsError(null_lsh(1), null_lsh(2), 2) )
! SpinDecompCoefs(GH, nq, np, s, z, f, sphcoef)
@@ -78,30 +78,30 @@
time = cctk_time
- call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, News, NewsSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, NewsB, NewsBSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, Psi4, Psi4SphCoeff)
if (compute_lin_strain .ne. 0) then - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, linStrain, linStrainSphCoeff) endif
else time = constant_uBondi
- call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, News_uBondi, NewsSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, NewsB_uBondi, NewsBSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, Psi4_uBondi, Psi4SphCoeff)
if (compute_lin_strain .ne. 0) then - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), NewsSpinWeight, & + call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & zeta, linStrain_uBondi, linStrainSphCoeff) endif endif @@ -137,7 +137,7 @@ deallocate(cmplxtmp) endif
- deallocate(NewsError) + ! deallocate(NewsError)
! Only output if this is processor 0 if (CCTK_MyProc(cctkGH) .gt. 0) then @@ -154,7 +154,9 @@ endif
if (debug_output == 1) then - + + time = cctk_time - 0.5 * cctk_delta_time + call NullDecomp_WriteCoefFile('J_scri', truncate, 2, lmax, JnSphCoeff, time) call NullDecomp_WriteCoefFile('Jl_scri', truncate, 2, lmax, Jn_lSphCoeff, time)
File [modified]: make.code.defn Delta lines: +1 -1 =================================================================== --- branches/tapir/src/make.code.defn 2014-01-03 03:45:42 UTC (rev 20) +++ branches/tapir/src/make.code.defn 2014-01-03 22:35:37 UTC (rev 21) @@ -4,7 +4,7 @@ # Source files in this directory SRCS = NullNews_Bondi.F90 NullNews_GetNews.F90 NullNews_Init.F90 \ NullNews_Omega.F90 NullNews_ScriUtil.F90 NullNews_ScriVals.F90 NullNews_CalcPsi4.F90 NullNews_SphHarmDecomp.F90 \ - NullNews_YlmScri.F90 NullNews_interp_to_constant_uBondi.cc + NullNews_interp_to_constant_uBondi.cc
# Subdirectories containing source files SUBDIRS =
Directory: /branches/tapir/ ===========================
File [modified]: interface.ccl Delta lines: +7 -7 =================================================================== --- branches/tapir/interface.ccl 2014-01-03 03:45:42 UTC (rev 20) +++ branches/tapir/interface.ccl 2014-01-03 22:35:37 UTC (rev 21) @@ -179,13 +179,13 @@ starting } "store state"
-CCTK_COMPLEX YlmScri_group[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 -{ - YlmScri_2, YlmScri_1, YlmScri_0 -} "Ylm at Scri by patch" +# CCTK_COMPLEX YlmScri_group[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 +# { +# YlmScri_2, YlmScri_1, YlmScri_0 +# } "Ylm at Scri by patch"
File [modified]: param.ccl Delta lines: +7 -7 =================================================================== --- branches/tapir/param.ccl 2014-01-03 03:45:42 UTC (rev 20) +++ branches/tapir/param.ccl 2014-01-03 22:35:37 UTC (rev 21) @@ -42,10 +42,10 @@ { } "no"
-CCTK_INT NewsSpinWeight "What weight for the News when writing the spherical harmonics?" -{ - 0:2 :: "Small range" -} 2 +# CCTK_INT NewsSpinWeight "What weight for the News when writing the spherical harmonics?" +# { +# 0:2 :: "Small range" +# } 2
BOOLEAN DEBUG_skip_BondiNews "should the bondi news algorithm be skipped?" { @@ -91,9 +91,9 @@ { } "no"
-BOOLEAN Ylm_at_Scri "This switch is introduced to check convergence for the spherical decomposition" -{ -} "no" +# BOOLEAN Ylm_at_Scri "This switch is introduced to check convergence for the spherical decomposition" +# { +# } "no"
int l_YlmScri "l in Ylm at Scri" {
File [modified]: schedule.ccl Delta lines: +9 -10 =================================================================== --- branches/tapir/schedule.ccl 2014-01-03 03:45:42 UTC (rev 20) +++ branches/tapir/schedule.ccl 2014-01-03 22:35:37 UTC (rev 21) @@ -83,14 +83,13 @@
}
-if (Ylm_at_Scri == 1) -{ - STORAGE: YlmScri_group +# if (Ylm_at_Scri == 1) +# { +# STORAGE: YlmScri_group +# +# schedule NullNews_YlmScri at INITIAL after NullNews_Init # before?? +# { +# LANG: Fortran +# } "fill the waveform at Scri with spherical harmonics" +# }
- schedule NullNews_YlmScri at INITIAL after NullNews_Init # before?? - { - LANG: Fortran - } "fill the waveform at Scri with spherical harmonics" - -} -