Commits February 2011

commits@lists.einsteintoolkit.org

8 participants
34 discussions

[svn:einsteintoolkit] TOVSolver/trunk/test/ (Rev. 122)
by knarf＠cct.lsu.edu 10 Feb '11

10 Feb '11

User: knarf Date: 2011/02/10 11:13 AM Modified: /trunk/test/ test_one_boost_max.par, test_one_static_max.par, test_tov_carpet.par, test_two_av.par, test_two_max.par Log: convert testsuites to use EOS_Omni File Changes: Directory: /trunk/test/ ======================= File [modified]: test_one_boost_max.par Delta lines: +1 -4 =================================================================== --- trunk/test/test_one_boost_max.par 2010-11-21 03:29:53 UTC (rev 121) +++ trunk/test/test_one_boost_max.par 2011-02-10 17:13:40 UTC (rev 122) @@ -1,4 +1,4 @@ -ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints Constants LocalReduce TmunuBase InitBase" +ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni admconstraints Constants LocalReduce TmunuBase InitBase" TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -48,9 +48,6 @@ tovsolver::TOV_Velocity_z[0] = 0.3 tovsolver::TOV_Combine_Method = "maximum" -EOS_Polytrope::eos_gamma = 2.0 -EOS_Polytrope::eos_k = 100.0 - IO::out_dir = $parfile IO::out_fileinfo="none" File [modified]: test_one_static_max.par Delta lines: +1 -5 =================================================================== --- trunk/test/test_one_static_max.par 2010-11-21 03:29:53 UTC (rev 121) +++ trunk/test/test_one_static_max.par 2011-02-10 17:13:40 UTC (rev 122) @@ -1,4 +1,4 @@ -ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints Constants LocalReduce TmunuBase InitBase" +ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni admconstraints Constants LocalReduce TmunuBase InitBase" TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -45,10 +45,6 @@ tovsolver::TOV_K[0] = 100.0 tovsolver::TOV_Combine_Method = "maximum" -EOS_Polytrope::eos_gamma = 2.0 -EOS_Polytrope::eos_k = 100.0 - - IO::out_dir = $parfile IO::out_fileinfo="none" File [modified]: test_tov_carpet.par Delta lines: +1 -4 =================================================================== --- trunk/test/test_tov_carpet.par 2010-11-21 03:29:53 UTC (rev 121) +++ trunk/test/test_tov_carpet.par 2011-02-10 17:13:40 UTC (rev 122) @@ -1,5 +1,5 @@ !DESC "Carpet unigrid, one TOV" -ActiveThorns = "time MoL coordbase symbase cartgrid3d ioutil boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver eos_base eos_idealfluid eos_polytrope admconstraints Constants LocalReduce Carpet CarpetLib CarpetInterp CarpetReduce CarpetIOScalar CarpetIOBasic LoopControl TmunuBase InitBase" +ActiveThorns = "time MoL coordbase symbase cartgrid3d ioutil boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver eos_omni admconstraints Constants LocalReduce Carpet CarpetLib CarpetInterp CarpetReduce CarpetIOScalar CarpetIOBasic LoopControl TmunuBase InitBase" TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -56,9 +56,6 @@ tovsolver::TOV_K[0] = 100.0 tovsolver::TOV_Combine_Method = "maximum" -EOS_Polytrope::eos_gamma = 2.0 -EOS_Polytrope::eos_k = 100.0 - Carpet::prolongation_order_space = 3 Carpet::prolongation_order_time = 2 File [modified]: test_two_av.par Delta lines: +1 -4 =================================================================== --- trunk/test/test_two_av.par 2010-11-21 03:29:53 UTC (rev 121) +++ trunk/test/test_two_av.par 2011-02-10 17:13:40 UTC (rev 122) @@ -1,4 +1,4 @@ -ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints constants LocalReduce TmunuBase InitBase" +ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni admconstraints constants LocalReduce TmunuBase InitBase" TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -54,9 +54,6 @@ tovsolver::TOV_K[1] = 100.0 tovsolver::TOV_Position_x[1] = 15.0 -EOS_Polytrope::eos_gamma = 2.0 -EOS_Polytrope::eos_k = 100.0 - IO::out_fileinfo="none" IO::out_dir = $parfile File [modified]: test_two_max.par Delta lines: +1 -4 =================================================================== --- trunk/test/test_two_max.par 2010-11-21 03:29:53 UTC (rev 121) +++ trunk/test/test_two_max.par 2011-02-10 17:13:40 UTC (rev 122) @@ -1,4 +1,4 @@ -ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope admconstraints constants LocalReduce TmunuBase InitBase" +ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_omni admconstraints constants LocalReduce TmunuBase InitBase" TmunuBase::stress_energy_storage = yes TmunuBase::stress_energy_at_RHS = yes @@ -54,9 +54,6 @@ tovsolver::TOV_K[1] = 100.0 tovsolver::TOV_Position_x[1] = 15.0 -EOS_Polytrope::eos_gamma = 2.0 -EOS_Polytrope::eos_k = 100.0 - IO::out_fileinfo="none" IO::out_dir = $parfile

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 121)
by knarf＠cct.lsu.edu 10 Feb '11

10 Feb '11

User: knarf Date: 2011/02/10 09:28 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: fix type of C2P_failed File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-01-01 00:10:16 UTC (rev 120) +++ trunk/src/GRHydro_Con2Prim.F90 2011-02-10 15:28:55 UTC (rev 121) @@ -49,7 +49,7 @@ CCTK_REAL rho_send,velx_send,vely_send,velz_send,eps_send CCTK_REAL press_send,w_lorentz_send,x_send,y_send,z_send,r_send CCTK_REAL pmin, epsmin - CCTK_INT C2P_failed + CCTK_REAL C2P_failed logical epsnegative ! begin EOS Omni vars @@ -104,7 +104,7 @@ call EOS_Omni_EpsFromPress(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) - C2P_failed = 0 + C2P_failed = 0.d0 write(*,*) 'Con2Prim test: converting to primitive variables' call Con2Prim_pt(GRHydro_eos_handle,dens_send,sx_send,sy_send,sz_send,&

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 217)
by knarf＠cct.lsu.edu 10 Feb '11

10 Feb '11

User: knarf Date: 2011/02/10 09:23 AM Modified: /trunk/src/ GRHydro_Prim2Con.F90 Log: fix declaration of xtemp, which has to be an array of 1 according to the function declaration of prim2con_hot File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Prim2Con.F90 Delta lines: +3 -3 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2011-02-09 19:23:22 UTC (rev 216) +++ trunk/src/GRHydro_Prim2Con.F90 2011-02-10 15:23:57 UTC (rev 217) @@ -46,7 +46,7 @@ integer :: i, j, k CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,& gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr - CCTK_REAL :: xtemp + CCTK_REAL :: xtemp(1) if(evolve_temper.ne.1) then !$OMP PARALLEL DO PRIVATE(i, j, avg_detl, avg_detr,& @@ -121,7 +121,7 @@ ! variable 'temperature' in prim2con at the interfaces ! We will instead use an average temperature as an initial ! guess. - xtemp = 0.5d0*(temperature(i,j,k) + & + xtemp(1) = 0.5d0*(temperature(i,j,k) + & temperature(i-xoffset,j-yoffset,k-zoffset)) call prim2con_hot(GRHydro_eos_handle, GRHydro_reflevel,& i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),gxxl,gxyl,gxzl,gyyl,& @@ -138,7 +138,7 @@ ! variable 'temperature' in prim2con at the interfaces ! We will instead use an average temperature as an initial ! guess. - xtemp = 0.5d0*(temperature(i,j,k) + & + xtemp(1) = 0.5d0*(temperature(i,j,k) + & temperature(i+xoffset,j+yoffset,k+zoffset)) call prim2con_hot(GRHydro_eos_handle, GRHydro_reflevel, & i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),gxxr,gxyr,gxzr,&

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 216)
by knarf＠cct.lsu.edu 09 Feb '11

09 Feb '11

User: knarf Date: 2011/02/09 01:23 PM Modified: /trunk/src/ GRHydro_Eigenproblem.F90 Log: improve error message File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2011-02-07 02:42:02 UTC (rev 215) +++ trunk/src/GRHydro_Eigenproblem.F90 2011-02-09 19:23:22 UTC (rev 216) @@ -546,7 +546,7 @@ roeflux5 = rflux(5) if(roeflux1.ne.roeflux1) then - stop "bad herberd" + call CCTK_WARN(0, "Found NaNs in roeflux1, aborting") endif end subroutine eigenproblem

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/nuc_eos/ (Rev. 37)
by cott＠tapir.caltech.edu 06 Feb '11

06 Feb '11

User: cott Date: 2011/02/06 11:36 PM Modified: /trunk/src/nuc_eos/ nuc_eos.F90 Log: * update nuc_eos with some changes in the low-density regime. File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [modified]: nuc_eos.F90 Delta lines: +32 -13 =================================================================== --- trunk/src/nuc_eos/nuc_eos.F90 2011-02-05 17:07:51 UTC (rev 36) +++ trunk/src/nuc_eos/nuc_eos.F90 2011-02-07 05:36:36 UTC (rev 37) @@ -160,6 +160,25 @@ end subroutine nuc_eos_full +subroutine nuc_poly_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) + + implicit none + real*8 xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe + real*8,parameter:: polyK1 = 5.0d14 + real*8,parameter :: polyGamma = 1.33333333333333d0 + integer keytemp + + xprs=polyK1*xrho**(polyGamma) + xenr=xprs/xrho/(polyGamma-1.d0) + xcs2=polyGamma*xprs/xrho + xdpderho=0.0d0 + xdpdrhoe=0.0d0 + + xenr=max(8.0d18,xenr) + xenr=min(3.0d20,xenr) + +end subroutine nuc_poly_eos + subroutine nuc_low_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) implicit none @@ -212,9 +231,9 @@ call CCTK_WARN (0, "nuc_eos: rho > rhomax") endif - if(xrho.lt.eos_rhomin*1.2d0) then - call nuc_low_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) - xent = 4.0d0 + if(xrho.lt.eos_rhomin*1.126d0) then + call nuc_poly_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) + xent = 0.0d0 return endif @@ -234,8 +253,8 @@ endif if(xtemp.lt.eos_tempmin) then - call nuc_low_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) - xent = 4.0d0 + call nuc_poly_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) + xent = 0.0d0 return endif endif @@ -335,8 +354,8 @@ call CCTK_WARN (0, "nuc_eos: rho > rhomax") endif - if(xrho.lt.eos_rhomin*1.2d0) then - call nuc_low_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) + if(xrho.lt.eos_rhomin*1.126d0) then + call nuc_poly_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) return endif @@ -354,9 +373,9 @@ if(xtemp.gt.eos_tempmax) then call CCTK_WARN (0, "nuc_eos: temp > tempmax") endif - + if(xtemp.lt.eos_tempmin) then - call nuc_low_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) + call nuc_poly_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) return endif endif @@ -414,8 +433,8 @@ call CCTK_WARN (0, "nuc_eos: rho > rhomax") endif - if(xrho.lt.eos_rhomin*1.2d0) then - call nuc_low_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) + if(xrho.lt.eos_rhomin*1.126d0) then + call nuc_poly_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) return endif @@ -433,9 +452,9 @@ if(xtemp.gt.eos_tempmax) then call CCTK_WARN (0, "nuc_eos: temp > tempmax") endif - + if(xtemp.lt.eos_tempmin) then - call nuc_low_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) + call nuc_poly_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) return endif endif

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 215)
by cott＠tapir.caltech.edu 06 Feb '11

06 Feb '11

User: cott Date: 2011/02/06 08:42 PM Modified: /trunk/src/ GRHydro_Prim2Con.F90 Log: * add !OMP CRITICAL around CCTK_WARN statements File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Prim2Con.F90 Delta lines: +7 -1 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2011-02-06 16:22:28 UTC (rev 214) +++ trunk/src/GRHydro_Prim2Con.F90 2011-02-07 02:42:02 UTC (rev 215) @@ -46,7 +46,7 @@ integer :: i, j, k CCTK_REAL :: gxxl,gxyl,gxzl,gyyl,gyzl,gzzl,avg_detl,& gxxr,gxyr,gxzr,gyyr,gyzr,gzzr,avg_detr - CCTK_REAL :: xtemp(1) + CCTK_REAL :: xtemp if(evolve_temper.ne.1) then !$OMP PARALLEL DO PRIVATE(i, j, avg_detl, avg_detr,& @@ -253,6 +253,7 @@ drho,deps,temp,ye,dpress,keyerr,anyerr) keytemp=0 if(anyerr.ne.0) then + !OMP CRITICAL call CCTK_WARN(1,"EOS error in prim2con_hot: lev 2") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(1,warnline) @@ -262,11 +263,13 @@ call CCTK_WARN(1,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) + !OMP END CRITICAL endif else ! This is a way of recovering even on finer refinement levels: ! Use the average temperature at the interface instead of the ! reconstructed specific internal energy. + !OMP CRITICAL call CCTK_WARN(1,"EOS error in prim2con_hot: NOW using averaged temp!") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(1,warnline) @@ -276,12 +279,14 @@ call CCTK_WARN(1,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) + !OMP END CRITICAL keytemp=1 temp = temp0 call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& drho,deps,temp,ye,dpress,keyerr,anyerr) keytemp=0 if(anyerr.ne.0) then + !OMP CRITICAL call CCTK_WARN(1,"EOS error in prim2con_hot") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z call CCTK_WARN(1,warnline) @@ -292,6 +297,7 @@ write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel call CCTK_WARN(1,warnline) call CCTK_WARN(0,"Aborting!!!") + !OMP END CRITICAL endif endif endif

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 214)
by cott＠tapir.caltech.edu 06 Feb '11

06 Feb '11

User: cott Date: 2011/02/06 10:22 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Con2Prim.F90 Log: * update to hot c2p routine: allow for a failsafe mode that handles off-the-table issues with tabulated EOS. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +101 -6 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-02-05 16:59:37 UTC (rev 213) +++ trunk/src/GRHydro_Con2Prim.F90 2011-02-06 16:22:28 UTC (rev 214) @@ -522,8 +522,10 @@ ! begin EOS Omni vars integer :: n,keytemp,anyerr,keyerr(1) real*8 :: xpress,temp0 + integer :: nfudgemax,nf n=1;keytemp=0;anyerr=0;keyerr(1)=0 temp0 = 0.0d0;xpress = 0.0d0 + nf=0;nfudgemax=10 ! end EOS Omni vars failinfomode = 1 @@ -567,8 +569,39 @@ write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - call CCTK_WARN(failinfomode,warnline) - call CCTK_WARN(failwarnmode,"Aborting!!!") + if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then + ! Handling of the case when no new temperature can be + ! found for a given epsilon. The amount of times + ! we get to this place should be monitored, as this + ! 'failsafe' mode creates artificial heat. + nf = 0 + do while(anyerr.ne.0.and.nf.le.nfudgemax) + anyerr = 0 + epsilon = epsilon + abs(epsilon)*0.05d0 + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& + rho,epsilon,temp,ye,xpress,keyerr,anyerr) + nf = nf + 1 + enddo + write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z + call CCTK_WARN(failinfomode,warnline) + if(nf.gt.nfudgemax) then + call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A7,i8)") "code: ",keyerr(1) + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failwarnmode,"Aborting!!!") + endif + else + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failwarnmode,"Aborting!!!") + endif endif endif @@ -611,8 +644,39 @@ write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - call CCTK_WARN(failinfomode,warnline) - call CCTK_WARN(failwarnmode,"Aborting!!!") + if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then + ! Handling of the case when no new temperature can be + ! found for a given epsilon. The amount of times + ! we get to this place should be monitored, as this + ! 'failsafe' mode creates artificial heat. + nf = 0 + do while(anyerr.ne.0.and.nf.le.nfudgemax) + anyerr = 0 + epsilon = epsilon + abs(epsilon)*0.05d0 + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& + rho,epsilon,temp,ye,xpress,keyerr,anyerr) + nf = nf + 1 + enddo + write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z + call CCTK_WARN(failinfomode,warnline) + if(nf.gt.nfudgemax) then + call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A7,i8)") "code: ",keyerr(1) + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failwarnmode,"Aborting!!!") + endif + else + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failwarnmode,"Aborting!!!") + endif endif endif f = pold - xpress @@ -673,8 +737,39 @@ write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - call CCTK_WARN(failinfomode,warnline) - call CCTK_WARN(failwarnmode,"Aborting!!!") + if(keyerr(1).eq.667.and.GRHydro_eos_hot_eps_fix.ne.0) then + ! Handling of the case when no new temperature can be + ! found for a given epsilon. The amount of times + ! we get to this place should be monitored, as this + ! 'failsafe' mode creates artificial heat. + nf = 0 + do while(anyerr.ne.0.and.nf.le.nfudgemax) + anyerr = 0 + epsilon = epsilon + abs(epsilon)*0.05d0 + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& + rho,epsilon,temp,ye,xpress,keyerr,anyerr) + nf = nf + 1 + enddo + write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z + call CCTK_WARN(failinfomode,warnline) + if(nf.gt.nfudgemax) then + call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A7,i8)") "code: ",keyerr(1) + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failwarnmode,"Aborting!!!") + endif + else + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failwarnmode,"Aborting!!!") + endif endif endif Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +15 -3 =================================================================== --- trunk/param.ccl 2011-02-05 16:59:37 UTC (rev 213) +++ trunk/param.ccl 2011-02-06 16:22:28 UTC (rev 214) @@ -251,11 +251,23 @@ } "Ideal_Fluid" -real GRHydro_eos_rf_prec "Precision to which root finding should be carried out" +real GRHydro_eos_rf_prec "Precision to which root finding should be carried out" STEERABLE=ALWAYS { (0.0:* :: "anything larger than 0 goes" } 1.0e-8 +# cott(a)tapir.caltech.edu: +# The below parameter controls the handling of EOS_Omni keyerr=667 +# failures. In these failures, no new temperature can be found for the +# eps it was called with. This may happen, for example, when a strong +# shock appears for the first time. Code checking this parameter will, +# if it is set to true, locally inject heat to fix the problem. +# This normally happens only very rarely, but one must monitor total energy +# conservation to check that this does ruin energy conservation. +boolean GRHydro_eos_hot_eps_fix "Activate quasi-failsafe mode for hot EOSs" STEERABLE=ALWAYS +{ +} "no" + ####################### Other Parameters ############################## #Parameters controlling conservative <-> primitive change. @@ -279,12 +291,12 @@ 0: :: "Positive" } 1.e-10 -real GRHydro_perc_ptol "Tolerance for primitive variable solve (percent)" +real GRHydro_perc_ptol "Tolerance for primitive variable solve (percent)" STEERABLE=ALWAYS { 0: :: "Do we really want both tolerances?" } 1.e-8 -real GRHydro_del_ptol "Tolerance for primitive variable solve (absolute)" +real GRHydro_del_ptol "Tolerance for primitive variable solve (absolute)" STEERABLE=ALWAYS { 0: :: "Do we really want both tolerances?" } 1.e-18

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/nuc_eos/ (Rev. 36)
by cott＠tapir.caltech.edu 05 Feb '11

05 Feb '11

User: cott Date: 2011/02/05 11:07 AM Modified: /trunk/src/nuc_eos/ readtable.F90 Log: * update hdf5 table reader routine so that 2006 results from Ott et al. 2007 can be reproduced by using the Shen table of the Garching group. Note that the code is currently commented (with #if 0 [...] #endif). File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [modified]: readtable.F90 Delta lines: +20 -0 =================================================================== --- trunk/src/nuc_eos/readtable.F90 2011-01-26 16:15:44 UTC (rev 35) +++ trunk/src/nuc_eos/readtable.F90 2011-02-05 17:07:51 UTC (rev 36) @@ -238,7 +238,27 @@ ! write(6,*) "Done reading eos tables" +#if 0 +! if using the actual garching table; +! keep this around for compatiblity and to +! reproduce 2006 results using the Garching Shen EOS table. + amu_cgs_andi = 1.66d-24 + do i=1,nrho + do j=1,ntemp + do k=1,nye + buffer1 = 10.0d0**alltables(i,j,k,2) + buffer1 = buffer1*amu_cgs_andi/mev_to_erg + buffer2 = (buffer1 + 939.5731d0 - 10.8d0 - amu_mev) + buffer3 = buffer2 - ye(k)*0.511d0 + buffer4 = buffer3/amu_cgs * mev_to_erg + alltables(i,j,k,2) = log10(buffer4) + enddo + enddo + enddo +#endif + + end subroutine nuc_eos_readtable

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 213)
by cott＠tapir.caltech.edu 05 Feb '11

05 Feb '11

User: cott Date: 2011/02/05 10:59 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: * update handling of the hot c2p business: add fallback option when c2p does not converge -- in this case the pointwise c2p is called again with a lower tolerance. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +43 -45 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-02-02 19:44:05 UTC (rev 212) +++ trunk/src/GRHydro_Con2Prim.F90 2011-02-05 16:59:37 UTC (rev 213) @@ -58,6 +58,7 @@ CCTK_INT :: type2_bits CCTK_REAL :: local_min_tracer + CCTK_REAL :: local_perc_ptol ! begin EOS Omni vars integer :: n,keytemp,anyerr,keyerr(1) @@ -157,12 +158,40 @@ z(i,j,k),r(i,j,k),epsnegative,GRHydro_rho_min,pmin, epsmin, & GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) else - call Con2Prim_pt_hot(i,j,k,GRHydro_eos_handle, dens(i,j,k),scon(i,j,k,1),scon(i,j,k,2), & - scon(i,j,k,3),tau(i,j,k),rho(i,j,k),vel(i,j,k,1),vel(i,j,k,2), & - vel(i,j,k,3),eps(i,j,k),temperature(i,j,k),y_e(i,j,k),press(i,j,k),w_lorentz(i,j,k), & + call Con2Prim_pt_hot(i,j,k,GRHydro_eos_handle, dens(i,j,k),scon(i,j,k,1),& + scon(i,j,k,2),scon(i,j,k,3),tau(i,j,k),rho(i,j,k),vel(i,j,k,1),& + vel(i,j,k,2),vel(i,j,k,3),eps(i,j,k),temperature(i,j,k),y_e(i,j,k),& + press(i,j,k),w_lorentz(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,det,x(i,j,k),y(i,j,k), & z(i,j,k),r(i,j,k),epsnegative,GRHydro_rho_min,pmin, epsmin, & - GRHydro_reflevel, GRHydro_C2P_failed(i,j,k)) + GRHydro_reflevel, GRHydro_C2P_failed(i,j,k), GRHydro_perc_ptol) + if(GRHydro_C2P_failed(i,j,k).eq.2) then + ! this means c2p did not converge. + ! In this case, we attempt to call c2p with a reduced + ! accuracy requirement; if it fails again, we abort + GRHydro_C2P_failed(i,j,k) = 0 + local_perc_ptol = GRHydro_perc_ptol*100.0d0 + call Con2Prim_pt_hot(i,j,k,GRHydro_eos_handle, dens(i,j,k),scon(i,j,k,1),& + scon(i,j,k,2),scon(i,j,k,3),tau(i,j,k),rho(i,j,k),& + vel(i,j,k,1),vel(i,j,k,2), vel(i,j,k,3),eps(i,j,k),& + temperature(i,j,k),y_e(i,j,k),press(i,j,k),w_lorentz(i,j,k), & + uxx,uxy,uxz,uyy,uyz,uzz,det,x(i,j,k),y(i,j,k), & + z(i,j,k),r(i,j,k),epsnegative,GRHydro_rho_min,pmin, epsmin, & + GRHydro_reflevel, GRHydro_C2P_failed(i,j,k), local_perc_ptol) + if(GRHydro_C2P_failed(i,j,k).eq.2) then + if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then + call CCTK_WARN(1,"Convergence problem in c2p") + write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel + call CCTK_WARN(1,warnline) + write(warnline,"(3i5,1P10E15.6)") i,j,k,x(i,j,k),y(i,j,k),z(i,j,k) + call CCTK_WARN(1,warnline) + write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k),& + temperature(i,j,k),y_e(i,j,k) + call CCTK_WARN(1,warnline) + call CCTK_WARN(0,"Aborting!!!") + endif + endif + endif endif if (epsnegative) then @@ -272,7 +301,7 @@ n=1;keytemp=0;anyerr=0;keyerr(1)=0 xpress=0.0d0;xtemp=0.0d0;xye=0.0d0 ! end EOS Omni vars - + !!$ Undensitize the variables udens = dens /sqrt(det) @@ -466,7 +495,7 @@ subroutine Con2Prim_pt_hot(ii,jj,kk,handle, dens, sx, sy, sz, tau, rho, velx, vely, & velz, epsilon, temp, ye, press, w_lorentz, uxx, uxy, uxz, uyy, & uyz, uzz, det, x, y, z, r, epsnegative, GRHydro_rho_min, pmin, epsmin, & - GRHydro_reflevel, GRHydro_C2P_failed) + GRHydro_reflevel, GRHydro_C2P_failed, local_perc_ptol) implicit none @@ -482,6 +511,7 @@ CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, epsold, epsnew, w2, & w2mhalf, temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin CCTK_REAL epsminl,pminl + CCTK_REAL local_perc_ptol character(len=200) warnline logical epsnegative @@ -495,11 +525,10 @@ n=1;keytemp=0;anyerr=0;keyerr(1)=0 temp0 = 0.0d0;xpress = 0.0d0 ! end EOS Omni vars - + failinfomode = 1 failwarnmode = 0 - ! set pmin and epsmin to something sensible: pminl = 1.0d-28 epsminl = 1.0e-5 @@ -543,7 +572,6 @@ endif endif - !!$ Check that the variables have a chance of being physical if( (utau + pold + udens)**2 - s2 .le. 0.0d0) then @@ -594,46 +622,16 @@ count = 0 pnew = pold - do while ( ((abs(pnew - pold)/abs(pnew) .gt. GRHydro_perc_ptol) .and. & + do while ( ((abs(pnew - pold)/abs(pnew) .gt. local_perc_ptol) .and. & (abs(pnew - pold) .gt. GRHydro_del_ptol)) .or. & (count .lt. GRHydro_countmin)) count = count + 1 if (count > GRHydro_countmax) then - GRHydro_C2P_failed = 1 - - !$OMP CRITICAL - if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then - call CCTK_WARN(failinfomode, 'count > GRHydro_countmax! ') - write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel - call CCTK_WARN(failinfomode,warnline) - write(warnline,'(a20,3g16.7)') 'xyz location: ',x,y,z - call CCTK_WARN(failinfomode,warnline) - write(warnline,'(a20,3i5)') 'ijk location: ',ii,jj,kk - call CCTK_WARN(failinfomode,warnline) - write(warnline,'(a20,g16.7)') 'radius: ',r - call CCTK_WARN(failinfomode,warnline) - call CCTK_WARN(failinfomode,"Setting the point to atmosphere") - endif - !$OMP END CRITICAL - - ! for safety, let's set the point to atmosphere - rho = GRHydro_rho_min - udens = rho - dens = sqrt(det) * rho - pnew = pminl - epsilon = epsminl - ! w_lorentz=1, so the expression for utau reduces to: - utau = rho + rho*epsminl - udens - sx = 0.d0 - sy = 0.d0 - sz = 0.d0 - s2 = 0.d0 - usx = 0.d0 - usy = 0.d0 - usz = 0.d0 - w_lorentz = 1.d0 - goto 51 + ! non-convergence is now handled outside of this + ! routine + GRHydro_C2P_failed = 2 + return end if call EOS_Omni_DPressByDRho(handle,keytemp,GRHydro_eos_rf_prec,n,& @@ -679,6 +677,7 @@ call CCTK_WARN(failwarnmode,"Aborting!!!") endif endif + f = pnew - xpress enddo @@ -713,7 +712,6 @@ call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n, & rho,epsilon,temp,ye,xpress,keyerr,anyerr) - ! error handling if(anyerr.ne.0) then if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then

1 0

[svn:einsteintoolkit] HydroBase/trunk/ (Rev. 36)
by roland.haas＠physics.gatech.edu 04 Feb '11

04 Feb '11

User: rhaas Date: 2011/02/04 08:23 AM Modified: /trunk/ interface.ccl Log: make Bvec an axial vector in interface.ccl File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2010-11-21 03:29:15 UTC (rev 35) +++ trunk/interface.ccl 2011-02-04 14:23:52 UTC (rev 36) @@ -39,7 +39,7 @@ CCTK_REAL temperature type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "Temperature [MeV]" CCTK_REAL entropy type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "Specific Entropy [k_b/baryon]" -CCTK_REAL Bvec[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="U" interpolator="matter"' "Magnetic field components B^i" +CCTK_REAL Bvec[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="U" tensorparity=-1 interpolator="matter"' "Magnetic field components B^i" # This may become CCTK_BYTE when Carpet enables it by default CCTK_INT hydro_excision_mask type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' "Mask for hydro excision"

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits February 2011