Commits June 2012

commits@lists.einsteintoolkit.org

4 participants
73 discussions

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 351)
by rhaas＠tapir.caltech.edu 05 Jun '12

05 Jun '12

User: rhaas Date: 2012/06/05 03:51 PM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_PreLoop.F90, GRHydro_Scalars.F90, GRHydro_TVDReconstruct.F90, make.code.defn Log: GRHydro: Fix slope limiters and get rid of broken cases; there is a related patch in TRAC at the moment Patch by Josh Faber. Some additional checks by Roland Haas. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PreLoop.F90 Delta lines: +0 -9 =================================================================== --- trunk/src/GRHydro_PreLoop.F90 2012-06-05 20:50:25 UTC (rev 350) +++ trunk/src/GRHydro_PreLoop.F90 2012-06-05 20:51:49 UTC (rev 351) @@ -39,9 +39,6 @@ DECLARE_CCTK_FUNCTIONS MINMOD = .false. - MINMOD2 = .false. - MINMOD3 = .false. - MC1 = .false. MC2 = .false. SUPERBEE = .false. HLLE = .false. @@ -49,12 +46,6 @@ if (CCTK_EQUALS(tvd_limiter,"minmod")) then MINMOD = .true. - else if (CCTK_EQUALS(tvd_limiter,"minmod2")) then - MINMOD2 = .true. - else if (CCTK_EQUALS(tvd_limiter,"minmod3")) then - MINMOD3 = .true. - else if (CCTK_EQUALS(tvd_limiter,"vanleerMC")) then - MC1 = .true. else if (CCTK_EQUALS(tvd_limiter,"vanleerMC2")) then MC2 = .true. else if (CCTK_EQUALS(tvd_limiter,"Superbee")) then File [modified]: GRHydro_Scalars.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Scalars.F90 2012-06-05 20:50:25 UTC (rev 350) +++ trunk/src/GRHydro_Scalars.F90 2012-06-05 20:51:49 UTC (rev 351) @@ -16,7 +16,7 @@ implicit none - LOGICAL :: MINMOD, MINMOD2, MINMOD3, MC1, MC2, SUPERBEE, PPM3, PPM4 + LOGICAL :: MINMOD, MC2, SUPERBEE, PPM3, PPM4 LOGICAL :: ANALYTICAL LOGICAL :: FAST LOGICAL :: HLLE, LLF File [modified]: GRHydro_TVDReconstruct.F90 Delta lines: +18 -14 =================================================================== --- trunk/src/GRHydro_TVDReconstruct.F90 2012-06-05 20:50:25 UTC (rev 350) +++ trunk/src/GRHydro_TVDReconstruct.F90 2012-06-05 20:51:49 UTC (rev 351) @@ -79,22 +79,26 @@ dloc = orig(i+xoffset, j+yoffset, k+zoffset) - orig(i, j, k) if (MINMOD) then - delta = minmod_func(dupw,dloc) + delta = minmod_func(dupw,dloc) else if (MC2) then -!!$ This is an alternative equivalent implementation -!!$ of vanLeeer MC slopelimiter - if (dupw*dloc < 0.d0) then - delta=0.d0 - else - delta=sign(min(2.d0*abs(dupw),2.d0*abs(dloc),& - 0.5d0*(abs(dupw)+abs(dloc))),dupw+dloc) - end if +!!$ This is the van Leer MC slope limiter + if (dupw*dloc < 0.d0) then + delta=0.d0 + else + delta=sign(min(2.d0*abs(dupw),2.d0*abs(dloc),& + 0.5d0*(abs(dupw)+abs(dloc))),dupw+dloc) + end if + else if (SUPERBEE) then + if (dupw*dloc < 0.d0) then + delta=0.d0 + else + delta=sign(max(min(2.d0*abs(dupw),abs(dloc)),& + min(2.d0*abs(dloc),abs(dupw))),dupw+dloc) + end if else - delta = 0.5d0*(dupw + dloc) - if (abs(dupw) < myfloor ) dupw = myfloor*sign(1.d0, dupw) - if (abs(dloc) < myfloor ) dloc = myfloor*sign(1.d0, dloc) - ratio = dupw / dloc - call slopelimiter(ratio, delta) + call CCTK_WARN(0, "Type of limiter not recognized") + ! NOTREACHED + delta = 0d0 end if hdelta = 0.5d0 * delta bextm(i, j, k) = orig(i, j, k) - hdelta File [modified]: make.code.defn Delta lines: +0 -1 =================================================================== --- trunk/src/make.code.defn 2012-06-05 20:50:25 UTC (rev 350) +++ trunk/src/make.code.defn 2012-06-05 20:51:49 UTC (rev 351) @@ -35,7 +35,6 @@ GRHydro_RoeSolver.F90 \ GRHydro_Scalars.F90 \ GRHydro_Shift.F90 \ - GRHydro_SlopeLimiter.F90 \ GRHydro_Source.F90 \ GRHydro_Startup.F90 \ GRHydro_TVDReconstruct.F90 \ Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +0 -3 =================================================================== --- trunk/param.ccl 2012-06-05 20:50:25 UTC (rev 350) +++ trunk/param.ccl 2012-06-05 20:51:49 UTC (rev 351) @@ -116,10 +116,7 @@ keyword tvd_limiter "Which slope limiter to use" { "minmod" :: "Minmod" - "vanleerMC" :: "Van Leer MC - Ian" "vanleerMC2" :: "Van Leer MC - Luca" - "minmod2" :: "Minmod - Ian" - "minmod3" :: "Minmod - Luca (or vice versa). Expect I've made a typo" "Superbee" :: "Superbee" } "minmod"

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 350)
by rhaas＠tapir.caltech.edu 05 Jun '12

05 Jun '12

User: rhaas Date: 2012/06/05 03:50 PM Modified: /trunk/src/ GRHydro_RegisterVars.cc Log: GRHydro: register TmunuBase variables as MoL constraint. Patch by Christian Reisswig. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_RegisterVars.cc Delta lines: +3 -0 =================================================================== --- trunk/src/GRHydro_RegisterVars.cc 2012-06-05 20:49:41 UTC (rev 349) +++ trunk/src/GRHydro_RegisterVars.cc 2012-06-05 20:50:25 UTC (rev 350) @@ -59,6 +59,9 @@ register_constrained("HydroBase::eps"); register_constrained("HydroBase::w_lorentz"); register_constrained("HydroBase::vel"); + register_constrained("TmunuBase::stress_energy_scalar"); + register_constrained("TmunuBase::stress_energy_vector"); + register_constrained("TmunuBase::stress_energy_tensor"); if (general_coordinates) { register_constrained("GRHydro::lvel");

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 349)
by rhaas＠tapir.caltech.edu 05 Jun '12

05 Jun '12

User: rhaas Date: 2012/06/05 03:49 PM Modified: /trunk/ param.ccl Log: GRHydro: Make enahnced params steerable. Patch by Christian Reisswig. File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +2 -2 =================================================================== --- trunk/param.ccl 2012-06-05 20:46:20 UTC (rev 348) +++ trunk/param.ccl 2012-06-05 20:49:41 UTC (rev 349) @@ -198,12 +198,12 @@ { } no -real enhanced_ppm_C2 "Parameter for enhancecd ppm limiter. Default from McCorquodale & Colella 2011" +real enhanced_ppm_C2 "Parameter for enhancecd ppm limiter. Default from McCorquodale & Colella 2011" STEERABLE=ALWAYS { *:* :: "must be greater than 1. According to Colella&Sekora 2008, enhanced ppm is insensitive to C in [1.25,5]" } 1.25 -real enhanced_ppm_C3 "Parameter for enhancecd ppm limiter. Default from McCorquodale & Colella 2011" +real enhanced_ppm_C3 "Parameter for enhancecd ppm limiter. Default from McCorquodale & Colella 2011" STEERABLE=ALWAYS { 0:* :: "must be greater than 0." } 0.1

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 348)
by rhaas＠tapir.caltech.edu 05 Jun '12

05 Jun '12

User: rhaas Date: 2012/06/05 03:46 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: * allow disabling check of the GRHydro_C2P_failed mask on coarse reflevels via GRHydro_c2p_warn_from_level parameter. Patch by Christian Ott. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +3 -0 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2012-06-05 20:45:16 UTC (rev 347) +++ trunk/src/GRHydro_Con2Prim.F90 2012-06-05 20:46:20 UTC (rev 348) @@ -1984,6 +1984,9 @@ ny = cctk_lsh(2) nz = cctk_lsh(3) + ! do not check if told not to + if(GRHydro_reflevel .lt. GRHydro_c2p_warn_from_reflevel) return + !$OMP PARALLEL DO PRIVATE(i,j,k) do k = 1, nz do j = 1, ny

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 347)
by rhaas＠tapir.caltech.edu 05 Jun '12

05 Jun '12

User: rhaas Date: 2012/06/05 03:45 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: GRHydro: fix format statements in hot C2P. Note: This should be propagated to ET! Patch by Christian Ott. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +3 -3 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2012-06-05 20:40:27 UTC (rev 346) +++ trunk/src/GRHydro_Con2Prim.F90 2012-06-05 20:45:16 UTC (rev 347) @@ -663,7 +663,7 @@ call CCTK_WARN(failinfomode,warnline) write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A10,i5)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration + write(warnline,"(A10,i5,i5)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") else @@ -756,7 +756,7 @@ call CCTK_WARN(failinfomode,warnline) write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A10,i5)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration + write(warnline,"(A10,i5,i5)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") else @@ -867,7 +867,7 @@ call CCTK_WARN(failinfomode,warnline) write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A10,i5)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration + write(warnline,"(A10,i5,i5)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") else

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 346)
by rhaas＠tapir.caltech.edu 05 Jun '12

05 Jun '12

User: rhaas Date: 2012/06/05 03:40 PM Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ GRHydro_CalcUpdate.F90, GRHydro_ParamCheck.F90 Log: GRHydro: Added option to constrain evolution to 1D by projecting out non-radial parts of the conserved velocity RHSs. Patch by Christian Reisswig. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_CalcUpdate.F90 Delta lines: +64 -0 =================================================================== --- trunk/src/GRHydro_CalcUpdate.F90 2012-06-05 20:32:09 UTC (rev 345) +++ trunk/src/GRHydro_CalcUpdate.F90 2012-06-05 20:40:27 UTC (rev 346) @@ -72,6 +72,7 @@ taurhs(i,j,k) = taurhs(i,j,k) + & (alp_l * tauflux(i-xoffset,j-yoffset,k-zoffset) - & alp_r * tauflux(i,j,k)) * idx + if(evolve_mhd.ne.0) then if(transport_constraints.ne.0) then ! we have to first compute all components of v\crossB = E and @@ -260,6 +261,7 @@ taurhs(i,j,k) = taurhs(i,j,k) + & (tauflux(i-xoffset,j-yoffset,k-zoffset) - & tauflux(i,j,k)) * idx + if(evolve_mhd.ne.0) then Bconsrhs(i,j,k,1) = Bconsrhs(i,j,k,1) + & (Bconsxflux(i-xoffset,j-yoffset,k-zoffset) - & @@ -319,3 +321,65 @@ end subroutine UpdateCalculation + + + + + /*@@ + @routine ConstrainSconTo1D + @date Tue 24 14:12 2012 + @author Christian Reisswig + @desc + Constrains the conserved fluid velocity to radial direction + @enddesc + @calls + @calledby + @history + @endhistory + +@@*/ + + +subroutine ConstrainSconTo1D(CCTK_ARGUMENTS) + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + CCTK_INT :: i,j,k + CCTK_REAL :: rnorm, rnormI, scon_tmp1, scon_tmp2, scon_tmp3 + + !$OMP PARALLEL DO PRIVATE(i,j,k,rnorm,rnormI,scon_tmp1,scon_tmp2,scon_tmp3) + do k = GRHydro_stencil + 1 - transport_constraints, cctk_lsh(3) - GRHydro_stencil ! we need to compute Evec on all faces/edges where the fluxes are defined + do j = GRHydro_stencil + 1 - transport_constraints, cctk_lsh(2) - GRHydro_stencil + do i = GRHydro_stencil + 1 - transport_constraints, cctk_lsh(1) - GRHydro_stencil + + + ! Eliminate non-radial fluid velocities to obtain pseudo 1D scheme + rnorm = (x(i,j,k)**2 + y(i,j,k)**2 + z(i,j,k)**2) + if (rnorm.eq.0) then + rnormI = 0 + else + rnormI = 1.0d0/rnorm + endif + + scon_tmp1 = (x(i,j,k)*scon(i,j,k,1) & + + y(i,j,k)*scon(i,j,k,2) & + + z(i,j,k)*scon(i,j,k,3)) * rnormI * x(i,j,k) + scon_tmp2 = (x(i,j,k)*scon(i,j,k,1) & + + y(i,j,k)*scon(i,j,k,2) & + + z(i,j,k)*scon(i,j,k,3)) * rnormI * y(i,j,k) + scon_tmp3 = (x(i,j,k)*scon(i,j,k,1) & + + y(i,j,k)*scon(i,j,k,2) & + + z(i,j,k)*scon(i,j,k,3)) * rnormI * z(i,j,k) + + scon(i,j,k,1) = scon_tmp1 + scon(i,j,k,2) = scon_tmp2 + scon(i,j,k,3) = scon_tmp3 + + end do + end do + end do +end subroutine ConstrainSconTo1D + File [modified]: GRHydro_ParamCheck.F90 Delta lines: +4 -0 =================================================================== --- trunk/src/GRHydro_ParamCheck.F90 2012-06-05 20:32:09 UTC (rev 345) +++ trunk/src/GRHydro_ParamCheck.F90 2012-06-05 20:40:27 UTC (rev 346) @@ -112,6 +112,10 @@ if (CCTK_Equals(riemann_solver,"HLLE").eq.0.and.coordinates_is_active.ne.0) then call CCTK_WARN(0, "There is currently no Riemann solver other than HLLE compatible with multipatch!") end if + + if (constrain_to_1D .eq. 1 .and. coordinates_is_active.eq.1) then + call CCTK_WARN(0, "Constrain to 1D option does not work with other than Cartesian coordinates. Ask Christian R. to implement it if required!") + endif if (CCTK_EQUALS(riemann_solver,"Roe").and.CCTK_EQUALS(Bvec_evolution_method,"GRHydro")) then call CCTK_PARAMWARN("Roe solver is not implemented yet for MHD") Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +17 -0 =================================================================== --- trunk/param.ccl 2012-06-05 20:32:09 UTC (rev 345) +++ trunk/param.ccl 2012-06-05 20:40:27 UTC (rev 346) @@ -612,3 +612,20 @@ { } no + + + + +############### Testing options ################################################### + + +# This constrains the flux velicity vectors to spherical symmetry. +# Only the radial contribution to the velocity vectors is considered. +# This is due to Kotake et al 2012. +BOOLEAN constrain_to_1D "Set fluid velocities to zero for non-radial motion" +{ +} no + + + + File [modified]: schedule.ccl Delta lines: +13 -0 =================================================================== --- trunk/schedule.ccl 2012-06-05 20:32:09 UTC (rev 345) +++ trunk/schedule.ccl 2012-06-05 20:40:27 UTC (rev 346) @@ -1280,3 +1280,16 @@ LANG: Fortran } "Calculate divB" } + + +if (constrain_to_1D) { + SCHEDULE ConstrainSconTo1D in MoL_PostStepModify + { + LANG: FORTRAN + OPTION: LOCAL + } "Constrain conserved fluid velocity to radial direction" +} + + + +

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 345)
by rhaas＠tapir.caltech.edu 05 Jun '12

05 Jun '12

User: rhaas Date: 2012/06/05 03:32 PM Modified: /trunk/src/ GRHydro_RegisterVars.cc Log: GRHydro: do not register any SandR variables if MaxNumSandR ==0 this is useful when running with a spacetime code that will register the ADMBase variables as constrained anyway, so one can save the memory used for SandR scratch space. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_RegisterVars.cc Delta lines: +8 -4 =================================================================== --- trunk/src/GRHydro_RegisterVars.cc 2012-06-05 20:31:21 UTC (rev 344) +++ trunk/src/GRHydro_RegisterVars.cc 2012-06-05 20:32:09 UTC (rev 345) @@ -93,9 +93,11 @@ CCTK_WARN(0, "Don't recognize the type of EOS!"); // lapse, metric, curv - register_saveandrestore("admbase::lapse"); - register_saveandrestore("admbase::metric"); - register_saveandrestore("admbase::curv"); + if(GRHydro_MaxNumSandRVars != 0) { // hack to save some memory since we "know" that someone else will register these as constrained + register_saveandrestore("admbase::lapse"); + register_saveandrestore("admbase::metric"); + register_saveandrestore("admbase::curv"); + } // shift if (!CCTK_EQUALS(initial_shift, "none")) @@ -106,8 +108,10 @@ register_evolved("GRHydro::GRHydro_coords", "GRHydro::GRHydro_coords_rhs"); } - else + else if(GRHydro_MaxNumSandRVars != 0) // hack to save some memory since we "know" that someone else will register these as constrained + { register_saveandrestore("admbase::shift"); + } } // tracer

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 344)
by rhaas＠tapir.caltech.edu 05 Jun '12

05 Jun '12

User: rhaas Date: 2012/06/05 03:31 PM Modified: /trunk/src/ GRHydro_Boundaries.F90 Log: GRHydro: Verbosity on which boundary selction routine is executed. Patch by Christian Reisswig. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +5 -0 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2012-06-05 20:30:33 UTC (rev 343) +++ trunk/src/GRHydro_Boundaries.F90 2012-06-05 20:31:21 UTC (rev 344) @@ -199,6 +199,8 @@ general_coordinates = GRHydro_UseGeneralCoordinates(cctkGH) + if (verbose.eq.1) call CCTK_INFO("Selecting conserved BC (and primitive BC if selected)") + !!$Flat boundaries if required if (CCTK_EQUALS(bound,"flat")) then @@ -381,6 +383,9 @@ ! The commented out code are those primitives which do not require and explicit ! initial guess for Con2Prim. The guesses are either not needed or computed from other quantities! + if (verbose.eq.1) call CCTK_INFO("Selecting primitive BC") + + if (CCTK_EQUALS(bound,"flat")) then !ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, &

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 343)
by rhaas＠tapir.caltech.edu 05 Jun '12

05 Jun '12

User: rhaas Date: 2012/06/05 03:30 PM Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ make.code.defn Log: GRHydro: Schedule AtmosphereReset in LAST Mol_PostStep This saves some syncs. This also gets rid of the akward parameter "disable_sync_and_tmunu_after_mol". Original patch by Christian Reisswig. Adapted to not rely on MoL support by Roland Haas. Bug fixed by Christian Reisswig. File Changes: Directory: /trunk/src/ ====================== File [modified]: make.code.defn Delta lines: +1 -0 =================================================================== --- trunk/src/make.code.defn 2012-06-05 20:29:03 UTC (rev 342) +++ trunk/src/make.code.defn 2012-06-05 20:30:33 UTC (rev 343) @@ -63,6 +63,7 @@ GRHydro_PPMMReconstruct_drv.F90\ GRHydro_ENOReconstruct_drv.F90\ GRHydro_PPMReconstruct_drv.F90\ + GRHydro_LastMoLPostStep.c\ GRHydro_TVDReconstruct_drv.F90 Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -0 =================================================================== --- trunk/interface.ccl 2012-06-05 20:29:03 UTC (rev 342) +++ trunk/interface.ccl 2012-06-05 20:30:33 UTC (rev 343) @@ -476,6 +476,7 @@ private: 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" real GRHydro_con_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' { File [modified]: param.ccl Delta lines: +4 -6 =================================================================== --- trunk/param.ccl 2012-06-05 20:29:03 UTC (rev 342) +++ trunk/param.ccl 2012-06-05 20:30:33 UTC (rev 343) @@ -592,14 +592,12 @@ 0: :: "Greater or equal to 0" } 0 -# The following parameter is to reduce the number of syncs/boundary calls done -# it will lead to correct results when set to yes ONLY when the simulation does not use -# an atmosphere at all. -boolean disable_sync_and_tmunu_after_MoL "Do not sync/prolongate and reset Tmunu after MoL integration is done" STEERABLE=ALWAYS -{ -} "no" +############### Optimization options ################################################### + + + # This can improve the performance on many cores, but may be dangerous # (it seems to work in simple testcases, but morde complicated settings may fail) # If you encounter strange behavior, switch this OFF File [modified]: schedule.ccl Delta lines: +117 -75 =================================================================== --- trunk/schedule.ccl 2012-06-05 20:29:03 UTC (rev 342) +++ trunk/schedule.ccl 2012-06-05 20:30:33 UTC (rev 343) @@ -67,6 +67,7 @@ STORAGE:evolve_Y_e STORAGE:evolve_temper STORAGE:GRHydro_reflevel +STORAGE:InLastMoLPostStep STORAGE:densrhs STORAGE:taurhs STORAGE:srhs @@ -1000,45 +1001,45 @@ if (!sync_conserved_only) { -schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound -{ - LANG: Fortran - OPTIONS: LEVEL - SYNC: dens - SYNC: tau - SYNC: scon - SYNC: HydroBase::w_lorentz - SYNC: HydroBase::rho - SYNC: HydroBase::press - SYNC: HydroBase::eps - SYNC: HydroBase::vel - SYNC: Bcons - SYNC: HydroBase::Bvec - SYNC: psidc - SYNC: GRHydro_cons_tracers - SYNC: GRHydro_tracers - SYNC: hydrobase::temperature - SYNC: hydrobase::entropy - SYNC: hydrobase::Y_e - SYNC: Y_e_con - SYNC: lvel - SYNC: lBvec -} "Select GRHydro boundary conditions" + schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound + { + LANG: Fortran + OPTIONS: LEVEL + SYNC: dens + SYNC: tau + SYNC: scon + SYNC: HydroBase::w_lorentz + SYNC: HydroBase::rho + SYNC: HydroBase::press + SYNC: HydroBase::eps + SYNC: HydroBase::vel + SYNC: Bcons + SYNC: HydroBase::Bvec + SYNC: psidc + SYNC: GRHydro_cons_tracers + SYNC: GRHydro_tracers + SYNC: hydrobase::temperature + SYNC: hydrobase::entropy + SYNC: hydrobase::Y_e + SYNC: Y_e_con + SYNC: lvel + SYNC: lBvec + } "Select GRHydro boundary conditions" } else { -schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound -{ - LANG: Fortran - OPTIONS: LEVEL - SYNC: dens - SYNC: tau - SYNC: scon - SYNC: Bcons - SYNC: psidc - SYNC: GRHydro_cons_tracers - SYNC: Y_e_con -} "Select GRHydro boundary conditions" + schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound + { + LANG: Fortran + OPTIONS: LEVEL + SYNC: dens + SYNC: tau + SYNC: scon + SYNC: Bcons + SYNC: psidc + SYNC: GRHydro_cons_tracers + SYNC: Y_e_con + } "Select GRHydro boundary conditions" # after a regrid Cactus relies on the boundary thorns to fill in the outer # and symmetry boundaries (we need valid data for the initial guess in Con2Prim) @@ -1049,36 +1050,63 @@ { } "Apply boundary conditions to primitives" - # This is necessary, otherwise we are inconsistent in atmosphere treatment of conserved and primitive variables - if(!disable_sync_and_tmunu_after_MoL) { - schedule group GRHydro_PrimitiveBoundaries IN CCTK_EVOL AFTER (MoL_Evolution,GRHydro_AtmosphereReset,sync_GRHydro_C2P_failed) BEFORE HydroBase_Boundaries - { - } "Apply boundary conditions to primitives" + # This is necessary to provide initial guesses for Con2Prim after atmo reset (which happens only at last MoL post-step)! + schedule group GRHydro_PrimitiveBoundaries IN HydroBase_PostStep BEFORE HydroBase_Boundaries IF GRHydro::InLastMoLPostStep + { + } "Apply boundary conditions to primitives" + + + if(CCTK_IsImplementationActive("Coordinates")) { + + # With MP, we only need to sync primitives in LOCAL tensor base!! + schedule GRHydro_SelectPrimitiveBoundaries IN GRHydro_PrimitiveBoundaries + { + LANG: Fortran + OPTIONS: LEVEL + # do a sync to be very sure we have proper initial guesses everywhere +# SYNC: HydroBase::w_lorentz # not used as initial guess and hence not needed! +# SYNC: HydroBase::press # not used as initial guess and hence not needed! +# SYNC: HydroBase::vel +# SYNC: HydroBase::Bvec +# SYNC: hydrobase::entropy # not used as initial guess and hence not needed! +# SYNC: hydrobase::Y_e # not used as initial guess and hence not needed! +# SYNC: GRHydro_tracers # not used as initial guess and hence not needed! + SYNC: HydroBase::rho + SYNC: HydroBase::eps + SYNC: hydrobase::temperature + SYNC: lvel + SYNC: lBvec + } "Select primitive variables for boudary conditions" } + else + { + # Without MP, we only need to sync primitives in GLOBAL tensor base!! + schedule GRHydro_SelectPrimitiveBoundaries IN GRHydro_PrimitiveBoundaries + { + LANG: Fortran + OPTIONS: LEVEL + # do a sync to be very sure we have proper initial guesses everywhere +# SYNC: HydroBase::w_lorentz # not used as initial guess and hence not needed! +# SYNC: HydroBase::press # not used as initial guess and hence not needed! +# SYNC: hydrobase::entropy # not used as initial guess and hence not needed! +# SYNC: hydrobase::Y_e # not used as initial guess and hence not needed! +# SYNC: lvel +# SYNC: lBvec +# SYNC: GRHydro_tracers # not used as initial guess and hence not needed! + SYNC: HydroBase::rho + SYNC: HydroBase::eps + SYNC: HydroBase::vel + SYNC: HydroBase::Bvec + SYNC: hydrobase::temperature + } "Select primitive variables for boudary conditions" - schedule GRHydro_SelectPrimitiveBoundaries IN GRHydro_PrimitiveBoundaries - { - LANG: Fortran - OPTIONS: LEVEL - # do a sync to be very sure we have proper initial guesses everywhere - SYNC: HydroBase::w_lorentz - SYNC: HydroBase::rho - SYNC: HydroBase::press - SYNC: HydroBase::eps - SYNC: HydroBase::vel - SYNC: HydroBase::Bvec - SYNC: hydrobase::temperature - SYNC: hydrobase::entropy - SYNC: hydrobase::Y_e - SYNC: lvel - SYNC: lBvec - SYNC: GRHydro_tracers - } "Select primitive variables for boudary conditions" + } + schedule group ApplyBCs AS GRHydro_ApplyPrimitiveBCs in GRHydro_PrimitiveBoundaries AFTER GRHydro_SelectPrimitiveBoundaries { } "Apply boundary conditions to primitive variables" -} +} # sync_conserved_only ############################################################ ### Compute first differences of rho for mesh refinement ### @@ -1100,37 +1128,51 @@ # } "Compute relative differences in rho" ################################################################ +### Some actions are only required in the very last MoL sub- ### +### step but cannot be moved into PseudoEvolution since they ### +### affect other routines in PostStep. A prime example is ### +### AmosphereReset which forms an operator split RHS. ### +################################################################ + +schedule GRHydro_SetLastMoLPostStep IN MoL_PostStep +{ + LANG: C + OPTIONS: level +} "Set grid scalar InLastMoLPostStep if this is the last MoL PostStep call" +# there used to be a comment along the lines "You did not see this abuse of +# MoL. Nothing to see here. Move along." Consider such a comment to be present +# again. +schedule GRHydro_ClearLastMoLPostStep IN MoL_Step AFTER MoL_PostStep +{ + LANG: C + OPTIONS: level +} "Reset InLastMoLPostStep to zero" +schedule GRHydro_ClearLastMoLPostStep IN CCTK_WRAGH +{ + LANG: C + OPTIONS: global-early +} "Initialize InLastMoLPostStep to zero" + +################################################################ ### If a point has been marked as requiring resetting to the ### ### atmosphere, this is where we do it. ### ### ### -### This is logically still part of the MoL evolution step ### -### since it is part of evolving the primitives. The final ### -### SetTmunu should be before PseudoEvolution so that eg. ### -### constraints use the correct stress energy tensor. ### +### This is executed in the last MoL_PosStep ### ################################################################ if (CCTK_Equals(Bvec_evolution_method,"GRHydro")) { - schedule GRHydro_AtmosphereResetM AT EVOL AFTER MoL_Evolution + schedule GRHydro_AtmosphereResetM IN MoL_PostStep AFTER ADMBase_SetADMVars AFTER GRHydro_SetLastMoLPostStep BEFORE HydroBase_PostStep IF GRHydro::InLastMoLPostStep { LANG: Fortran } "Reset the atmosphere - MHD version" } else { - schedule GRHydro_AtmosphereReset AT EVOL AFTER MoL_Evolution + schedule GRHydro_AtmosphereReset IN MoL_PostStep AFTER ADMBase_SetADMVars BEFORE HydroBase_PostStep IF GRHydro::InLastMoLPostStep { LANG: Fortran } "Reset the atmosphere" } -if(!disable_sync_and_tmunu_after_MoL) { - schedule group HydroBase_Boundaries AT EVOL AFTER MoL_Evolution AFTER (GRHydro_AtmosphereReset GRHydro_AtmosphereResetM) - { - } "HydroBase Boundary conditions group" - - schedule GROUP SetTmunu AT EVOL AFTER HydroBase_Boundaries BEFORE MoL_PseudoEvolution - { - } "Calculate the stress-energy tensor" -} } # end of if (CCTK_EQUALS(hydrobase::evolution_method, "GRHydro"))

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 342)
by rhaas＠tapir.caltech.edu 05 Jun '12

05 Jun '12

User: rhaas Date: 2012/06/05 03:29 PM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_UpdateMask.F90 Log: GRHydro: Added verbosity parameter. Patch by Christian Reisswig. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_UpdateMask.F90 Delta lines: +2 -0 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2012-06-05 20:28:24 UTC (rev 341) +++ trunk/src/GRHydro_UpdateMask.F90 2012-06-05 20:29:03 UTC (rev 342) @@ -221,6 +221,8 @@ vup => vel end if + if (verbose.eq.1) call CCTK_INFO("Entering AtmosphereReset.") + !$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +7 -0 =================================================================== --- trunk/param.ccl 2012-06-05 20:28:24 UTC (rev 341) +++ trunk/param.ccl 2012-06-05 20:29:03 UTC (rev 342) @@ -607,3 +607,10 @@ { } no + + + +BOOLEAN verbose "Some debug output" +{ +} no +

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits June 2012