Commits August 2012

commits@lists.einsteintoolkit.org

7 participants
71 discussions

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 134)
by rhaas＠tapir.caltech.edu 08 Aug '12

08 Aug '12

User: rhaas Date: 2012/08/09 01:08 AM Added: /trunk/par/ MagTOVstar.par, TOVstar.par, advectedloop2D.par, advectedloop3D.par, balsara1_1d.par, balsara1b.par, balsara1c.par, bondi-ks.par, bondi-punc-iso.par, bondi-punc.par, bondi-punc2.par, bondi-sch.par, bondi-sch2.par, cylexp.par, rotor.par /trunk/src/ GRHydro_AdvectedLoopM.F90, GRHydro_AlfvenWaveM.F90, GRHydro_Bondi.c, GRHydro_BondiM.c, GRHydro_BondiM_new.F90, GRHydro_Bondi_new.F90, GRHydro_C2P2CM_eosomni.F90, GRHydro_P2C2PM_eosomni.F90, GRHydro_PoloidalMagFieldM.F90, GRHydro_RotorM.F90 Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ CheckParam.c, GRHydro_CylindricalExplosionM.F90, GRHydro_MonopoleM.F90, GRHydro_ShockTubeM.F90, make.code.defn Log: Snapshot of ET GRHydro_InitData rev. 132 with a poloidal magnetic field routine added. File Changes: Directory: /trunk/par/ ====================== File [added]: MagTOVstar.par Delta lines: <Unavailable> File [added]: TOVstar.par Delta lines: <Unavailable> File [added]: advectedloop2D.par Delta lines: <Unavailable> File [added]: advectedloop3D.par Delta lines: <Unavailable> File [added]: balsara1_1d.par Delta lines: <Unavailable> File [added]: balsara1b.par Delta lines: <Unavailable> File [added]: balsara1c.par Delta lines: <Unavailable> File [added]: bondi-ks.par Delta lines: <Unavailable> File [added]: bondi-punc-iso.par Delta lines: <Unavailable> File [added]: bondi-punc.par Delta lines: <Unavailable> File [added]: bondi-punc2.par Delta lines: <Unavailable> File [added]: bondi-sch.par Delta lines: <Unavailable> File [added]: bondi-sch2.par Delta lines: <Unavailable> File [added]: cylexp.par Delta lines: <Unavailable> File [added]: rotor.par Delta lines: <Unavailable> Directory: /trunk/src/ ====================== File [modified]: CheckParam.c Delta lines: <Unavailable> File [added]: GRHydro_AdvectedLoopM.F90 Delta lines: <Unavailable> File [added]: GRHydro_AlfvenWaveM.F90 Delta lines: <Unavailable> File [added]: GRHydro_Bondi.c Delta lines: <Unavailable> File [added]: GRHydro_BondiM.c Delta lines: <Unavailable> File [added]: GRHydro_BondiM_new.F90 Delta lines: <Unavailable> File [added]: GRHydro_Bondi_new.F90 Delta lines: <Unavailable> File [added]: GRHydro_C2P2CM_eosomni.F90 Delta lines: <Unavailable> File [modified]: GRHydro_CylindricalExplosionM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_MonopoleM.F90 Delta lines: <Unavailable> File [added]: GRHydro_P2C2PM_eosomni.F90 Delta lines: <Unavailable> File [added]: GRHydro_PoloidalMagFieldM.F90 Delta lines: <Unavailable> File [added]: GRHydro_RotorM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ShockTubeM.F90 Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 08 Aug '12

08 Aug '12

changeset: 3616:bffbe6c03780 tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Aug 08 16:49:28 2012 -0400 summary: Carpet: Move CCTK_INFO calls out of OpenMP parallel region

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 407)
by rhaas＠tapir.caltech.edu 04 Aug '12

04 Aug '12

User: rhaas Date: 2012/08/04 02:41 AM Modified: /trunk/src/ GRHydro_Eigenproblem.F90, GRHydro_PPMMReconstruct_drv.F90, GRHydro_UpdateMask.F90 Log: GRHydro: add forgotten label in error message, whitespace change File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2012-08-04 07:18:51 UTC (rev 406) +++ trunk/src/GRHydro_Eigenproblem.F90 2012-08-04 07:41:17 UTC (rev 407) @@ -88,7 +88,7 @@ if(cs2.lt.0.0d0) then !$OMP CRITICAL if (abs(cs2) .gt. 1.0d-4) then - write(warnline,'(a50,6g16.7)') 'rho, dpdrho, press*dpdeps/rho**2, eps, press/rho: ', abs(cs2), rho, dpdrho, press * dpdeps / (rho**2), eps, press/rho + write(warnline,'(a50,6g16.7)') 'abs(cs2), rho, dpdrho, press*dpdeps/rho**2, eps, press/rho: ', abs(cs2), rho, dpdrho, press * dpdeps / (rho**2), eps, press/rho call CCTK_WARN(1,warnline) call CCTK_WARN(1,"cs2 < 0! Check speed of sound calculation!") cs2 = 0.0d0 File [modified]: GRHydro_PPMMReconstruct_drv.F90 Delta lines: +1 -0 =================================================================== --- trunk/src/GRHydro_PPMMReconstruct_drv.F90 2012-08-04 07:18:51 UTC (rev 406) +++ trunk/src/GRHydro_PPMMReconstruct_drv.F90 2012-08-04 07:41:17 UTC (rev 407) @@ -240,6 +240,7 @@ end do !$OMP END PARALLEL DO end if + if(evolve_Y_e.ne.0) then !$OMP PARALLEL DO PRIVATE(j, k) do k = GRHydro_stencil, nz - GRHydro_stencil + 1 File [modified]: GRHydro_UpdateMask.F90 Delta lines: +2 -0 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2012-08-04 07:18:51 UTC (rev 406) +++ trunk/src/GRHydro_UpdateMask.F90 2012-08-04 07:41:17 UTC (rev 407) @@ -48,6 +48,7 @@ densrhs(i,j,k) = 0.0d0 srhs(i,j,k,:) = 0.0d0 taurhs(i,j,k) = 0.0d0 + ! Set real-valued mask! This will be sync'ed and right after syncing translated to ! our standard integer based mask (so that atmosphere_mask is still valid!). atmosphere_mask_real(i,j,k) = 1 @@ -69,6 +70,7 @@ densrhs(i,j,k) = 0.0d0 srhs(i,j,k,:) = 0.0d0 taurhs(i,j,k) = 0.0d0 + ! Set real-valued mask! This will be sync'ed and right after syncing translated to ! our standard integer based mask (so that atmosphere_mask is still valid!). atmosphere_mask_real(i,j,k) = 1

1 0

[svn:einsteintoolkit] GRHydro/trunk/test/ (Rev. 406)
by rhaas＠tapir.caltech.edu 04 Aug '12

04 Aug '12

User: rhaas Date: 2012/08/04 02:18 AM Added: /trunk/test/ tov_slowsector.par /trunk/test/tov_slowsector/ gxx_x_[3][3].xg, gxx_y_[3][3].xg, gxx_z_[3][3].xg, rho_x_[3][3].xg, rho_y_[3][3].xg, rho_z_[3][3].xg Log: GRHydro: add test case for slow MoL sector of RK4-RK2 File Changes: Directory: /trunk/test/ ======================= File [added]: tov_slowsector.par Delta lines: +103 -0 =================================================================== --- trunk/test/tov_slowsector.par (rev 0) +++ trunk/test/tov_slowsector.par 2012-08-04 07:18:51 UTC (rev 406) @@ -0,0 +1,103 @@ +!DESC "PUGH unigrid, one TOV, slow sector" +ActiveThorns = "time MoL coordbase symbase cartgrid3d ioutil boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver eos_omni Constants LocalReduce PUGH PUGHSlab IOBasic LoopControl TmunuBase InitBase ReflectionSymmetry IOASCII" + +TmunuBase::stress_energy_storage = yes +TmunuBase::stress_energy_at_RHS = yes + +time::dtfac = 0.375 + +boundary::radpower = 2 + +SpaceMask::use_mask = "yes" + +CartGrid3D::type = "coordbase" +CartGrid3D::domain = "full" +CartGrid3D::avoid_origin = "no" +CoordBase::domainsize = minmax + +CoordBase::spacing = "numcells" +CoordBase::xmin = 0.0 +CoordBase::ymin = 0.0 +CoordBase::zmin = 0.0 +CoordBase::xmax = 15.001 +CoordBase::ymax = 15.001 +CoordBase::zmax = 15.001 +CoordBase::ncells_x = 8 +CoordBase::ncells_y = 8 +CoordBase::ncells_z = 8 + +CoordBase::boundary_size_x_lower = 3 +CoordBase::boundary_size_y_lower = 3 +CoordBase::boundary_size_z_lower = 3 +CoordBase::boundary_shiftout_x_lower = 1 +CoordBase::boundary_shiftout_y_lower = 1 +CoordBase::boundary_shiftout_z_lower = 1 +CoordBase::boundary_size_x_upper = 3 +CoordBase::boundary_size_y_upper = 3 +CoordBase::boundary_size_z_upper = 3 +CoordBase::boundary_shiftout_x_upper = 0 +CoordBase::boundary_shiftout_y_upper = 0 +CoordBase::boundary_shiftout_z_upper = 0 + +PUGH::global_nsize = 13 +PUGH::periodic_x = "no" +PUGH::periodic_y = "no" +PUGH::periodic_z = "no" + +ReflectionSymmetry::reflection_x = "yes" +ReflectionSymmetry::reflection_y = "yes" +ReflectionSymmetry::reflection_z = "yes" +ReflectionSymmetry::avoid_origin_x = "no" +ReflectionSymmetry::avoid_origin_y = "no" +ReflectionSymmetry::avoid_origin_z = "no" +ReflectionSymmetry::verbose = "no" + +driver::ghost_size = 3 + +cactus::cctk_itlast = 2 + +methodoflines::ode_method = "rk4-rk2" +methodoflines::mol_intermediate_steps = 4 +methodoflines::mol_num_scratch_levels = 4 + +hydrobase::timelevels = 3 +hydrobase::evolution_method = "GRHydro" + +GRHydro::use_MoL_slow_multirate_sector = yes +GRHydro::GRHydro_MaxNumEvolvedVars = 5 +GRHydro::GRHydro_MaxNumEvolvedVarsSlow = 5 + +GRHydro::riemann_solver = "Marquina" +GRHydro::GRHydro_eos_type = "Polytype" +GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::recon_method = "tvd" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "flat" +GRHydro::tvd_limiter = "VanLeerMC2" +GRHydro::rho_abs_min = 1.e-7 +GRHydro::initial_atmosphere_factor = 0.999 +# these do not match TOVSolver to make the star actually move +EOS_Omni::poly_gamma = 1.3 +EOS_Omni::gl_gamma = 1.3 +EOS_Omni::poly_k = 50 +EOS_Omni::gl_k = 50 +GRHydro::GRHydro_perc_ptol = 1e-5 +GRHydro::GRHydro_del_ptol = 1e-5 + +ADMBase::initial_data = "tov" +ADMBase::initial_lapse = "tov" +ADMBase::initial_shift = "tov" + +tovsolver::TOV_Rho_Central[0] = 1.28e-3 +tovsolver::TOV_Gamma[0] = 2.0 +tovsolver::TOV_K[0] = 100.0 +tovsolver::TOV_Combine_Method = "maximum" + +IO::out_dir = $parfile +IO::out_fileinfo = "none" + +IOBasic::outInfo_every = -1 + +IOASCII::out1D_every = 1 +IOASCII::out1D_d = "no" +IOASCII::out1D_vars = "hydrobase::rho admbase::gxx" Directory: /trunk/test/tov_slowsector/ ====================================== File [added]: gxx_x_[3][3].xg Delta lines: +48 -0 =================================================================== --- trunk/test/tov_slowsector/gxx_x_[3][3].xg (rev 0) +++ trunk/test/tov_slowsector/gxx_x_[3][3].xg 2012-08-04 07:18:51 UTC (rev 406) @@ -0,0 +1,48 @@ + + +"Time = 0.0000000000000 +-5.6253750000000 1.5754162379559 +-3.7502500000000 1.7660416048851 +-1.8751250000000 1.9505536028541 +0.0000000000000 2.0318467652572 +1.8751250000000 1.9505536028541 +3.7502500000000 1.7660416048851 +5.6253750000000 1.5754162379559 +7.5005000000000 1.4287126614054 +9.3756250000000 1.3338310935609 +11.2507500000000 1.2731112530214 +13.1258750000000 1.2731112530214 +15.0010000000000 1.2731112530214 +16.8761250000000 1.2731112530214 + + +"Time = 0.7031718750000 +-5.6253750000000 1.5754162379559 +-3.7502500000000 1.7660416048851 +-1.8751250000000 1.9505536028541 +0.0000000000000 2.0318467652572 +1.8751250000000 1.9505536028541 +3.7502500000000 1.7660416048851 +5.6253750000000 1.5754162379559 +7.5005000000000 1.4287126614054 +9.3756250000000 1.3338310935609 +11.2507500000000 1.2731112530214 +13.1258750000000 1.2731112530214 +15.0010000000000 1.2731112530214 +16.8761250000000 1.2731112530214 + + +"Time = 1.4063437500000 +-5.6253750000000 1.5754162379559 +-3.7502500000000 1.7660416048851 +-1.8751250000000 1.9505536028541 +0.0000000000000 2.0318467652572 +1.8751250000000 1.9505536028541 +3.7502500000000 1.7660416048851 +5.6253750000000 1.5754162379559 +7.5005000000000 1.4287126614054 +9.3756250000000 1.3338310935609 +11.2507500000000 1.2731112530214 +13.1258750000000 1.2731112530214 +15.0010000000000 1.2731112530214 +16.8761250000000 1.2731112530214 File [added]: gxx_y_[3][3].xg Delta lines: +48 -0 =================================================================== --- trunk/test/tov_slowsector/gxx_y_[3][3].xg (rev 0) +++ trunk/test/tov_slowsector/gxx_y_[3][3].xg 2012-08-04 07:18:51 UTC (rev 406) @@ -0,0 +1,48 @@ + + +"Time = 0.0000000000000 +-5.6253750000000 1.5754162379559 +-3.7502500000000 1.7660416048851 +-1.8751250000000 1.9505536028541 +0.0000000000000 2.0318467652572 +1.8751250000000 1.9505536028541 +3.7502500000000 1.7660416048851 +5.6253750000000 1.5754162379559 +7.5005000000000 1.4287126614054 +9.3756250000000 1.3338310935609 +11.2507500000000 1.2731112530214 +13.1258750000000 1.2731112530214 +15.0010000000000 1.2731112530214 +16.8761250000000 1.2731112530214 + + +"Time = 0.7031718750000 +-5.6253750000000 1.5754162379559 +-3.7502500000000 1.7660416048851 +-1.8751250000000 1.9505536028541 +0.0000000000000 2.0318467652572 +1.8751250000000 1.9505536028541 +3.7502500000000 1.7660416048851 +5.6253750000000 1.5754162379559 +7.5005000000000 1.4287126614054 +9.3756250000000 1.3338310935609 +11.2507500000000 1.2731112530214 +13.1258750000000 1.2731112530214 +15.0010000000000 1.2731112530214 +16.8761250000000 1.2731112530214 + + +"Time = 1.4063437500000 +-5.6253750000000 1.5754162379559 +-3.7502500000000 1.7660416048851 +-1.8751250000000 1.9505536028541 +0.0000000000000 2.0318467652572 +1.8751250000000 1.9505536028541 +3.7502500000000 1.7660416048851 +5.6253750000000 1.5754162379559 +7.5005000000000 1.4287126614054 +9.3756250000000 1.3338310935609 +11.2507500000000 1.2731112530214 +13.1258750000000 1.2731112530214 +15.0010000000000 1.2731112530214 +16.8761250000000 1.2731112530214 File [added]: gxx_z_[3][3].xg Delta lines: +48 -0 =================================================================== --- trunk/test/tov_slowsector/gxx_z_[3][3].xg (rev 0) +++ trunk/test/tov_slowsector/gxx_z_[3][3].xg 2012-08-04 07:18:51 UTC (rev 406) @@ -0,0 +1,48 @@ + + +"Time = 0.0000000000000 +-5.6253750000000 1.5754162379559 +-3.7502500000000 1.7660416048851 +-1.8751250000000 1.9505536028541 +0.0000000000000 2.0318467652572 +1.8751250000000 1.9505536028541 +3.7502500000000 1.7660416048851 +5.6253750000000 1.5754162379559 +7.5005000000000 1.4287126614054 +9.3756250000000 1.3338310935609 +11.2507500000000 1.2731112530214 +13.1258750000000 1.2731112530214 +15.0010000000000 1.2731112530214 +16.8761250000000 1.2731112530214 + + +"Time = 0.7031718750000 +-5.6253750000000 1.5754162379559 +-3.7502500000000 1.7660416048851 +-1.8751250000000 1.9505536028541 +0.0000000000000 2.0318467652572 +1.8751250000000 1.9505536028541 +3.7502500000000 1.7660416048851 +5.6253750000000 1.5754162379559 +7.5005000000000 1.4287126614054 +9.3756250000000 1.3338310935609 +11.2507500000000 1.2731112530214 +13.1258750000000 1.2731112530214 +15.0010000000000 1.2731112530214 +16.8761250000000 1.2731112530214 + + +"Time = 1.4063437500000 +-5.6253750000000 1.5754162379559 +-3.7502500000000 1.7660416048851 +-1.8751250000000 1.9505536028541 +0.0000000000000 2.0318467652572 +1.8751250000000 1.9505536028541 +3.7502500000000 1.7660416048851 +5.6253750000000 1.5754162379559 +7.5005000000000 1.4287126614054 +9.3756250000000 1.3338310935609 +11.2507500000000 1.2731112530214 +13.1258750000000 1.2731112530214 +15.0010000000000 1.2731112530214 +16.8761250000000 1.2731112530214 File [added]: rho_x_[3][3].xg Delta lines: +48 -0 =================================================================== --- trunk/test/tov_slowsector/rho_x_[3][3].xg (rev 0) +++ trunk/test/tov_slowsector/rho_x_[3][3].xg 2012-08-04 07:18:51 UTC (rev 406) @@ -0,0 +1,48 @@ + + +"Time = 0.0000000000000 +-5.6253750000000 0.0003603742972 +-3.7502500000000 0.0007388051562 +-1.8751250000000 0.0011125336050 +0.0000000000000 0.0012799999924 +1.8751250000000 0.0011125336050 +3.7502500000000 0.0007388051562 +5.6253750000000 0.0003603742972 +7.5005000000000 0.0000724355159 +9.3756250000000 0.0000001000000 +11.2507500000000 0.0000001000000 +13.1258750000000 0.0000001000000 +15.0010000000000 0.0000001000000 +16.8761250000000 0.0000001000000 + + +"Time = 0.7031718750000 +-5.6253750000000 0.0000001000000 +-3.7502500000000 0.0000001000000 +-1.8751250000000 0.0000001000000 +0.0000000000000 0.0000001000000 +1.8751250000000 0.0000001000000 +3.7502500000000 0.0000001000000 +5.6253750000000 0.0000001000000 +7.5005000000000 0.0000723975984 +9.3756250000000 0.0000001000000 +11.2507500000000 0.0000001000000 +13.1258750000000 0.0000001000000 +15.0010000000000 0.0000001000000 +16.8761250000000 0.0000001000000 + + +"Time = 1.4063437500000 +-5.6253750000000 0.0000003055006 +-3.7502500000000 0.0000001000000 +-1.8751250000000 0.0000001000000 +0.0000000000000 0.0000001000000 +1.8751250000000 0.0000001000000 +3.7502500000000 0.0000001000000 +5.6253750000000 0.0000003055006 +7.5005000000000 0.0000001000000 +9.3756250000000 0.0000001000000 +11.2507500000000 0.0000001000000 +13.1258750000000 0.0000001000000 +15.0010000000000 0.0000001000000 +16.8761250000000 0.0000001000000 File [added]: rho_y_[3][3].xg Delta lines: +48 -0 =================================================================== --- trunk/test/tov_slowsector/rho_y_[3][3].xg (rev 0) +++ trunk/test/tov_slowsector/rho_y_[3][3].xg 2012-08-04 07:18:51 UTC (rev 406) @@ -0,0 +1,48 @@ + + +"Time = 0.0000000000000 +-5.6253750000000 0.0003603742972 +-3.7502500000000 0.0007388051562 +-1.8751250000000 0.0011125336050 +0.0000000000000 0.0012799999924 +1.8751250000000 0.0011125336050 +3.7502500000000 0.0007388051562 +5.6253750000000 0.0003603742972 +7.5005000000000 0.0000724355159 +9.3756250000000 0.0000001000000 +11.2507500000000 0.0000001000000 +13.1258750000000 0.0000001000000 +15.0010000000000 0.0000001000000 +16.8761250000000 0.0000001000000 + + +"Time = 0.7031718750000 +-5.6253750000000 0.0000001000000 +-3.7502500000000 0.0000001000000 +-1.8751250000000 0.0000001000000 +0.0000000000000 0.0000001000000 +1.8751250000000 0.0000001000000 +3.7502500000000 0.0000001000000 +5.6253750000000 0.0000001000000 +7.5005000000000 0.0000723975984 +9.3756250000000 0.0000001000000 +11.2507500000000 0.0000001000000 +13.1258750000000 0.0000001000000 +15.0010000000000 0.0000001000000 +16.8761250000000 0.0000001000000 + + +"Time = 1.4063437500000 +-5.6253750000000 0.0000003055006 +-3.7502500000000 0.0000001000000 +-1.8751250000000 0.0000001000000 +0.0000000000000 0.0000001000000 +1.8751250000000 0.0000001000000 +3.7502500000000 0.0000001000000 +5.6253750000000 0.0000003055006 +7.5005000000000 0.0000001000000 +9.3756250000000 0.0000001000000 +11.2507500000000 0.0000001000000 +13.1258750000000 0.0000001000000 +15.0010000000000 0.0000001000000 +16.8761250000000 0.0000001000000 File [added]: rho_z_[3][3].xg Delta lines: +48 -0 =================================================================== --- trunk/test/tov_slowsector/rho_z_[3][3].xg (rev 0) +++ trunk/test/tov_slowsector/rho_z_[3][3].xg 2012-08-04 07:18:51 UTC (rev 406) @@ -0,0 +1,48 @@ + + +"Time = 0.0000000000000 +-5.6253750000000 0.0003603742972 +-3.7502500000000 0.0007388051562 +-1.8751250000000 0.0011125336050 +0.0000000000000 0.0012799999924 +1.8751250000000 0.0011125336050 +3.7502500000000 0.0007388051562 +5.6253750000000 0.0003603742972 +7.5005000000000 0.0000724355159 +9.3756250000000 0.0000001000000 +11.2507500000000 0.0000001000000 +13.1258750000000 0.0000001000000 +15.0010000000000 0.0000001000000 +16.8761250000000 0.0000001000000 + + +"Time = 0.7031718750000 +-5.6253750000000 0.0000001000000 +-3.7502500000000 0.0000001000000 +-1.8751250000000 0.0000001000000 +0.0000000000000 0.0000001000000 +1.8751250000000 0.0000001000000 +3.7502500000000 0.0000001000000 +5.6253750000000 0.0000001000000 +7.5005000000000 0.0000723975984 +9.3756250000000 0.0000001000000 +11.2507500000000 0.0000001000000 +13.1258750000000 0.0000001000000 +15.0010000000000 0.0000001000000 +16.8761250000000 0.0000001000000 + + +"Time = 1.4063437500000 +-5.6253750000000 0.0000003055006 +-3.7502500000000 0.0000001000000 +-1.8751250000000 0.0000001000000 +0.0000000000000 0.0000001000000 +1.8751250000000 0.0000001000000 +3.7502500000000 0.0000001000000 +5.6253750000000 0.0000003055006 +7.5005000000000 0.0000001000000 +9.3756250000000 0.0000001000000 +11.2507500000000 0.0000001000000 +13.1258750000000 0.0000001000000 +15.0010000000000 0.0000001000000 +16.8761250000000 0.0000001000000

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 405)
by rhaas＠tapir.caltech.edu 04 Aug '12

04 Aug '12

User: rhaas Date: 2012/08/04 02:18 AM Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_RegisterVars.cc Log: GRHydro: Option to use the slow sector of multirate RK methods. NOTE: This patch requires support from MoL. Patch by Christian Reisswig. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_RegisterVars.cc Delta lines: +38 -3 =================================================================== --- trunk/src/GRHydro_RegisterVars.cc 2012-07-21 13:49:08 UTC (rev 404) +++ trunk/src/GRHydro_RegisterVars.cc 2012-08-04 07:18:49 UTC (rev 405) @@ -21,7 +21,11 @@ // future, a check can simply be inserted here. static void register_evolved(string v1, string v2) { - MoLRegisterEvolvedGroup(CCTK_GroupIndex(v1.c_str()), CCTK_GroupIndex(v2.c_str())); + DECLARE_CCTK_PARAMETERS; + if (use_MoL_slow_multirate_sector) + MoLRegisterEvolvedGroupSlow(CCTK_GroupIndex(v1.c_str()), CCTK_GroupIndex(v2.c_str())); + else + MoLRegisterEvolvedGroup(CCTK_GroupIndex(v1.c_str()), CCTK_GroupIndex(v2.c_str())); } static void register_constrained(string v1) { @@ -42,12 +46,14 @@ const int general_coordinates = GRHydro_UseGeneralCoordinates(cctkGH); // We need some aliased functions, so we first check if they are available - string needed_funs[5] = {"MoLRegisterEvolvedGroup", + string needed_funs[7] = {"MoLRegisterEvolvedGroup", + "MoLRegisterEvolvedGroupSlow", "MoLRegisterConstrainedGroup", "MoLRegisterSaveAndRestoreGroup", "MoLRegisterEvolved", + "MoLRegisterEvolvedSlow", "MoLRegisterConstrained"}; - for (int i = 0; i < 5; i++) + for (int i = 0; i < 7; i++) if (!CCTK_IsFunctionAliased(needed_funs[i].c_str())) CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, "The function \"%s\" has not been aliased!", @@ -154,3 +160,32 @@ } } + + +void GRHydro_Set_Execution_Flags(CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + + const int index1 = CCTK_VarIndex("MoL::MoL_SlowStep"); + const int index2 = CCTK_VarIndex("MoL::MoL_SlowPostStep"); + + if (index1 < 0 || index2 < 0) + { + CCTK_WARN(0, "Error: MoL does not provide MoL_SlowStep or MoL_SlowPostStep. Does your MoL thorn support multirate RK?"); + } + + *execute_MoL_Step = *((CCTK_INT *) (CCTK_VarDataPtrI(cctkGH, 0, index1))); + *execute_MoL_PostStep = *((CCTK_INT *) (CCTK_VarDataPtrI(cctkGH, 0, index2))); +} + +void GRHydro_Reset_Execution_Flags(CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + + *execute_MoL_Step = 1; + *execute_MoL_PostStep = 1; +} + + + + Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +9 -0 =================================================================== --- trunk/interface.ccl 2012-07-21 13:49:08 UTC (rev 404) +++ trunk/interface.ccl 2012-08-04 07:18:49 UTC (rev 405) @@ -205,15 +205,21 @@ CCTK_INT FUNCTION MoLRegisterEvolved(CCTK_INT IN EvolvedIndex, \ CCTK_INT IN RHSIndex) +CCTK_INT FUNCTION MoLRegisterEvolvedSlow(CCTK_INT IN EvolvedIndex, \ + CCTK_INT IN RHSIndexSlow) CCTK_INT FUNCTION MoLRegisterConstrained(CCTK_INT IN ConstrainedIndex) CCTK_INT FUNCTION MoLRegisterEvolvedGroup(CCTK_INT IN EvolvedIndex, \ CCTK_INT IN RHSIndex) +CCTK_INT FUNCTION MoLRegisterEvolvedGroupSlow(CCTK_INT IN EvolvedIndex, \ + CCTK_INT IN RHSIndexSlow) CCTK_INT FUNCTION MoLRegisterConstrainedGroup(CCTK_INT IN ConstrainedIndex) CCTK_INT FUNCTION MoLRegisterSaveAndRestoreGroup(CCTK_INT IN SandRIndex) USES FUNCTION MoLRegisterEvolved +USES FUNCTION MoLRegisterEvolvedSlow USES FUNCTION MoLRegisterConstrained USES FUNCTION MoLRegisterEvolvedGroup +USES FUNCTION MoLRegisterEvolvedGroupSlow USES FUNCTION MoLRegisterConstrainedGroup USES FUNCTION MoLRegisterSaveAndRestoreGroup @@ -486,6 +492,9 @@ int GRHydro_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level GRHydro is working on right now" int InLastMoLPostStep type = SCALAR tags='checkpoint="no"' "Flag to indicate if we are currently in the last MoL_PostStep" +int execute_MoL_Step type = SCALAR tags='checkpoint="no"' "Flag indicating whether we use the slow sector of multirate RK time integration" +int execute_MoL_PostStep type = SCALAR tags='checkpoint="no"' "Flag indicating whether we use the slow sector of multirate RK time integration" + real GRHydro_con_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' { densplus, sxplus, syplus, szplus, tauplus, File [modified]: param.ccl Delta lines: +19 -0 =================================================================== --- trunk/param.ccl 2012-07-21 13:49:08 UTC (rev 404) +++ trunk/param.ccl 2012-08-04 07:18:49 UTC (rev 405) @@ -50,6 +50,7 @@ shares: MethodOfLines USES CCTK_INT MoL_Num_Evolved_Vars +USES CCTK_INT MoL_Num_Evolved_Vars_Slow USES CCTK_INT MoL_Num_Constrained_Vars USES CCTK_INT MoL_Num_SaveAndRestore_Vars USES CCTK_INT MoL_Max_Evolved_Array_Size @@ -76,9 +77,16 @@ CCTK_INT GRHydro_MaxNumEvolvedVars "The maximum number of evolved variables used by GRHydro" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars { + 0 :: "when using multirate" 5:10 :: "dens scon[3] tau Bvec[3] psidc ye" } 5 +CCTK_INT GRHydro_MaxNumEvolvedVarsSlow "The maximum number of evolved variables used by GRHydro" ACCUMULATOR-BASE=MethodofLines::MoL_Num_Evolved_Vars_Slow +{ + 0 :: "do not use multirate" + 5:10 :: "dens scon[3] tau Bvec[3] psidc ye" +} 0 + # 7 primitives (rho,press,eps,w_lorentz,vel) # 10 Tmunu # 3 Bvec @@ -640,8 +648,19 @@ } no +restricted: +# This uses the slow sector of MoL multirate methods. +# Since the CFL requirements for hydro are less demanding, +# it is possible to get a significant speed up by +# using a lower order time integration such as RK2, while the spacetime +# is still integrated with an RK4 +BOOLEAN use_MoL_slow_multirate_sector "Whether to make use of MoL's slow multirate sector" +{ +} no +private: + BOOLEAN verbose "Some debug output" { } no File [modified]: schedule.ccl Delta lines: +45 -18 =================================================================== --- trunk/schedule.ccl 2012-07-21 13:49:08 UTC (rev 404) +++ trunk/schedule.ccl 2012-08-04 07:18:49 UTC (rev 405) @@ -7,6 +7,44 @@ ####################################################################### ################################################# +### Storage for MoL execution flag ### +################################################# + +STORAGE: execute_MoL_Step +STORAGE: execute_MoL_PostStep + +# Set execution flags initially to "True" +SCHEDULE GRHydro_Reset_Execution_Flags AT CCTK_BASEGRID +{ + LANG: C + OPTIONS: GLOBAL +} "Initially set execution flags to 'YEAH, Execute'!" + +# When using MoL with multirate, we need to set execution flags for each MoL step! +if (use_MoL_slow_multirate_sector) +{ + SCHEDULE GRHydro_Set_Execution_Flags IN MoL_Step AFTER MoL_DecrementCounter BEFORE MoL_PostStepModify + { + LANG: C + OPTIONS: LEVEL + } "Check if we need to execute RHS / Post-step calculation" + + SCHEDULE GRHydro_Reset_Execution_Flags IN MoL_StartStep AFTER MoL_SetCounter + { + LANG: C + OPTIONS: LEVEL + } "Reset execution flags to 'YEAH, Execute'!" + + SCHEDULE GRHydro_Reset_Execution_Flags IN MoL_Evolution AFTER MoL_FinishLoop + { + LANG: C + OPTIONS: LEVEL + } "Reset execution flags to 'YEAH, Execute'!" +} + + + +################################################# ### Storage for the extra timelevels for the ### ### use of MoL with Einstein ### ################################################# @@ -543,31 +581,20 @@ } "Transform ADM metric, extr. curv. and shift to local tensor basis." - schedule GRHydroTransformADMToLocalBasis IN ADMBase_SetADMVars + schedule GRHydroTransformADMToLocalBasis IN ADMBase_SetADMVars IF GRHydro::execute_MoL_Step { LANG: C } "Transform metric and shift to local tensor basis." - #schedule GRHydroTransformADMToLocalBasis IN CTG_Convert_to_ADM AFTER CTGBase_Convert_CTG_to_ADM - #{ - # LANG: C - #} "Transform metric and shift to local tensor basis." - - #schedule GRHydroTransformADMToLocalBasis IN MoL_Step BEFORE MoL_CalcRHS - #{ - # LANG: C - #} "Transform metric and shift to local tensor basis." - - - schedule GRHydroTransformPrimToGlobalBasis IN HydroBase_PostStep AFTER HydroBase_Con2Prim + schedule GRHydroTransformPrimToGlobalBasis IN HydroBase_PostStep AFTER HydroBase_Con2Prim IF GRHydro::execute_MoL_PostStep { LANG: C } "Transform primitive vars to global tensor basis." } -schedule group GRHydroRHS IN HydroBase_RHS +schedule group GRHydroRHS IN HydroBase_RHS IF GRHydro::execute_MoL_Step { STORAGE:GRHydro_scalars } "Calculate the update terms" @@ -936,7 +963,7 @@ if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) { - schedule Conservative2PrimitiveM IN HydroBase_Con2Prim AS Con2Prim + schedule Conservative2PrimitiveM IN HydroBase_Con2Prim AS Con2Prim IF GRHydro::execute_MoL_PostStep { LANG: Fortran } "Convert back to primitive variables (general) - MHD version" @@ -946,7 +973,7 @@ LANG: Fortran } "Convert initial data given in primive variables to conserved variables - MHD version" } else { - schedule Conservative2Primitive IN HydroBase_Con2Prim AS Con2Prim + schedule Conservative2Primitive IN HydroBase_Con2Prim AS Con2Prim IF GRHydro::execute_MoL_PostStep { LANG: Fortran } "Convert back to primitive variables (general)" @@ -1028,7 +1055,7 @@ # Now synchronize other evolution variables if (!sync_conserved_only) { - schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound + schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound IF GRHydro::execute_MoL_PostStep { LANG: Fortran OPTIONS: LEVEL @@ -1055,7 +1082,7 @@ } else { - schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound + schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound IF GRHydro::execute_MoL_PostStep { LANG: Fortran OPTIONS: LEVEL

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 02 Aug '12

02 Aug '12

changeset: 3615:9eb66003e0ec tag: tip user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Wed Aug 01 09:13:42 2012 -0700 summary: CarpetIOHDF5: only warn once about reading extra files

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 02 Aug '12

02 Aug '12

changeset: 3614:a18c74f37684 tag: tip user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Thu Aug 02 08:57:44 2012 -0700 summary: Carpet: change defaults of periodic_[xyz] to "yes" to match PUGH

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/ (Rev. 64)
by rhaas＠tapir.caltech.edu 01 Aug '12

01 Aug '12

User: rhaas Date: 2012/08/01 03:35 PM Modified: /trunk/ param.ccl Log: make more parameters steerable File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +12 -12 =================================================================== --- trunk/param.ccl 2012-06-22 17:18:12 UTC (rev 63) +++ trunk/param.ccl 2012-08-01 20:35:47 UTC (rev 64) @@ -4,54 +4,54 @@ restricted: # poly EOS -REAL poly_gamma "Adiabatic Index for poly EOS" +REAL poly_gamma "Adiabatic Index for poly EOS" STEERABLE=RECOVER { : :: "" } 2.0 -REAL poly_gamma_ini "Initial Adiabatic Index for poly EOS" +REAL poly_gamma_ini "Initial Adiabatic Index for poly EOS" STEERABLE=RECOVER { : :: "" } 2.0 -REAL poly_k "Polytropic constant in c=G=Msun=1" +REAL poly_k "Polytropic constant in c=G=Msun=1" STEERABLE=RECOVER { : :: "" } 100.0 # gamma-law EOS -REAL gl_gamma "Adiabatic Index for gamma-law EOS" +REAL gl_gamma "Adiabatic Index for gamma-law EOS" STEERABLE=RECOVER { : :: "" } 2.0 -REAL gl_k "Polytropic constant in c=G=Msun=1 for gamma-law EOS" +REAL gl_k "Polytropic constant in c=G=Msun=1 for gamma-law EOS" STEERABLE=RECOVER { : :: "" } 100.0 # hybrid EOS -REAL hybrid_gamma1 "subnuclear adiabatic Index for hybrid EOS" +REAL hybrid_gamma1 "subnuclear adiabatic Index for hybrid EOS" STEERABLE=RECOVER { : :: "" } 1.325 -REAL hybrid_gamma2 "subnuclear adiabatic Index for hybrid EOS" +REAL hybrid_gamma2 "subnuclear adiabatic Index for hybrid EOS" STEERABLE=RECOVER { : :: "" } 2.5 -REAL hybrid_gamma_th "Thermal gamma for hybrid EOS" +REAL hybrid_gamma_th "Thermal gamma for hybrid EOS" STEERABLE=RECOVER { : :: "" } 1.5 -REAL hybrid_k1 "Polytropic constant in c=G=Msun=1 for hybrid EOS" +REAL hybrid_k1 "Polytropic constant in c=G=Msun=1 for hybrid EOS" STEERABLE=RECOVER { : :: "" } 0.4640517 -REAL hybrid_rho_nuc "Density at which to switch between gammas; c=G=Msun=1" +REAL hybrid_rho_nuc "Density at which to switch between gammas; c=G=Msun=1" STEERABLE=RECOVER { : :: "" } 3.238607e-4 @@ -75,11 +75,11 @@ .* :: "Can be anything" } "blah.asc" -STRING nuceos_table_name "nuceos table name (hdf5)" +STRING nuceos_table_name "nuceos table name (hdf5)" STEERABLE=RECOVER { .* :: "Can be anything" } "blah.h5" shares: IO -USES STRING out_dir \ No newline at end of file +USES STRING out_dir

1 0

[svn:einsteintoolkit] NullSHRExtract/trunk/ (Rev. 11)
by rhaas＠tapir.caltech.edu 01 Aug '12

01 Aug '12

User: rhaas Date: 2012/08/01 12:46 PM Modified: /trunk/ interface.ccl /trunk/src/ NullSHRE_WTSphHarm.F90, wt_SphHarmDecomp.F90 Log: NullSHRExtract: respect Cactus' IO::truncate parameter File Changes: Directory: /trunk/src/ ====================== File [modified]: NullSHRE_WTSphHarm.F90 Delta lines: +19 -12 =================================================================== --- trunk/src/NullSHRE_WTSphHarm.F90 2012-07-31 20:06:39 UTC (rev 10) +++ trunk/src/NullSHRE_WTSphHarm.F90 2012-08-01 17:46:34 UTC (rev 11) @@ -42,6 +42,9 @@ CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: NUwtSphCoeff CCTK_COMPLEX, dimension(1:lmax, -lmax:lmax) :: NUwt_xSphCoeff + logical, save :: first_time = .TRUE. + logical :: truncate + DECLARE_CCTK_FUNCTIONS DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS @@ -117,20 +120,22 @@ ! NullDecomp_WriteCoefFile(FieldName, TruncateFile, Lmin, Lmax, YlmCoef, time) - call NullDecomp_WriteCoefFile('J_wt', cctk_iteration.eq.0, 2, Lmax, JwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('Jl_wt', cctk_iteration.eq.0, 2, Lmax, Jwt_lSphCoeff, cctk_time) + truncate = (IO_TruncateOutputFiles(cctkGH) .ne. 0) .and. first_time - call NullDecomp_WriteCoefFile('Q_wt', cctk_iteration.eq.0, 1, Lmax, QwtSphCoeff, 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_WriteCoefFile('U_wt', cctk_iteration.eq.0, 1, Lmax, UwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('Ul_wt', cctk_iteration.eq.0, 1, Lmax, Uwt_lSphCoeff, cctk_time) + call NullDecomp_WriteCoefFile('Q_wt', truncate, 1, Lmax, QwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('B_wt', cctk_iteration.eq.0, 0, Lmax, BwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('Bl_wt', cctk_iteration.eq.0, 0, Lmax, Bwt_lSphCoeff, cctk_time) + 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_WriteCoefFile('W_wt', cctk_iteration.eq.0, 0, Lmax, WwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('Wl_wt', cctk_iteration.eq.0, 0, Lmax, Wwt_lSphCoeff, 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_WriteCoefFile('W_wt', truncate, 0, Lmax, WwtSphCoeff, cctk_time) + call NullDecomp_WriteCoefFile('Wl_wt', truncate, 0, Lmax, Wwt_lSphCoeff, 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)) @@ -143,10 +148,12 @@ ! call NullDecomp_WriteCoefFile('CBx_wt', cctk_iteration.eq.0, 1, Lmax, CBwt_xSphCoeff, cctk_time) ! end if - call NullDecomp_WriteCoefFile('X_wt', cctk_iteration.eq.0, 0, Lmax, XwtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('r0_wt', cctk_iteration.eq.0, 0, Lmax, r0wtSphCoeff, cctk_time) - call NullDecomp_WriteCoefFile('detg_wt', cctk_iteration.eq.0, 0, Lmax, detgwtSphCoeff, 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) + first_time = .FALSE. + end subroutine NullSHRE_WTSphHarm File [modified]: wt_SphHarmDecomp.F90 Delta lines: +9 -4 =================================================================== --- trunk/src/wt_SphHarmDecomp.F90 2012-07-31 20:06:39 UTC (rev 10) +++ trunk/src/wt_SphHarmDecomp.F90 2012-08-01 17:46:34 UTC (rev 11) @@ -23,6 +23,8 @@ CCTK_INT :: i_max, gi_max, i_min, gi_min, retval CCTK_INT, save :: reduce_handle character(len=500) :: message + logical, save :: first_time = .TRUE. + logical :: truncate DECLARE_CCTK_FUNCTIONS DECLARE_CCTK_ARGUMENTS @@ -90,16 +92,19 @@ ! NullDecomp_WriteCoefFile(FieldName, TruncateFile, Lmin, Lmax, YlmCoef, time) - call NullDecomp_WriteCoefRadiusFile('nullgridJ_wt', cctk_iteration.eq.0, 2, lmax, JSphCoeff, cctk_time, null_rb(Nradial)) + truncate = (IO_TruncateOutputFiles(cctkGH) .ne. 0) .and. first_time - call NullDecomp_WriteCoefRadiusFile('nullgridU_wt', cctk_iteration.eq.0, 1, lmax, USphCoeff, cctk_time, null_rb(Nradial)) + call NullDecomp_WriteCoefRadiusFile('nullgridJ_wt', truncate, 2, lmax, JSphCoeff, cctk_time, null_rb(Nradial)) - call NullDecomp_WriteCoefRadiusFile('nullgridB_wt', cctk_iteration.eq.0, 0, lmax, betaSphCoeff, cctk_time, null_rb(Nradial)) + call NullDecomp_WriteCoefRadiusFile('nullgridU_wt', truncate, 1, lmax, USphCoeff, cctk_time, null_rb(Nradial)) - call NullDecomp_WriteCoefRadiusFile('nullgridW_wt', cctk_iteration.eq.0, 0, lmax, WSphCoeff, cctk_time, null_rb(Nradial)) + call NullDecomp_WriteCoefRadiusFile('nullgridB_wt', truncate, 0, lmax, betaSphCoeff, cctk_time, null_rb(Nradial)) + call NullDecomp_WriteCoefRadiusFile('nullgridW_wt', truncate, 0, lmax, WSphCoeff, cctk_time, null_rb(Nradial)) + first_time = .FALSE. + end subroutine wt_WriteSphHarmWT Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +4 -0 =================================================================== --- trunk/interface.ccl 2012-07-31 20:06:39 UTC (rev 10) +++ trunk/interface.ccl 2012-08-01 17:46:34 UTC (rev 11) @@ -25,7 +25,11 @@ USES FUNCTION GetExtractionParameters +CCTK_INT FUNCTION IO_TruncateOutputFiles \ + (CCTK_POINTER_TO_CONST IN GH) +USES FUNCTION IO_TruncateOutputFiles + private: CCTK_REAL NYlm[(l_max+1)*(l_max+1)] TYPE=ARRAY dim=2 size=\

1 0

[svn:einsteintoolkit] NullNews/trunk/ (Rev. 11)
by rhaas＠tapir.caltech.edu 01 Aug '12

01 Aug '12

User: rhaas Date: 2012/08/01 12:45 PM Modified: /trunk/ interface.ccl /trunk/src/ NullNews_SphHarmDecomp.F90 Log: NullNews: respect Cactus' IO::truncate parameter File Changes: Directory: /trunk/src/ ====================== File [modified]: NullNews_SphHarmDecomp.F90 Delta lines: +5 -5 =================================================================== --- trunk/src/NullNews_SphHarmDecomp.F90 2012-07-31 20:05:24 UTC (rev 10) +++ trunk/src/NullNews_SphHarmDecomp.F90 2012-08-01 17:45:45 UTC (rev 11) @@ -40,9 +40,11 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - logical, save :: truncate = .TRUE. - !truncate = cctk_iteration.eq.0 + logical, save :: first_time = .TRUE. + logical :: truncate + 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 @@ -156,9 +158,7 @@ endif - if (truncate) then - truncate = .FALSE. - endif + first_time = .FALSE. end subroutine NullNews_WriteSphHarm Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +5 -0 =================================================================== --- trunk/interface.ccl 2012-07-31 20:05:24 UTC (rev 10) +++ trunk/interface.ccl 2012-08-01 17:45:45 UTC (rev 11) @@ -4,6 +4,11 @@ implements: NullNews inherits: NullGrid NullVars NullInterp +CCTK_INT FUNCTION IO_TruncateOutputFiles \ + (CCTK_POINTER_TO_CONST IN GH) + +USES FUNCTION IO_TruncateOutputFiles + public: # private:

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits August 2012