Commits June 2012

commits@lists.einsteintoolkit.org

4 participants
73 discussions

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

05 Jun '12

User: rhaas Date: 2012/06/05 03:28 PM Modified: /trunk/src/ GRHydro_Boundaries.F90 Log: GRHydro: sync those primitives which are needed for initial Con2Prim guesses Patch by Christian Reisswig. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +33 -30 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2012-06-05 20:25:44 UTC (rev 340) +++ trunk/src/GRHydro_Boundaries.F90 2012-06-05 20:28:24 UTC (rev 341) @@ -378,15 +378,18 @@ !!$Flat boundaries if required +! 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 (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::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::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, & @@ -405,34 +408,34 @@ endif endif - if(evolve_tracer.ne.0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::GRHydro_tracers", "Flat") - 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_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") + !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::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::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, & @@ -453,23 +456,23 @@ endif - if(evolve_tracer.ne.0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::GRHydro_tracers", "None") - - 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_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") + !ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + ! "HydroBase::entropy", "None") endif end if

1 0

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

05 Jun '12

User: rhaas Date: 2012/06/05 03:25 PM Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ GRHydro_Boundaries.F90, GRHydro_Con2Prim.F90 Log: GRHydro: Added parameter to perform sync on conserved quantities only. Primitives are only sync'ed after regridding to get initial guesses. Schedule Primitive boundary call in PostRegridInitial if sync_only_coserved == yes. Fixed issue with the sync call in CCTK_EVOL after MoL_Evolution when sync_conserved_only==yes: Conserved vars must be synced here as well, otherwise conserved vars are reset to atmospshere whereas primitives are not! This is wrong. Patches by Christian Reisswig. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +247 -81 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2012-05-28 22:19:32 UTC (rev 339) +++ trunk/src/GRHydro_Boundaries.F90 2012-06-05 20:25:44 UTC (rev 340) @@ -66,12 +66,14 @@ general_coordinates = GRHydro_UseGeneralCoordinates(cctkGH) - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::rho") - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::press") + !if (sync_conserved_only .eq. 0) then + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::rho") + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::press") + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::w_lorentz") + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::eps") + !endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::dens") call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::tau") - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::w_lorentz") - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::eps") call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::GRHydro_C2P_failed") if(evolve_mhd.ne.0.and.clean_divergence.ne.0) then call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::psidc") @@ -84,27 +86,35 @@ endif if(evolve_y_e.ne.0) then + !if (sync_conserved_only .eq. 0) then call SetCartSymGN(ierr, cctkGH, sym, "HydroBase::Y_e") + !endif call SetCartSymGN(ierr, cctkGH, sym, "GRHydro::Y_e_con") endif if(evolve_temper.ne.0) then - call SetCartSymGN(ierr, cctkGH, sym, "HydroBase::temperature") - call SetCartSymGN(ierr, cctkGH, sym, "HydroBase::entropy") + !if (sync_conserved_only .eq. 0) then + call SetCartSymGN(ierr, cctkGH, sym, "HydroBase::temperature") + call SetCartSymGN(ierr, cctkGH, sym, "HydroBase::entropy") + !endif endif sym(1) = -1 sym(2) = 1 sym(3) = 1 - if (general_coordinates .ne. 0) then - call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[0]") - else - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[0]") - endif + !if (sync_conserved_only .eq. 0) then + if (general_coordinates .ne. 0) then + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[0]") + else + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[0]") + endif + !endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[0]") if(evolve_mhd.ne.0) then - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::Bvec[0]") + !if (sync_conserved_only .eq. 0) then + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::Bvec[0]") + !endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::Bcons[0]") endif @@ -112,14 +122,18 @@ sym(2) = -1 sym(3) = 1 - if (general_coordinates .ne. 0) then - call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[1]") - else - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[1]") - endif + !if (sync_conserved_only .eq. 0) then + if (general_coordinates .ne. 0) then + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[1]") + else + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[1]") + endif + !endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[1]") if(evolve_mhd.ne.0) then - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::Bvec[1]") + !if (sync_conserved_only .eq. 0) then + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::Bvec[1]") + !endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::Bcons[1]") endif @@ -127,15 +141,19 @@ sym(2) = 1 sym(3) = -1 - if (general_coordinates .ne. 0) then - call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[2]") - else - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[2]") - endif + !if (sync_conserved_only .eq. 0) then + if (general_coordinates .ne. 0) then + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[2]") + else + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[2]") + endif + !endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[2]") if(evolve_mhd.ne.0) then - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::Bvec[2]") - call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::Bcons[2]") + !if (sync_conserved_only .eq. 0) then + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::Bvec[2]") + !endif + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::Bcons[2]") endif ! check that storage for shift is active @@ -190,28 +208,32 @@ "GRHydro::tau", "Flat") ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::scon", "Flat") - 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") + if (sync_conserved_only .eq. 0) 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 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") + if (sync_conserved_only .eq. 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 ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::Bcons", "Flat") @@ -222,24 +244,30 @@ endif if(evolve_tracer.ne.0) then + if (sync_conserved_only .eq. 0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::GRHydro_tracers", "Flat") + endif ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::GRHydro_tracers", "Flat") - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::GRHydro_cons_tracers", "Flat") endif if(evolve_y_e.ne.0) then + if (sync_conserved_only .eq. 0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::Y_e", "Flat") + endif ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::Y_e", "Flat") - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::Y_e_con", "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") + if (sync_conserved_only .eq. 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 @@ -252,29 +280,34 @@ "GRHydro::tau", "None") ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::scon", "None") - 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") + + if (sync_conserved_only .eq. 0) 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 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") + if (sync_conserved_only .eq. 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 ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::Bcons", "None") @@ -285,34 +318,167 @@ endif if(evolve_tracer.ne.0) then + if (sync_conserved_only .eq. 0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "GRHydro::GRHydro_tracers", "None") + endif ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::GRHydro_tracers", "None") - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::GRHydro_cons_tracers", "None") endif if(evolve_y_e.ne.0) then + if (sync_conserved_only .eq. 0) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::Y_e", "None") + endif ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::Y_e", "None") - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::Y_e_con", "None") endif if(evolve_temper.ne.0) then + if (sync_conserved_only .eq. 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 + endif + + endif + + 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_Boundaries + + + +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 (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, & - "HydroBase::temperature", "None") + "GRHydro::GRHydro_tracers", "Flat") + endif + + if(evolve_y_e.ne.0) then ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::entropy", "None") + "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_Boundaries +end subroutine GRHydro_SelectPrimitiveBoundaries - File [modified]: GRHydro_Con2Prim.F90 Delta lines: +2 -0 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2012-05-28 22:19:32 UTC (rev 339) +++ trunk/src/GRHydro_Con2Prim.F90 2012-06-05 20:25:44 UTC (rev 340) @@ -475,6 +475,7 @@ df = 1.0d0 - dpressbydrho*drhobydpress - & dpressbydeps*depsbydpress + pold = pnew pnew = max(pold - f/df, pmin) @@ -555,6 +556,7 @@ vely = uxy * vlowx + uyy * vlowy + uyz * vlowz velz = uxz * vlowx + uyz * vlowy + uzz * vlowz + !!$If all else fails, use the polytropic EoS if(epsilon .lt. 0.0d0) then Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +9 -0 =================================================================== --- trunk/param.ccl 2012-05-28 22:19:32 UTC (rev 339) +++ trunk/param.ccl 2012-06-05 20:25:44 UTC (rev 340) @@ -598,3 +598,12 @@ boolean disable_sync_and_tmunu_after_MoL "Do not sync/prolongate and reset Tmunu after MoL integration is done" STEERABLE=ALWAYS { } "no" + + +# 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 +BOOLEAN sync_conserved_only "Only sync evolved conserved quantities during evolution." +{ +} no + File [modified]: schedule.ccl Delta lines: +58 -1 =================================================================== --- trunk/schedule.ccl 2012-05-28 22:19:32 UTC (rev 339) +++ trunk/schedule.ccl 2012-06-05 20:25:44 UTC (rev 340) @@ -998,6 +998,8 @@ { } "GRHydro Boundary conditions group" +if (!sync_conserved_only) +{ schedule GRHydro_Boundaries IN HydroBase_Select_Boundaries AS GRHydro_Bound { LANG: Fortran @@ -1022,7 +1024,62 @@ 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" + + # 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) + schedule group GRHydro_PrimitiveBoundaries IN CCTK_POSTREGRID BEFORE MoL_PostStep + { + } "Apply boundary conditions to primitives" + schedule group GRHydro_PrimitiveBoundaries IN CCTK_POSTREGRIDINITIAL BEFORE MoL_PostStep + { + } "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" + } + + 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" + +} + ############################################################ ### Compute first differences of rho for mesh refinement ### ############################################################

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 04 Jun '12

04 Jun '12

changeset: 3564:abccf9fb2cb6 user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Thu May 03 19:04:00 2012 -0700 summary: CarpetLib: add offset3 function identical to index3 without tests changeset: 3565:514e50f6f625 user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Mon Jun 04 17:50:53 2012 -0700 summary: CarpetLib: add fifth order cc restriction operator changeset: 3566:ecaee1efeb07 user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Mon Jun 04 19:23:59 2012 -0700 summary: CarpetLib: make parameters controlling restrition order restricted changeset: 3567:88990f0ba28e tag: tip user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Mon Jun 04 19:24:36 2012 -0700 summary: Carpet: check ghost size against restrion operator order

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 04 Jun '12

04 Jun '12

changeset: 3563:510fe416ad2f tag: tip user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Mon Jun 04 17:30:54 2012 -0700 summary: CarpetLib: disable debugging tests in 3rd order cc restrict operator

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 04 Jun '12

04 Jun '12

changeset: 3562:300e67a7a3d3 tag: tip user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Mon Jun 04 12:51:35 2012 -0700 summary: CarpetLib: clean up higher order restriciton some

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 04 Jun '12

04 Jun '12

changeset: 3561:4ded0850ead5 tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Mon Jun 04 13:34:25 2012 -0400 summary: CarpetRegrid2: Add comments

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 04 Jun '12

04 Jun '12

changeset: 3560:0ff845fa1d71 tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Mon Jun 04 13:33:52 2012 -0400 summary: CarpetAdaptiveRegrid: Improve CCTK_Warn replacement

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 04 Jun '12

04 Jun '12

changeset: 3559:8baed9ee6149 tag: tip user: Roland Haas <roland.haas(a)physics.gatech.edu> date: Sat Jun 02 17:36:04 2012 -0700 summary: CarpetLib: add preliminary support for higher order restriction

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/nuc_eos/ (Rev. 62)
by rhaas＠tapir.caltech.edu 04 Jun '12

04 Jun '12

User: rhaas Date: 2012/06/04 12:14 PM Modified: /trunk/src/nuc_eos/ eosmodule.F90, readtable.c Log: EOS_Omni: avoid allocting temporary memory twice instead of storing a copy of the data in the Fortran module store Fortran pointers. File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [modified]: eosmodule.F90 Delta lines: +16 -22 =================================================================== --- trunk/src/nuc_eos/eosmodule.F90 2012-05-28 22:19:15 UTC (rev 61) +++ trunk/src/nuc_eos/eosmodule.F90 2012-06-04 17:14:00 UTC (rev 62) @@ -24,7 +24,7 @@ ! basics integer, parameter :: nvars = 19 - real*8,allocatable :: alltables(:,:,:,:) + real*8,pointer :: alltables(:,:,:,:) ! index variable mapping: ! 1 -> logpress ! 2 -> logenergy @@ -46,9 +46,9 @@ ! 18 -> zbar ! 19 -> gamma - real*8,allocatable,save :: logrho(:) - real*8,allocatable,save :: logtemp(:) - real*8,allocatable,save :: ye(:) + real*8,pointer :: logrho(:) + real*8,pointer :: logtemp(:) + real*8,pointer :: ye(:) ! constants real*8,save :: mev_to_erg = 1.60217733d-6 @@ -65,35 +65,29 @@ end module eosmodule ! This function is called from within readtable.c -! It copies the values of the arrays given as parameters into arrays -! of the eos module, until I can find out how I can use those arrays -! directly. -subroutine allocate_eosmodule(nrho_, ntemp_, nye_, alltables_, logrho_, logtemp_, ye_, energy_shift_) +! It creates pointers to the arrays given as parameters into arrays +! of the eos module. +subroutine setup_eosmodule(nrho_, ntemp_, nye_, alltables_, logrho_, logtemp_, ye_, energy_shift_) use eosmodule DECLARE_CCTK_PARAMETERS CCTK_INT :: nrho_, ntemp_, nye_ - CCTK_REAL :: alltables_(nrho_, ntemp_, nye_, 19) - CCTK_REAL :: logrho_(nrho_) - CCTK_REAL :: logtemp_(ntemp_) - CCTK_REAL :: ye_(nye_) + CCTK_REAL, TARGET :: alltables_(nrho_, ntemp_, nye_, 19) + CCTK_REAL, TARGET :: logrho_(nrho_) + CCTK_REAL, TARGET :: logtemp_(ntemp_) + CCTK_REAL, TARGET :: ye_(nye_) CCTK_REAL :: energy_shift_ nrho = nrho_ ntemp = ntemp_ nye = nye_ - allocate(alltables(nrho,ntemp,nye,nvars)) - allocate(logrho(nrho)) - allocate(logtemp(ntemp)) - allocate(ye(nye)) + alltables => alltables_ + logrho => logrho_ + logtemp => logtemp_ + ye => ye_ - alltables = alltables_ - logrho = logrho_ - logtemp = logtemp_ - ye = ye_ - energy_shift = energy_shift_ if(do_energy_shift.ne.1) then energy_shift = 0.0d0 @@ -109,5 +103,5 @@ eos_tempmin = 10.0d0**logtemp(1) eos_tempmax = 10.0d0**logtemp(ntemp) -end subroutine allocate_eosmodule +end subroutine setup_eosmodule File [modified]: readtable.c Delta lines: +4 -11 =================================================================== --- trunk/src/nuc_eos/readtable.c 2012-05-28 22:19:15 UTC (rev 61) +++ trunk/src/nuc_eos/readtable.c 2012-06-04 17:14:00 UTC (rev 62) @@ -9,7 +9,7 @@ #include "cctk_Functions.h" // Interface of function for fortran module eostable -void CCTK_FNAME(allocate_eosmodule) +void CCTK_FNAME(setup_eosmodule) (CCTK_INT* , CCTK_INT* , CCTK_INT*, CCTK_REAL*, CCTK_REAL*, CCTK_REAL*, CCTK_REAL*, CCTK_REAL*); @@ -133,17 +133,10 @@ HDF5_ERROR(H5Sclose(mem3)); HDF5_ERROR(H5Fclose(file)); - // Give all values to fortran - which will copy them until I can find out how - // I can tell Fortran to use those pointers inside the module - CCTK_FNAME(allocate_eosmodule) + // Give all values to fortran - which will store pointers to them, so don't + // free these arrays. + CCTK_FNAME(setup_eosmodule) (&nrho, &ntemp, &nye, alltables, logrho, logtemp, ye, &energy_shift); - - // Free the memory again because fortran copied the whole thing now - free(ye); - free(logtemp); - free(logrho); - free(alltables); - }

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 04 Jun '12

04 Jun '12

changeset: 3558:81e53030bdcb tag: tip user: Christian Reisswig <reisswig(a)tapir.caltech.edu> date: Mon Jun 04 07:56:51 2012 -0700 summary: CarpetInterp: "m" -> "mglevel" when accessing groupdata.AT(gi).activetimelevels.AT(mglevel).AT(rl) to find out how many active timelevels are available. When using "m", I get a std::vector out of range.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits June 2012