Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[Carpet] branch, psamr, updated. ET_2013_11_v0-36-g2d45762
by Carpet git repositories 08 Jan '14

08 Jan '14

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, psamr has been updated via 2d457629284bcebb98e81807ff84d17462c8d2ca (commit) via d22ffea3024dc9b6ec07f13526459cc50c41b8ef (commit) from 35c2d00655107b4d7f835ac41b4133ba11bc9235 (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 2d457629284bcebb98e81807ff84d17462c8d2ca Author: Steven R. Brandt <sbrandt(a)cct.lsu.edu> Date: Wed Jan 8 12:25:17 2014 -0600 First joint hacking effort commit d22ffea3024dc9b6ec07f13526459cc50c41b8ef Author: Steven R. Brandt <sbrandt(a)cct.lsu.edu> Date: Tue Jan 7 14:50:21 2014 -0600 changed the par file to make it more similar ----------------------------------------------------------------------- Summary of changes: Carpet/Carpet/param.ccl | 2 +- Carpet/Carpet/src/CallFunction.cc | 17 +- Carpet/Carpet/src/Comm.cc | 45 +++- Carpet/Carpet/src/Evolve.cc | 412 +++++++++++++++++++++++++---------- Carpet/Carpet/src/Initialise.cc | 42 ++-- Carpet/Carpet/src/Recompose.cc | 4 + Carpet/Carpet/src/Restrict.cc | 12 +- Carpet/Carpet/src/SetupGH.cc | 3 +- Carpet/Carpet/src/Timing.cc | 3 +- Carpet/Carpet/src/functions.hh | 5 +- Carpet/Carpet/src/modes.cc | 2 + Carpet/Carpet/src/variables.cc | 4 +- Carpet/Carpet/src/variables.hh | 3 +- Carpet/CarpetIOASCII/src/ioascii.cc | 5 +- Carpet/CarpetRegrid2/param.ccl | 2 +- Carpet/CarpetRegrid2/src/regrid.cc | 4 +- Carpet/PSARM_stuff/wavemol.par | 14 +- 17 files changed, 408 insertions(+), 171 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, psamr, updated. ET_2013_11_v0-34-g35c2d00
by Carpet git repositories 08 Jan '14

08 Jan '14

1 0

[svn:einsteintoolkit] NullGrid/branches/tapir/ (Rev. 17)
by bela＠caltech.edu 07 Jan '14

07 Jan '14

User: szilagyi Date: 2014/01/07 04:38 PM Modified: /branches/tapir/ schedule.ccl /branches/tapir/src/ NullGrid_InitCoord.F90 Log: work on adaptive time-stepping algorithm File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullGrid_InitCoord.F90 Delta lines: +8 -5 =================================================================== --- branches/tapir/src/NullGrid_InitCoord.F90 2014-01-03 07:23:01 UTC (rev 16) +++ branches/tapir/src/NullGrid_InitCoord.F90 2014-01-07 22:38:56 UTC (rev 17) @@ -32,7 +32,6 @@ return end function NullGrid_RegisterCoords - subroutine NullGrid_InitTime(CCTK_ARGUMENTS) use cctk @@ -40,9 +39,9 @@ DECLARE_CCTK_ARGUMENTS - null_time = cctk_time - null_time_p = cctk_time - cctk_delta_time - null_time_p_p = cctk_time - 2.0*cctk_delta_time + null_time = 0 + null_time_p = 0 + null_time_p_p = 0 end subroutine NullGrid_InitTime @@ -54,7 +53,11 @@ DECLARE_CCTK_ARGUMENTS - null_time = cctk_time + null_time = cctk_time + if(abs(null_time_p-null_time_p_p)<1.e-10*cctk_delta_time) then + null_time_p = cctk_time - cctk_delta_time + null_time_p_p = cctk_time - 2.0*cctk_delta_time + end if end subroutine NullGrid_CopyTime Directory: /branches/tapir/ =========================== File [modified]: schedule.ccl Delta lines: +9 -1 =================================================================== --- branches/tapir/schedule.ccl 2014-01-03 07:23:01 UTC (rev 16) +++ branches/tapir/schedule.ccl 2014-01-07 22:38:56 UTC (rev 17) @@ -28,12 +28,20 @@ OPTIONS: global } "setup variables" -schedule NullGrid_InitTime at CCTK_INITIAL +schedule NullGrid_InitTime at CCTK_BASEGRID { LANG: Fortran OPTIONS: global } "initialize null time variable" +schedule NullGrid_CopyTime at CCTK_INITIAL \ + BEFORE NullEvol_BoundaryInit \ + BEFORE NullEvol_Initial +{ + LANG: Fortran + OPTIONS: global +} "copy value of time to local var" + schedule NullGrid_CopyTime at CCTK_PRESTEP { LANG: Fortran

1 0

[svn:einsteintoolkit] NullNews/branches/tapir/src/ (Rev. 24)
by bela＠caltech.edu 07 Jan '14

07 Jan '14

User: szilagyi Date: 2014/01/07 04:37 PM Modified: /branches/tapir/src/ NullNews_GetNews.F90 Log: work on variable time-step compatibility and on diagnostic code File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullNews_GetNews.F90 Delta lines: +65 -15 =================================================================== --- branches/tapir/src/NullNews_GetNews.F90 2014-01-07 22:36:50 UTC (rev 23) +++ branches/tapir/src/NullNews_GetNews.F90 2014-01-07 22:37:24 UTC (rev 24) @@ -12,6 +12,7 @@ use NullNews_ScriUtil, only: NullNews_ResetInactiveRe use NullInterp use NullDecomp_SpinDecomp, only: SpinDecompFilter + use NullDecomp_IO implicit none @@ -24,20 +25,22 @@ CCTK_REAL, dimension (:,:,:), allocatable, save::& beta, omega, beta_u, u0 - CCTK_REAL, dimension(3) :: BUF logical, save :: FirstTime = .True. logical, save :: ThisProc = .false. integer, save :: loc_q, loc_p, myproc CCTK_INT, dimension(1) :: Tarr - character(len=500) :: message CCTK_INT :: ip + CCTK_REAL :: dt DECLARE_CCTK_FUNCTIONS DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + logical :: truncate + truncate = (IO_TruncateOutputFiles(cctkGH) .ne. 0) .and. FirstTime + ! call CCTK_INFO("Null News, Calculating News") if (FirstTime) then FirstTime = .false. @@ -82,9 +85,16 @@ endif myproc = CCTK_MyProc(cctkGH) endif + + ! assumes 'time' is time on the new level + time_of_news = 0.5*(null_time+null_time_p) + dt=null_time-null_time_p + if (use_linearized_omega .eq. 0) then - call NullNews_integ_omega (cctkGH, null_lsh, cctk_delta_time, tmp_rgfn, tmp_rgfs, Uo, Un, omegao, omegan,betao,betan) - call NullNews_integ_comega (cctkGH, null_lsh, cctk_delta_time, tmp_cgfn, tmp_cgfs, omegao, omegan, comegao, comegan) + call NullNews_integ_omega (cctkGH, null_lsh, dt, & + tmp_rgfn, tmp_rgfs, Uo, Un, omegao, omegan,betao,betan) + call NullNews_integ_comega (cctkGH, null_lsh, dt, & + tmp_cgfn, tmp_cgfs, omegao, omegan, comegao, comegan) else call NullNews_lin_omega (cctkGH, null_lsh, zeta, Jn, omegan, comegan) endif @@ -107,19 +117,56 @@ ! mid level values, from the characteristic evolution J = 0.5d0 * (Jn + Jo) - J_u = (Jn - Jo) / cctk_delta_time + J_u = (Jn - Jo) / dt J_l = 0.5d0 * (Jn_l + Jo_l) - J_l_u = (Jn_l - Jo_l) / cctk_delta_time + J_l_u = (Jn_l - Jo_l) / dt beta = 0.5d0 * (betan + betao) cB = 0.5d0 * (cBn + cBo) U = 0.5d0 * (Un + Uo) ! For psi4 calculation - beta_u = (betan - betao) / cctk_delta_time - U_u = (Un - Uo) / cctk_delta_time + beta_u = (betan - betao) / dt + + U_u = (Un - Uo) / dt U_l = 0.5d0 * (Un_l + Uo_l) U_l_l = 0.5d0 * (Un_l_l + Uo_l_l) + + if (debug_output == 1) then + + call NullDecomp_WriteCoefsForComplexFunc('J_scri', cctkGH, truncate, & + null_lsh, 2, zeta, J(:,:,1), J(:,:,2), time_of_news) + + call NullDecomp_WriteCoefsForComplexFunc('Ju_scri', cctkGH, truncate, & + null_lsh, 2, zeta, J_u(:,:,1), J_u(:,:,2), time_of_news) + + call NullDecomp_WriteCoefsForComplexFunc('Jl_scri', cctkGH, truncate, & + null_lsh, 2, zeta, J_l(:,:,1), J_l(:,:,2), time_of_news) + + call NullDecomp_WriteCoefsForComplexFunc('Jlu_scri', cctkGH, truncate, & + null_lsh, 2, zeta, J_l_u(:,:,1), J_l_u(:,:,2), time_of_news) + + call NullDecomp_WriteCoefsForRealFunc('B_scri', cctkGH, truncate, & + null_lsh, zeta, beta(:,:,1), beta(:,:,2), time_of_news) + + call NullDecomp_WriteCoefsForRealFunc('Bu_scri', cctkGH, truncate, & + null_lsh, zeta, beta_u(:,:,1), beta_u(:,:,2), time_of_news) + + call NullDecomp_WriteCoefsForComplexFunc('U_scri', cctkGH, truncate, & + null_lsh, 1, zeta, U(:,:,1), U(:,:,2), time_of_news) + + call NullDecomp_WriteCoefsForComplexFunc('Uu_scri', cctkGH, truncate, & + null_lsh, 1, zeta, U_u(:,:,1), U_u(:,:,2), time_of_news) + + call NullDecomp_WriteCoefsForComplexFunc('Ul_scri', cctkGH, truncate, & + null_lsh, 1, zeta, U_l(:,:,1), U_l(:,:,2), time_of_news) + + call NullDecomp_WriteCoefsForComplexFunc('Ull_scri', cctkGH, truncate, & + null_lsh, 1, zeta, U_l_l(:,:,1), U_l_l(:,:,2), time_of_news) + + endif + + call NullInterp_d1 (eth_U(:,:,1), U(:,:,1), 1, 1) call NullInterp_d1 (eth_U(:,:,2), U(:,:,2), 1, 1) @@ -154,9 +201,6 @@ call NullNews_ResetInactive(null_lsh, eth_J) call NullNews_ResetInactive(null_lsh, beth_J) - ! assumes 'time' is time on the new level - time_of_news = cctk_time - .5d0 * cctk_delta_time - ! mid level values, from quantities computed above sigmaJo = sigmaJn; sigmaKo = sigmaKn; sigmauo = sigmaun @@ -170,7 +214,7 @@ call NullNews_Psi4 (cctkGH, null_lsh, tmp_cgfn, tmp_cgfs, Jo, Jo_l,betao, cBo, Uo, Uo_l,& sigmaJn, sigmaKn, sigmaun,sigmarn, sigmarun, sigmauun,& - sigmaJo, sigmaKo, sigmauo,sigmaro, sigmaruo, sigmauuo,Psi4(:,:,1:2),cctk_delta_time) + sigmaJo, sigmaKo, sigmauo,sigmaro, sigmaruo, sigmauuo,Psi4(:,:,1:2),dt) Psi4(:,:,1:2) = Psi4(:,:,1:2)/omega**3 @@ -185,7 +229,7 @@ endif if (DEBUG_skip_BondiNews.eq.0) & - call NullNews_News2BondiNews(cctkGH, null_lsh, cctk_delta_time, qsize,& + call NullNews_News2BondiNews(cctkGH, null_lsh, dt, qsize,& Uo, Un, Uyo, Uyn, zEvolo, zEvoln,& zEvolh, News(:,:,1:2), NewsB(:,:,1:2), uBondio, uBondi, uBondin,& redshiftB, omega, J, eth_J, beth_J, eth_U, beth_U,& @@ -194,8 +238,15 @@ n_tmp3_cgfn, n_tmp3_cgfs, n_tmp1_rgfn, n_tmp1_rgfs,& n_tmp2_rgfn, n_tmp2_rgfs, starting, EV_mask) - dMdOmega = NewsB(:,:,1:2) * conjg(NewsB(:,:,1:2)) * redshiftB * circle + if (debug_output == 1) then + call NullDecomp_WriteCoefsForRealFunc('uB_scri', cctkGH, truncate, & + null_lsh, zeta, uBondi(:,:,1), uBondi(:,:,2), time_of_news) + + end if + + dMdOmega = real(NewsB(:,:,1:2) * conjg(NewsB(:,:,1:2))) * redshiftB * circle + if (mask_NewsB .ne. 0) then do ip = 1, 2 NewsB(:,:,ip) = EQ_mask(:,:) * NewsB(:,:,ip) ! EV_mask @@ -226,7 +277,6 @@ omegao = omegan comegao = comegan - end subroutine NullNews_GetNews

1 0

[svn:einsteintoolkit] NullNews/branches/tapir/src/ (Rev. 23)
by bela＠caltech.edu 07 Jan '14

07 Jan '14

User: szilagyi Date: 2014/01/07 04:36 PM Modified: /branches/tapir/src/ NullNews_SphHarmDecomp.F90 Log: work on diagnostic code File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullNews_SphHarmDecomp.F90 Delta lines: +13 -82 =================================================================== --- branches/tapir/src/NullNews_SphHarmDecomp.F90 2014-01-07 22:36:05 UTC (rev 22) +++ branches/tapir/src/NullNews_SphHarmDecomp.F90 2014-01-07 22:36:50 UTC (rev 23) @@ -17,24 +17,10 @@ implicit none CCTK_COMPLEX, dimension (:,:,:), allocatable:: cmplxtmp - ! 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 - CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: JnSphCoeff - CCTK_COMPLEX, dimension(2:lmax, -lmax:lmax) :: Jn_lSphCoeff - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: QnSphCoeff - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: Qn_lSphCoeff - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: UnSphCoeff - CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: Un_lSphCoeff - CCTK_COMPLEX, dimension(0:lmax, -lmax:lmax) :: omeganSphCoeff - 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 CCTK_REAL :: time DECLARE_CCTK_FUNCTIONS @@ -46,30 +32,6 @@ truncate = (IO_TruncateOutputFiles(cctkGH) .ne. 0) .and. first_time -! 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 - -! 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 - - ! allocate(NewsError(null_lsh(1), null_lsh(2), 2) ) ! SpinDecompCoefs(GH, nq, np, s, z, f, sphcoef) @@ -106,37 +68,6 @@ endif endif - if (debug_output == 1) then - allocate(cmplxtmp(null_lsh(1), null_lsh(2), 2) ) - - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & - zeta, Jn, JnSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 2, & - zeta, Jn_l, Jn_lSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & - zeta, Qn, QnSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & - zeta, Qn_l, Qn_lSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & - zeta, Un, UnSphCoeff) - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 1, & - zeta, Un_l, Un_lSphCoeff) - cmplxtmp = omegan - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, omeganSphCoeff) - cmplxtmp = betan - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, betanSphCoeff) - cmplxtmp = Wn - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, WnSphCoeff) - cmplxtmp = uBondi - call SpinDecompCoefs(cctkGH, null_lsh(1), null_lsh(2), 0, & - zeta, cmplxtmp, uBondiSphCoeff) - - deallocate(cmplxtmp) - endif - ! deallocate(NewsError) ! Only output if this is processor 0 @@ -153,26 +84,26 @@ call NullDecomp_WriteCoefFile('linStrain_scri', truncate, 2, lmax, linStrainSphCoeff, time) endif - if (debug_output == 1) then +! if (debug_output == 1) then - time = cctk_time - 0.5 * cctk_delta_time +! 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) +! call NullDecomp_WriteCoefFile('J_scri', truncate, 2, lmax, JnSphCoeff, time) +! call NullDecomp_WriteCoefFile('Jl_scri', truncate, 2, lmax, Jn_lSphCoeff, time) - call NullDecomp_WriteCoefFile('U_scri', truncate, 1, lmax, UnSphCoeff, time) - call NullDecomp_WriteCoefFile('Ul_scri', truncate, 1, lmax, Un_lSphCoeff, time) +! call NullDecomp_WriteCoefFile('U_scri', truncate, 1, lmax, UnSphCoeff, time) +! call NullDecomp_WriteCoefFile('Ul_scri', truncate, 1, lmax, Un_lSphCoeff, time) - call NullDecomp_WriteCoefFile('Q_scri', truncate, 1, lmax, QnSphCoeff, time) - call NullDecomp_WriteCoefFile('Ql_scri', truncate, 1, lmax, Qn_lSphCoeff, time) +! call NullDecomp_WriteCoefFile('Q_scri', truncate, 1, lmax, QnSphCoeff, time) +! call NullDecomp_WriteCoefFile('Ql_scri', truncate, 1, lmax, Qn_lSphCoeff, time) - call NullDecomp_WriteCoefFile('B_scri', truncate, 0, lmax, betanSphCoeff, time) - call NullDecomp_WriteCoefFile('W_scri', truncate, 0, lmax, WnSphCoeff, time) +! call NullDecomp_WriteCoefFile('B_scri', truncate, 0, lmax, betanSphCoeff, time) +! call NullDecomp_WriteCoefFile('W_scri', truncate, 0, lmax, WnSphCoeff, time) - call NullDecomp_WriteCoefFile('omega_scri', truncate, 0, lmax, omeganSphCoeff, time) - call NullDecomp_WriteCoefFile('uBondi_scri', truncate, 0, lmax, uBondiSphCoeff, time) +! call NullDecomp_WriteCoefFile('omega_scri', truncate, 0, lmax, omeganSphCoeff, time) +! call NullDecomp_WriteCoefFile('uBondi_scri', truncate, 0, lmax, uBondiSphCoeff, time) - endif +! endif first_time = .FALSE.

