Commits May 2013

commits@lists.einsteintoolkit.org

9 participants
106 discussions

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

13 May '13

User: rhaas Date: 2013/05/13 01:11 PM Removed: /trunk/src/ GRHydro_InterfacesAM.h Modified: /trunk/src/ GRHydro_Con2PrimAM.F90 Log: GRHydro: remove duplicate (and incorrect) GRHydro_InterfacesAM.h sync up GRHydro_Con2PrimAM with GRHydro_Con2PrimM File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimAM.F90 Delta lines: +35 -6 =================================================================== --- trunk/src/GRHydro_Con2PrimAM.F90 2013-05-13 17:54:52 UTC (rev 516) +++ trunk/src/GRHydro_Con2PrimAM.F90 2013-05-13 18:11:19 UTC (rev 517) @@ -13,7 +13,6 @@ #include "cctk_Arguments.h" #include "cctk_Functions.h" #include "SpaceMask.h" -#include "GRHydro_InterfacesAM.h" #include "GRHydro_Macros.h" #define ITER_TOL (1.0e-8) @@ -349,6 +348,18 @@ !of the comoving B-field, b^{\mu} b_{\mu}. It is overwritten !in this routine, but we may need to find a better notation !avoid future confusions. + if(GRHydro_eos_handle .eq. 1 .or. GRHydro_eos_handle .eq. 2) then + + call GRHydro_Con2PrimM_ptold(GRHydro_eos_handle, local_gam(1), dens(i,j,k), & + scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & + Bconsx_tmp,Bconsy_tmp,Bconsz_tmp,rho_tmp, & + velx_tmp,vely_tmp,velz_tmp,eps_tmp,press_tmp, & + Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,b2, w_lorentz_tmp,& + g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), & + uxx,uxy,uxz,uyy,uyz,uzz,det, & + epsnegative,GRHydro_C2P_failed(i,j,k)) + + else call GRHydro_Con2PrimM_pt2(GRHydro_eos_handle, keytemp, GRHydro_eos_rf_prec, GRHydro_perc_ptol, local_gam(1), dens(i,j,k), & scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & Bconsx_tmp, Bconsy_tmp, Bconsz_tmp,xye(1), & @@ -358,9 +369,16 @@ g22(i,j,k),g23(i,j,k),g33(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,det, & epsnegative,GRHydro_C2P_failed(i,j,k)) + endif if(evolve_entropy.ne.0) then + if(GRHydro_C2P_failed(i,j,k).ne.0) then + !Use previous time step for rho: entropy(i,j,k) = entropycons(i,j,k)/dens(i,j,k)*rho(i,j,k) + else + !Use the current correct value of rho returned by con2prim: + entropy(i,j,k) = entropycons(i,j,k)/dens(i,j,k)*rho_tmp + endif endif if(GRHydro_C2P_failed(i,j,k).ne.0) then @@ -449,6 +467,19 @@ Bconsy_tmp = sdet*Bvecy_tmp Bconsz_tmp = sdet*Bvecz_tmp + if(evolve_entropy.ne.0) then + call GRHydro_Con2PrimM_ptee(GRHydro_eos_handle, keytemp, & + GRHydro_eos_rf_prec, local_gam(1), dens(i,j,k), & + scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), tau(i,j,k), & + Bconsx_tmp,Bconsy_tmp,Bconsz_tmp, & + entropycons(i,j,k), xye(1), & + xtemp(1),rho_tmp,velx_tmp,vely_tmp,velz_tmp,& + eps_tmp,press_tmp,Bvecx_tmp,Bvecy_tmp,Bvecz_tmp,b2,& + w_lorentz_tmp,g11(i,j,k),g12(i,j,k),g13(i,j,k),& + g22(i,j,k),g23(i,j,k),g33(i,j,k), & + uxx,uxy,uxz,uyy,uyz,uzz,det, & + epsnegative,GRHydro_C2P_failed(i,j,k)) + else call GRHydro_Con2PrimM_Polytype_pt(GRHydro_eos_handle, local_pgam, & dens(i,j,k),scon(i,j,k,1),scon(i,j,k,2),scon(i,j,k,3), sc, & Bconsx_tmp, Bconsy_tmp, Bconsz_tmp, rho_tmp,& @@ -457,6 +488,7 @@ g11(i,j,k),g12(i,j,k),g13(i,j,k),g22(i,j,k),g23(i,j,k),g33(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,det, & epsnegative,GRHydro_C2P_failed(i,j,k)) + end if rho(i,j,k) = rho_tmp press(i,j,k) = press_tmp @@ -682,12 +714,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 end do @@ -870,6 +898,7 @@ if(evolve_Y_e.ne.0) then Y_e(i,j,k) = Y_e_con(i,j,k) / dens(i,j,k) endif + Bconsx_tmp = sqrt(avg_detl)*Bvecxminus(i,j,k) Bconsy_tmp = sqrt(avg_detl)*Bvecyminus(i,j,k) Bconsz_tmp = sqrt(avg_detl)*Bveczminus(i,j,k) File [removed]: GRHydro_InterfacesAM.h Delta lines: +0 -95 =================================================================== --- trunk/src/GRHydro_InterfacesAM.h 2013-05-13 17:54:52 UTC (rev 516) +++ trunk/src/GRHydro_InterfacesAM.h 2013-05-13 18:11:19 UTC (rev 517) @@ -1,95 +0,0 @@ -module Con2PrimAM_fortran_interfaces - implicit none - - interface - - subroutine GRHydro_Con2PrimM_pt( handle, keytemp, prec, & - local_gam, dens, & - sx, sy, sz, & - tau, & - Bconsx, Bconsy, Bconsz, & - xye, xtemp, & - rho, & - velx, vely, velz,& - epsilon, pressure,& - Bx, By, Bz, & - bsq,& - w_lorentz, & - gxx, gxy, gxz, & - gyy, gyz, gzz, & - uxx, uxy, uxz,& - uyy, uyz, uzz,& - det,& - epsnegative, & - retval) - - implicit none - CCTK_INT handle - CCTK_INT keytemp - CCTK_REAL prec - CCTK_REAL local_gam - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL Bconsx, Bconsy, Bconsz - CCTK_REAL xye - CCTK_REAL xtemp - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, pressure - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq - CCTK_REAL w_lorentz - CCTK_REAL gxx, gxy, gxz - CCTK_REAL gyy, gyz, gzz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_INT epsnegative - CCTK_REAL retval - end subroutine GRHydro_Con2PrimM_pt - - subroutine GRHydro_Con2PrimM_Polytype_pt( handle, local_gam,& - dens, & - sx, sy, sz, & - sc, & - Bconsx, Bconsy, Bconsz, & - rho, & - velx, vely, velz,& - epsilon, pressure,& - Bx, By, Bz, & - bsq,& - w_lorentz, & - gxx, gxy, gxz, & - gyy, gyz, gzz, & - uxx, uxy, uxz,& - uyy, uyz, uzz,& - det,& - epsnegative, & - retval) - - implicit none - CCTK_INT handle - CCTK_REAL local_gam - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL sc - CCTK_REAL Bconsx, Bconsy, Bconsz - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, pressure - CCTK_REAL Bx, By, Bz - CCTK_REAL bsq - CCTK_REAL w_lorentz - CCTK_REAL gxx, gxy, gxz - CCTK_REAL gyy, gyz, gzz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_INT epsnegative - CCTK_REAL retval - end subroutine GRHydro_Con2PrimM_Polytype_pt - - end interface - -end module Con2PrimAM_fortran_interfaces

1 0

[svn:einsteintoolkit] www/about/gallery/ (Rev. 1008)
by knarf＠cct.lsu.edu 13 May '13

13 May '13

User: knarf Date: 2013/05/13 01:06 PM Modified: /about/gallery/ tov.par /about/gallery/tov/ rho_max.pdf, rho_max.png Log: update par-file and plot File Changes: Directory: /about/gallery/ ========================== File [modified]: tov.par Delta lines: +7 -7 =================================================================== --- about/gallery/tov.par 2013-05-11 06:54:09 UTC (rev 1007) +++ about/gallery/tov.par 2013-05-13 18:06:52 UTC (rev 1008) @@ -192,15 +192,15 @@ # Parameters for initial star TOVSolver::TOV_Rho_Central[0] = 1.28e-3 -TOVSolver::TOV_Gamma[0] = 2.75 -TOVSolver::TOV_K[0] = 30000 +TOVSolver::TOV_Gamma[0] = 2 +TOVSolver::TOV_K[0] = 100 # Set equation of state for evolution -EOS_Omni::poly_gamma = 2.75 -EOS_Omni::poly_gamma_ini = 2.75 -EOS_Omni::poly_k = 30000 -EOS_Omni::gl_gamma = 2.75 -EOS_Omni::gl_k = 30000 +EOS_Omni::poly_gamma = 2 +EOS_Omni::poly_gamma_ini = 2 +EOS_Omni::poly_k = 100 +EOS_Omni::gl_gamma = 2 +EOS_Omni::gl_k = 100 # I/O Directory: /about/gallery/tov/ ============================== File [modified]: rho_max.pdf Delta lines: +0 -0 =================================================================== (Binary files differ) File [modified]: rho_max.png Delta lines: +0 -0 =================================================================== (Binary files differ)

1 0

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

13 May '13

User: rhaas Date: 2013/05/13 12:54 PM Modified: /trunk/src/ GRHydro_SourceAM.F90 Log: GRHydro: do not declare grid scalar as OpenMP PRIVATE instead leave it SHARED since it is a global read-only variable. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_SourceAM.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_SourceAM.F90 2013-05-13 17:21:51 UTC (rev 515) +++ trunk/src/GRHydro_SourceAM.F90 2013-05-13 17:54:52 UTC (rev 516) @@ -260,7 +260,7 @@ !$OMP tau_source,sx_source,sy_source,sz_source,& !$OMP dx_det_bydet,dy_det_bydet,dz_det_bydet,& !$OMP gdg_x,gdg_y,gdg_z,& - !$OMP Avcx_source,Avcy_source,Avcz_source,evolve_Lorenz_gge,& + !$OMP Avcx_source,Avcy_source,Avcz_source,& !$OMP uxx, uxy, uxz, uyy, uyz, uzz,& !$OMP dx_gxx, dx_gxy, dx_gxz, dx_gyy, dx_gyz, dx_gzz,& !$OMP dy_gxx, dy_gxy, dy_gxz, dy_gyy, dy_gyz, dy_gzz,&

1 0

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

13 May '13

User: rhaas Date: 2013/05/13 12:21 PM Modified: /trunk/src/ GRHydro_Eigenproblem.F90 Log: GRHydro: fix use of uninitialized variable in eigenproblem_leftright this is only used when doing flux split FD which is not the default. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +3 -0 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2013-05-13 05:29:59 UTC (rev 514) +++ trunk/src/GRHydro_Eigenproblem.F90 2013-05-13 17:21:51 UTC (rev 515) @@ -618,6 +618,9 @@ call EOS_Omni_cs2(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,eps,xtemp,xye,cs2,keyerr,anyerr) + call EOS_Omni_DPressByDEps(handle,keytemp,GRHydro_eos_rf_prec,n,& + rho,eps,xtemp,xye,dpdeps,keyerr,anyerr) + ! if (cs2<0) cs2=0 ! this does not modify the roe crashing problem with shocktube enthalpy = one + eps + press / rho

1 0

[svn:einsteintoolkit] GRHydro/ (Rev. 514)
by rhaas＠tapir.caltech.edu 12 May '13

12 May '13

User: rhaas Date: 2013/05/13 12:30 AM Modified: /branches/ET_2013_05/ /branches/ET_2013_05/src/ GRHydro_Prim2ConM.F90 Log: GRHydro: Fix a problem with ghost zones in Prim2ConCells calls in MHD case. From: Christian Reisswig <reisswig(a)tapir.caltech.edu> Directory Changes: Directory: /branches/ET_2013_05/ ================================ Property changes on: branches/ET_2013_05 ___________________________________________________________________ Directory: /svn:mergeinfo/ ========================== - /branches/divclean:231-243 /branches/hot_and_MHD_temp_dev:166-185 /trunk:510 + /branches/divclean:231-243 /branches/hot_and_MHD_temp_dev:166-185 /trunk:510,512 File Changes: Directory: /branches/ET_2013_05/src/ ==================================== File [modified]: GRHydro_Prim2ConM.F90 Delta lines: +9 -9 =================================================================== --- branches/ET_2013_05/src/GRHydro_Prim2ConM.F90 2013-05-13 05:27:57 UTC (rev 513) +++ branches/ET_2013_05/src/GRHydro_Prim2ConM.F90 2013-05-13 05:29:59 UTC (rev 514) @@ -464,9 +464,9 @@ if(evolve_temper.ne.1) then !$OMP PARALLEL DO PRIVATE(k,j,i,det), REDUCTION(MAX:maxtau0) - do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 - do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1 - do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1 + do k = 1,cctk_lsh(3) + do j = 1,cctk_lsh(2) + do i = 1,cctk_lsh(1) det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k), \ gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) @@ -505,9 +505,9 @@ else !$OMP PARALLEL DO PRIVATE(k,j,i,det) - do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 - do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1 - do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1 + do k = 1,cctk_lsh(3) + do j = 1,cctk_lsh(2) + do i = 1,cctk_lsh(1) det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k), \ gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) @@ -747,9 +747,9 @@ CCTK_REAL :: det !$OMP PARALLEL DO PRIVATE(k,j,i,det) - do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 - do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1 - do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1 + do k = 1,cctk_lsh(3) + do j = 1,cctk_lsh(2) + do i = 1,cctk_lsh(1) det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),\ gyy(i,j,k),gyz(i,j,k),gzz(i,j,k))

1 0

[svn:einsteintoolkit] GRHydro/ (Rev. 513)
by rhaas＠tapir.caltech.edu 12 May '13

12 May '13

User: rhaas Date: 2013/05/13 12:27 AM Modified: /branches/ET_2013_05/ /branches/ET_2013_05/src/ GRHydro_Con2PrimM_polytype_pt.c Log: GRhydro: Pressure in polytypeM_pt was off by factor inv_sqrt_detg Directory Changes: Directory: /branches/ET_2013_05/ ================================ Property changes on: branches/ET_2013_05 ___________________________________________________________________ Directory: /svn:mergeinfo/ ========================== - /branches/divclean:231-243 /branches/hot_and_MHD_temp_dev:166-185 + /branches/divclean:231-243 /branches/hot_and_MHD_temp_dev:166-185 /trunk:510 File Changes: Directory: /branches/ET_2013_05/src/ ==================================== File [modified]: GRHydro_Con2PrimM_polytype_pt.c Delta lines: +1 -1 =================================================================== --- branches/ET_2013_05/src/GRHydro_Con2PrimM_polytype_pt.c 2013-05-11 06:29:37 UTC (rev 512) +++ branches/ET_2013_05/src/GRHydro_Con2PrimM_polytype_pt.c 2013-05-13 05:27:57 UTC (rev 513) @@ -406,7 +406,7 @@ // printf("doublecheck - S, rho, gamma: %e %e %e\n",*sc_in, rho_gm1,gamma); - p = (*sc_in) * rho_gm1 / gamma; + p = (*sc_in) * inv_sqrt_detg * rho_gm1 / gamma; u = p / gm1;

1 0

[Carpet] branch, ET_2013_05, updated. carpet-6-init-231-gc8bbd52
by Carpet git repositories 12 May '13

12 May '13

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 "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, ET_2013_05 has been updated via c8bbd52a3ddfe031ba4789bee3a8ab72ecab4e9f (commit) from d2265e829d3e1f3f9ab19bd5b805b82c7f79942f (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 c8bbd52a3ddfe031ba4789bee3a8ab72ecab4e9f Author: Roland Haas <rhaas(a)tapir.caltech.edu> Date: Sun May 12 11:53:20 2013 -0700 LoopControl: disable smt by default We currently have issues with this switch changing results of computation when used in combination with openmp and using all cores. ----------------------------------------------------------------------- Summary of changes: Carpet/LoopControl/param.ccl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. carpet-6-init-231-ga4dc204
by Carpet git repositories 12 May '13

12 May '13

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 "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via a4dc204e712f58cabfc270a5cb158ff9664485cf (commit) from d2265e829d3e1f3f9ab19bd5b805b82c7f79942f (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 a4dc204e712f58cabfc270a5cb158ff9664485cf Author: Roland Haas <rhaas(a)tapir.caltech.edu> Date: Sun May 12 11:53:20 2013 -0700 LoopControl: disable smt by default We currently have issues with this switch changing results of computation when used in combination with openmp and using all cores. ----------------------------------------------------------------------- Summary of changes: Carpet/LoopControl/param.ccl | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] manifest/branches/ET_2013_05/ (Rev. 239)
by knarf＠cct.lsu.edu 11 May '13

11 May '13

User: knarf Date: 2013/05/11 02:27 PM Modified: /branches/ET_2013_05/ einsteintoolkit.th Log: remove EOSG thorns File Changes: Directory: /branches/ET_2013_05/ ================================ File [modified]: einsteintoolkit.th Delta lines: +0 -4 =================================================================== --- branches/ET_2013_05/einsteintoolkit.th 2013-05-11 19:26:43 UTC (rev 238) +++ branches/ET_2013_05/einsteintoolkit.th 2013-05-11 19:27:02 UTC (rev 239) @@ -214,7 +214,6 @@ EinsteinBase/Constants EinsteinBase/CoordGauge EinsteinBase/EOS_Base -#EinsteinBase/EOSG_Base EinsteinBase/HydroBase EinsteinBase/StaticConformal EinsteinBase/TmunuBase @@ -223,9 +222,6 @@ EinsteinEOS/EOS_IdealFluid EinsteinEOS/EOS_Omni EinsteinEOS/EOS_Polytrope -#EinsteinEOS/EOSG_Hybrid -#EinsteinEOS/EOSG_IdealFluid -#EinsteinEOS/EOSG_Polytrope EinsteinEvolve/GRHydro EinsteinEvolve/LegoExcision

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 238)
by knarf＠cct.lsu.edu 11 May '13

11 May '13

User: knarf Date: 2013/05/11 02:26 PM Modified: /trunk/ einsteintoolkit.th Log: remove EOSG thorns File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.th Delta lines: +0 -4 =================================================================== --- trunk/einsteintoolkit.th 2013-05-10 14:29:37 UTC (rev 237) +++ trunk/einsteintoolkit.th 2013-05-11 19:26:43 UTC (rev 238) @@ -212,7 +212,6 @@ EinsteinBase/Constants EinsteinBase/CoordGauge EinsteinBase/EOS_Base -#EinsteinBase/EOSG_Base EinsteinBase/HydroBase EinsteinBase/StaticConformal EinsteinBase/TmunuBase @@ -221,9 +220,6 @@ EinsteinEOS/EOS_IdealFluid EinsteinEOS/EOS_Omni EinsteinEOS/EOS_Polytrope -#EinsteinEOS/EOSG_Hybrid -#EinsteinEOS/EOSG_IdealFluid -#EinsteinEOS/EOSG_Polytrope EinsteinEvolve/GRHydro EinsteinEvolve/LegoExcision

1 0

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits May 2013