Commits January 2013

commits@lists.einsteintoolkit.org

9 participants
94 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 463)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_CalcBcom.F90 Log: GRHydro: use distinct dummys for calc_vlow_blow also check actual timelevels information for storage of bcom From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_CalcBcom.F90 Delta lines: +7 -5 =================================================================== --- trunk/src/GRHydro_CalcBcom.F90 2013-01-14 14:23:47 UTC (rev 462) +++ trunk/src/GRHydro_CalcBcom.F90 2013-01-14 14:23:48 UTC (rev 463) @@ -30,12 +30,14 @@ CCTK_REAL :: velxlow, velylow, velzlow CCTK_REAL :: Bvecxlow,Bvecylow,Bveczlow - CCTK_REAL :: bdotv,b2,bxlow,bylow,bzlow,dum + CCTK_REAL :: bdotv,b2,bxlow,bylow,bzlow,dum1,dum2 CCTK_INT :: i,j,k CCTK_INT :: GRHydro_UseGeneralCoordinates + integer :: timelevels - if(stress_energy_state.ne.0) then - return + call CCTK_ActiveTimeLevels(timelevels, cctkGH, "GRHydro::bcom") + if(timelevels.eq.0) then + call CCTK_WARN(0,"No storage for GRHydro::bcom") end if if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then @@ -43,7 +45,7 @@ end if !$OMP PARALLEL DO PRIVATE(i,j,k,velxlow, velylow, velzlow,& - !$OMP Bvecxlow,Bvecylow,Bveczlow, bdotv,dum,b2,bxlow,bylow,bzlow) + !$OMP Bvecxlow,Bvecylow,Bveczlow, bdotv,dum1,dum2,b2,bxlow,bylow,bzlow) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) @@ -53,7 +55,7 @@ gyy(i,j,k),gyz(i,j,k),gzz(i,j,k), & velx(i,j,k),vely(i,j,k),velz(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k), & velxlow,velylow,velzlow,Bvecxlow,Bvecylow,Bveczlow, & - bdotv,b2,dum,dum,bxlow,bylow,bzlow) + bdotv,b2,dum1,dum2,bxlow,bylow,bzlow) bcom_sq(i,j,k) = b2 bcom0(i,j,k) = w_lorentz(i,j,k)*bdotv/alp(i,j,k)

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 462)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Con2PrimM.F90 Log: GRHydro: correct tau when resetting to atmosphere before a term rho*b2 was present when the correct one is only b2 From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +1 -5 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:45 UTC (rev 461) +++ trunk/src/GRHydro_Con2PrimM.F90 2013-01-14 14:23:47 UTC (rev 462) @@ -656,12 +656,8 @@ !!$ tau does need to take into account the existing B-field !!$ with w_lorentz=1, we find tau = sqrtdet*(rho (1+eps+b^2/2)) - dens [Press drops out] - tau(i,j,k) = sdet * (rho(i,j,k)*(1.0+eps(i,j,k)+b2/2.0)) - dens(i,j,k) + tau(i,j,k) = sdet * (rho(i,j,k)*eps(i,j,k)+b2/2.0) - if(tau(i,j,k).le.sdet*b2*0.5d0)then - tau(i,j,k) = GRHydro_tau_min + sdet*b2*0.5d0 - endif - end if ! ! Again, reset 3-metric only for con2prim inversion. Restoring

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 461)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Analysis.F90 Log: GRHydro: clear divB everywhere rather than just in interior From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Analysis.F90 Delta lines: +1 -10 =================================================================== --- trunk/src/GRHydro_Analysis.F90 2013-01-14 14:23:44 UTC (rev 460) +++ trunk/src/GRHydro_Analysis.F90 2013-01-14 14:23:45 UTC (rev 461) @@ -13,16 +13,7 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - CCTK_INT :: i,j,k - !$OMP PARALLEL DO PRIVATE(i,j,k) - 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 - divB(i,j,k) = 0.0d0 - end do - end do - end do - !$OMP END PARALLEL DO + divB = 0.0d0 end subroutine GRHydro_Analysis_Init

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 460)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Boundaries.F90 Log: GRHydro: CCTK_Equals -> CCTK_EQUALS since only the later (a macro) contains the required ".ne. 0" to turn the return value into a logical type From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2013-01-14 14:23:42 UTC (rev 459) +++ trunk/src/GRHydro_Boundaries.F90 2013-01-14 14:23:44 UTC (rev 460) @@ -234,7 +234,7 @@ endif endif - if (CCTK_Equals(Bvec_evolution_method, "GRHydro_Avec")) then + if (CCTK_EQUALS(Bvec_evolution_method, "GRHydro_Avec")) then ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::Avec", "Flat") if (general_coordinates .ne. 0) then @@ -320,7 +320,7 @@ endif endif - if (CCTK_Equals(Bvec_evolution_method, "GRHydro_Avec")) then + if (CCTK_EQUALS(Bvec_evolution_method, "GRHydro_Avec")) then ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::Avec", "None") if (general_coordinates .ne. 0) then

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 459)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Con2PrimM_pt_EOSOmni.c, GRHydro_Con2PrimM_pt_EOSOmni.c.hopefullyfixed.c Log: GRHydro: Fixing comment to reflect what is used in the code (sqrt(\gamma) - > \gamma). not code change From: Philipp Moesta <pmoesta(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM_pt_EOSOmni.c Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Con2PrimM_pt_EOSOmni.c 2013-01-14 14:23:40 UTC (rev 458) +++ trunk/src/GRHydro_Con2PrimM_pt_EOSOmni.c 2013-01-14 14:23:42 UTC (rev 459) @@ -172,7 +172,7 @@ tau = \alpha^2 \sqrt(\gamma) T^{00} - D g[x,y,z][x,y,x] = spatial metric corresponding to \gamma u[x,y,z][x,y,z] = inverse of the spatial metric, g[x,y,z][x,y,x] - det = sqrt(\gamma) + det = gamma B[x,y,z] = Bvec[0,1,2] bsq = b^\mu b_\mu File [modified]: GRHydro_Con2PrimM_pt_EOSOmni.c.hopefullyfixed.c Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Con2PrimM_pt_EOSOmni.c.hopefullyfixed.c 2013-01-14 14:23:40 UTC (rev 458) +++ trunk/src/GRHydro_Con2PrimM_pt_EOSOmni.c.hopefullyfixed.c 2013-01-14 14:23:42 UTC (rev 459) @@ -172,7 +172,7 @@ tau = \alpha^2 \sqrt(\gamma) T^{00} - D g[x,y,z][x,y,x] = spatial metric corresponding to \gamma u[x,y,z][x,y,z] = inverse of the spatial metric, g[x,y,z][x,y,x] - det = sqrt(\gamma) + det = \gamma B[x,y,z] = Bvec[0,1,2] bsq = b^\mu b_\mu

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 458)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/ schedule.ccl /trunk/src/ GRHydro_Boundaries.F90, GRHydro_Con2PrimAM.F90 Log: GRHydro: Starting to push vector potential changes * incl boundary calls for Avec * disable call to BvecfromAvec from within loop, this one is a schedule function call now. From: Philipp Moesta <pmoesta(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +120 -134 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2013-01-14 14:23:38 UTC (rev 457) +++ trunk/src/GRHydro_Boundaries.F90 2013-01-14 14:23:40 UTC (rev 458) @@ -85,11 +85,6 @@ call SetCartSymGN(ierr, cctkGH, sym, "HydroBase::entropy") !endif endif - - if(evolve_entropy.ne.0) then - call SetCartSymGN(ierr, cctkGH, sym, "HydroBase::entropy") - call SetCartSymGN(ierr, cctkGH, sym, "GRHydro::entropycons") - endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::atmosphere_mask_real") @@ -99,9 +94,9 @@ !if (sync_conserved_only .eq. 0) then if (general_coordinates .ne. 0) then - call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[0]") + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[0]") else - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[0]") + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[0]") endif !endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[0]") @@ -118,15 +113,15 @@ !if (sync_conserved_only .eq. 0) then if (general_coordinates .ne. 0) then - call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[1]") + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[1]") else - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[1]") + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[1]") endif !endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[1]") if(evolve_mhd.ne.0) then !if (sync_conserved_only .eq. 0) then - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::Bvec[1]") + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::Bvec[1]") !endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::Bcons[1]") endif @@ -137,9 +132,9 @@ !if (sync_conserved_only .eq. 0) then if (general_coordinates .ne. 0) then - call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[2]") + call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::lvel[2]") else - call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[2]") + call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::vel[2]") endif !endif call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::scon[2]") @@ -206,31 +201,31 @@ "GRHydro::scon", "Flat") if (sync_conserved_only .eq. 0) then ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::w_lorentz", "Flat") + "HydroBase::w_lorentz", "Flat") ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::rho", "Flat") + "HydroBase::rho", "Flat") ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::press", "Flat") + "HydroBase::press", "Flat") ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::eps", "Flat") + "HydroBase::eps", "Flat") if (general_coordinates .ne. 0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::lvel", "Flat") + 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") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::vel", "Flat") endif endif if(evolve_mhd.ne.0) then - 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 + 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") if(clean_divergence.ne.0) then @@ -239,10 +234,22 @@ endif endif + if (CCTK_Equals(Bvec_evolution_method, "GRHydro_Avec")) then + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::Avec", "Flat") + 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 if (sync_conserved_only .eq. 0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::GRHydro_tracers", "Flat") + 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_cons_tracers", "Flat") @@ -250,8 +257,8 @@ 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") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::Y_e", "Flat") endif ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::Y_e_con", "Flat") @@ -259,21 +266,13 @@ if(evolve_temper.ne.0) then 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") + 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(evolve_entropy.ne.0) then - if (sync_conserved_only .eq. 0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::entropy", "Flat") - endif - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::entropycons", "Flat") - endif endif @@ -287,44 +286,56 @@ if (sync_conserved_only .eq. 0) then ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::w_lorentz", "None") + "HydroBase::w_lorentz", "None") ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::rho", "None") + "HydroBase::rho", "None") ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::press", "None") + "HydroBase::press", "None") ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::eps", "None") + "HydroBase::eps", "None") if (general_coordinates .ne. 0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::lvel", "None") + 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") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::vel", "None") endif endif if(evolve_mhd.ne.0) then - if (sync_conserved_only .eq. 0) then - if (general_coordinates .ne. 0) then + 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") + if(clean_divergence.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 + "GRHydro::psidc", "None") + endif + endif + + if (CCTK_Equals(Bvec_evolution_method, "GRHydro_Avec")) then ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::Bcons", "None") - if(clean_divergence.ne.0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::psidc", "None") + "HydroBase::Avec", "None") + 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 + 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") + 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_cons_tracers", "None") @@ -332,8 +343,8 @@ 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") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::Y_e", "None") endif ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::Y_e_con", "None") @@ -341,22 +352,13 @@ 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") + 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 - if(evolve_entropy.ne.0) then - if (sync_conserved_only .eq. 0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::entropy", "None") - endif - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::entropycons", "None") - endif - endif if (CCTK_EQUALS(bound,"scalar")) then @@ -415,13 +417,13 @@ "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 + 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 @@ -441,10 +443,6 @@ ! "HydroBase::entropy", "Flat") endif - if(evolve_entropy.ne.0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::entropy", "Flat") - endif endif @@ -466,13 +464,14 @@ 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 + 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 @@ -494,11 +493,6 @@ ! "HydroBase::entropy", "None") endif - if(evolve_entropy.ne.0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::entropy", "None") - endif - end if if (CCTK_EQUALS(bound,"scalar")) then @@ -558,25 +552,24 @@ 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 + 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") + 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") + ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::Y_e", "Flat") endif if(evolve_temper.ne.0) then @@ -586,10 +579,6 @@ "HydroBase::entropy", "Flat") endif - if(evolve_entropy.ne.0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::entropy", "Flat") - endif endif @@ -611,18 +600,20 @@ 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 + 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 @@ -638,11 +629,6 @@ "HydroBase::entropy", "None") endif - if(evolve_entropy.ne.0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::entropy", "None") - endif - end if if (CCTK_EQUALS(bound,"scalar")) then File [modified]: GRHydro_Con2PrimAM.F90 Delta lines: +0 -3 =================================================================== --- trunk/src/GRHydro_Con2PrimAM.F90 2013-01-14 14:23:38 UTC (rev 457) +++ trunk/src/GRHydro_Con2PrimAM.F90 2013-01-14 14:23:40 UTC (rev 458) @@ -102,9 +102,6 @@ !as conformally flat only for con2prim inversion purposes. posdef = .true. - !! Get Bvec from Avec before rest, so we can reuse pointwise MHD recovery - call GRHydro_BvecfromAvec(CCTK_PASS_FTOF) - if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then g11 => gaa g12 => gab Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +11 -6 =================================================================== --- trunk/schedule.ccl 2013-01-14 14:23:38 UTC (rev 457) +++ trunk/schedule.ccl 2013-01-14 14:23:40 UTC (rev 458) @@ -1066,21 +1066,26 @@ { LANG: Fortran } "Convert initial data given in primive variables to conserved variables - MHD version" - } - else if(CCTK_Equals(Bvec_evolution_method,"GRHydro_Avec")) + } else if(CCTK_Equals(Bvec_evolution_method,"GRHydro_Avec")) { - schedule Conservative2PrimitiveAM IN HydroBase_Con2Prim AS Con2Prim IF GRHydro::execute_MoL_PostStep + schedule GRHydro_BvecfromAvec IN HydroBase_Con2Prim { LANG: Fortran + } "Populate Bvec from Avec" +# SCHEDULE group HydroBase_Boundaries AT CCTK_POSTINITIAL AFTER GRHydro_PoloidalMagFieldM AFTER GRHydro_BvecfromAvec + SCHEDULE group HydroBase_Boundaries IN HydroBase_Con2Prim AFTER GRHydro_BvecfromAvec + { + } "Call boundary conditions after magnetic field initial data setup" + schedule Conservative2PrimitiveAM IN HydroBase_Con2Prim AS Con2Prim AFTER HydroBase_Boundaries IF GRHydro::execute_MoL_PostStep + { + LANG: Fortran } "Convert back to primitive variables (general) - MHD with Avec version" schedule Primitive2ConservativeCellsAM IN HydroBase_Prim2ConInitial { LANG: Fortran } "Convert initial data given in primive variables to conserved variables - MHD with Avec version" - } - else - { + } else { schedule Conservative2Primitive IN HydroBase_Con2Prim AS Con2Prim IF GRHydro::execute_MoL_PostStep { LANG: Fortran

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 457)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/src/ GRHydro_Tmunu.F90 Log: GRHydro: Improved Tmunu damping. * faster falloff to make sure to damp to atmosphere at Tmunu_damping_radius_max From: Christian Reisswig <reisswig(a)scriwalker.(none)> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Tmunu.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Tmunu.F90 2013-01-14 14:23:37 UTC (rev 456) +++ trunk/src/GRHydro_Tmunu.F90 2013-01-14 14:23:38 UTC (rev 457) @@ -122,7 +122,7 @@ if ((Tmunu_damping_radius_min .gt. 0) .and. (r(i,j,k) .gt. Tmunu_damping_radius_min)) then ! 0.5 * (1.0 - tanh(4.0*(x-x0)/sigma0)) if (r(i,j,k) .lt. Tmunu_damping_radius_max) then - dampfac = 0.5 * (1.0 - tanh(4.0*(r(i,j,k)-0.5*(Tmunu_damping_radius_max+Tmunu_damping_radius_min))/(Tmunu_damping_radius_max-Tmunu_damping_radius_min))) + dampfac = 0.5d0 * (1.0d0 - tanh((8.0d0*r(i,j,k)-4.0d0*(Tmunu_damping_radius_max+Tmunu_damping_radius_min))/(Tmunu_damping_radius_max-Tmunu_damping_radius_min))) else dampfac = 0.0 continue ! no need to add anything to Tmunu at the current point (it's zero anyway!)

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 456)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Added: /trunk/src/ GRHydro_BvecfromAvec.F90, GRHydro_Con2PrimAM.F90, GRHydro_HLLE_AM.F90, GRHydro_InterfacesAM.h, GRHydro_Prim2ConAM.F90, GRHydro_RiemannSolveAM.F90, GRHydro_SourceAM.F90 Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_Con2PrimM.F90, GRHydro_ParamCheck.F90, GRHydro_RegisterVars.cc, GRHydro_UpdateMaskM.F90, make.code.defn Log: GRHydro: Add basic vector potential support Basic cell-centered, algebraic gauge vector potential method with place-holders for lorenz gauge. Initial Avec constrained to poloidal at the moment. From: Tanja Bode <tanja.bode(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [added]: GRHydro_BvecfromAvec.F90 Delta lines: <Unavailable> File [added]: GRHydro_Con2PrimAM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Con2PrimM.F90 Delta lines: <Unavailable> File [added]: GRHydro_HLLE_AM.F90 Delta lines: <Unavailable> File [added]: GRHydro_InterfacesAM.h Delta lines: <Unavailable> File [modified]: GRHydro_ParamCheck.F90 Delta lines: <Unavailable> File [added]: GRHydro_Prim2ConAM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_RegisterVars.cc Delta lines: <Unavailable> File [added]: GRHydro_RiemannSolveAM.F90 Delta lines: <Unavailable> File [added]: GRHydro_SourceAM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_UpdateMaskM.F90 Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: <Unavailable> File [modified]: param.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 455)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_Boundaries.F90, GRHydro_CalcUpdate.F90, GRHydro_Con2Prim.F90, GRHydro_Con2PrimM.F90, GRHydro_ENOReconstruct_drv.F90, GRHydro_HLLEM.F90, GRHydro_Macros.h, GRHydro_PPMMReconstruct_drv.F90, GRHydro_ParamCheck.F90, GRHydro_Prim2ConM.F90, GRHydro_Reconstruct.F90, GRHydro_RegisterVars.cc, GRHydro_SourceM.F90, GRHydro_TVDReconstruct_drv.F90 Log: GRHydro: Implement entropy evolution (separated from temp evolution) From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: <Unavailable> File [modified]: GRHydro_CalcUpdate.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Con2Prim.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Con2PrimM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ENOReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_HLLEM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Macros.h Delta lines: <Unavailable> File [modified]: GRHydro_PPMMReconstruct_drv.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ParamCheck.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Prim2ConM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_Reconstruct.F90 Delta lines: <Unavailable> File [modified]: GRHydro_RegisterVars.cc Delta lines: <Unavailable> File [modified]: GRHydro_SourceM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_TVDReconstruct_drv.F90 Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: <Unavailable> File [modified]: param.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 454)
by rhaas＠tapir.caltech.edu 14 Jan '13

14 Jan '13

User: rhaas Date: 2013/01/14 08:23 AM Added: /trunk/src/ GRHydro_EvolutionMask.F90 /trunk/test/ tov_carpetevolutionmask.par /trunk/test/tov_carpetevolutionmask/ evolution_mask.x.asc, evolution_mask.y.asc, evolution_mask.z.asc, rho.x.asc, rho.y.asc, rho.z.asc Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_ParamCheck.F90, make.code.defn Log: GRHydro: optionally use CarpetEvolutionMask::evolution_mask to skip validity tests in regions that are not needed for evolution From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: <Unavailable> File [added]: GRHydro_EvolutionMask.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ParamCheck.F90 Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> Directory: /trunk/test/ ======================= File [added]: tov_carpetevolutionmask.par Delta lines: <Unavailable> Directory: /trunk/test/tov_carpetevolutionmask/ =============================================== File [added]: evolution_mask.x.asc Delta lines: <Unavailable> File [added]: evolution_mask.y.asc Delta lines: <Unavailable> File [added]: evolution_mask.z.asc Delta lines: <Unavailable> File [added]: rho.x.asc Delta lines: <Unavailable> File [added]: rho.y.asc Delta lines: <Unavailable> File [added]: rho.z.asc Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: <Unavailable>

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits January 2013