1 0

[svn:einsteintoolkit] NullNews/branches/tapir/src/ (Rev. 22)
by bela＠caltech.edu 07 Jan '14

07 Jan '14

User: szilagyi Date: 2014/01/07 04:36 PM Modified: /branches/tapir/src/ NullNews_interp_to_constant_uBondi.cc Log: reduce verbosity File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullNews_interp_to_constant_uBondi.cc Delta lines: +1 -1 =================================================================== --- branches/tapir/src/NullNews_interp_to_constant_uBondi.cc 2014-01-03 22:35:37 UTC (rev 21) +++ branches/tapir/src/NullNews_interp_to_constant_uBondi.cc 2014-01-07 22:36:05 UTC (rev 22) @@ -90,7 +90,7 @@ if (*constant_uBondi > 0.5*(min_p+min_p_p)) *constant_uBondi = 0.5*(min_p+min_p_p); - cout << "constant_uBondi = " << *constant_uBondi << endl; + // cout << "constant_uBondi = " << *constant_uBondi << endl; /*cout << "min = " << min << endl; cout << "min_p = " << min_p << endl; cout << "min_p_p = " << min_p_p << endl;*/

1 0

[svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconGen/ (Rev. 111)
by bela＠caltech.edu 07 Jan '14

07 Jan '14

User: szilagyi Date: 2014/01/07 04:35 PM Modified: /PITTNullCode/SphericalHarmonicReconGen/ param.ccl, schedule.ccl /PITTNullCode/SphericalHarmonicReconGen/src/ read.cc Log: work on the time-step adjuster algorithm File Changes: Directory: /PITTNullCode/SphericalHarmonicReconGen/ =================================================== File [modified]: param.ccl Delta lines: +8 -8 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/param.ccl 2014-01-07 05:53:08 UTC (rev 110) +++ PITTNullCode/SphericalHarmonicReconGen/param.ccl 2014-01-07 22:35:23 UTC (rev 111) @@ -16,27 +16,27 @@ { } no -BOOLEAN adjust_timestep "Should the time-step be adjusted?" +BOOLEAN adjust_timestep "Should the time-step be adjusted? Ignored if time_interpolate==false." { } no -CCTK_INT adjust_timestep__steps_per_time_level \ -"Number of time-steps between two time-values in the datafile. Ignored if time_interpolate==false." +CCTK_INT adjust_timestep__target_steps_per_time_level \ +"Target number of time-steps between two time-values in the datafile." { 1:* :: "at least one" } 1 CCTK_REAL adjust_timestep__maximum_time_step \ -"Maximum allowed time-step. Ignored if time_interpolate==false." +"Maximum allowed time-step." { (0:* :: "larger than zero" } 0.1 -CCTK_REAL adjust_timestep__max_relative_change_per_step \ -"Maximum allowed relative change of the time-step during a single step. Ignored if time_interpolate==false." +CCTK_REAL adjust_timestep__rate_of_change \ +"Rate of change of the time-step." { - (0:1] :: "The smaller the value the more gradual the change in cctk_delta_time." -} 0.1 + (0:* :: "The smaller the value the more gradual the change in cctk_delta_time." +} 0.001 CCTK_INT sphere_number "the sphere number (if multiple spheres are present in one file) that corresponds to the worldtube radius NullSHRExtract::cr" { File [modified]: schedule.ccl Delta lines: +2 -3 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/schedule.ccl 2014-01-07 05:53:08 UTC (rev 110) +++ PITTNullCode/SphericalHarmonicReconGen/schedule.ccl 2014-01-07 22:35:23 UTC (rev 111) @@ -21,9 +21,8 @@ #} "Schedule group for reconstructing world-tube data" if(adjust_timestep) { - SCHEDULE SphericalHarmonicReconGeneric_SetTimeStep at CCTK_PRESTEP \ - before NullNews_InterpCycleTimelevels \ - before NullGrid_CopyTime + SCHEDULE SphericalHarmonicReconGeneric_SetTimeStep at CCTK_EVOL \ + after NullEvol_Step after NullNews_ScriVals { LANG: C OPTIONS: global Directory: /PITTNullCode/SphericalHarmonicReconGen/src/ ======================================================= File [modified]: read.cc Delta lines: +20 -27 =================================================================== --- PITTNullCode/SphericalHarmonicReconGen/src/read.cc 2014-01-07 05:53:08 UTC (rev 110) +++ PITTNullCode/SphericalHarmonicReconGen/src/read.cc 2014-01-07 22:35:23 UTC (rev 111) @@ -101,33 +101,24 @@ if (! SHR::initialized) { CCTK_WARN(CCTK_WARN_ABORT, "Schedule mismatch. \n" - " SphericalHarmonicReconGeneric_SetTimeStep must be called after\n" - " SphericalHarmonicReconGeneric_Startup"); + " SphericalHarmonicReconGeneric_SetTimeStep must be called after\n" + " SphericalHarmonicReconGeneric_Startup"); } CCTK_REAL &dt = cctkGH->cctk_delta_time; // no adaptivity for the 1st few time-steps if(cctk_iteration<5) { - CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been left at %g",(double)dt); + if(not time_interpolate) + CCTK_WARN(1, "cannot adjust time-step when time_interpolate==false"); return; } SHR::SPH_database& db=*(SHR::db[0]); - const double dt_old = dt; + double current_time_gap_in_file = -1; const double time=cctk_time + SHR::initial_time_in_file; const double eps=1.e-10*(db.time(1)-db.time(0)); - if(db.n_timesteps()<2) { - CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been left at %g",(double)dt); - return; // no adjustment - } - if(time<db.time(0)-eps) { - dt = db.time(1)-db.time(0); - CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been left at %g",(double)dt); - return; - } - if(time>eps+db.time(db.n_timesteps()-1)) { - CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been left at %g",(double)dt); - return; // no adjustment - } + if(db.n_timesteps()<2) return; // no adjustment + if(time<db.time(0)-eps) return; // no adjustment + if(time>eps+db.time(db.n_timesteps()-1)) return; // no adjustment // locate by bisection the interval containing time for(int l0=0,l1=db.n_timesteps()-1,c=0;;++c) { @@ -135,21 +126,23 @@ if(time<db.time(lh)-eps) l1=lh; else l0=lh; if(l1==l0+1) { - dt = db.time(l1)-db.time(l0); + current_time_gap_in_file = db.time(l1)-db.time(l0); break; } if(c>2+db.n_timesteps()) CCTK_WARN(0, "run-away bisection algorithm"); } - //if (CCTK_MyProc(cctkGH) == 0) - if (time_interpolate) - { - dt /= adjust_timestep__steps_per_time_level; - // change the time-step gradually - dt = dt_old + (dt - dt_old) * adjust_timestep__max_relative_change_per_step; - dt = std::min(dt,adjust_timestep__maximum_time_step); - } - if(verbose) CCTK_VInfo(CCTK_THORNSTRING, "Time-step has been set to %g",(double)dt); + if(current_time_gap_in_file<0) + CCTK_WARN(0, "cannot identify time gap in data file"); + + double target_dt = current_time_gap_in_file/ + adjust_timestep__target_steps_per_time_level; + // change the time-step gradually + target_dt = std::min(target_dt,adjust_timestep__maximum_time_step); + dt += adjust_timestep__rate_of_change*(target_dt-dt); + + if(verbose) CCTK_VInfo(CCTK_THORNSTRING, + "Time-step has been set to %g",(double)dt); } void SphericalHarmonicReconGeneric_ReadData(CCTK_ARGUMENTS)

1 0

[svn:einsteintoolkit] NullEvolve/branches/tapir/src/ (Rev. 23)
by bela＠caltech.edu 07 Jan '14

07 Jan '14

User: szilagyi Date: 2014/01/07 04:34 PM Modified: /branches/tapir/src/ NullEvol_Diag.F90 Log: work on diagnostics code File Changes: Directory: /branches/tapir/src/ =============================== File [modified]: NullEvol_Diag.F90 Delta lines: +11 -6 =================================================================== --- branches/tapir/src/NullEvol_Diag.F90 2014-01-03 08:14:54 UTC (rev 22) +++ branches/tapir/src/NullEvol_Diag.F90 2014-01-07 22:34:53 UTC (rev 23) @@ -26,17 +26,22 @@ truncate = (IO_TruncateOutputFiles(cctkGH) .ne. 0) .and. first_time call NullEvol_DiagImArray(cctkGH, 'J_ev', truncate, 2, jcn, jcs, diagtmp, null_xb, cctk_time) + ! call NullEvol_DiagImArray(cctkGH, 'dxJ_ev', truncate, 2, tmpn, tmps, diagtmp, null_xb, cctk_time) - call NullEvol_DiagImArray(cctkGH, 'dxJ_ev', truncate, 2, tmpn, tmps, diagtmp, null_xb, cctk_time) - if(.not. first_time) then - tmpn = (jcn-jcn_p)/cctk_delta_time - tmps = (jcs-jcs_p)/cctk_delta_time + tmpn = (jcn-jcn_p)/(null_time-null_time_p) + tmps = (jcs-jcs_p)/(null_time-null_time_p) - call NullEvol_DiagImArray(cctkGH, 'dtJ_ev', truncate, 2, & - tmpn, tmps, diagtmp, null_xb, cctk_time-0.5*cctk_delta_time) + call NullEvol_DiagImArray(cctkGH, 'Ju_ev', truncate, 2, & + tmpn, tmps, diagtmp, null_xb, 0.5*(null_time+null_time_p)) + tmpn = (ucn-ucn_p)/cctk_delta_time + tmps = (ucs-ucs_p)/cctk_delta_time + + call NullEvol_DiagImArray(cctkGH, 'Uu_ev', truncate, 1, & + tmpn, tmps, diagtmp, null_xbh, 0.5*(null_time+null_time_p)) + tmpn = 1.e16 tmps = 1.e16

1 0

[Carpet] branch, pamr, created. carpet-6-init-292-g0281b49
by Carpet git repositories 07 Jan '14

07 Jan '14

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, pamr has been created at 0281b494817ce771d562609376825dbc2e6f1cc1 (commit) - Log ----------------------------------------------------------------- commit 0281b494817ce771d562609376825dbc2e6f1cc1 Author: Frank Löffler <knarf(a)cct.lsu.edu> Date: Tue Sep 10 10:55:20 2013 -0500 working version for any number of mpi processes, 3 levels and rk4 commit f0b48fee888d74d091191508094272d45e591f0c Author: Frank Löffler <knarf(a)cct.lsu.edu> Date: Tue Sep 3 21:21:25 2013 -0500 remove hack that limits to 2 processors commit 707aa57e85b757016d86280459264e8294bc8e7e Author: Frank Löffler <knarf(a)cct.lsu.edu> Date: Mon Sep 2 22:42:00 2013 -0500 works for 2 levels and 10 iterations and wavemol -> yeah commit f6829452b35ca06cb56aed9d794dabae7cda4baa Author: Frank Löffler <knarf(a)cct.lsu.edu> Date: Fri Aug 30 21:26:20 2013 -0500 bith versions at least run commit ae21aa55e3966fcdef1808c0137be79c30ed320c Author: Frank Löffler <knarf(a)cct.lsu.edu> Date: Mon Jul 29 18:07:50 2013 -0700 somewhat working version ----------------------------------------------------------------------- hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, psamr, updated. ET_2013_11_v0-33-g790a93f
by Carpet git repositories 07 Jan '14

07 Jan '14

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits