Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro/branches/hot_and_MHD_temp_dev/ (Rev. 178)
by cott＠tapir.caltech.edu 17 Nov '10

17 Nov '10

User: cott Date: 2010/11/17 05:07 PM Modified: /branches/hot_and_MHD_temp_dev/ param.ccl, schedule.ccl /branches/hot_and_MHD_temp_dev/src/ GRHydro_Boundaries.F90, GRHydro_Con2Prim.F90, GRHydro_ParamCheck.F90, Utils.F90 Log: * better error handling in c2p: implement a temporary hack to deal with boundary zones in octant symmetry; this will be removed once we have a sensible Carpet mask. * fix boundary issues concerning temperature and entropy File Changes: Directory: /branches/hot_and_MHD_temp_dev/ ========================================== File [modified]: param.ccl Delta lines: +6 -0 =================================================================== --- branches/hot_and_MHD_temp_dev/param.ccl 2010-11-16 22:44:45 UTC (rev 177) +++ branches/hot_and_MHD_temp_dev/param.ccl 2010-11-17 23:07:08 UTC (rev 178) @@ -545,3 +545,9 @@ { 0:* :: "Any value, but one to 12 is preferred" } 1.0 + +############### temporary parameters to be removed once connected issues are fixed. + +boolean con2prim_oct_hack "Disregard c2p failures in oct/rotsym90 boundary cells with xyz < 0" STEERABLE=ALWAYS +{ +} "no" File [modified]: schedule.ccl Delta lines: +4 -19 =================================================================== --- branches/hot_and_MHD_temp_dev/schedule.ccl 2010-11-16 22:44:45 UTC (rev 177) +++ branches/hot_and_MHD_temp_dev/schedule.ccl 2010-11-17 23:07:08 UTC (rev 178) @@ -878,15 +878,10 @@ } "Calculate current refinement level" #debug -### schedule GRHydro_Debug IN MoL_PostRHS AFTER dissipation_add -### { -### LANG: Fortran -### } "debug" -### -### schedule GRHydro_Debug AS guender IN MoL_Step AFTER MoL_Add -### { -### LANG: Fortran -### } "debug" +###schedule GRHydro_Debug IN ZelmaniLeakChangeYe BEFORE ZelmaniLeak_ye_of_rho +###{ +### LANG: Fortran +###} "debug" schedule GRHydro_RefinementLevel AT CCTK_PostStep { @@ -1286,13 +1281,3 @@ { } "Calculate the stress-energy tensor" - -###schedule GRH_debug in CCTK_POSTPOSTINITIAL -###{ -### LANG: Fortran -###} "Do some debugging" -### -###schedule GRH_debug in MoL_Step AFTER MoL_InitRHS BEFORE MoL_CalcRHS -###{ -### LANG: Fortran -###} "Do some debugging" Directory: /branches/hot_and_MHD_temp_dev/src/ ============================================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +22 -3 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Boundaries.F90 2010-11-16 22:44:45 UTC (rev 177) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Boundaries.F90 2010-11-17 23:07:08 UTC (rev 178) @@ -47,7 +47,7 @@ DECLARE_CCTK_FUNCTIONS integer, dimension(3) :: sym - integer :: ierr + integer :: ierr = 0 integer :: itracer character(len=100) tracername @@ -76,6 +76,10 @@ 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") + endif sym(1) = -1 sym(2) = 1 @@ -160,13 +164,21 @@ "GRHydro::GRHydro_cons_tracers", "Flat") endif - if(CCTK_EQUALS(Y_e_evolution_method,"GRHydro")) then + if(evolve_y_e) then ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::Y_e", "Flat") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::Y_e_con", "Flat") endif + if(evolve_temper) then + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::temperature", "Flat") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::entropy", "Flat") + endif + + endif if (CCTK_EQUALS(bound,"none")) then @@ -194,13 +206,20 @@ "GRHydro::GRHydro_cons_tracers", "None") endif - if(CCTK_EQUALS(Y_e_evolution_method,"GRHydro")) then + if(evolve_y_e) then ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::Y_e", "None") ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "GRHydro::Y_e_con", "None") endif + if(evolve_temper) then + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::temperature", "None") + ierr = Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & + "HydroBase::entropy", "None") + endif + end if if (CCTK_EQUALS(bound,"scalar")) then File [modified]: GRHydro_Con2Prim.F90 Delta lines: +45 -31 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Con2Prim.F90 2010-11-16 22:44:45 UTC (rev 177) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Con2Prim.F90 2010-11-17 23:07:08 UTC (rev 178) @@ -493,17 +493,30 @@ character(len=200) warnline logical epsnegative + integer :: failwarnmode = 0 + integer :: failinfomode = 1 + ! begin EOS Omni vars integer :: n = 1 integer :: keytemp = 0 integer :: anyerr = 0 integer :: keyerr(1) = 0 real*8 :: xpress = 0.0d0 + real*8 :: temp0 = 0.0d0 ! end EOS Omni vars ! set pmin and epsmin to something sensible: pmin = 1.0d-28 epsmin = 1.0e-5 + + + if(con2prim_oct_hack.ne.0.and.& + x .lt. 0.0d0 .or.& + y .lt. 0.0d0 .or.& + z .lt. 0.0d0) then + failwarnmode = 2 + failinfomode = 2 + endif !!$ Undensitize the variables @@ -516,21 +529,22 @@ 2.*usx*usz*uxz + 2.*usy*usz*uyz !!$ Set initial guess for pressure: + temp0 = temp call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,temp,ye,xpress,keyerr,anyerr) pold = max(1.d-15,xpress) ! error handling if(anyerr.ne.0) then - call CCTK_WARN(1,"EOS error in c2p 0") + call CCTK_WARN(failinfomode,"EOS error in c2p 0") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z - call CCTK_WARN(1,warnline) - write(warnline,"(1P10E15.6)") rho,dens,epsilon,temp,ye - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) + write(warnline,"(1P10E15.6)") rho,dens,epsilon,temp,temp0,ye + call CCTK_WARN(failinfomode,warnline) write(warnline,"(A7,i8)") "code: ",keyerr(1) - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - call CCTK_WARN(1,warnline) - call CCTK_WARN(0,"Aborting!!!") + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failwarnmode,"Aborting!!!") endif @@ -564,16 +578,16 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) ! error handling if(anyerr.ne.0) then - call CCTK_WARN(1,"EOS error in c2p 1") + call CCTK_WARN(failinfomode,"EOS error in c2p 1") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,"(A7,i8)") "code: ",keyerr(1) - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - call CCTK_WARN(1,warnline) - call CCTK_WARN(0,"Aborting!!!") + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failwarnmode,"Aborting!!!") endif f = pold - xpress @@ -592,16 +606,16 @@ GRHydro_C2P_failed = 1 !$OMP CRITICAL - call CCTK_WARN(1, 'count > GRHydro_countmax! ') + call CCTK_WARN(failinfomode, 'count > GRHydro_countmax! ') write(warnline,'(a28,i2)') 'on carpet reflevel: ',GRHydro_reflevel - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,'(a20,3g16.7)') 'xyz location: ',x,y,z - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,'(a20,3i5)') 'ijk location: ',ii,jj,kk - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,'(a20,g16.7)') 'radius: ',r - call CCTK_WARN(1,warnline) - call CCTK_WARN(1,"Setting the point to atmosphere") + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failinfomode,"Setting the point to atmosphere") !$OMP END CRITICAL ! for safety, let's set the point to atmosphere @@ -653,16 +667,16 @@ rho,epsilon,temp,ye,xpress,keyerr,anyerr) ! error handling if(anyerr.ne.0) then - call CCTK_WARN(1,"EOS error in c2p 2") + call CCTK_WARN(failinfomode,"EOS error in c2p 2") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,"(A7,i8)") "code: ",keyerr(1) - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - call CCTK_WARN(1,warnline) - call CCTK_WARN(0,"Aborting!!!") + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failwarnmode,"Aborting!!!") endif f = pnew - xpress @@ -702,16 +716,16 @@ ! error handling if(anyerr.ne.0) then - call CCTK_WARN(1,"EOS error in c2p 3") + call CCTK_WARN(failinfomode,"EOS error in c2p 3") write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,"(A7,i8)") "code: ",keyerr(1) - call CCTK_WARN(1,warnline) + call CCTK_WARN(failinfomode,warnline) write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel - call CCTK_WARN(1,warnline) - call CCTK_WARN(0,"Aborting!!!") + call CCTK_WARN(failinfomode,warnline) + call CCTK_WARN(failwarnmode,"Aborting!!!") endif File [modified]: GRHydro_ParamCheck.F90 Delta lines: +0 -1 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_ParamCheck.F90 2010-11-16 22:44:45 UTC (rev 177) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_ParamCheck.F90 2010-11-17 23:07:08 UTC (rev 178) @@ -105,6 +105,5 @@ endif - end subroutine GRHydro_ParamCheck File [modified]: Utils.F90 Delta lines: +11 -19 =================================================================== --- branches/hot_and_MHD_temp_dev/src/Utils.F90 2010-11-16 22:44:45 UTC (rev 177) +++ branches/hot_and_MHD_temp_dev/src/Utils.F90 2010-11-17 23:07:08 UTC (rev 178) @@ -31,29 +31,21 @@ implicit none DECLARE_CCTK_ARGUMENTS - integer loc(3) + integer i,j,k - loc = minloc(y_e_con/dens) -#if 0 - write(6,*) minval(y_e_con/dens) - write(6,*) y_e_con_rhs(loc(1),loc(2),loc(3)),densrhs(loc(1),loc(2),loc(3)) - write(6,*) y_e_con(loc(1),loc(2),loc(3)),dens(loc(1),loc(2),loc(3)) - write(6,*) loc - write(6,*) dens(4,5,5),y_e(4,5,5),y_e_con(4,5,5) - write(6,*) x(loc(1),loc(2),loc(3)),y(loc(1),loc(2),loc(3)),z(loc(1),loc(2),loc(3)) -#endif - loc(1) = 4 - loc(2) = 5 - loc(3) = 4 - write(6,*) minval(y_e_con/dens) - write(6,*) y_e_con_rhs(loc(1),loc(2),loc(3)),densrhs(loc(1),loc(2),loc(3)) - write(6,*) y_e_con(loc(1),loc(2),loc(3)),dens(loc(1),loc(2),loc(3)) - write(6,*) loc - write(6,*) dens(4,5,5),y_e(4,5,5),y_e_con(4,5,5) - write(6,*) x(loc(1),loc(2),loc(3)),y(loc(1),loc(2),loc(3)),z(loc(1),loc(2),loc(3)) + GRHydro_reflevel = aint(log10(dble(cctk_levfac(1)))/log10(2.0d0)) + i=25 + j=3 + k=3 + write(6,"(i4,1P10E15.6)") GRHydro_reflevel, temperature(i,j,k),temperature(i,j,k),temperature(i,j,k) + write(6,"(i4,1P10E15.6)") GRHydro_reflevel, rho(i,j,k) + write(6,"(3i4)") cctk_lsh(1),cctk_lsh(2),cctk_lsh(3) call flush(6) +! if(GRHydro_reflevel.eq.4.and.temperature(1,1,1).lt.0.1d0) then +! call CCTK_WARN(0,"stop") +! endif end subroutine GRHydro_Debug

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/src/nuc_eos/ (Rev. 22)
by cott＠tapir.caltech.edu 17 Nov '10

17 Nov '10

User: cott Date: 2010/11/17 09:37 AM Modified: /EOS_Omni/src/nuc_eos/ readtable.F90 Log: * tiny change to make gcc/gfortran happy File Changes: Directory: /EOS_Omni/src/nuc_eos/ ================================= File [modified]: readtable.F90 Delta lines: +1 -1 =================================================================== --- EOS_Omni/src/nuc_eos/readtable.F90 2010-11-16 22:45:24 UTC (rev 21) +++ EOS_Omni/src/nuc_eos/readtable.F90 2010-11-17 15:37:53 UTC (rev 22) @@ -11,7 +11,7 @@ implicit none - DECLARE_CCTK_PARAMETERS; + DECLARE_CCTK_PARAMETERS character(*) eos_filename

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 414)
by ian.hinder＠aei.mpg.de 17 Nov '10

17 Nov '10

User: hinder Date: 2010/11/17 09:10 AM Modified: /release-info/ damiana__1.log, damiana__2.log Log: Update Damiana testsuite results File Changes: Directory: /release-info/ ========================= File [modified]: damiana__1.log Delta lines: +7 -11 =================================================================== --- release-info/damiana__1.log 2010-11-16 22:11:00 UTC (rev 413) +++ release-info/damiana__1.log 2010-11-17 15:10:44 UTC (rev 414) @@ -880,9 +880,9 @@ IDAxiBrillBH: test_axibrill_nostagger Success: 96 files compared, 69 differ in the last digits IDAxiOddBrillBH: E2xeon_test_axioddbh - Success: 88 files compared, 85 differ in the last digits + Success: 88 files compared, 87 differ in the last digits IDAxiOddBrillBH: test_axioddbh - Success: 120 files compared, 72 differ in the last digits + Success: 120 files compared, 76 differ in the last digits IDConstraintViolate: ConstraintViolate Success: 24 files identical IDLinearWaves: test_pw_ADM_leap @@ -1016,7 +1016,7 @@ WaveToyFreeF90: test_rad Success: 6 files compared, 1 differ in the last digits WeylScal4: teukolsky - Failure: 8 files compared, 8 differ, 6 differ significantly + Success: 8 files compared, 6 differ in the last digits WeylScal4: teukolskyID Success: 8 files compared, 6 differ in the last digits @@ -1025,7 +1025,7 @@ Summary for configuration sim - Time -> Sat Nov 6 05:34:19 CET 2010 + Time -> Wed Nov 17 06:02:56 CET 2010 Host -> sl-18 User -> ianhin @@ -1034,14 +1034,10 @@ Runnable tests -> 132 Total number of thorns -> 157 Number of tested thorns -> 39 - Number of tests passed -> 131 + Number of tests passed -> 132 Number passed only to - set tolerance -> 74 - Number failed -> 1 + set tolerance -> 75 + Number failed -> 0 - Tests failed: - - teukolsky (from WeylScal4) - ======================================================================== File [modified]: damiana__2.log Delta lines: +1 -1 =================================================================== --- release-info/damiana__2.log 2010-11-16 22:11:00 UTC (rev 413) +++ release-info/damiana__2.log 2010-11-17 15:10:44 UTC (rev 414) @@ -1016,7 +1016,7 @@ Summary for configuration sim - Time -> Sat Nov 6 05:55:54 CET 2010 + Time -> Wed Nov 17 06:33:36 CET 2010 Host -> sl-18 User -> ianhin

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/ (Rev. 21)
by cott＠tapir.caltech.edu 16 Nov '10

16 Nov '10

User: cott Date: 2010/11/16 04:45 PM Modified: /EOS_Omni/ param.ccl /EOS_Omni/src/ EOS_Omni_SingleVarCalls.F90 /EOS_Omni/src/nuc_eos/ readtable.F90 Log: * add a parameter controlling a potential energy shift File Changes: Directory: /EOS_Omni/ ===================== File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- EOS_Omni/param.ccl 2010-11-16 15:19:04 UTC (rev 20) +++ EOS_Omni/param.ccl 2010-11-16 22:45:24 UTC (rev 21) @@ -62,6 +62,10 @@ { } "No" +BOOLEAN do_energy_shift "shift energies around?" STEERABLE=ALWAYS +{ +} "yes" + STRING nuceos_table_name "nuceos table name (hdf5)" { .* :: "Can be anything" Directory: /EOS_Omni/src/nuc_eos/ ================================= File [modified]: readtable.F90 Delta lines: +11 -1 =================================================================== --- EOS_Omni/src/nuc_eos/readtable.F90 2010-11-16 15:19:04 UTC (rev 20) +++ EOS_Omni/src/nuc_eos/readtable.F90 2010-11-16 22:45:24 UTC (rev 21) @@ -1,3 +1,7 @@ +#include "cctk.h" +#include "cctk_Parameters.h" + + subroutine nuc_eos_readtable(eos_filename) ! This routine reads the table and initializes ! all variables in the module. @@ -7,6 +11,8 @@ implicit none + DECLARE_CCTK_PARAMETERS; + character(*) eos_filename character(len=100) message @@ -205,13 +211,17 @@ call h5dread_f(dset_id, H5T_NATIVE_DOUBLE, energy_shift, dims1, error) call h5dclose_f(dset_id,error) accerr=accerr+error - + if(accerr.ne.0) then stop "Problem reading EOS table file" endif call h5fclose_f (file_id,error) + if(do_energy_shift.ne.1) then + energy_shift = 0.0d0 + endif + ! not a good idea to call this function as it will screw recovery ! call h5close_f (error) Directory: /EOS_Omni/src/ ========================= File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +0 -7 =================================================================== --- EOS_Omni/src/EOS_Omni_SingleVarCalls.F90 2010-11-16 15:19:04 UTC (rev 20) +++ EOS_Omni/src/EOS_Omni_SingleVarCalls.F90 2010-11-16 22:45:24 UTC (rev 21) @@ -96,13 +96,6 @@ xtemp = temp(i) xye = ye(i) xenr = eps(i) * inv_eps_gf - if(xye.lt.0.1) then - write (warnstring,"(A6,1P10E16.7)") "blah: ",xye,xrho - call CCTK_WARN(1,warnstring) - keyerr(i) = 102 - anyerr = 1 - return - endif call nuc_eos_press_eps(xrho,xtemp,xye,xenr,xprs,& keytemp,keyerr(i),rf_precision)

1 0

[svn:einsteintoolkit] GRHydro/branches/hot_and_MHD_temp_dev/src/ (Rev. 177)
by cott＠tapir.caltech.edu 16 Nov '10

16 Nov '10

User: cott Date: 2010/11/16 04:44 PM Modified: /branches/hot_and_MHD_temp_dev/src/ GRHydro_CalcUpdate.F90, GRHydro_Con2Prim.F90, GRHydro_Eigenproblem.F90, GRHydro_HLLE.F90, GRHydro_HLLEPoly.F90, GRHydro_Prim2Con.F90, GRHydro_Reconstruct.F90 Log: * bunch of whitespace * bugfix: allow negative eps in reconstruction (needed for hot EOS; will still be caught in atmo routines) * allow eigenvalues_hot routine to know on what point it is operating File Changes: Directory: /branches/hot_and_MHD_temp_dev/src/ ============================================== File [modified]: GRHydro_CalcUpdate.F90 Delta lines: +6 -3 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_CalcUpdate.F90 2010-11-16 15:19:43 UTC (rev 176) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_CalcUpdate.F90 2010-11-16 22:44:45 UTC (rev 177) @@ -81,6 +81,7 @@ (alp_l * tauflux(i-xoffset,j-yoffset,k-zoffset) - & alp_r * tauflux(i,j,k)) * idx + if (evolve_tracer .ne. 0) then do itracer=1,number_of_tracers cons_tracerrhs(i,j,k,itracer) = cons_tracerrhs(i,j,k,itracer) + & @@ -93,11 +94,13 @@ Y_e_con_rhs(i,j,k) = Y_e_con_rhs(i,j,k) + & (alp_l * Y_e_con_flux(i-xoffset,j-yoffset,k-zoffset) - & alp_r * Y_e_con_flux(i,j,k)) * idx -! if(j.eq.4.and.k.eq.4) then -! write(6,*) Y_e(i,j,k),Y_e_plus(i,j,k), Y_e_minus(i,j,k) -! endif end if +! densrhs(i,j,k) = 0.0d0 +! taurhs(i,j,k) = 0.0d0 +! srhs(i,j,k,:) = 0.0d0 +! y_e_con_rhs(i,j,k) = 0.0d0 + if (wk_atmosphere .eq. 1) then File [modified]: GRHydro_Con2Prim.F90 Delta lines: +2 -0 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Con2Prim.F90 2010-11-16 15:19:43 UTC (rev 176) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Con2Prim.F90 2010-11-16 22:44:45 UTC (rev 177) @@ -668,6 +668,7 @@ f = pnew - xpress enddo + !!$ Polish the root @@ -698,6 +699,7 @@ 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 call CCTK_WARN(1,"EOS error in c2p 3") File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +2 -2 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Eigenproblem.F90 2010-11-16 15:19:43 UTC (rev 176) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Eigenproblem.F90 2010-11-16 22:44:45 UTC (rev 177) @@ -118,7 +118,7 @@ end subroutine eigenvalues -subroutine eigenvalues_hot(handle,rho,velx,vely,velz,eps, & +subroutine eigenvalues_hot(handle,ii,jj,kk,rho,velx,vely,velz,eps, & temp,ye,w_lorentz,lam,gxx,gxy,gxz,gyy,gyz,gzz,u,alp,beta) implicit none @@ -133,7 +133,7 @@ CCTK_REAL cs2,one,two CCTK_REAL vlowx,vlowy,vlowz,v2,w CCTK_REAL lam1,lam2,lam3,lamm,lamp,lamm_nobeta,lamp_nobeta - CCTK_INT handle + CCTK_INT handle,ii,jj,kk CCTK_REAL dpdrho,dpdeps,press ! begin EOS Omni vars File [modified]: GRHydro_HLLE.F90 Delta lines: +1 -0 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_HLLE.F90 2010-11-16 15:19:43 UTC (rev 176) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_HLLE.F90 2010-11-16 22:44:45 UTC (rev 177) @@ -341,6 +341,7 @@ end do end do + end subroutine GRHydro_HLLEGeneral File [modified]: GRHydro_HLLEPoly.F90 Delta lines: +10 -6 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_HLLEPoly.F90 2010-11-16 15:19:43 UTC (rev 176) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_HLLEPoly.F90 2010-11-16 22:44:45 UTC (rev 177) @@ -199,7 +199,7 @@ usendh,avg_alp,avg_beta) else xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,& + call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velxminus(i+xoffset,j+yoffset,k+zoffset),& velyminus(i+xoffset,j+yoffset,k+zoffset),& @@ -212,7 +212,8 @@ gyzh,gzzh,& usendh,avg_alp,avg_beta) xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,rhoplus(i,j,k),& + call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& + rhoplus(i,j,k),& velxplus(i,j,k),velyplus(i,j,k),& velzplus(i,j,k),epsplus(i,j,k), & xtemp,y_e_plus(i,j,k),& @@ -251,7 +252,7 @@ usendh,avg_alp,avg_beta) else xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,& + call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velyminus(i+xoffset,j+yoffset,k+zoffset),& velzminus(i+xoffset,j+yoffset,k+zoffset),& @@ -264,7 +265,8 @@ gxzh,gxxh,& usendh,avg_alp,avg_beta) xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,rhoplus(i,j,k),& + call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& + rhoplus(i,j,k),& velyplus(i,j,k),velzplus(i,j,k),& velxplus(i,j,k),epsplus(i,j,k),& xtemp,y_e_plus(i,j,k),& @@ -303,7 +305,7 @@ usendh,avg_alp,avg_beta) else xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,& + call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& rhominus(i+xoffset,j+yoffset,k+zoffset),& velzminus(i+xoffset,j+yoffset,k+zoffset),& velxminus(i+xoffset,j+yoffset,k+zoffset),& @@ -315,7 +317,8 @@ gxxh,gxyh,gyyh,& usendh,avg_alp,avg_beta) xtemp = temperature(i,j,k) - call eigenvalues_hot(GRHydro_eos_handle,rhoplus(i,j,k),& + call eigenvalues_hot(GRHydro_eos_handle,i,j,k,& + rhoplus(i,j,k),& velzplus(i,j,k),velxplus(i,j,k),& velyplus(i,j,k),epsplus(i,j,k),& xtemp,y_e_plus(i,j,k),& @@ -384,6 +387,7 @@ end do end do end do + end subroutine GRHydro_HLLE File [modified]: GRHydro_Prim2Con.F90 Delta lines: +2 -0 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Prim2Con.F90 2010-11-16 15:19:43 UTC (rev 176) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Prim2Con.F90 2010-11-16 22:44:45 UTC (rev 177) @@ -136,6 +136,7 @@ velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),& w_lorentzplus(i,j,k),xtemp, & y_e_plus(i,j,k)) + end do end do @@ -259,6 +260,7 @@ dsz = sqrt(det) * (drho*(1+deps)+dpress)*w*w * vlowz dtau = sqrt(det) * ((drho*(1+deps)+dpress)*w*w - dpress) - ddens + end subroutine prim2con_hot File [modified]: GRHydro_Reconstruct.F90 Delta lines: +2 -2 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Reconstruct.F90 2010-11-16 15:19:43 UTC (rev 176) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Reconstruct.F90 2010-11-16 22:44:45 UTC (rev 177) @@ -158,6 +158,7 @@ if (CCTK_EQUALS(recon_vars,"primitive")) then call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, & rho, rhoplus, rhominus, trivial_rp, hydro_excision_mask) + call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, & vel(:,:,:,1), velxplus, velxminus, trivial_rp, hydro_excision_mask) call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, & @@ -548,8 +549,7 @@ deallocate(psi4, lbetax, lbetay, lbetaz) !$OMP WORKSHARE - where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min).or.& - (epsplus < 0.d0).or.(epsminus < 0.d0) ) + where ( (rhoplus < GRHydro_rho_min).or.(rhominus < GRHydro_rho_min) ) rhoplus = rho rhominus = rho velxplus = vel(:,:,:,1)

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 413)
by bcmsma＠astro.rit.edu 16 Nov '10

16 Nov '10

User: bmundim Date: 2010/11/16 04:11 PM Modified: /release-info/ bluedrop__1.log, bluedrop__2.log Log: Bluedrop updates. File Changes: Directory: /release-info/ ========================= File [modified]: bluedrop__1.log Delta lines: +5 -6 =================================================================== --- release-info/bluedrop__1.log 2010-11-16 16:26:02 UTC (rev 412) +++ release-info/bluedrop__1.log 2010-11-16 22:11:00 UTC (rev 413) @@ -1015,7 +1015,7 @@ WaveToyFreeF90: test_rad Success: 6 files identical WeylScal4: teukolsky - Failure: 8 files compared, 8 differ, 8 differ significantly + Success: 8 files compared, 6 differ in the last digits WeylScal4: teukolskyID Success: 8 files compared, 6 differ in the last digits @@ -1024,7 +1024,7 @@ Summary for configuration sim - Time -> Sun Nov 7 18:12:07 CST 2010 + Time -> Tue Nov 16 15:24:15 CST 2010 Host -> bd-login User -> bcmundim @@ -1033,16 +1033,15 @@ Runnable tests -> 132 Total number of thorns -> 156 Number of tested thorns -> 39 - Number of tests passed -> 129 + Number of tests passed -> 130 Number passed only to - set tolerance -> 78 - Number failed -> 3 + set tolerance -> 79 + Number failed -> 2 Tests failed: E2xeon_test_dbh (from DistortedBHIVP) Schwarzschild_EF (from Exact) - teukolsky (from WeylScal4) ======================================================================== File [modified]: bluedrop__2.log Delta lines: +1 -1 =================================================================== --- release-info/bluedrop__2.log 2010-11-16 16:26:02 UTC (rev 412) +++ release-info/bluedrop__2.log 2010-11-16 22:11:00 UTC (rev 413) @@ -1015,7 +1015,7 @@ Summary for configuration sim - Time -> Sun Nov 7 18:36:11 CST 2010 + Time -> Tue Nov 16 15:59:10 CST 2010 Host -> bd-login User -> bcmundim

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 412)
by roland.haas＠physics.gatech.edu 16 Nov '10

16 Nov '10

User: rhaas Date: 2010/11/16 10:26 AM Modified: /release-info/ minkowski__1.log, minkowski__2.log Log: new result for gatech workstation File Changes: Directory: /release-info/ ========================= File [modified]: minkowski__1.log Delta lines: +6 -8 =================================================================== --- release-info/minkowski__1.log 2010-11-15 23:01:17 UTC (rev 411) +++ release-info/minkowski__1.log 2010-11-16 16:26:02 UTC (rev 412) @@ -814,7 +814,7 @@ CarpetReduce: staggered Success: 5 files identical DistortedBHIVP: E2xeon_test_dbh - Failure: 100 files compared, 44 differ, 44 differ significantly + Success: 100 files compared, 44 differ in the last digits Exact: Schwarzschild_EF Success: 112 files compared, 3 differ in the last digits Exact: bowl-evolution @@ -994,7 +994,7 @@ TwoPunctures: twopunctures Success: 144 files compared, 95 differ in the last digits WaveBinarySource: test_binary_1 - Failure: 5 files compared, 4 differ, 4 differ significantly + Success: 9 files identical WaveToyC: test_rad Success: 6 files identical WaveToyC: wave_output @@ -1016,7 +1016,7 @@ WaveToyFreeF90: test_rad Success: 6 files compared, 1 differ in the last digits WeylScal4: teukolsky - Success: 8 files compared, 6 differ in the last digits + Success: 8 files identical WeylScal4: teukolskyID Success: 8 files identical @@ -1025,7 +1025,7 @@ Summary for configuration sim - Time -> Mon Nov 1 18:41:09 EDT 2010 + Time -> Tue Nov 16 09:39:43 EST 2010 Host -> phys44230.physics.gatech.edu User -> rhaas3 @@ -1034,18 +1034,16 @@ Runnable tests -> 132 Total number of thorns -> 157 Number of tested thorns -> 39 - Number of tests passed -> 127 + Number of tests passed -> 129 Number passed only to set tolerance -> 75 - Number failed -> 5 + Number failed -> 3 Tests failed: - E2xeon_test_dbh (from DistortedBHIVP) halfsphere_pugh_ppm (from Hydro_InitExcision) x_flip_pugh_ppm (from Hydro_InitExcision) x_pugh_ppm (from Hydro_InitExcision) - test_binary_1 (from WaveBinarySource) ======================================================================== File [modified]: minkowski__2.log Delta lines: +7 -10 =================================================================== --- release-info/minkowski__2.log 2010-11-15 23:01:17 UTC (rev 411) +++ release-info/minkowski__2.log 2010-11-16 16:26:02 UTC (rev 412) @@ -761,7 +761,7 @@ ADM: test_ADM_1 Success: 32 files compared, 1 differ in the last digits ADM: test_ADM_2 - Failure: 32 files compared, 32 differ, 32 differ significantly + Success: 32 files identical ADM: test_ADM_3 Success: 32 files compared, 1 differ in the last digits ADM: test_ADM_4 @@ -809,7 +809,7 @@ AHFinderDirect: recoverML Failure: 5 files compared, 5 differ, 5 differ significantly DistortedBHIVP: E2xeon_test_dbh - Failure: 100 files compared, 44 differ, 44 differ significantly + Success: 100 files compared, 44 differ in the last digits Exact: Schwarzschild_EF Success: 112 files compared, 3 differ in the last digits Exact: bowl-evolution @@ -989,7 +989,7 @@ TestTable: test-table Success: 0 files identical WaveBinarySource: test_binary_1 - Failure: 5 files compared, 4 differ, 4 differ significantly + Success: 9 files identical WaveToyC: test_rad Success: 6 files identical WaveToyC: wave_output @@ -1016,7 +1016,7 @@ Summary for configuration sim - Time -> Mon Nov 1 19:03:36 EDT 2010 + Time -> Tue Nov 16 10:01:41 EST 2010 Host -> phys44230.physics.gatech.edu User -> rhaas3 @@ -1025,14 +1025,13 @@ Runnable tests -> 126 Total number of thorns -> 157 Number of tested thorns -> 36 - Number of tests passed -> 107 + Number of tests passed -> 110 Number passed only to - set tolerance -> 62 - Number failed -> 19 + set tolerance -> 63 + Number failed -> 16 Tests failed: - test_ADM_2 (from ADM) Kerr (from AHFinderDirect) Kerr-definition-expansion (from AHFinderDirect) Kerr-definition-expansion-product (from AHFinderDirect) @@ -1046,11 +1045,9 @@ checkpointML (from AHFinderDirect) misner1.2-025 (from AHFinderDirect) recoverML (from AHFinderDirect) - E2xeon_test_dbh (from DistortedBHIVP) halfsphere_pugh_ppm (from Hydro_InitExcision) x_flip_pugh_ppm (from Hydro_InitExcision) x_pugh_ppm (from Hydro_InitExcision) - test_binary_1 (from WaveBinarySource) ========================================================================

1 0

[svn:einsteintoolkit] GRHydro/branches/hot_and_MHD_temp_dev/ (Rev. 176)
by cott＠tapir.caltech.edu 16 Nov '10

16 Nov '10

User: cott Date: 2010/11/16 09:19 AM Modified: /branches/hot_and_MHD_temp_dev/ schedule.ccl /branches/hot_and_MHD_temp_dev/src/ GRHydro_Boundaries.F90, GRHydro_Con2Prim.F90, GRHydro_Prim2Con.F90, GRHydro_Source.F90, GRHydro_UpdateMask.F90, Utils.F90 Log: * a number of small modifications having to do with boundary/atmosphere treatment when the hot EOS is being used. File Changes: Directory: /branches/hot_and_MHD_temp_dev/ ========================================== File [modified]: schedule.ccl Delta lines: +11 -0 =================================================================== --- branches/hot_and_MHD_temp_dev/schedule.ccl 2010-11-14 05:28:48 UTC (rev 175) +++ branches/hot_and_MHD_temp_dev/schedule.ccl 2010-11-16 15:19:43 UTC (rev 176) @@ -877,6 +877,17 @@ LANG: Fortran } "Calculate current refinement level" +#debug +### schedule GRHydro_Debug IN MoL_PostRHS AFTER dissipation_add +### { +### LANG: Fortran +### } "debug" +### +### schedule GRHydro_Debug AS guender IN MoL_Step AFTER MoL_Add +### { +### LANG: Fortran +### } "debug" + schedule GRHydro_RefinementLevel AT CCTK_PostStep { LANG: Fortran Directory: /branches/hot_and_MHD_temp_dev/src/ ============================================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +2 -2 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Boundaries.F90 2010-11-14 05:28:48 UTC (rev 175) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Boundaries.F90 2010-11-16 15:19:43 UTC (rev 176) @@ -66,12 +66,12 @@ call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::GRHydro_C2P_failed") !!$ handle multiple tracer variables - if(evolve_tracer.eq.1) then + if(evolve_tracer.ne.0) then call SetCartSymGN(ierr, cctkGH, sym, "GRHydro::GRHydro_tracers") call SetCartSymGN(ierr, cctkGH, sym, "GRHydro::GRHydro_cons_tracers") endif - if(CCTK_EQUALS(Y_e_evolution_method,"GRHydro")) then + if(evolve_y_e.ne.0) then call SetCartSymGN(ierr, cctkGH, sym, "HydroBase::Y_e") call SetCartSymGN(ierr, cctkGH, sym, "GRHydro::Y_e_con") endif File [modified]: GRHydro_Con2Prim.F90 Delta lines: +18 -1 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Con2Prim.F90 2010-11-14 05:28:48 UTC (rev 175) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Con2Prim.F90 2010-11-16 15:19:43 UTC (rev 176) @@ -230,7 +230,6 @@ end do !$OMP END PARALLEL DO - return end subroutine Conservative2Primitive @@ -502,6 +501,10 @@ real*8 :: xpress = 0.0d0 ! end EOS Omni vars +! set pmin and epsmin to something sensible: + pmin = 1.0d-28 + epsmin = 1.0e-5 + !!$ Undensitize the variables udens = dens /sqrt(det) @@ -516,7 +519,21 @@ call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& rho,epsilon,temp,ye,xpress,keyerr,anyerr) pold = max(1.d-15,xpress) + ! error handling + if(anyerr.ne.0) then + call CCTK_WARN(1,"EOS error in c2p 0") + write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z + call CCTK_WARN(1,warnline) + write(warnline,"(1P10E15.6)") rho,dens,epsilon,temp,ye + call CCTK_WARN(1,warnline) + write(warnline,"(A7,i8)") "code: ",keyerr(1) + call CCTK_WARN(1,warnline) + write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + call CCTK_WARN(1,warnline) + call CCTK_WARN(0,"Aborting!!!") + endif + !!$ Check that the variables have a chance of being physical if( (utau + pold + udens)**2 - s2 .le. 0.0d0) then File [modified]: GRHydro_Prim2Con.F90 Delta lines: +25 -6 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Prim2Con.F90 2010-11-14 05:28:48 UTC (rev 175) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Prim2Con.F90 2010-11-16 15:19:43 UTC (rev 176) @@ -113,7 +113,8 @@ ! eps is reconstructed. Hence, we do not update the ! variable 'temperature' in prim2con at the interfaces xtemp = temperature(i,j,k) - call prim2con_hot(GRHydro_eos_handle, gxxl,gxyl,gxzl,gyyl,& + 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,& gyzl,gzzl, & avg_detl,densminus(i,j,k),sxminus(i,j,k),& syminus(i,j,k),szminus(i,j,k),tauminus(i,j,k),& @@ -126,7 +127,8 @@ ! eps is reconstructed. Hence, we do not update the ! variable 'temperature' in prim2con at the interfaces xtemp = temperature(i,j,k) - call prim2con_hot(GRHydro_eos_handle, gxxr,gxyr,gxzr,& + 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,& gyyr,gyzr,gzzr, & avg_detr, densplus(i,j,k),sxplus(i,j,k),& syplus(i,j,k),szplus(i,j ,k),tauplus(i,j,k),& @@ -201,7 +203,8 @@ end subroutine prim2con -subroutine prim2con_hot(handle, gxx, gxy, gxz, gyy, gyz, gzz, det, ddens, & +subroutine prim2con_hot(handle, GRHydro_reflevel, ii, jj, kk, & + x, y, z, gxx, gxy, gxz, gyy, gyz, gzz, det, ddens, & dsx, dsy, dsz, dtau , drho, dvelx, dvely, dvelz, deps, dpress, w, & temp,ye) @@ -212,8 +215,9 @@ CCTK_REAL :: gxx, gxy, gxz, gyy, gyz, gzz, det CCTK_REAL :: ddens, dsx, dsy, dsz, dtau, drho, dvelx, dvely, dvelz,& deps, dpress, w, vlowx, vlowy, vlowz - CCTK_REAL :: temp,ye - CCTK_INT :: handle + CCTK_REAL :: temp,ye, x, y, z + CCTK_INT :: handle, GRHydro_reflevel, ii, jj, kk + character(len=512) warnline ! begin EOS Omni vars integer :: n = 1 @@ -231,6 +235,19 @@ call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,& drho,deps,temp,ye,dpress,keyerr,anyerr) + ! error handling + if(anyerr.ne.0) then + 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) + write(warnline,"(1P10E15.6)") drho,deps,temp,ye + call CCTK_WARN(1,warnline) + write(warnline,"(A7,i8)") "code: ",keyerr(1) + call CCTK_WARN(1,warnline) + write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + call CCTK_WARN(1,warnline) + call CCTK_WARN(0,"Aborting!!!") + endif vlowx = gxx*dvelx + gxy*dvely + gxz*dvelz vlowy = gxy*dvelx + gyy*dvely + gyz*dvelz @@ -271,6 +288,7 @@ CCTK_INT :: i, j, k CCTK_REAL :: det + character(len=512) :: warnline if(evolve_Y_e.ne.0) then !$OMP PARALLEL DO PRIVATE(i, j) @@ -312,7 +330,8 @@ 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)) - call prim2con_hot(GRHydro_eos_handle,gxx(i,j,k),& + call prim2con_hot(GRHydro_eos_handle,GRHydro_reflevel,i,j,k,& + x(i,j,k),y(i,j,k),z(i,j,k),gxx(i,j,k),& gxy(i,j,k),gxz(i,j,k),& gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& File [modified]: GRHydro_Source.F90 Delta lines: +1 -1 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Source.F90 2010-11-14 05:28:48 UTC (rev 175) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Source.F90 2010-11-16 15:19:43 UTC (rev 176) @@ -101,7 +101,7 @@ end if if (evolve_Y_e .ne. 0) then - Y_e_con_rhs = 0.0d0 + y_e_con_rhs = 0.0d0 endif !!$ Set up the array for checking the order. We switch to second order File [modified]: GRHydro_UpdateMask.F90 Delta lines: +89 -36 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_UpdateMask.F90 2010-11-14 05:28:48 UTC (rev 175) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_UpdateMask.F90 2010-11-16 15:19:43 UTC (rev 176) @@ -123,6 +123,10 @@ cons_tracerrhs = 0.0d0 endif + if (evolve_y_e .ne. 0) then + y_e_con_rhs = 0.0d0 + endif + atmosphere_mask = 0 call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere") @@ -308,23 +312,40 @@ if (rho(i,j,k) .le. rho_min) then rho(i,j,k) = rho_min + 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)) + velx(i,j,k) = 0.0d0 vely(i,j,k) = 0.0d0 velz(i,j,k) = 0.0d0 - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) - call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho(i,j,k),xeps,xtemp,xye,press(i,j,k),eps(i,j,k),keyerr,anyerr) + if(evolve_temper.ne.0) then + ! set the temperature to be relatively low + temperature(i,j,k) = 0.1d0 + keytemp = 1 + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),temperature(i,j,k),y_e(i,j,k),& + press(i,j,k),keyerr,anyerr) - 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)) - call prim2conpolytype(eos_handle, & - gxx(i,j,k), gxy(i,j,k), gxz(i,j,k), & - gyy(i,j,k), gyz(i,j,k), gzz(i,j,k), det, & - 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), velx(i,j,k), vely(i,j,k), & - velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k)) + call prim2con_hot(GRHydro_eos_handle, GRHydro_reflevel,& + i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),gxx(i,j,k),gxy(i,j,k),& + gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k), & + det,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), velx(i,j,k), vely(i,j,k), & + velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k),& + temperature(i,j,k),y_e(i,j,k)) + else + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),xeps,xtemp,xye,press(i,j,k),eps(i,j,k),keyerr,anyerr) + call prim2conpolytype(eos_handle, & + gxx(i,j,k), gxy(i,j,k), gxz(i,j,k), & + gyy(i,j,k), gyz(i,j,k), gzz(i,j,k), det, & + 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), velx(i,j,k), vely(i,j,k), & + velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k)) + endif end if if (timelevels .gt. 1) then if (rho_p(i,j,k) .le. rho_min) then @@ -333,19 +354,37 @@ vely_p(i,j,k) = 0.0d0 velz_p(i,j,k) = 0.0d0 - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho_p(i,j,k),eps_p(i,j,k),xtemp,xye,press_p(i,j,k),keyerr,anyerr) - call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho_p(i,j,k),xeps,xtemp,xye,press_p(i,j,k),eps_p(i,j,k),keyerr,anyerr) - det = SPATIAL_DETERMINANT(gxx_p(i,j,k), gxy_p(i,j,k), gxz_p(i,j,k), \ gyy_p(i,j,k), gyz_p(i,j,k), gzz_p(i,j,k)) - call prim2conpolytype(eos_handle, & - gxx_p(i,j,k), gxy_p(i,j,k), gxz_p(i,j,k), & - gyy_p(i,j,k), gyz_p(i,j,k), gzz_p(i,j,k), det, & - dens_p(i,j,k), scon_p(i,j,k,1), scon_p(i,j,k,2), scon_p(i,j,k,3), & - tau_p(i,j,k), rho_p(i,j,k), velx_p(i,j,k), vely_p(i,j,k), & - velz_p(i,j,k), eps_p(i,j,k), press_p(i,j,k), w_lorentz_p(i,j,k)) + + if(evolve_temper.ne.0) then + ! set the temperature to be relatively low + temperature_p(i,j,k) = 0.1d0 + keytemp = 1 + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho_p(i,j,k),eps_p(i,j,k),temperature_p(i,j,k),y_e_p(i,j,k),& + press_p(i,j,k),keyerr,anyerr) + + call prim2con_hot(GRHydro_eos_handle, GRHydro_reflevel,& + i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),gxx_p(i,j,k),gxy_p(i,j,k),& + gxz_p(i,j,k),gyy_p(i,j,k),gyz_p(i,j,k),gzz_p(i,j,k), & + det,dens_p(i,j,k),scon_p(i,j,k,1), scon_p(i,j,k,2), scon_p(i,j,k,3), & + tau_p(i,j,k), rho_p(i,j,k), velx_p(i,j,k), vely_p(i,j,k), & + velz_p(i,j,k), eps_p(i,j,k), press_p(i,j,k), w_lorentz_p(i,j,k),& + temperature_p(i,j,k),y_e_p(i,j,k)) + else + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho_p(i,j,k),eps_p(i,j,k),xtemp,xye,press_p(i,j,k),keyerr,anyerr) + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho_p(i,j,k),xeps,xtemp,xye,press_p(i,j,k),eps_p(i,j,k),keyerr,anyerr) + call prim2conpolytype(eos_handle, & + gxx_p(i,j,k), gxy_p(i,j,k), gxz_p(i,j,k), & + gyy_p(i,j,k), gyz_p(i,j,k), gzz_p(i,j,k), det, & + dens_p(i,j,k), scon_p(i,j,k,1), scon_p(i,j,k,2), scon_p(i,j,k,3), & + tau_p(i,j,k), rho_p(i,j,k), velx_p(i,j,k), vely_p(i,j,k), & + velz_p(i,j,k), eps_p(i,j,k), press_p(i,j,k), w_lorentz_p(i,j,k)) + endif + endif end if if (timelevels .gt. 2) then @@ -354,20 +393,35 @@ velx_p_p(i,j,k) = 0.0d0 vely_p_p(i,j,k) = 0.0d0 velz_p_p(i,j,k) = 0.0d0 - - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho_p_p(i,j,k),eps_p_p(i,j,k),xtemp,xye,press_p_p(i,j,k),keyerr,anyerr) - call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho_p_p(i,j,k),xeps,xtemp,xye,press_p_p(i,j,k),eps_p_p(i,j,k),keyerr,anyerr) - det = SPATIAL_DETERMINANT(gxx_p_p(i,j,k), gxy_p_p(i,j,k), gxz_p_p(i,j,k), \ gyy_p_p(i,j,k), gyz_p_p(i,j,k), gzz_p_p(i,j,k)) - call prim2conpolytype(eos_handle, & - gxx_p_p(i,j,k), gxy_p_p(i,j,k), gxz_p_p(i,j,k), & - gyy_p_p(i,j,k), gyz_p_p(i,j,k), gzz_p_p(i,j,k), det, & - dens_p_p(i,j,k), scon_p_p(i,j,k,1), scon_p_p(i,j,k,2), scon_p_p(i,j,k,3), & - tau_p_p(i,j,k), rho_p_p(i,j,k), velx_p_p(i,j,k), vely_p_p(i,j,k), & - velz_p_p(i,j,k), eps_p_p(i,j,k), press_p_p(i,j,k), w_lorentz_p_p(i,j,k)) + + if(evolve_temper.ne.0) then + ! set the temperature to be relatively low + temperature_p_p(i,j,k) = 0.1d0 + keytemp = 1 + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho_p_p(i,j,k),eps_p_p(i,j,k),temperature_p_p(i,j,k),y_e_p_p(i,j,k),& + press_p_p(i,j,k),keyerr,anyerr) + call prim2con_hot(GRHydro_eos_handle, GRHydro_reflevel,& + i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),gxx_p_p(i,j,k),gxy_p_p(i,j,k),& + gxz_p_p(i,j,k),gyy_p_p(i,j,k),gyz_p_p(i,j,k),gzz_p_p(i,j,k), & + det,dens_p_p(i,j,k),scon_p_p(i,j,k,1), scon_p_p(i,j,k,2), scon_p_p(i,j,k,3), & + tau_p_p(i,j,k), rho_p_p(i,j,k), velx_p_p(i,j,k), vely_p_p(i,j,k), & + velz_p_p(i,j,k), eps_p_p(i,j,k), press_p_p(i,j,k), w_lorentz_p_p(i,j,k),& + temperature_p_p(i,j,k),y_e_p_p(i,j,k)) + else + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho_p_p(i,j,k),eps_p_p(i,j,k),xtemp,xye,press_p_p(i,j,k),keyerr,anyerr) + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho_p_p(i,j,k),xeps,xtemp,xye,press_p_p(i,j,k),eps_p_p(i,j,k),keyerr,anyerr) + call prim2conpolytype(eos_handle, & + gxx_p_p(i,j,k), gxy_p_p(i,j,k), gxz_p_p(i,j,k), & + gyy_p_p(i,j,k), gyz_p_p(i,j,k), gzz_p_p(i,j,k), det, & + dens_p_p(i,j,k), scon_p_p(i,j,k,1), scon_p_p(i,j,k,2), scon_p_p(i,j,k,3), & + tau_p_p(i,j,k), rho_p_p(i,j,k), velx_p_p(i,j,k), vely_p_p(i,j,k), & + velz_p_p(i,j,k), eps_p_p(i,j,k), press_p_p(i,j,k), w_lorentz_p_p(i,j,k)) + endif endif endif @@ -375,6 +429,5 @@ end do end do - end subroutine GRHydro_InitialAtmosphereReset File [modified]: Utils.F90 Delta lines: +31 -0 =================================================================== --- branches/hot_and_MHD_temp_dev/src/Utils.F90 2010-11-14 05:28:48 UTC (rev 175) +++ branches/hot_and_MHD_temp_dev/src/Utils.F90 2010-11-16 15:19:43 UTC (rev 176) @@ -27,6 +27,37 @@ @endhistory @@*/ +subroutine GRHydro_Debug(CCTK_ARGUMENTS) + + implicit none + DECLARE_CCTK_ARGUMENTS + integer loc(3) + + loc = minloc(y_e_con/dens) +#if 0 + write(6,*) minval(y_e_con/dens) + write(6,*) y_e_con_rhs(loc(1),loc(2),loc(3)),densrhs(loc(1),loc(2),loc(3)) + write(6,*) y_e_con(loc(1),loc(2),loc(3)),dens(loc(1),loc(2),loc(3)) + write(6,*) loc + write(6,*) dens(4,5,5),y_e(4,5,5),y_e_con(4,5,5) + write(6,*) x(loc(1),loc(2),loc(3)),y(loc(1),loc(2),loc(3)),z(loc(1),loc(2),loc(3)) +#endif + loc(1) = 4 + loc(2) = 5 + loc(3) = 4 + write(6,*) minval(y_e_con/dens) + write(6,*) y_e_con_rhs(loc(1),loc(2),loc(3)),densrhs(loc(1),loc(2),loc(3)) + write(6,*) y_e_con(loc(1),loc(2),loc(3)),dens(loc(1),loc(2),loc(3)) + write(6,*) loc + write(6,*) dens(4,5,5),y_e(4,5,5),y_e_con(4,5,5) + write(6,*) x(loc(1),loc(2),loc(3)),y(loc(1),loc(2),loc(3)),z(loc(1),loc(2),loc(3)) + + + call flush(6) + +end subroutine GRHydro_Debug + + subroutine GRHydro_RefinementLevel(CCTK_ARGUMENTS) implicit none

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/src/ (Rev. 20)
by cott＠tapir.caltech.edu 16 Nov '10

16 Nov '10

User: cott Date: 2010/11/16 09:19 AM Modified: /EOS_Omni/src/ EOS_Omni_SingleVarCalls.F90 /EOS_Omni/src/nuc_eos/ nuc_eos.F90, readtable.F90 Log: * minor mods related to hot EOS File Changes: Directory: /EOS_Omni/src/nuc_eos/ ================================= File [modified]: nuc_eos.F90 Delta lines: +6 -2 =================================================================== --- EOS_Omni/src/nuc_eos/nuc_eos.F90 2010-11-14 06:17:54 UTC (rev 19) +++ EOS_Omni/src/nuc_eos/nuc_eos.F90 2010-11-16 15:19:04 UTC (rev 20) @@ -195,7 +195,9 @@ endif if(xye.lt.eos_yemin) then - stop "nuc_eos: ye < yemin" + keyerr = 102 + write(6,*) "ye: ", xye + stop "nuc_eos ye < yemin" endif if(keytemp.eq.1) then @@ -298,7 +300,9 @@ endif if(xye.lt.eos_yemin) then - stop "nuc_eos: ye < yemin" + keyerr = 102 + write(6,*) "ye: ", xye + stop "nuc_eos ye < yemin" endif if(keytemp.eq.1) then File [modified]: readtable.F90 Delta lines: +0 -1 =================================================================== --- EOS_Omni/src/nuc_eos/readtable.F90 2010-11-14 06:17:54 UTC (rev 19) +++ EOS_Omni/src/nuc_eos/readtable.F90 2010-11-16 15:19:04 UTC (rev 20) @@ -210,7 +210,6 @@ stop "Problem reading EOS table file" endif - call h5fclose_f (file_id,error) ! not a good idea to call this function as it will screw recovery Directory: /EOS_Omni/src/ ========================= File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +7 -0 =================================================================== --- EOS_Omni/src/EOS_Omni_SingleVarCalls.F90 2010-11-14 06:17:54 UTC (rev 19) +++ EOS_Omni/src/EOS_Omni_SingleVarCalls.F90 2010-11-16 15:19:04 UTC (rev 20) @@ -96,6 +96,13 @@ xtemp = temp(i) xye = ye(i) xenr = eps(i) * inv_eps_gf + if(xye.lt.0.1) then + write (warnstring,"(A6,1P10E16.7)") "blah: ",xye,xrho + call CCTK_WARN(1,warnstring) + keyerr(i) = 102 + anyerr = 1 + return + endif call nuc_eos_press_eps(xrho,xtemp,xye,xenr,xprs,& keytemp,keyerr(i),rf_precision)

1 0

[svn:einsteintoolkit] www/info/citing/ (Rev. 411)
by knarf＠cct.lsu.edu 15 Nov '10

15 Nov '10

User: knarf Date: 2010/11/15 05:01 PM Modified: /info/citing/ parse_citations.pl Log: fix path File Changes: Directory: /info/citing/ ======================== File [modified]: parse_citations.pl Delta lines: +1 -1 =================================================================== --- info/citing/parse_citations.pl 2010-11-15 22:59:28 UTC (rev 410) +++ info/citing/parse_citations.pl 2010-11-15 23:01:17 UTC (rev 411) @@ -5,7 +5,7 @@ my $tmpfile = "/tmp/ET-citations.bib"; # create bib file -my $command = "../../../tools/trunk/bibtex/parse_bibtex.pl --input ../../manifest/einsteintoolkit.bib --filter=required-for"; +my $command = "../../bibtex/parse_bibtex.pl --input ../../manifest/einsteintoolkit.bib --filter=required-for"; `$command > $tmpfile`; # get bibtex key list my $keys = `$command --showkey=required-for`;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits