Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 156)
by rhaas＠tapir.caltech.edu 04 Sep '12

04 Sep '12

User: rhaas Date: 2012/09/04 07:28 AM Added: /trunk/par/ GRHydro_Carpet_Shocktube_reflux_hot.par Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_ShockTube.F90 Log: * add a hot shocktube to run shocktube tests with the nuclear EOS From: Christian Ott <cott(a)bethe.tapir.caltech.edu> File Changes: Directory: /trunk/par/ ====================== File [added]: GRHydro_Carpet_Shocktube_reflux_hot.par Delta lines: +254 -0 =================================================================== --- trunk/par/GRHydro_Carpet_Shocktube_reflux_hot.par (rev 0) +++ trunk/par/GRHydro_Carpet_Shocktube_reflux_hot.par 2012-09-04 12:28:47 UTC (rev 156) @@ -0,0 +1,254 @@ +ActiveThorns = "time + symbase + aeilocalinterp + carpetinterp + carpet + carpetlib + carpetregrid2 + carpetreduce + carpetslab + cartgrid3d + coordbase + mol + boundary + admbase + staticconformal + spacemask + admcoupling + coordgauge + admmacros + constants + initbase + tmunubase + loopcontrol + hydrobase + ioutil + formaline + timerreport + nanchecker + " + +# EOS +ActiveThorns = "EOS_Omni + " +# Hydro +ActiveThorns = "grhydro + grhydro_initdata + refluxing + " + +# I/O +ActiveThorns = "carpetiobasic + carpetioascii + carpetioscalar + carpetiohdf5 + " + + +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# I/O +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +carpetioscalar::outScalar_vars = "hydrobase::rho + hydrobase::vel + hydrobase::eps + hydrobase::press + grhydro::dens + grhydro::scon + grhydro::tau" + +IOBasic::outInfo_vars = "hydrobase::rho + hydrobase::vel[0]" + +IOASCII::out1D_vars = "grid::coordinates + carpetreduce::weight + hydrobase::rho + hydrobase::vel + hydrobase::eps + hydrobase::press + grhydro::dens + grhydro::scon + grhydro::tau" + +IO::out_dir = $parfile +io::recover = no +carpet::enable_all_storage = no + +carpetioscalar::outScalar_every = 1 +IOASCII::out1D_every = 1 +IOBasic::outInfo_every = 1 + +carpetioascii::out2D_every = 128 + +iohdf5::out_every = -1 +iohdf5::checkpoint = no +io::checkpoint_every = -1 + + +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# Timer +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +TimerReport::output_schedule_timers = no +TimerReport::n_top_timers = 20 + + +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# Initialization +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + +Carpet::init_fill_timelevels = yes + +grhydro_initdata::shocktube_type = "xshock" +grhydro_initdata::shock_xpos = 0.48e0 +grhydro_initdata::shock_case = "simple" + + +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# AMR and Grid Setup +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +Cactus::cctk_full_warnings = yes +carpet::veryverbose = no +carpet::verbose = no + +carpet::max_refinement_levels = 2 +carpet::use_buffer_zones = yes +Carpet::refinement_centering = "cell" +Carpet::prolongation_order_space = 4 +Carpet::prolongation_order_time = 2 + +CarpetLib::use_higher_order_restriction = yes +Carpet::use_overlap_zones = yes + +Carpet::poison_new_timelevels = yes +CarpetLib::poison_new_memory = yes + + +cartgrid3d::type = "coordbase" +cartgrid3d::domain = "full" +cartgrid3d::avoid_origin = no + +coordbase::xmin = 0.0 +coordbase::xmax = 1.0 +coordbase::ymin = -0.00125 +coordbase::ymax = +0.00125 +coordbase::zmin = -0.00125 +coordbase::zmax = +0.00125 +coordbase::dx = 0.0025 +coordbase::dy = 0.0025 +coordbase::dz = 0.0025 + +CoordBase::boundary_staggered_x_lower = yes +CoordBase::boundary_staggered_y_lower = yes +CoordBase::boundary_staggered_z_lower = yes +CoordBase::boundary_staggered_x_upper = yes +CoordBase::boundary_staggered_y_upper = yes +CoordBase::boundary_staggered_z_upper = yes + +driver::ghost_size = 3 + +cactus::cctk_itlast = 100 + +Carpet::domain_from_coordbase = yes + +CoordBase::boundary_size_x_lower = 3 +CoordBase::boundary_size_y_lower = 3 +CoordBase::boundary_size_z_lower = 3 +CoordBase::boundary_size_x_upper = 3 +CoordBase::boundary_size_y_upper = 3 +CoordBase::boundary_size_z_upper = 3 + +CarpetRegrid2::regrid_every = 0 +CarpetRegrid2::verbose = yes +CarpetRegrid2::snap_to_coarse = yes + +CarpetRegrid2::num_centres = 1 +CarpetRegrid2::num_levels_1 = 2 +CarpetRegrid2::position_x_1 = 0.4 +CarpetRegrid2::radius_1[1] = 0.1 + +refluxing::Refluxing_MaxNumEvolvedVars = 36 + +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# Hydro +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +tmunubase::stress_energy_storage = yes + +hydrobase::timelevels = 3 +hydrobase::evolution_method = "grhydro" +hydrobase::prolongation_type = "ENO" +hydrobase::initial_hydro = "shocktube_hot" + +hydrobase::y_e_evolution_method = "GRHydro" +hydrobase::temperature_evolution_method = "GRHydro" +hydrobase::initial_y_e = "one" +hydrobase::initial_temperature = "zero" +HydroBase::initial_entropy = "zero" + +grhydro::grhydro_maxnumevolvedvars = 6 +grhydro::grhydro_maxnumsandrvars = 16 +grhydro::evolve_tracer = no +grhydro::number_of_tracers = 0 + +grhydro::grhydro_rho_central = 1.62e-8 +grhydro::riemann_solver = "HLLE" +grhydro::grhydro_eos_type = "General" +grhydro::grhydro_eos_table = "nuc_eos" +grhydro::recon_method = "ppm" +grhydro::tvd_limiter = "vanleerMC2" + +grhydro::ppm_detect = "yes" +grhydro::grhydro_stencil = 3 +grhydro::bound = "flat" + +eos_omni::nuceos_read_table = yes +eos_omni::nuceos_table_name = "LS220_234r_136t_50y_analmu_20091212_SVNr26.h5" +eos_omni::do_energy_shift = yes + +eos_omni::poly_gamma = 5.0 +eos_omni::poly_gamma_ini = 1.333333333333333 +eos_omni::poly_k = 0.4640517 +eos_omni::gl_gamma = 5.0 +eos_omni::gl_k = 0.4640517 +eos_omni::hybrid_gamma1 = 5.0 +eos_omni::hybrid_gamma2 = 2.4 +eos_omni::hybrid_gamma_th = 1.333333333333333333 +eos_omni::hybrid_k1 = 0.4640517 +eos_omni::hybrid_rho_nuc = 3.238607e-4 + +# Atmosphere +SpaceMask::use_mask = yes + +grhydro::rho_rel_min = 1.e-9 +grhydro::initial_atmosphere_factor = 1.e2 +grhydro::initial_rho_abs_min = 5e-17 + +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# Timestepping and MoL +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +time::dtfac = 0.4 +mol::ode_method = "RK2" +MoL::MoL_Intermediate_Steps = 2 + +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# Curvature +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +admbase::evolution_method = "none" +admbase::metric_type = "physical" +admbase::metric_timelevels = 3 +admbase::shift_timelevels = 3 +admbase::lapse_timelevels = 3 + + +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +# Check for NaNs +#%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + +NaNChecker::check_every = 1 +NaNChecker::check_vars = "grhydro::dens grhydro::tau hydrobase::rho hydrobase::press" +nanchecker::action_if_found = abort Directory: /trunk/src/ ====================== File [modified]: GRHydro_ShockTube.F90 Delta lines: +153 -0 =================================================================== --- trunk/src/GRHydro_ShockTube.F90 2012-09-04 12:28:44 UTC (rev 155) +++ trunk/src/GRHydro_ShockTube.F90 2012-09-04 12:28:47 UTC (rev 156) @@ -164,3 +164,156 @@ return end subroutine GRHydro_shocktube + +subroutine GRHydro_shocktube_hot(CCTK_ARGUMENTS) + + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + CCTK_INT :: i, j, k, nx, ny, nz + CCTK_REAL :: direction, det + CCTK_REAL :: rhol, rhor, velxl, velxr, velyl, velyr, & + velzl, velzr, epsl, epsr, templ, tempr, yel, yer + CCTK_REAL :: vlowx, vlowy, vlowz, w, tenthalpy + +! begin EOS Omni vars + integer :: n,keytemp,anyerr,keyerr(1) + integer :: handle + character(len=256) :: warnline + ! handle for nuclear EOS + handle=4 + n = 1;keytemp = 0;anyerr = 0;keyerr(1) = 0 +! end EOS Omni vars + + nx = cctk_ash(1) + ny = cctk_ash(2) + nz = cctk_ash(3) + + call CCTK_INFO("Setting up initial data for hot shocktube") + + if(.not.CCTK_EQUALS(Y_e_evolution_method,"GRHydro").or.& + .not.CCTK_EQUALS(temperature_evolution_method,"GRHydro")) then + call CCTK_WARN(0,"Must have Y_e_evolution_method and temperature_evolution_method set to GRHydro") + endif + + if (nuceos_read_table.eq.0) then + call CCTK_WARN(0,"You must read in a nuclear EOS table for initial data shocktube_hot to work!") + endif + + if (.not.CCTK_EQUALS(GRHydro_eos_table,"nuc_eos").or..not.CCTK_EQUALS(GRHydro_eos_type,"General")) then + call CCTK_WARN(0,"You must set GRHydro::GRHydro_eos_table = nuc_eos and GRHydro::GRHydro_eos_type = General!") + endif + + do i=1,nx + do j=1,ny + do k=1,nz + if (CCTK_EQUALS(shocktube_type,"diagshock")) then + direction = x(i,j,k) - shock_xpos + & + y(i,j,k) - shock_ypos + z(i,j,k) - shock_zpos + else if (CCTK_EQUALS(shocktube_type,"xshock")) then + direction = x(i,j,k) - shock_xpos + else if (CCTK_EQUALS(shocktube_type,"yshock")) then + direction = y(i,j,k) - shock_ypos + else if (CCTK_EQUALS(shocktube_type,"zshock")) then + direction = z(i,j,k) - shock_zpos + else if (CCTK_EQUALS(shocktube_type,"sphere")) then + direction = sqrt((x(i,j,k)-shock_xpos)**2+& + (y(i,j,k)-shock_ypos)**2+& + (z(i,j,k)-shock_zpos)**2)-shock_radius + end if + if (CCTK_EQUALS(shock_case,"Simple")) then + rhol = 1.62e-8 + rhor = 1.62e-9 + velxl = 0.d0 + velxr = 0.d0 + velyl = 0.d0 + velyr = 0.d0 + velzl = 0.d0 + velzr = 0.d0 + templ = 8.0d0 + tempr = 0.6d0 + yel = 0.48d0 + yer = 0.48d0 + else + call CCTK_WARN(0,"Shock case not recognized") + end if + + if ( ((change_shock_direction==0).and.(direction .lt. 0.0d0)).or.& + ((change_shock_direction==1).and.(direction .gt. 0.0d0)) ) then + rho(i,j,k) = rhol + velx(i,j,k) = velxl + vely(i,j,k) = velyl + velz(i,j,k) = velzl + temperature(i,j,k) = templ + y_e(i,j,k) = yel + else + rho(i,j,k) = rhor + velx(i,j,k) = velxr + vely(i,j,k) = velyr + velz(i,j,k) = velzr + temperature(i,j,k) = tempr + y_e(i,j,k) = yer + end if + + 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 EOS with + keytemp = 1 + call EOS_Omni_press(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) + + if(anyerr.ne.0) then + call CCTK_WARN(1,"Error in Initial Data EOS call!") + write(warnline,"(A10,i8)") "keyerr= ",keyerr + call CCTK_WARN(0,warnline) + endif + + ! set up conserved variables + w = 1.0d0 / & + sqrt(1.0d0 - (gxx(i,j,k)*vel(i,j,k,1)*vel(i,j,k,1) & + + gyy(i,j,k)*vel(i,j,k,2)*vel(i,j,k,2) & + + gzz(i,j,k)*vel(i,j,k,3)*vel(i,j,k,3) ) ) + + vlowx = gxx(i,j,k)*vel(i,j,k,1) & + + gxy(i,j,k)*vel(i,j,k,2) & + + gxz(i,j,k)*vel(i,j,k,3) + vlowy = gxy(i,j,k)*vel(i,j,k,1) & + + gyy(i,j,k)*vel(i,j,k,2) & + + gyz(i,j,k)*vel(i,j,k,3) + vlowz = gxz(i,j,k)*vel(i,j,k,1) & + + gyz(i,j,k)*vel(i,j,k,2) & + + gzz(i,j,k)*vel(i,j,k,3) + + + dens(i,j,k) = sqrt(det)*w*rho(i,j,k) + + tenthalpy = 1.0d0 + eps(i,j,k) + press(i,j,k) / rho(i,j,k) + + tau(i,j,k) = sqrt(det)*( (rho(i,j,k)*(1.0d0+eps(i,j,k))+press(i,j,k))*w*w - press(i,j,k)) & + - dens(i,j,k) + + w_lorentz(i,j,k) = w + + scon(i,j,k,1) = sqrt(det)*rho(i,j,k)*tenthalpy*(w**2) & + *vlowx + scon(i,j,k,2) = sqrt(det)*rho(i,j,k)*tenthalpy*(w**2) & + *vlowy + scon(i,j,k,3) = sqrt(det)*rho(i,j,k)*tenthalpy*(w**2) & + *vlowz + + Y_e_con(i,j,k) = dens(i,j,k)*Y_e(i,j,k) + + enddo + enddo + enddo + + densrhs = 0.d0 + srhs = 0.d0 + taurhs = 0.d0 + + return + +end subroutine GRHydro_shocktube_hot Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2012-09-04 12:28:44 UTC (rev 155) +++ trunk/interface.ccl 2012-09-04 12:28:47 UTC (rev 156) @@ -2,7 +2,7 @@ # $Header$ implements: GRHydro_init_data -inherits: GRHydro grid +inherits: GRHydro grid EOS_Omni #USES INCLUDE: EOS_Base.inc USES INCLUDE: SpaceMask.h File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2012-09-04 12:28:44 UTC (rev 155) +++ trunk/param.ccl 2012-09-04 12:28:47 UTC (rev 156) @@ -5,10 +5,13 @@ USES CCTK_INT timelevels USES KEYWORD Bvec_evolution_method +USES KEYWORD Y_e_evolution_method +USES KEYWORD temperature_evolution_method EXTENDS KEYWORD initial_hydro "" { "shocktube" :: "Shocktube type" + "shocktube_hot" :: "Shocktube with hot nuclear EOS" "only_atmo" :: "Set only a low atmosphere" "read_conformal":: "After reading in initial alp, rho and gxx from h5 files, sets the other quantities" "simple_wave" :: "Set initial data from Anile Miller Motta, Phys.Fluids. 26, 1450 (1983)" @@ -386,3 +389,4 @@ shares:EOS_Omni USES REAL gl_gamma +USES BOOLEAN nuceos_read_table File [modified]: schedule.ccl Delta lines: +7 -0 =================================================================== --- trunk/schedule.ccl 2012-09-04 12:28:44 UTC (rev 155) +++ trunk/schedule.ccl 2012-09-04 12:28:47 UTC (rev 156) @@ -33,6 +33,13 @@ } "Circularly polarized Alfven wave initial data" } +if (CCTK_Equals(initial_hydro,"shocktube_hot")) { + schedule GRHydro_shocktube_hot in HydroBase_Initial AFTER (HydroBase_Y_e_one,HydroBase_Zero) + { + LANG: Fortran + } "Hot Shocktube initial data" +} + if (CCTK_Equals(initial_hydro,"shocktube")) { if(CCTK_Equals(initial_Bvec,"shocktube")) {

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 155)
by rhaas＠tapir.caltech.edu 04 Sep '12

04 Sep '12

User: rhaas Date: 2012/09/04 07:28 AM Modified: /trunk/ param.ccl, schedule.ccl Log: GRHydro_InitData: extent initial_Bvec rather than defining a private parameter of the same name. From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +5 -6 =================================================================== --- trunk/param.ccl 2012-09-04 12:28:43 UTC (rev 154) +++ trunk/param.ccl 2012-09-04 12:28:44 UTC (rev 155) @@ -23,6 +23,11 @@ "magnetized_bondi_solution_iso" :: "Magnetized Spherical single black hole Bondi solution - TEST ISO CASE!!!!!!" } +EXTENDS KEYWORD initial_Bvec +{ + "shocktube" :: "Shocktube type" + "poloidalmagfield" :: "Poloidal Magnetic Field" +} shares:ADMBase EXTENDS KEYWORD initial_data "" @@ -37,12 +42,6 @@ private: -KEYWORD initial_Bvec "Initial magnetic field." -{ - "none" :: "No initial magnetic field is set." - "poloidalmagfield" :: "Poloidal Magnetic Field" -} "none" - KEYWORD shocktube_type "Diagonal or parallel shock?" { "diagshock" :: "Diagonal across all axes" File [modified]: schedule.ccl Delta lines: +1 -1 =================================================================== --- trunk/schedule.ccl 2012-09-04 12:28:43 UTC (rev 154) +++ trunk/schedule.ccl 2012-09-04 12:28:44 UTC (rev 155) @@ -34,7 +34,7 @@ } if (CCTK_Equals(initial_hydro,"shocktube")) { - if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) + if(CCTK_Equals(initial_Bvec,"shocktube")) { schedule GRHydro_shocktubeM in HydroBase_Initial {

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 154)
by rhaas＠tapir.caltech.edu 04 Sep '12

04 Sep '12

User: rhaas Date: 2012/09/04 07:28 AM Modified: /trunk/src/ GRHydro_PoloidalMagFieldM.F90 Log: Make GRHydro_PoloidalMagFieldM.F90 call P2C correctly for temperature evolved or not evolved. From: Philipp Moesta <pmoesta(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PoloidalMagFieldM.F90 Delta lines: +18 -15 =================================================================== --- trunk/src/GRHydro_PoloidalMagFieldM.F90 2012-09-04 12:28:40 UTC (rev 153) +++ trunk/src/GRHydro_PoloidalMagFieldM.F90 2012-09-04 12:28:43 UTC (rev 154) @@ -136,21 +136,24 @@ eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& w_lorentz(i,j,k)) else - call Prim2ConGenM_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),& - tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(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),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& - w_lorentz(i,j,k),temperature(i,j,k),y_e(i,j,k)) -! call Prim2ConGenM(GRHydro_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),sx(i,j,k),sy(i,j,k),sz(i,j,k),& -! tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(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),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& -! w_lorentz(i,j,k)) + if (evolve_temper .ne. 0) then + call Prim2ConGenM_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),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(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),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k),temperature(i,j,k),y_e(i,j,k)) + else + call Prim2ConGenM(GRHydro_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),sx(i,j,k),sy(i,j,k),sz(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(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),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) + end if end if enddo

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 153)
by rhaas＠tapir.caltech.edu 04 Sep '12

04 Sep '12

User: rhaas Date: 2012/09/04 07:28 AM Modified: /trunk/ interface.ccl, schedule.ccl /trunk/src/ GRHydro_PoloidalMagFieldM.F90 Log: Changes to make GRHydro MHD work with nuclear/hot equation of state: 1) Switch to EOSOmni pointwise C2P routine and modify where necessary. 2) Modify Con2PrimM.F90 to allow for the evolution of temperature and adjust the wrapper routine. 3) Create EigenProblemM_hot pointwise routine and call that from HLLEM.F90 when temperature is evolved. Additionally adjust HLLEM where necessary. 4) Adjust InterfacesM.h to incorporate the newly created functions. 5) Fix a loop problem (not taking into account constraint transport) in PPM reconstruction of Y_e 6) Introduce Prim2ConM_hot and call this pointwise routine from Prim2ConM.F90 when temperature is evolved. Additionally also make this routine available to initial data routine in GRHydro_InitData 7) Adjust loops in GRHydro_PoloidalMagFieldM.F90 to not set boundary points it cannot set but instead call boundary group afterwards! Pay attention as this will not work with boundary conditions set to "none" in MHD case anymore but is the correct thing to do. 8) Allow StarMapper to extend HydroBase::initial_hydro = "starmapper". 9) Smaller fixes. From: Philipp Moesta <pmoesta(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PoloidalMagFieldM.F90 Delta lines: +22 -6 =================================================================== --- trunk/src/GRHydro_PoloidalMagFieldM.F90 2012-08-27 21:19:38 UTC (rev 152) +++ trunk/src/GRHydro_PoloidalMagFieldM.F90 2012-09-04 12:28:40 UTC (rev 153) @@ -75,10 +75,12 @@ dy = CCTK_DELTA_SPACE(2) dz = CCTK_DELTA_SPACE(3) - do i=1,nx - do j=1,ny - do k=1,nz + write(*,*)'GRHydro_InitData: Setting up initial poloidal magnetic field' + do i=2,nx-1 + do j=2,ny-1 + do k=2,nz-1 + rhofac = 1.0d0-rho(i,j,k)/poloidal_rho_max delPcut = press(i,j,k)-poloidal_P_cut maxP_Pcut = max(delPcut,0.0d0) @@ -121,6 +123,10 @@ Bvecy(i,j,k) = - Ax_dz/sdet Bvecz(i,j,k) = (Ax_dy-Ay_dx)/sdet + !Bvecx(i,j,k) = 0.0d0 + !Bvecy(i,j,k) = 0.0d0 + !Bvecz(i,j,k) = 0.00000001/sdet + if (CCTK_EQUALS(GRHydro_eos_type,"Polytype")) then call Prim2ConPolyM(GRHydro_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),& @@ -130,13 +136,21 @@ eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& w_lorentz(i,j,k)) else - call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& + call Prim2ConGenM_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),& tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(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),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& - w_lorentz(i,j,k)) + w_lorentz(i,j,k),temperature(i,j,k),y_e(i,j,k)) +! call Prim2ConGenM(GRHydro_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),sx(i,j,k),sy(i,j,k),sz(i,j,k),& +! tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(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),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& +! w_lorentz(i,j,k)) end if enddo @@ -147,7 +161,9 @@ srhs = 0.d0 taurhs = 0.d0 Bconsrhs = 0.d0 - + if (clean_divergence .ne. 0) then + psidcrhs =0.0 + endif return end subroutine GRHydro_PoloidalMagFieldM Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +17 -0 =================================================================== --- trunk/interface.ccl 2012-08-27 21:19:38 UTC (rev 152) +++ trunk/interface.ccl 2012-09-04 12:28:40 UTC (rev 153) @@ -66,7 +66,23 @@ CCTK_REAL OUT press, CCTK_REAL IN Bvecx, CCTK_REAL IN Bvecy, \ CCTK_REAL IN Bvecz, CCTK_REAL OUT w_lorentz) +SUBROUTINE Prim2ConGenM_hot(CCTK_INT IN handle, CCTK_INT IN GRHydro_reflevel, CCTK_INT IN i, CCTK_INT IN j, CCTK_INT IN k, \ + CCTK_REAL IN x, CCTK_REAL IN y, CCTK_REAL IN z, \ + CCTK_REAL IN gxx, CCTK_REAL IN gxy, \ + CCTK_REAL IN gxz, CCTK_REAL IN gyy, \ + CCTK_REAL IN gyz, CCTK_REAL IN gzz, \ + CCTK_REAL IN det, CCTK_REAL OUT dens, \ + CCTK_REAL OUT sx, CCTK_REAL OUT sy, \ + CCTK_REAL OUT sz, CCTK_REAL OUT tau, \ + CCTK_REAL OUT Bconsx, CCTK_REAL OUT Bconsy, \ + CCTK_REAL OUT Bconsz, CCTK_REAL IN rho, CCTK_REAL IN velx, \ + CCTK_REAL IN vely, \ + CCTK_REAL IN velz, CCTK_REAL IN epsilon, \ + CCTK_REAL OUT press, CCTK_REAL IN Bvecx, CCTK_REAL IN Bvecy, \ + CCTK_REAL IN Bvecz, CCTK_REAL OUT w_lorentz, \ + CCTK_REAL INOUT temperature, CCTK_REAL IN Y_e) + SUBROUTINE Con2PrimPoly(CCTK_INT IN handle, CCTK_REAL OUT dens, \ CCTK_REAL OUT sx, CCTK_REAL OUT sy, \ CCTK_REAL OUT sz, CCTK_REAL OUT tau, \ @@ -154,6 +170,7 @@ USES FUNCTION Prim2ConGen USES FUNCTION Prim2ConPolyM USES FUNCTION Prim2ConGenM +USES FUNCTION Prim2ConGenM_hot USES FUNCTION Con2PrimPoly USES FUNCTION Con2PrimGen USES FUNCTION Con2PrimGenM File [modified]: schedule.ccl Delta lines: +5 -1 =================================================================== --- trunk/schedule.ccl 2012-08-27 21:19:38 UTC (rev 152) +++ trunk/schedule.ccl 2012-09-04 12:28:40 UTC (rev 153) @@ -245,9 +245,13 @@ if (CCTK_EQUALS(initial_Bvec, "poloidalmagfield")) { - SCHEDULE GRHydro_PoloidalMagFieldM IN HydroBase_Initial AFTER TOV_Initial_Data +# SCHEDULE GRHydro_PoloidalMagFieldM AT CCTK_INITIAL AFTER IN HydroBase_Initial AFTER rnsid_init AFTER TOV_Initial_Data after CCCC_StarMapper_InitialData + SCHEDULE GRHydro_PoloidalMagFieldM AT CCTK_POSTINITIAL { LANGUAGE: Fortran } "Set up a poloidal magnetic field. It expects the other fluid variables already to be set, as for example in the TOV solution" + SCHEDULE group HydroBase_Boundaries IN HydroBase_Initial AFTER GRHydro_PoloidalMagFieldM + { + } "Call boundary conditions after magnetic field initial data setup" }

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 420)
by knarf＠cct.lsu.edu 03 Sep '12

03 Sep '12

User: knarf Date: 2012/09/03 08:20 PM Modified: /trunk/ schedule.ccl Log: put { on new line after else File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +3 -1 =================================================================== --- trunk/schedule.ccl 2012-08-27 19:19:46 UTC (rev 419) +++ trunk/schedule.ccl 2012-09-04 01:20:40 UTC (rev 420) @@ -972,7 +972,9 @@ { LANG: Fortran } "Convert initial data given in primive variables to conserved variables - MHD version" - } else { + } + else + { schedule Conservative2Primitive IN HydroBase_Con2Prim AS Con2Prim IF GRHydro::execute_MoL_PostStep { LANG: Fortran

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 31 Aug '12

31 Aug '12

changeset: 3643:237f69922fd3 user: Erik Schnetter <schnetter(a)gmail.com> date: Fri Aug 31 21:17:27 2012 -0400 summary: CarpetRegrid2: Try harder to combine different refined regions changeset: 3644:e0d7a3f3ccd4 tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Fri Aug 31 21:17:51 2012 -0400 summary: Carpet: Handle granularity in recursive load balancing

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 31 Aug '12

31 Aug '12

changeset: 3642:ab3bc09908fe tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Fri Aug 31 20:56:39 2012 -0400 summary: CarpetRegrid2: Add virtual destructor to base class

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 30 Aug '12

30 Aug '12

changeset: 3641:54ba1142d56a tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Thu Aug 30 10:43:14 2012 -0400 summary: Carpet: Requirements: Interpret schedule options

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 30 Aug '12

30 Aug '12

changeset: 3637:e6e31142ec70 user: Erik Schnetter <schnetter(a)gmail.com> date: Thu Aug 30 10:26:26 2012 -0400 summary: Carpet: Remove unused variable changeset: 3638:c8208761bb63 user: Erik Schnetter <schnetter(a)gmail.com> date: Thu Aug 30 10:26:58 2012 -0400 summary: Carpet: Remove unused variable changeset: 3639:4266a2016693 user: Erik Schnetter <schnetter(a)gmail.com> date: Thu Aug 30 10:27:41 2012 -0400 summary: Carpet: Check schedule reads/writes statements at run time changeset: 3640:45f506e78cec tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Thu Aug 30 10:28:08 2012 -0400 summary: CarpetLib: White space change

1 0

New changesets in Carpet Mercurial
by Carpet mercurial repositories 28 Aug '12

28 Aug '12

changeset: 3636:b8419c874695 tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Tue Aug 28 20:18:45 2012 -0400 summary: CarpetIOHDF5: Use string instead of char[] in HDF5 for large attributes

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits