Commits July 2012

commits@lists.einsteintoolkit.org

7 participants
70 discussions

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

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/ schedule.ccl Log: GRHydro: Fixed mislabeled scheduling comment (cosmetic change). File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +3 -3 =================================================================== --- trunk/schedule.ccl 2012-07-05 05:36:36 UTC (rev 378) +++ trunk/schedule.ccl 2012-07-05 05:36:38 UTC (rev 379) @@ -1065,17 +1065,17 @@ # and symmetry boundaries (we need valid data for the initial guess in Con2Prim) schedule group GRHydro_PrimitiveBoundaries IN CCTK_POSTREGRID BEFORE MoL_PostStep { - } "Apply boundary conditions to primitives used for initial guesses" + } "Apply boundary conditions to all primitives" schedule group GRHydro_PrimitiveBoundaries IN CCTK_POSTREGRIDINITIAL BEFORE MoL_PostStep { - } "Apply boundary conditions to primitives used for initial guesses" + } "Apply boundary conditions to all primitives" # Primitive sync is always necessary to provide initial guesses for Con2Prim in the buffer zones via prolongation. # Buffer zones are not guaranteed to have the correct values! Prolongation happens only in the last MoL poststep # so we only need to sync in the last MoL post step. schedule group GRHydro_PrimitiveInitialGuessesBoundaries IN HydroBase_PostStep BEFORE HydroBase_Boundaries IF GRHydro::InLastMoLPostStep { - } "Apply boundary conditions to all primitives" + } "Apply boundary conditions to those primitives used as initial guesses" if(CCTK_IsImplementationActive("Coordinates")) {

1 0

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

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/ schedule.ccl /trunk/src/ GRHydro_Boundaries.F90 Log: GRHydro: Sync ALL prinmitives after regridding. This ensures that all variables are known on the finer grid when sync_conserved_only = yes. This is fix only affects runs which use a microphysical EOS. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +139 -1 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2012-07-05 05:36:34 UTC (rev 377) +++ trunk/src/GRHydro_Boundaries.F90 2012-07-05 05:36:36 UTC (rev 378) @@ -360,7 +360,7 @@ -subroutine GRHydro_SelectPrimitiveBoundaries(CCTK_ARGUMENTS) +subroutine GRHydro_SelectPrimitiveInitialGuessesBoundaries(CCTK_ARGUMENTS) implicit none @@ -490,6 +490,142 @@ if (ierr < 0) call CCTK_WARN(0, "problems with applying the chosen boundary condition") +end subroutine GRHydro_SelectPrimitiveInitialGuessesBoundaries + + + + + + + + +subroutine GRHydro_SelectPrimitiveBoundaries(CCTK_ARGUMENTS) + + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + integer, dimension(3) :: sw + integer :: ierr = 0 + integer :: i,j,k + CCTK_INT :: GRHydro_UseGeneralCoordinates, general_coordinates + + CCTK_INT, parameter :: faces=CCTK_ALL_FACES + CCTK_INT, parameter :: ione=1 + + sw = GRHydro_stencil + + general_coordinates = GRHydro_UseGeneralCoordinates(cctkGH) + +!!$Flat boundaries if required + + 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, & + "HydroBase::w_lorentz", "Flat") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::rho", "Flat") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::press", "Flat") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::eps", "Flat") + if (general_coordinates .ne. 0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::lvel", "Flat") + else + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::vel", "Flat") + endif + if(evolve_mhd.ne.0) then + if (general_coordinates .ne. 0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::lBvec", "Flat") + else + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::Bvec", "Flat") + endif + endif + + if(evolve_tracer.ne.0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::GRHydro_tracers", "Flat") + endif + + if(evolve_y_e.ne.0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::Y_e", "Flat") + endif + + if(evolve_temper.ne.0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::temperature", "Flat") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::entropy", "Flat") + endif + + + endif + + if (CCTK_EQUALS(bound,"none")) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::w_lorentz", "None") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::rho", "None") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::press", "None") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::eps", "None") + if (general_coordinates .ne. 0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::lvel", "None") + else + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::vel", "None") + endif + + if(evolve_mhd.ne.0) then + if (general_coordinates .ne. 0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::lBvec", "None") + else + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::Bvec", "None") + endif + + endif + + if(evolve_tracer.ne.0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::GRHydro_tracers", "None") + + endif + + if(evolve_y_e.ne.0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::Y_e", "None") + + endif + + if(evolve_temper.ne.0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::temperature", "None") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::entropy", "None") + endif + + end if + + if (CCTK_EQUALS(bound,"scalar")) then + call CCTK_WARN(0, "Until somebody uses this I see no reason to support it") + end if + + if (ierr < 0) call CCTK_WARN(0, "problems with applying the chosen boundary condition") + end subroutine GRHydro_SelectPrimitiveBoundaries @@ -497,6 +633,8 @@ + + subroutine GRHydro_SelectAtmosphereMaskBoundaries(CCTK_ARGUMENTS) implicit none Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +53 -11 =================================================================== --- trunk/schedule.ccl 2012-07-05 05:36:34 UTC (rev 377) +++ trunk/schedule.ccl 2012-07-05 05:36:36 UTC (rev 378) @@ -1065,27 +1065,27 @@ # and symmetry boundaries (we need valid data for the initial guess in Con2Prim) schedule group GRHydro_PrimitiveBoundaries IN CCTK_POSTREGRID BEFORE MoL_PostStep { - } "Apply boundary conditions to primitives" + } "Apply boundary conditions to primitives used for initial guesses" schedule group GRHydro_PrimitiveBoundaries IN CCTK_POSTREGRIDINITIAL BEFORE MoL_PostStep { - } "Apply boundary conditions to primitives" + } "Apply boundary conditions to primitives used for initial guesses" # Primitive sync is always necessary to provide initial guesses for Con2Prim in the buffer zones via prolongation. # Buffer zones are not guaranteed to have the correct values! Prolongation happens only in the last MoL poststep # so we only need to sync in the last MoL post step. - schedule group GRHydro_PrimitiveBoundaries IN HydroBase_PostStep BEFORE HydroBase_Boundaries IF GRHydro::InLastMoLPostStep + schedule group GRHydro_PrimitiveInitialGuessesBoundaries IN HydroBase_PostStep BEFORE HydroBase_Boundaries IF GRHydro::InLastMoLPostStep { - } "Apply boundary conditions to primitives" + } "Apply boundary conditions to all primitives" if(CCTK_IsImplementationActive("Coordinates")) { + # Via prolongation, we only need to sync variables used for initial guesses! # With MP, we only need to sync primitives in LOCAL tensor base!! - schedule GRHydro_SelectPrimitiveBoundaries IN GRHydro_PrimitiveBoundaries + schedule GRHydro_SelectPrimitiveInitialGuessesBoundaries IN GRHydro_PrimitiveInitialGuessesBoundaries { 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 @@ -1098,16 +1098,36 @@ SYNC: hydrobase::temperature SYNC: lvel SYNC: lBvec + } "Select initial guess primitive variables for boudary conditions" + + # After regridding, we better sync every primitive! + # With MP, we only need to sync primitives in LOCAL tensor base!! + schedule GRHydro_SelectPrimitiveBoundaries IN GRHydro_PrimitiveBoundaries + { + LANG: Fortran + OPTIONS: LEVEL + SYNC: HydroBase::w_lorentz + SYNC: HydroBase::press +# SYNC: HydroBase::vel +# SYNC: HydroBase::Bvec + SYNC: hydrobase::entropy + SYNC: hydrobase::Y_e + SYNC: GRHydro_tracers + SYNC: HydroBase::rho + SYNC: HydroBase::eps + SYNC: hydrobase::temperature + SYNC: lvel + SYNC: lBvec } "Select primitive variables for boudary conditions" } else { + # Via prolongation, we only need to sync variables used for initial guesses! # Without MP, we only need to sync primitives in GLOBAL tensor base!! - schedule GRHydro_SelectPrimitiveBoundaries IN GRHydro_PrimitiveBoundaries + schedule GRHydro_SelectPrimitiveInitialGuessesBoundaries IN GRHydro_PrimitiveInitialGuessesBoundaries { 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! @@ -1120,13 +1140,35 @@ SYNC: HydroBase::vel SYNC: HydroBase::Bvec SYNC: hydrobase::temperature + } "Select initial guess primitive variables for boudary conditions" + + # After regridding, we better sync every primitive! + # Without MP, we only need to sync primitives in GLOBAL tensor base!! + schedule GRHydro_SelectPrimitiveBoundaries IN GRHydro_PrimitiveBoundaries + { + LANG: Fortran + OPTIONS: LEVEL + 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: 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 group ApplyBCs AS GRHydro_ApplyPrimitiveInitialGuessBCs in GRHydro_PrimitiveInitialGuessesBoundaries AFTER GRHydro_SelectPrimitiveInitialGuessesBoundaries + { + } "Apply boundary conditions to initial guess primitive variables" + schedule group ApplyBCs AS GRHydro_ApplyPrimitiveBCs in GRHydro_PrimitiveBoundaries AFTER GRHydro_SelectPrimitiveBoundaries { - } "Apply boundary conditions to primitive variables" + } "Apply boundary conditions to all primitive variables" } # sync_conserved_only @@ -1191,12 +1233,12 @@ # Afterwards, reset mask! if (CCTK_Equals(Bvec_evolution_method,"GRHydro")) { - schedule GRHydro_AtmosphereResetM IN HydroBase_PostStep AFTER GRHydroPostSyncAtmosphereMask BEFORE (HydroBase_Boundaries,GRHydro_PrimitiveBoundaries) IF GRHydro::InLastMoLPostStep + schedule GRHydro_AtmosphereResetM IN HydroBase_PostStep AFTER GRHydroPostSyncAtmosphereMask BEFORE (HydroBase_Boundaries,GRHydro_PrimitiveInitialGuessesBoundaries) IF GRHydro::InLastMoLPostStep { LANG: Fortran } "Reset the atmosphere - MHD version" } else { - schedule GRHydro_AtmosphereReset IN HydroBase_PostStep AFTER GRHydroPostSyncAtmosphereMask BEFORE (HydroBase_Boundaries,GRHydro_PrimitiveBoundaries) IF GRHydro::InLastMoLPostStep + schedule GRHydro_AtmosphereReset IN HydroBase_PostStep AFTER GRHydroPostSyncAtmosphereMask BEFORE (HydroBase_Boundaries,GRHydro_PrimitiveInitialGuessesBoundaries) IF GRHydro::InLastMoLPostStep { LANG: Fortran } "Reset the atmosphere"

1 0

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

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/ interface.ccl, schedule.ccl /trunk/src/ GRHydro_Boundaries.F90, GRHydro_Eigenproblem.F90, GRHydro_UpdateMask.F90 Log: GRHydro: Fixes to atmosphere mask and the way we sync. These are the changes as discussed with Roland. In particular, we sync the atmo mask in an extra call before all other syncs and then do atmo reset. Furthermore, primitives must always be synced in last post step in order to get initial guesses in the buffer zones via prolongation. Atmo reset must be done before prolongation to ensure we don't overwrite "good" data from the coarse grid! File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +48 -0 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2012-07-05 05:36:31 UTC (rev 376) +++ trunk/src/GRHydro_Boundaries.F90 2012-07-05 05:36:34 UTC (rev 377) @@ -99,6 +99,8 @@ !endif endif + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::atmosphere_mask_real") + sym(1) = -1 sym(2) = 1 sym(3) = 1 @@ -490,3 +492,49 @@ end subroutine GRHydro_SelectPrimitiveBoundaries + + + + + +subroutine GRHydro_SelectAtmosphereMaskBoundaries(CCTK_ARGUMENTS) + + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + integer, dimension(3) :: sw + integer :: ierr = 0 + integer :: i,j,k + + CCTK_INT, parameter :: faces=CCTK_ALL_FACES + CCTK_INT, parameter :: ione=1 + + sw = GRHydro_stencil + + +!!$Flat boundaries if required + + if (verbose.eq.1) call CCTK_INFO("Selecting atmosphere mask BC") + + + if (CCTK_EQUALS(bound,"flat")) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::GRHydro_atmosphere_mask_real", "Flat") + endif + + if (CCTK_EQUALS(bound,"none")) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::GRHydro_atmosphere_mask_real", "None") + end if + + if (CCTK_EQUALS(bound,"scalar")) then + call CCTK_WARN(0, "Until somebody uses this I see no reason to support it") + end if + + if (ierr < 0) call CCTK_WARN(0, "problems with applying the chosen boundary condition") + +end subroutine GRHydro_SelectAtmosphereMaskBoundaries + File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2012-07-05 05:36:31 UTC (rev 376) +++ trunk/src/GRHydro_Eigenproblem.F90 2012-07-05 05:36:34 UTC (rev 377) @@ -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)') 'abs(cs2), 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)') '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_UpdateMask.F90 Delta lines: +35 -2 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2012-07-05 05:36:31 UTC (rev 376) +++ trunk/src/GRHydro_UpdateMask.F90 2012-07-05 05:36:34 UTC (rev 377) @@ -48,7 +48,9 @@ densrhs(i,j,k) = 0.0d0 srhs(i,j,k,:) = 0.0d0 taurhs(i,j,k) = 0.0d0 - atmosphere_mask(i,j,k) = 1 + ! 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 end if end do end do @@ -67,7 +69,9 @@ densrhs(i,j,k) = 0.0d0 srhs(i,j,k,:) = 0.0d0 taurhs(i,j,k) = 0.0d0 - atmosphere_mask(i,j,k) = 1 + ! 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 end if end do end do @@ -77,6 +81,33 @@ end subroutine GRHydroUpdateAtmosphereMask + +subroutine GRHydroPostSyncAtmosphereMask(CCTK_ARGUMENTS) + + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + + CCTK_INT :: i,j,k + +!! This sets the integer atmo mask based on the real-valued (and sync'ed) atmo mask + + !$OMP PARALLEL DO PRIVATE(k,j,i) + do k = 1, cctk_lsh(3) + do j = 1, cctk_lsh(2) + do i = 1, cctk_lsh(1) + if ( abs(atmosphere_mask_real(i,j,k)) .gt. 0.5) then + atmosphere_mask(i,j,k) = 1 + end if + end do + end do + end do + !$OMP END PARALLEL DO + +end subroutine GRHydroPostSyncAtmosphereMask + + /*@@ @routine GRHydro_SetupMask @date Thu Jun 20 13:27:28 2002 @@ -116,6 +147,7 @@ endif atmosphere_mask = 0 + atmosphere_mask_real = 0 call CCTK_INFO("Setting up the atmosphere mask: all points are not_atmosphere") @@ -263,6 +295,7 @@ velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k)) if (wk_atmosphere .eq. 0) then atmosphere_mask(i, j, k) = 0 + atmosphere_mask_real(i, j, k) = 0 end if endif Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +8 -0 =================================================================== --- trunk/interface.ccl 2012-07-05 05:36:31 UTC (rev 376) +++ trunk/interface.ccl 2012-07-05 05:36:34 UTC (rev 377) @@ -424,6 +424,14 @@ atmosphere_mask } "Flags to say whether a point needs to be reset to the atmosphere" +# This real mask is set during UpdateAtmosphereMask and sync'ed afterwards (including possible interpatch interpolation) +# After syn'ing and before any con2prim fun, we set the integer mask above based on the real-valued mask. +# This ensures that any routine using the int mask is still correctly working. +real GRHydro_atmosphere_mask_real type = GF Timelevels = 1 tags='Prolongation="sync" checkpoint="no"' +{ + atmosphere_mask_real +} "Flags to say whether a point needs to be reset to the atmosphere. This is sync'ed (and possibly interpolated)!" + int GRHydro_atmosphere_descriptors type=SCALAR { atmosphere_field_descriptor File [modified]: schedule.ccl Delta lines: +32 -3 =================================================================== --- trunk/schedule.ccl 2012-07-05 05:36:31 UTC (rev 376) +++ trunk/schedule.ccl 2012-07-05 05:36:34 UTC (rev 377) @@ -477,6 +477,7 @@ if (CCTK_EQUALS(evolution_method, "GRHydro")) { STORAGE:GRHydro_atmosphere_mask +STORAGE:GRHydro_atmosphere_mask_real STORAGE:GRHydro_atmosphere_descriptors schedule GRHydro_SetupMask AT CCTK_Initial BEFORE HydroBase_Initial @@ -999,6 +1000,25 @@ { } "GRHydro Boundary conditions group" + +# Synchronize the atmosphere mask before doing other boundaries! +schedule group GRHydro_AtmosphereMaskBoundaries IN HydroBase_PostStep BEFORE (HydroBase_Boundaries,GRHydro_PrimitiveBoundaries) +{ +} "Apply boundary conditions to primitives" + +schedule GRHydro_SelectAtmosphereMaskBoundaries IN GRHydro_AtmosphereMaskBoundaries +{ + LANG: Fortran + OPTIONS: LEVEL + SYNC: GRHydro_atmosphere_mask_real +} "Select primitive variables for boudary conditions" + +schedule group ApplyBCs AS GRHydro_ApplyAtmosphereMaskBCs in GRHydro_AtmosphereMaskBoundaries AFTER GRHydro_SelectAtmosphereMaskBoundaries +{ +} "Apply boundary conditions to real-valued atmosphere mask" + + +# Now synchronize other evolution variables if (!sync_conserved_only) { schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound @@ -1050,7 +1070,9 @@ { } "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)! + # Primitive sync is always necessary to provide initial guesses for Con2Prim in the buffer zones via prolongation. + # Buffer zones are not guaranteed to have the correct values! Prolongation happens only in the last MoL poststep + # so we only need to sync in the last MoL post step. schedule group GRHydro_PrimitiveBoundaries IN HydroBase_PostStep BEFORE HydroBase_Boundaries IF GRHydro::InLastMoLPostStep { } "Apply boundary conditions to primitives" @@ -1160,14 +1182,21 @@ ### This is executed in the last MoL_PosStep ### ################################################################ +# First (right after sync) we need to convert real (and synchronized mask) to an integer mask! +schedule GRHydroPostSyncAtmosphereMask IN HydroBase_PostStep AFTER GRHydro_AtmosphereMaskBoundaries +{ + LANG: Fortran +} "Set integer atmosphere mask from synchronized real atmosphere mask" + +# Afterwards, reset mask! if (CCTK_Equals(Bvec_evolution_method,"GRHydro")) { - schedule GRHydro_AtmosphereResetM IN MoL_PostStep AFTER ADMBase_SetADMVars AFTER GRHydro_SetLastMoLPostStep BEFORE HydroBase_PostStep IF GRHydro::InLastMoLPostStep + schedule GRHydro_AtmosphereResetM IN HydroBase_PostStep AFTER GRHydroPostSyncAtmosphereMask BEFORE (HydroBase_Boundaries,GRHydro_PrimitiveBoundaries) IF GRHydro::InLastMoLPostStep { LANG: Fortran } "Reset the atmosphere - MHD version" } else { - schedule GRHydro_AtmosphereReset IN MoL_PostStep AFTER ADMBase_SetADMVars BEFORE HydroBase_PostStep IF GRHydro::InLastMoLPostStep + schedule GRHydro_AtmosphereReset IN HydroBase_PostStep AFTER GRHydroPostSyncAtmosphereMask BEFORE (HydroBase_Boundaries,GRHydro_PrimitiveBoundaries) IF GRHydro::InLastMoLPostStep { LANG: Fortran } "Reset the atmosphere"

1 0

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

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/ param.ccl Log: * fix range error in GRHydro_Y_e_max File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +1 -1 =================================================================== --- trunk/param.ccl 2012-07-05 05:36:29 UTC (rev 375) +++ trunk/param.ccl 2012-07-05 05:36:31 UTC (rev 376) @@ -316,7 +316,7 @@ REAL GRHydro_Y_e_max "maximum allowed Y_e" STEERABLE=ALWAYS { - 1.0:* :: "Larger than or equal to zero; 1 is default" + 0.0:* :: "Larger than or equal to zero; 1 is default" } 1.0

1 0

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

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/src/ GRHydro_Prim2Con.F90 Log: * add limit on values of Y_e also in Prim2Con File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Prim2Con.F90 Delta lines: +2 -0 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2012-06-26 23:48:01 UTC (rev 374) +++ trunk/src/GRHydro_Prim2Con.F90 2012-07-05 05:36:29 UTC (rev 375) @@ -270,6 +270,8 @@ *dvelz*dvelz + 2*gxy*dvelx*dvely + 2*gxz*dvelx *dvelz + 2*gyz& *dvely*dvelz)) + ye = max(min(ye,GRHydro_Y_e_max),GRHydro_Y_e_min) + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& drho,deps,temp,ye,dpress,keyerr,anyerr) ! error handling

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 03 Jul '12

03 Jul '12

changeset: 3594:3553270f34bf user: Erik Schnetter <schnetter(a)gmail.com> date: Tue Jul 03 21:33:41 2012 -0400 summary: Introduce cctk_ash, retire cctk_lssh changeset: 3595:03821ea5555f tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Tue Jul 03 21:33:52 2012 -0400 summary: Introduce cctk_ash, retire cctk_lssh

1 0

[McLachlan]McLachlan branch, master, updated. 9301a1b665598cafd094b7a653419de4cef77640
by Carpet git repositories 03 Jul '12

03 Jul '12

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 "McLachlan". The branch, master has been updated via 9301a1b665598cafd094b7a653419de4cef77640 (commit) from 42a4051247ff477c8973f985d68a0ccecd4e0aa8 (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 9301a1b665598cafd094b7a653419de4cef77640 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Tue Jul 3 21:32:38 2012 -0400 Introduce cctk_ash, retire cctk_lssh Introduce cctk_ash, describing the process-local array shape that has been allocated. This may be larger than cctk_lsh, the process-local shape that should be used. Retire cctk_lssh and related infrastructure to handle staggered grid functions. ----------------------------------------------------------------------- Summary of changes: ML_ADM/src/ML_ADM_Minkowski.cc | 80 +++--- ML_ADM/src/ML_ADM_RHS.cc | 133 +++++---- ML_ADM/src/ML_ADM_boundary.cc | 80 +++--- ML_ADM/src/ML_ADM_constraints.cc | 135 +++++---- ML_ADM/src/ML_ADM_constraints_boundary.cc | 80 +++--- ML_ADM/src/ML_ADM_convertFromADMBase.cc | 80 +++--- ML_ADM/src/ML_ADM_convertToADMBase.cc | 80 +++--- ML_ADMConstraints/src/ML_ADMConstraints.cc | 8 +- ML_ADMQuantities/src/ML_ADMQuantities.cc | 8 +- ML_BSSN/src/ML_BSSN_Advect.cc | 176 ++++++----- ML_BSSN/src/ML_BSSN_Dissipation.cc | 164 +++++----- ML_BSSN/src/ML_BSSN_InitGamma.cc | 164 +++++----- ML_BSSN/src/ML_BSSN_InitRHS.cc | 164 +++++----- ML_BSSN/src/ML_BSSN_Minkowski.cc | 164 +++++----- ML_BSSN/src/ML_BSSN_RHS1.cc | 244 ++++++++------- ML_BSSN/src/ML_BSSN_RHS2.cc | 256 ++++++++-------- ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc | 164 +++++----- ML_BSSN/src/ML_BSSN_boundary.cc | 164 +++++----- ML_BSSN/src/ML_BSSN_constraints1.cc | 248 ++++++++-------- ML_BSSN/src/ML_BSSN_constraints2.cc | 190 ++++++------ ML_BSSN/src/ML_BSSN_convertFromADMBase.cc | 180 ++++++------ ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc | 186 ++++++------ ML_BSSN/src/ML_BSSN_convertToADMBase.cc | 166 +++++----- .../src/ML_BSSN_convertToADMBaseDtLapseShift.cc | 189 ++++++------ ...ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc | 177 ++++++----- .../ML_BSSN_convertToADMBaseFakeDtLapseShift.cc | 177 ++++++----- ML_BSSN/src/ML_BSSN_enforce.cc | 176 ++++++------ ML_CCZ4/src/ML_CCZ4_Advect.cc | 176 ++++++----- ML_CCZ4/src/ML_CCZ4_Dissipation.cc | 164 +++++----- ML_CCZ4/src/ML_CCZ4_InitGamma.cc | 164 +++++----- ML_CCZ4/src/ML_CCZ4_InitRHS.cc | 164 +++++----- ML_CCZ4/src/ML_CCZ4_Minkowski.cc | 164 +++++----- ML_CCZ4/src/ML_CCZ4_RHS1.cc | 323 ++++++++++---------- ML_CCZ4/src/ML_CCZ4_RHS2.cc | 268 ++++++++-------- ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc | 164 +++++----- ML_CCZ4/src/ML_CCZ4_boundary.cc | 164 +++++----- ML_CCZ4/src/ML_CCZ4_constraints1.cc | 260 ++++++++-------- ML_CCZ4/src/ML_CCZ4_constraints2.cc | 190 ++++++------ ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc | 180 ++++++------ ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc | 186 ++++++------ ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc | 166 +++++----- .../src/ML_CCZ4_convertToADMBaseDtLapseShift.cc | 192 ++++++------ ...ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc | 180 ++++++------ .../ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc | 180 ++++++------ ML_CCZ4/src/ML_CCZ4_enforce.cc | 176 ++++++------ ML_WaveToy/src/WT_Dirichlet.cc | 26 +- ML_WaveToy/src/WT_Energy.cc | 28 +- ML_WaveToy/src/WT_EnergyBoundary.cc | 26 +- ML_WaveToy/src/WT_Gaussian.cc | 28 +- ML_WaveToy/src/WT_RHS.cc | 26 +- ML_WaveToy/src/WT_Standing.cc | 30 +- ML_WaveToy_CL/src/WT_CL_Dirichlet.cc | 26 +- ML_WaveToy_CL/src/WT_CL_Energy.cc | 28 +- ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc | 26 +- ML_WaveToy_CL/src/WT_CL_Gaussian.cc | 28 +- ML_WaveToy_CL/src/WT_CL_RHS.cc | 26 +- ML_WaveToy_CL/src/WT_CL_Standing.cc | 30 +- 57 files changed, 4044 insertions(+), 3778 deletions(-) hooks/post-receive -- McLachlan

1 0

[svn:einsteintoolkit] WeylScal4/trunk/src/ (Rev. 119)
by schnetter＠cct.lsu.edu 03 Jul '12

03 Jul '12

User: eschnett Date: 2012/07/03 08:30 PM Modified: /trunk/src/ invars_calc_2nd.cc, invars_calc_4th.cc, invars_calc_Nth.cc, psi4_calc_2nd.cc, psi4_calc_4th.cc, psi4_calc_Nth.cc, psis_calc_2nd.cc, psis_calc_4th.cc, psis_calc_Nth.cc Log: Introduce cctk_ash, retire cctk_lssh Introduce cctk_ash, describing the process-local array shape that has been allocated. This may be larger than cctk_lsh, the process-local shape that should be used. Retire cctk_lssh and related infrastructure to handle staggered grid functions. File Changes: Directory: /trunk/src/ ====================== File [modified]: invars_calc_2nd.cc Delta lines: <Unavailable> File [modified]: invars_calc_4th.cc Delta lines: <Unavailable> File [modified]: invars_calc_Nth.cc Delta lines: <Unavailable> File [modified]: psi4_calc_2nd.cc Delta lines: <Unavailable> File [modified]: psi4_calc_4th.cc Delta lines: <Unavailable> File [modified]: psi4_calc_Nth.cc Delta lines: <Unavailable> File [modified]: psis_calc_2nd.cc Delta lines: <Unavailable> File [modified]: psis_calc_4th.cc Delta lines: <Unavailable> File [modified]: psis_calc_Nth.cc Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] Exact/trunk/src/ (Rev. 277)
by schnetter＠cct.lsu.edu 03 Jul '12

03 Jul '12

User: eschnett Date: 2012/07/03 08:30 PM Modified: /trunk/src/ gauge.F77, initialize.F77 Log: Modify syntax for disabling OpenMP statements File Changes: Directory: /trunk/src/ ====================== File [modified]: gauge.F77 Delta lines: +19 -19 =================================================================== --- trunk/src/gauge.F77 2012-05-28 22:19:18 UTC (rev 276) +++ trunk/src/gauge.F77 2012-07-04 01:30:11 UTC (rev 277) @@ -88,25 +88,25 @@ if ( set_lapse .or. set_shift .or. set_dtlapse .or. set_dtshift) then -C$o mp parallel do private ( -C$o mp$ i, j, k, -C$o mp$ tt, xx, yy, zz, -C$o mp$ alptmp, dtalptmp, axtmp, aytmp, aztmp, -C$o mp$ betaxtmp, betaytmp, betaztmp, -C$o mp$ dtbetaxtmp, dtbetaytmp, dtbetaztmp, -C$o mp$ bxxtmp, bxytmp, bxztmp, -C$o mp$ byxtmp, byytmp, byztmp, -C$o mp$ bzxtmp, bzytmp, bzztmp, -C$o mp$ dxgxxtmp, dxgyytmp, dxgzztmp, -C$o mp$ dxgxytmp, dxgyztmp, dxgxztmp, -C$o mp$ dygxxtmp, dygyytmp, dygzztmp, -C$o mp$ dygxytmp, dygyztmp, dygxztmp, -C$o mp$ dzgxxtmp, dzgyytmp, dzgzztmp, -C$o mp$ dzgxytmp, dzgyztmp, dzgxztmp, -C$o mp$ exact_psi, -C$o mp$ exact_psix, exact_psiy, exact_psiz, -C$o mp$ exact_psixx, exact_psiyy, exact_psizz, -C$o mp$ exact_psixy, exact_psiyz, exact_psixz) +C.omp parallel do private ( +C.omp$ i, j, k, +C.omp$ tt, xx, yy, zz, +C.omp$ alptmp, dtalptmp, axtmp, aytmp, aztmp, +C.omp$ betaxtmp, betaytmp, betaztmp, +C.omp$ dtbetaxtmp, dtbetaytmp, dtbetaztmp, +C.omp$ bxxtmp, bxytmp, bxztmp, +C.omp$ byxtmp, byytmp, byztmp, +C.omp$ bzxtmp, bzytmp, bzztmp, +C.omp$ dxgxxtmp, dxgyytmp, dxgzztmp, +C.omp$ dxgxytmp, dxgyztmp, dxgxztmp, +C.omp$ dygxxtmp, dygyytmp, dygzztmp, +C.omp$ dygxytmp, dygyztmp, dygxztmp, +C.omp$ dzgxxtmp, dzgyytmp, dzgzztmp, +C.omp$ dzgxytmp, dzgyztmp, dzgxztmp, +C.omp$ exact_psi, +C.omp$ exact_psix, exact_psiy, exact_psiz, +C.omp$ exact_psixx, exact_psiyy, exact_psizz, +C.omp$ exact_psixy, exact_psiyz, exact_psixz) do k=1,nz do j=1,ny do i=1,nx File [modified]: initialize.F77 Delta lines: +19 -19 =================================================================== --- trunk/src/initialize.F77 2012-05-28 22:19:18 UTC (rev 276) +++ trunk/src/initialize.F77 2012-07-04 01:30:11 UTC (rev 277) @@ -60,25 +60,25 @@ ny = cctk_lsh(2) nz = cctk_lsh(3) -C$o mp parallel do private( -C$o mp$ i, j, k, -C$o mp$ tt, xx, yy, zz, -C$o mp$ alpjunk, dtalpjunk, axjunk, ayjunk, azjunk, -C$o mp$ betaxjunk, betayjunk, betazjunk, -C$o mp$ dtbetaxjunk, dtbetayjunk, dtbetazjunk, -C$o mp$ bxxjunk, bxyjunk, bxzjunk, -C$o mp$ byxjunk, byyjunk, byzjunk, -C$o mp$ bzxjunk, bzyjunk, bzzjunk, -C$o mp$ dxgxxjunk, dxgyyjunk, dxgzzjunk, -C$o mp$ dxgxyjunk, dxgyzjunk, dxgxzjunk, -C$o mp$ dygxxjunk, dygyyjunk, dygzzjunk, -C$o mp$ dygxyjunk, dygyzjunk, dygxzjunk, -C$o mp$ dzgxxjunk, dzgyyjunk, dzgzzjunk, -C$o mp$ dzgxyjunk, dzgyzjunk, dzgxzjunk, -C$o mp$ exact_psi, -C$o mp$ exact_psix, exact_psiy, exact_psiz, -C$o mp$ exact_psixx, exact_psiyy, exact_psizz, -C$o mp$ exact_psixy, exact_psiyz, exact_psixz) +C.omp parallel do private( +C.omp$ i, j, k, +C.omp$ tt, xx, yy, zz, +C.omp$ alpjunk, dtalpjunk, axjunk, ayjunk, azjunk, +C.omp$ betaxjunk, betayjunk, betazjunk, +C.omp$ dtbetaxjunk, dtbetayjunk, dtbetazjunk, +C.omp$ bxxjunk, bxyjunk, bxzjunk, +C.omp$ byxjunk, byyjunk, byzjunk, +C.omp$ bzxjunk, bzyjunk, bzzjunk, +C.omp$ dxgxxjunk, dxgyyjunk, dxgzzjunk, +C.omp$ dxgxyjunk, dxgyzjunk, dxgxzjunk, +C.omp$ dygxxjunk, dygyyjunk, dygzzjunk, +C.omp$ dygxyjunk, dygyzjunk, dygxzjunk, +C.omp$ dzgxxjunk, dzgyyjunk, dzgzzjunk, +C.omp$ dzgxyjunk, dzgyzjunk, dzgxzjunk, +C.omp$ exact_psi, +C.omp$ exact_psix, exact_psiy, exact_psiz, +C.omp$ exact_psixx, exact_psiyy, exact_psizz, +C.omp$ exact_psixy, exact_psiyz, exact_psixz) do k=1,nz do j=1,ny do i=1,nx

1 0

[svn:einsteintoolkit] NewRad/trunk/src/ (Rev. 16)
by schnetter＠cct.lsu.edu 03 Jul '12

03 Jul '12

User: eschnett Date: 2012/07/03 08:29 PM Modified: /trunk/src/ extrap.cc, newrad.cc Log: Introduce cctk_ash, retire cctk_lssh Introduce cctk_ash, describing the process-local array shape that has been allocated. This may be larger than cctk_lsh, the process-local shape that should be used. Retire cctk_lssh and related infrastructure to handle staggered grid functions. File Changes: Directory: /trunk/src/ ====================== File [modified]: extrap.cc Delta lines: +2 -2 =================================================================== --- trunk/src/extrap.cc 2012-06-17 21:43:18 UTC (rev 15) +++ trunk/src/extrap.cc 2012-07-04 01:29:43 UTC (rev 16) @@ -94,7 +94,7 @@ { int imin[3], imax[3], is_symbnd[6], is_physbnd[6], is_ipbnd[6]; GenericFD_GetBoundaryInfo - (cctkGH, cctkGH->cctk_lsh, cctkGH->cctk_lssh, cctkGH->cctk_bbox, + (cctkGH, cctkGH->cctk_ash, cctkGH->cctk_lsh, cctkGH->cctk_bbox, cctkGH->cctk_nghostzones, imin, imax, is_symbnd, is_physbnd, is_ipbnd); @@ -142,7 +142,7 @@ break; case +1: bmin[d] = imax[d]; - bmax[d] = cctkGH->cctk_lssh[CCTK_LSSH_IDX(0,d)]; + bmax[d] = cctkGH->cctk_lsh[d]; have_bnd = true; all_physbnd = all_physbnd and is_physbnd[2*d+1]; any_physbnd = any_physbnd or is_physbnd[2*d+1]; File [modified]: newrad.cc Delta lines: +2 -2 =================================================================== --- trunk/src/newrad.cc 2012-06-17 21:43:18 UTC (rev 15) +++ trunk/src/newrad.cc 2012-07-04 01:29:43 UTC (rev 16) @@ -282,7 +282,7 @@ { int imin[3], imax[3], is_symbnd[6], is_physbnd[6], is_ipbnd[6]; GenericFD_GetBoundaryInfo - (cctkGH, cctkGH->cctk_lsh, cctkGH->cctk_lssh, cctkGH->cctk_bbox, + (cctkGH, cctkGH->cctk_ash, cctkGH->cctk_lsh, cctkGH->cctk_bbox, cctkGH->cctk_nghostzones, imin, imax, is_symbnd, is_physbnd, is_ipbnd); @@ -330,7 +330,7 @@ break; case +1: bmin[d] = imax[d]; - bmax[d] = cctkGH->cctk_lssh[CCTK_LSSH_IDX(0,d)]; + bmax[d] = cctkGH->cctk_lsh[d]; have_bnd = true; all_physbnd = all_physbnd and is_physbnd[2*d+1]; any_physbnd = any_physbnd or is_physbnd[2*d+1];

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits July 2012