Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

Start a nNew thread

[Carpet] branch, master, updated. carpet-6-init-12-gf06c356
by Carpet git repositories 18 Sep '12

18 Sep '12

1 0

[Carpet] branch, master, updated. carpet-6-init-11-g45872e1
by Carpet git repositories 18 Sep '12

18 Sep '12

1 0

[Carpet] branch, master, updated. carpet-6-init-10-gb57036c
by Carpet git repositories 18 Sep '12

18 Sep '12

1 0

[Carpet] branch, master, updated. carpet-6-init-9-g8496cf3
by Carpet git repositories 18 Sep '12

18 Sep '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 8496cf3fd9417c64cd1d1a48386e3b308a28fbfc (commit) via ffefc62d26d05fa2c71fd58250e27715746eca33 (commit) via 35e17ca7c03bf6848d8cf2446da6630af2ea82c2 (commit) from bdafb413884068b7327c2f32f41edacf7a620931 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 8496cf3fd9417c64cd1d1a48386e3b308a28fbfc Author: Erik Schnetter <schnetter(a)gmail.com> Date: Tue Sep 18 10:16:28 2012 -0400 CarpetIOASCII: Implement using grid::coordinates to output coordinates commit ffefc62d26d05fa2c71fd58250e27715746eca33 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon Sep 17 23:16:23 2012 -0400 CarpetIOASCII: White space change commit 35e17ca7c03bf6848d8cf2446da6630af2ea82c2 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon Sep 17 22:37:53 2012 -0400 CarpetIOASCII: Pass vectors by reference ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetIOASCII/interface.ccl | 11 +- Carpet/CarpetIOASCII/param.ccl | 6 + Carpet/CarpetIOASCII/src/ioascii.cc | 87 +- Carpet/CarpetIOASCII/src/ioascii.hh | 5 +- Carpet/CarpetIOASCII/test/grid-coords.par | 63 + .../CarpetIOASCII/test/grid-coords/grid-coords.par | 63 + .../test/grid-coords/grid::coordinates..asc | 96 + .../test/grid-coords/grid::coordinates.d.asc | 171 + .../test/grid-coords/grid::coordinates.x.asc | 250 + .../test/grid-coords/grid::coordinates.xy.asc | 976 +++ .../test/grid-coords/grid::coordinates.xyz.asc | 8214 ++++++++++++++++++++ .../test/grid-coords/grid::coordinates.xz.asc | 1678 ++++ .../test/grid-coords/grid::coordinates.y.asc | 204 + .../test/grid-coords/grid::coordinates.yz.asc | 1282 +++ .../test/grid-coords/grid::coordinates.z.asc | 292 + .../test/grid-coords/interptoarray::arrays1d..asc | 19 + .../test/grid-coords/interptoarray::arrays1d.x.asc | 107 + .../test/grid-coords/interptoarray::arrays1d.y.asc | 17 + .../test/grid-coords/interptoarray::arrays2d..asc | 19 + .../test/grid-coords/interptoarray::arrays2d.x.asc | 96 + .../grid-coords/interptoarray::arrays2d.xy.asc | 547 ++ .../test/grid-coords/interptoarray::arrays2d.y.asc | 83 + .../test/grid-coords/interptoarray::arrays2d.z.asc | 17 + .../test/grid-coords/interptoarray::arrays3d..asc | 19 + .../test/grid-coords/interptoarray::arrays3d.d.asc | 39 + .../test/grid-coords/interptoarray::arrays3d.x.asc | 74 + .../grid-coords/interptoarray::arrays3d.xy.asc | 283 + .../grid-coords/interptoarray::arrays3d.xyz.asc | 844 ++ .../grid-coords/interptoarray::arrays3d.xz.asc | 215 + .../test/grid-coords/interptoarray::arrays3d.y.asc | 61 + .../grid-coords/interptoarray::arrays3d.yz.asc | 182 + .../test/grid-coords/interptoarray::arrays3d.z.asc | 50 + .../test/grid-coords/interptoarray::scalars..asc | 19 + 33 files changed, 16062 insertions(+), 27 deletions(-) create mode 100644 Carpet/CarpetIOASCII/test/grid-coords.par create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/grid-coords.par create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/grid::coordinates..asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/grid::coordinates.d.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/grid::coordinates.x.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/grid::coordinates.xy.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/grid::coordinates.xyz.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/grid::coordinates.xz.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/grid::coordinates.y.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/grid::coordinates.yz.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/grid::coordinates.z.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d..asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d.x.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays1d.y.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d..asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.x.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.xy.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.y.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays2d.z.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d..asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.d.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.x.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xy.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xyz.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.xz.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.y.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.yz.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::arrays3d.z.asc create mode 100644 Carpet/CarpetIOASCII/test/grid-coords/interptoarray::scalars..asc hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

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

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/src/ GRHydro_BondiM_new.F90 Log: GRHydro_InitData: port bondi fixes to magnetized version. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_BondiM_new.F90 Delta lines: +41 -26 =================================================================== --- trunk/src/GRHydro_BondiM_new.F90 2012-09-17 16:27:37 UTC (rev 171) +++ trunk/src/GRHydro_BondiM_new.F90 2012-09-17 16:27:39 UTC (rev 172) @@ -57,13 +57,17 @@ DECLARE_CCTK_FUNCTIONS CCTK_INT :: i, j, k, nx, ny, nz, imin, jb,N_points - PARAMETER (N_points=2000) + CCTK_REAL :: ONEmTINY, tiny + PARAMETER (N_points=100000,ONEmTINY=0.999999d0,tiny=1.0d-12) CCTK_REAL :: M, Msq, Mdot, rs, gam, rmin_bondi, rmax_bondi, cs_sq,cs,vs_sq,vs,rhos,gtemp,hs, Kval, Qdot CCTK_REAL :: logrmin,dlogr,rhotmp,utmp,vtmp,rspher CCTK_REAL :: r_bondi(N_points), logr_bondi(N_points), rho_bondi(N_points), u_bondi(N_points), v_bondi(N_points) CCTK_REAL :: drhodr, det, rhocheck, rhocheck2, riso, rnew, rsch, ucheck CCTK_REAL :: uiso, uisocheck, vcheck, ucheck2, vcheck2, xhat,yhat, zhat, xp, yp, zp + CCTK_REAL :: f,df,ddf,a,b,c,rsm,roverm + character(400) :: debug_message + !!$set_bondi_parameters M = bondi_central_mass(1) Msq = M*M @@ -71,7 +75,9 @@ rs = r_sonicpt_bondi gam = gl_gamma - write(*,*) 'Bondi_pars:',M,mdot_sonicpt_bondi,r_sonicpt_bondi,gl_gamma + write(debug_message,'(a,4f22.14)') "Bondi_pars: ",M,mdot_sonicpt_bondi, & + r_sonicpt_bondi,gl_gamma + call CCTK_INFO(debug_message) rmin_bondi = M * bondi_rmin(1) rmax_bondi = M * bondi_rmax(1) @@ -95,7 +101,9 @@ logrmin = log10(rmin_bondi) dlogr = (log10(rmax_bondi) - logrmin)/(1.*(N_points-1)) - write(*,*)'More pars:',cs,vs,rhos,hs,Kval,Qdot,logrmin,dlogr + write(debug_message,'(a,8f22.14)') "More pars: ",cs,vs,rhos,hs,Kval,Qdot,& + logrmin,dlogr + call CCTK_INFO(debug_message) rhotmp=1.0d30 imin=1 @@ -137,11 +145,27 @@ u_bondi(i) = utmp v_bondi(i) = vtmp enddo + + open (47,file="bondi.asc",form="formatted") + do i=1,N_points + write(47,'(i5,4f22.14)')i,r_bondi(i),rho_bondi(i),& + u_bondi(i),v_bondi(i) + end do + close(47) + +!!$ write(debug_message,'(a,4f22.14)') "i=1:",r_bondi(1),rho_bondi(1),& +!!$ u_bondi(1),v_bondi(1) +!!$ call CCTK_INFO(debug_message) +!!$ write(debug_message,'(a,4f22.14)') "i=100:",r_bondi(100),rho_bondi(100),& +!!$ u_bondi(100),v_bondi(100) +!!$ call CCTK_INFO(debug_message) +!!$ write(debug_message,'(a,4f22.14)') "i=1000:",r_bondi(1000),rho_bondi(1000),& +!!$ u_bondi(1000),v_bondi(1000) +!!$ call CCTK_INFO(debug_message) +!!$ write(debug_message,'(a,4f22.14)') "i=1500:",r_bondi(1500),rho_bondi(1500),& +!!$ u_bondi(1500),v_bondi(1500) +!!$ call CCTK_INFO(debug_message) - write(*,*)"i=1:",r_bondi(1),rho_bondi(1),u_bondi(1),v_bondi(1) - write(*,*)"i=100:",r_bondi(100),rho_bondi(100),u_bondi(100),v_bondi(100) - write(*,*)"i=1000:",r_bondi(1000),rho_bondi(1000),u_bondi(1000),v_bondi(1000) - write(*,*)"i=1500:",r_bondi(1500),rho_bondi(1500),u_bondi(1500),v_bondi(1500) !!$ // find the derivative near r=M rnew = 2.25 * M @@ -156,7 +180,8 @@ call find_bondi_solution( rnew, rhocheck2, ucheck2, vcheck2, rs, rhos, M, Mdot, Kval, gam, Qdot ) drhodr = 100.0*(rhocheck2-rhocheck)/M - write(6,*)'Rhocheck:',rhocheck,rhocheck2,drhodr + write(debug_message,'(a,3f22.14)') 'Rhocheck:',rhocheck,rhocheck2,drhodr + call CCTK_INFO(debug_message) nx = cctk_lsh(1) ny = cctk_lsh(2) @@ -174,19 +199,9 @@ xhat = xp/riso yhat = yp/riso zhat = zp/riso + roverm = riso/M - if(riso < 1.0e-7) then - gxx(i,j,k) = 1.0e4 - gyy(i,j,k) = 1.0e4 - gzz(i,j,k) = 1.0e4 - gxy(i,j,k) = 0.0 - gxz(i,j,k) = 0.0 - gyz(i,j,k) = 0.0 - endif - - alp(i,j,k) = 1.0/gxx(i,j,k)**2 - - if(riso > M) then + if(roverm > ONEmTINY) then rsch = 0.25 * ( 2.*riso + M)**2 / riso jb = floor( 0.5 + (log10(rsch) - logrmin) / dlogr ) @@ -197,7 +212,7 @@ rho(i,j,k) = rhotmp uiso = vtmp / (1.0 - M/2.0/riso) / (1.0+ M/2.0/riso) else - if(riso > 0.5*M) then + if(roverm > 0.5d0*ONEmTINY) then rho(i,j,k) = rhocheck+drhodr*riso*(riso-M)/M else rho(i,j,k) = (rhocheck-drhodr*M/4.0)*(1.-cos(2.*M_PI*riso/M))/2.0 @@ -219,11 +234,11 @@ Bvecz(i,j,k) = bondi_bmag*M**2*zhat/sqrt(det)/riso**2 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), & + 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 do

1 0

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

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/src/ GRHydro_Bondi_new.F90 Log: GRHydro_Bondi_new.F90: unused variable... From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Bondi_new.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:35 UTC (rev 170) +++ trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:37 UTC (rev 171) @@ -56,7 +56,7 @@ CCTK_REAL :: M, Msq, Mdot, rs, gam, rmin_bondi, rmax_bondi, cs_sq,cs,vs_sq,vs,rhos,gtemp,hs, Kval, Qdot CCTK_REAL :: logrmin,dlogr,rhotmp,utmp,vtmp,rspher CCTK_REAL :: r_bondi(N_points), logr_bondi(N_points), rho_bondi(N_points), u_bondi(N_points), v_bondi(N_points) - CCTK_REAL :: drhodr, det, rhocheck, rhocheck2, riso, rnew, rsch, ucheck, psinew + CCTK_REAL :: drhodr, det, rhocheck, rhocheck2, riso, rnew, rsch, ucheck CCTK_REAL :: uiso, uisocheck, vcheck, ucheck2, vcheck2, xhat,yhat, zhat, xp, yp, zp CCTK_REAL :: f,df,ddf,a,b,c,rsm,roverm

1 0

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

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/par/ bondi_sp.par Log: GRHydro_InitData: Bondi works when matter is coupled to spacetime too. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/par/ ====================== File [modified]: bondi_sp.par Delta lines: +2 -2 =================================================================== --- trunk/par/bondi_sp.par 2012-09-17 16:27:34 UTC (rev 169) +++ trunk/par/bondi_sp.par 2012-09-17 16:27:35 UTC (rev 170) @@ -328,8 +328,8 @@ InitBase::initial_data_setup_method = "init_all_levels" -TmunuBase::stress_energy_storage = "no" -TmunuBase::stress_energy_at_RHS = "no" +TmunuBase::stress_energy_storage = "yes" +TmunuBase::stress_energy_at_RHS = "yes" TmunuBase::timelevels = 1 TmunuBase::prolongation_type = "none" TmunuBase::support_old_CalcTmunu_mechanism = "no"

1 0

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

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Added: /trunk/par/ bondi_sp.par Log: GRHydro_InitData: par file for bondi evolution on a smoothed puncture data From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/par/ ====================== File [added]: bondi_sp.par Delta lines: +664 -0 =================================================================== --- trunk/par/bondi_sp.par (rev 0) +++ trunk/par/bondi_sp.par 2012-09-17 16:27:34 UTC (rev 169) @@ -0,0 +1,664 @@ +#============================================================================== +# Bondi accretion into a BH represented by a smoothed puncture: +# McLachlan GRHydro_InitData SmoothedPuncture +#============================================================================== + +#------------------------------------------------------------------------------ +# Cactus parameters: +#------------------------------------------------------------------------------ +Cactus::cctk_run_title = "Bondi on smoothed puncture data" +Cactus::cctk_full_warnings = "yes" + +#Cactus::terminate = "never" +#Cactus::terminate = "time" +#Cactus::cctk_final_time = 1500.0 +#Cactus::terminate = "iteration" +#Cactus::cctk_itlast = 0 +#Cactus::cctk_itlast = 2560 +Cactus::terminate="runtime" +#Cactus::max_runtime=28800 # 46 days +Cactus::max_runtime=1410 # 23.5 hours +#Cactus::max_runtime=1380 # 23 hours +#Cactus::max_runtime=690 # 11.5 hours +#Cactus::max_runtime=450 # 7.5 hours +#Cactus::max_runtime=210 # 3.5 hours + +#------------------------------------------------------------------------------ +# Activate all necessary thorns: +#------------------------------------------------------------------------------ + +ActiveThorns = "Boundary CartGrid3D CoordBase Fortran InitBase IOUtil LocalReduce SymBase Time" +ActiveThorns = "AEILocalInterp LocalInterp" +#ActiveThorns = "MoL Slab SpaceMask SphericalSurface" +ActiveThorns = "MoL ReflectionSymmetry Slab SpaceMask SphericalSurface" +#ActiveThorns = "MoL ReflectionSymmetry RotatingSymmetry180 Slab SpaceMask SphericalSurface" +#ActiveThorns = "MoL ReflectionSymmetry Slab SpaceMask SphericalSurface" +ActiveThorns = "Carpet CarpetInterp CarpetIOASCII CarpetIOScalar CarpetLib CarpetIOBasic CarpetReduce CarpetRegrid2 CarpetSlab CarpetTracker CarpetMask LoopControl CarpetIOHDF5 CarpetEvolutionMask" +#ActiveThorns = "Formaline NaNChecker TerminationTrigger TimerReport" +ActiveThorns = "NaNChecker TerminationTrigger TimerReport" +ActiveThorns = "ADMbase ADMcoupling ADMmacros CoordGauge StaticConformal" +#ActiveThorns = "PunctureTracker" +#ActiveThorns = "ADManalysis Constants TmunuBase HydroBase " +ActiveThorns = "Constants TmunuBase HydroBase " +#ActiveThorns = "Constants TmunuBase " +ActiveThorns = "QuasiLocalMeasures" +#ActiveThorns = "ADMConstraints" +#ActiveThorns = "EOS_Base EOS_IdealFluid EOS_Polytrope" +ActiveThorns = "EOS_Omni" +ActiveThorns = "GRHydro GRHydro_InitData" +ActiveThorns = "SmoothedPuncture" +ActiveThorns = "BLAS LAPACK GSL" +#ActiveThorns = "TwoPunctures" +ActiveThorns = "SummationByParts" +#ActiveThorns = "TOVSolver" +ActiveThorns = "GenericFD NewRad" +ActiveThorns = "ML_BSSN ML_BSSN_Helper ML_ADMConstraints" +#ActiveThorns = "Hydro_Analysis" +ActiveThorns = "Dissipation" +ActiveThorns = "AHFinderDirect" +#ActiveThorns = "WeylScal4 Multipole" +#ActiveThorns = "SetMask_SphericalSurface" +#ActiveThorns = "SystemStatistics" + +#------------------------------------------------------------------------------ +# Diagnostic parameters: +#------------------------------------------------------------------------------ +AHFinderDirect::verbose_level = "physics details" + +#Carpet::output_timers_every = 1024 +#Carpet::output_timer_tree_every = 256 +#Carpet::output_initialise_timer_tree = "yes" +Carpet::storage_verbose = "no" +#Carpet::timers_verbose = "no" +#Carpet::verbose = "yes" # only for Initial Data +Carpet::verbose = "no" +Carpet::veryverbose = "no" +Carpet::grid_structure_filename = "carpet-grid-structure.asc" +Carpet::grid_coordinates_filename = "carpet-grid-coordinates.asc" + +CarpetLib::output_bboxes = "no" +CarpetLib::print_memstats_every = 1024 +CarpetLib::memstat_file = "carpetlib-memory-statistics.asc" +#CarpetLib::print_timestats_every = 1024 +#CarpetLib::timestat_file = "carpetlib-timing-statistics.asc" + +#CarpetEvolutionMask::verbose = "yes" + +CarpetMask::verbose = "yes" +CarpetReduce::verbose = "no" +#CarpetRegrid2::verbose = "yes" +#CarpetRegrid2::veryverbose = "yes" + +#CarpetTracker::verbose = "yes" + +Dissipation::verbose = "no" + +#NaNChecker::verbose = "all" + +#PunctureTracker::verbose = "yes" + +TimerReport::out_every = 1024 +TimerReport::out_filename = "TimerReport" +#TimerReport::output_all_timers = "yes" +#TimerReport::output_all_timers_together = "yes" +#TimerReport::output_all_timers_readable = "yes" +#TimerReport::before_checkpoint = "yes" +TimerReport::n_top_timers = 40 + +#TwoPunctures::verbose = "yes" + +#QuasiLocalMeasures::verbose = "yes" +#SphericalSurface::verbose = "yes" + +#------------------------------------------------------------------------------ +# Utility parameters: +#------------------------------------------------------------------------------ + +#NaNChecker::check_every = 16 +NaNChecker::check_every = 1 +NaNChecker::check_vars = " + ADMBase::curv + ADMBase::metric + ADMBase::lapse + ADMBase::shift + HydroBase::rho + HydroBase::eps + HydroBase::press + HydroBase::vel + ML_BSSN::ML_log_confac + ML_BSSN::ML_metric + ML_BSSN::ML_trace_curv + ML_BSSN::ML_curv + ML_BSSN::ML_Gamma + ML_BSSN::ML_lapse + ML_BSSN::ML_shift + ML_BSSN::ML_dtlapse + ML_BSSN::ML_dtshift +" +NaNChecker::action_if_found = "terminate" +#NaNChecker::action_if_found = "abort" +#NaNChecker::action_if_found = "just warn" #"terminate", "just warn", "abort" +#NaNChecker::check_after=0 + +#TerminationTrigger::max_walltime = 0.0 # hours +#TerminationTrigger::max_walltime = 24.0 # hours +#TerminationTrigger::on_remaining_walltime = 10.0 # minutes +TerminationTrigger::termination_from_file = "yes" +TerminationTrigger::create_termination_file = "yes" +TerminationTrigger::termination_file = "../TERMINATE" + + +#------------------------------------------------------------------------------ +# Run parameters: +#------------------------------------------------------------------------------ + +#------ +# Grid: +#------ + +Time::dtfac = 0.25 +MoL::ODE_Method = "rk4" +MoL::MoL_Intermediate_Steps = 4 +MoL::MoL_Num_Scratch_Levels = 1 + +CartGrid3D::type = "coordbase" +CartGrid3D::domain = "full" +CartGrid3D::avoid_origin = "no" + +CoordBase::domainsize = "minmax" +CoordBase::spacing = "gridspacing" # "gridspacing" or "numcells" + +CoordBase::xmin = 0.00 +CoordBase::ymin = 0.00 +CoordBase::zmin = 0.00 +CoordBase::xmax = 61.44 +CoordBase::ymax = 61.44 +CoordBase::zmax = 61.44 +CoordBase::dx = 1.28 # dx or ncells_x +CoordBase::dy = 1.28 # dy or ncells_y +CoordBase::dz = 1.28 # dz or ncells_z + +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 +CoordBase::boundary_shiftout_x_lower = 1 +CoordBase::boundary_shiftout_y_lower = 1 +CoordBase::boundary_shiftout_z_lower = 1 +CoordBase::boundary_shiftout_x_upper = 0 +CoordBase::boundary_shiftout_y_upper = 0 +CoordBase::boundary_shiftout_z_upper = 0 + +Driver::ghost_size = 3 + +ReflectionSymmetry::reflection_x = "yes" +ReflectionSymmetry::reflection_y = "yes" +ReflectionSymmetry::reflection_z = "yes" +ReflectionSymmetry::avoid_origin_x = "no" +ReflectionSymmetry::avoid_origin_y = "no" +ReflectionSymmetry::avoid_origin_z = "no" + + +# General Carpet parameters: +Carpet::domain_from_coordbase = "yes" +Carpet::enable_all_storage = "no" +Carpet::use_buffer_zones = "yes" +Carpet::schedule_barriers = "no" + +Carpet::poison_new_timelevels = "yes" +Carpet::check_for_poison = "no" +#Carpet::poison_value = 113 # git version only! + +Carpet::init_3_timelevels = "no" +Carpet::init_fill_timelevels = "yes" + +CarpetEvolutionMask::enlarge_evolved_region_by = 0 +CarpetEvolutionMask::writeNaNs = "yes" +CarpetEvolutionMask::enforce_mask = "yes" +CarpetEvolutionMask::enforce_vars = " + ML_BSSN::ML_lapse + ML_BSSN::ML_shift + GRHydro::dens + GRHydro::scon + GRHydro::tau +" + +CarpetLib::poison_new_memory = "yes" +CarpetLib::poison_value = 114 +CarpetLib::check_bboxes = "no" +CarpetLib::interleave_communications = "yes" +#CarpetLib::vary_tags = "yes" # git version only! +CarpetLib::combine_sends = "yes" +#CarpetLib::reduce_mpi_waitall = "yes" # git version only! + +CarpetInterp::tree_search = "yes" +CarpetInterp::check_tree_search = "no" + +CarpetRegrid2::freeze_unaligned_levels = "yes" +#CarpetRegrid2::snap_to_coarse = "yes" +#CarpetRegrid2::symmetry_rotating90 = "yes" + +# System specific Carpet parameters: +Carpet::max_refinement_levels = 7 +Carpet::prolongation_order_space = 5 +Carpet::prolongation_order_time = 2 + +CarpetRegrid2::regrid_every = 0 +CarpetRegrid2::num_centres = 1 + +CarpetRegrid2::num_levels_1 = 7 +CarpetRegrid2::position_x_1 = 0.0 +CarpetRegrid2::position_y_1 = 0.0 +CarpetRegrid2::position_z_1 = 0.0 +CarpetRegrid2::radius_1[1] = 30.72 # 4 +CarpetRegrid2::radius_1[2] = 15.36 # 2 +CarpetRegrid2::radius_1[3] = 7.68 # 1 +CarpetRegrid2::radius_1[4] = 3.84 # 0.5 +CarpetRegrid2::radius_1[5] = 1.92 # 0.25 +CarpetRegrid2::radius_1[6] = 0.96 # 0.125 + +#CarpetRegrid2::radius_1[1] = 30.72 # 4 +#CarpetRegrid2::radius_1[2] = 15.36 # 2 +#CarpetRegrid2::radius_1[3] = 7.68 # 1 +#CarpetRegrid2::radius_1[4] = 3.84 # 0.5 +#CarpetRegrid2::radius_1[5] = 1.92 # 0.25 +#CarpetRegrid2::radius_1[6] = 0.96 # 0.125 + +#CarpetMask::excluded_surface [0] = 0 +#CarpetMask::excluded_surface_factor[0] = 1.0 + +#CarpetTracker::surface[0] = 0 + +#------ +# MODEL: +#------ + +HydroBase::initial_hydro = "hydro_bondi_solution_iso" + +GRHydro_InitData::mdot_sonicpt_bondi = 1.e-6 +GRHydro_InitData::r_sonicpt_bondi = 8.1 +GRHydro_InitData::bondi_coordinates = "Isotropic" +GRHydro_InitData::bondi_rmax[0] = 100. +GRHydro_InitData::bondi_rmin[0] = 0.1 +#GRHydro_InitData::bondi_use_smooth_puncture_data = "yes" +#GRHydro_InitData::bondi_smooth_gxx = "yes" +#GRHydro_InitData::bondi_smooth_puncture_radius = "0.25" + +ADMBase::initial_data = "smoothedpuncture" +ADMBase::initial_lapse = "smoothedpuncture" + +ADMBase::metric_type = "physical" +#ADMBase::initial_data = "twopunctures" +#ADMBase::initial_lapse = "twopunctures-averaged" +ADMBase::initial_shift = "zero" +ADMBase::initial_dtlapse = "zero" +ADMBase::initial_dtshift = "zero" +# needed for AHFinderDirect: +ADMBase::metric_timelevels = 3 + +#TwoPunctures::schedule_in_ADMBase_InitialData = "no" +#TwoPunctures::keep_u_around = "yes" + +#TwoPunctures::npoints_A = 16 +#TwoPunctures::npoints_B = 16 +#TwoPunctures::npoints_phi = 14 +#TwoPunctures::Newton_tol = 1.e-10 +#TwoPunctures::grid_setup_method = "evaluation" +##TwoPunctures::grid_setup_method = "Taylor expansion" +# +#TwoPunctures::par_b = 1.0 +# +#TwoPunctures::par_m_plus = 1.0 +#TwoPunctures::par_m_minus = 0.0 +# +#TwoPunctures::Newton_maxit = 10 +#TwoPunctures::do_residuum_debug_output = "no" +#TwoPunctures::do_initial_debug_output = "no" +##TwoPunctures::TP_Tiny = 1.0e-10 +#TwoPunctures::TP_Tiny = 1.0e-2 +#TwoPunctures::center_offset[0] = -1.0 +#TwoPunctures::center_offset[1] = 0 +#TwoPunctures::center_offset[2] = 0 +# +#---------- +# Numerics: +#---------- + +InitBase::initial_data_setup_method = "init_all_levels" + +TmunuBase::stress_energy_storage = "no" +TmunuBase::stress_energy_at_RHS = "no" +TmunuBase::timelevels = 1 +TmunuBase::prolongation_type = "none" +TmunuBase::support_old_CalcTmunu_mechanism = "no" + +HydroBase::timelevels = 3 + +ADMMacros::spatial_order = 4 +SummationByParts::order = 4 + +SpaceMask::use_mask = "yes" + +#Dissipation::ah_slope = 0.2 +#Dissipation::epsdis = 0.01 +#Dissipation::extra_dissipation_in_horizons = "yes" +#Dissipation::ah_max_epsdis=0.1 +#Dissipation::update_ah_every = 16 +#Dissipation::surface_number[0] = 0 +#Dissipation::horizon_number[0] = 1 +Dissipation::order = 5 +Dissipation::vars = " + ML_BSSN::ML_log_confac + ML_BSSN::ML_metric + ML_BSSN::ML_curv + ML_BSSN::ML_trace_curv + ML_BSSN::ML_Gamma + ML_BSSN::ML_lapse + ML_BSSN::ML_shift + ML_BSSN::ML_dtlapse + ML_BSSN::ML_dtshift +" + +SphericalSurface::nsurfaces = 1 +SphericalSurface::maxntheta = 39 +SphericalSurface::maxnphi = 76 + +SphericalSurface::ntheta [0] = 39 +SphericalSurface::nphi [0] = 76 +SphericalSurface::nghoststheta[0] = 2 +SphericalSurface::nghostsphi [0] = 2 +#SphericalSurface::radius [0] = 0.5 + +#SetMask_SphericalSurface::SetMask_SurfaceIndex[0] = 0 +#SetMask_SphericalSurface::SetMask_RadiusFactor[0] = 0.75 + + +#----------- +# Evolution: +#----------- + +HydroBase::evolution_method = "GRHydro" + +GRHydro::riemann_solver = "Marquina" +GRHydro::recon_method = "ppm" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "none" +GRHydro::rho_abs_min = 1.0e-13 +Grhydro::initial_rho_abs_min = 1.0e-13 +Grhydro::grhydro_atmo_tolerance = 0.0001 +Grhydro::initial_Gamma = 1.666666666666667 +EOS_Omni::gl_gamma = 1.666666666666667 + + +GRHydro::c2p_reset_pressure = "yes" +#GRHydro::GRHydro_enable_internal_excision = "false" + +GRHydro::GRHydro_eos_type = "General" +GRHydro::GRHydro_eos_table = "Ideal_Fluid" +# +GRHydro::GRHydro_MaxNumSandRVars = 16 +#GRHydro::GRHydro_MaxNumConstrainedVars = 12 +#GRHydro::GRHydro_MaxNumEvolvedVars = 0 +#GRHydro::GRHydro_MaxNumSandRVars = 0 +#GRHydro::GRHydro_MaxNumEvolvedVars = 6 # When 1 tracer is evolved! + +GRHydro::use_evolution_mask = "yes" + +ADMBase::evolution_method = "ML_BSSN" +ADMBase::lapse_evolution_method = "ML_BSSN" +ADMBase::shift_evolution_method = "ML_BSSN" +ADMBase::dtlapse_evolution_method= "ML_BSSN" +ADMBase::dtshift_evolution_method= "ML_BSSN" + +ML_BSSN::timelevels = 3 + +#ML_BSSN::conformalMethod = 1 # 1 for W, 0 for phi + +ML_BSSN::harmonicN = 1 # 1+log +ML_BSSN::harmonicF = 2.0 # 1+log +ML_BSSN::ShiftGammaCoeff = 0.75 +ML_BSSN::BetaDriver = 1.0 +ML_BSSN::LapseAdvectionCoeff = 1.0 +ML_BSSN::ShiftAdvectionCoeff = 1.0 + +ML_BSSN::MinimumLapse = 1.0e-8 + +ML_BSSN::my_initial_boundary_condition = "extrapolate-gammas" +ML_BSSN::my_rhs_boundary_condition = "NewRad" +Boundary::radpower = 2 + +ML_BSSN::ML_log_confac_bound = "none" +ML_BSSN::ML_metric_bound = "none" +ML_BSSN::ML_Gamma_bound = "none" +ML_BSSN::ML_trace_curv_bound = "none" +ML_BSSN::ML_curv_bound = "none" +ML_BSSN::ML_lapse_bound = "none" +ML_BSSN::ML_dtlapse_bound = "none" +ML_BSSN::ML_shift_bound = "none" +ML_BSSN::ML_dtshift_bound = "none" + +#------------------------------------------------------------------------------ +# Analysis: +#------------------------------------------------------------------------------ +AHFinderDirect::find_every = 512 + +#AHFinderDirect::run_at_CCTK_ANALYSIS = "yes" +#AHFinderDirect::run_at_CCTK_POSTSTEP = "no" +#AHFinderDirect::run_at_CCTK_POST_RECOVER_VARIABLES = "no" + +#AHFinderDirect::move_origins = "yes" +#AHFinderDirect::reshape_while_moving = "yes" +#AHFinderDirect::predict_origin_movement = "yes" + +# Hermite to order 3 to avoid discontinuities in the metric spatial derivatives: +AHFinderDirect::geometry_interpolator_name = "Hermite polynomial interpolation" +AHFinderDirect::geometry_interpolator_pars = "order=3" +AHFinderDirect::surface_interpolator_name = "Hermite polynomial interpolation" +AHFinderDirect::surface_interpolator_pars = "order=3" +#AHFinderDirect::geometry_interpolator_name = "Lagrange polynomial interpolation" +#AHFinderDirect::geometry_interpolator_pars = "order=4" +#AHFinderDirect::surface_interpolator_name = "Lagrange polynomial interpolation" +#AHFinderDirect::surface_interpolator_pars = "order=4" + +AHFinderDirect::output_h_every = 0 + +AHFinderDirect::N_horizons = 1 + +AHFinderDirect::reset_horizon_after_not_finding [1] = "no" +AHFinderDirect::initial_guess__coord_sphere__radius [1] = 0.45 +AHFinderDirect::origin_x [1] = 0.0 +AHFinderDirect::origin_y [1] = 0.0 +AHFinderDirect::origin_z [1] = 0.0 +AHFinderDirect::initial_guess__coord_sphere__x_center[1] = 0.0 +AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.0 +AHFinderDirect::initial_guess__coord_sphere__z_center[1] = 0.0 +#AHFinderDirect::track_origin_from_grid_scalar [1] = "yes" +#AHFinderDirect::track_origin_source_x [1] = "PunctureTracker::pt_loc_x[0]" +#AHFinderDirect::track_origin_source_y [1] = "PunctureTracker::pt_loc_y[0]" +#AHFinderDirect::track_origin_source_z [1] = "PunctureTracker::pt_loc_z[0]" +AHFinderDirect::which_surface_to_store_info [1] = 0 + + +#Hydro_Analysis::Hydro_Analysis_comp_rho_max = "true" + +#PunctureTracker::track [0] = "yes" +#PunctureTracker::initial_x [0] = 10.64502257 +#PunctureTracker::initial_y [0] = 0 +#PunctureTracker::initial_z [0] = 0 +#PunctureTracker::which_surface_to_store_info[0] = 0 + +#QuasiLocalMeasures::num_surfaces = 1 +#QuasiLocalMeasures::spatial_order = 4 +#QuasiLocalMeasures::interpolator = "Lagrange polynomial interpolation" +#QuasiLocalMeasures::interpolator_options = "order=4" +#QuasiLocalMeasures::surface_index [0] = 0 + +#Multipole::nradii = 4 +#Multipole::radius[0] = 80 +#Multipole::radius[1] = 100 +#Multipole::radius[2] = 120 +#Multipole::radius[3] = 140 +#Multipole::ntheta = 120 +#Multipole::nphi = 240 +#Multipole::variables = "WeylScal4::Psi4r{sw=-2 cmplx='WeylScal4::Psi4i' name='psi4'}" +#Multipole::out_every = 4 +#Multipole::l_max = 4 +#Multipole::integration_method = "Simpson" + +#WeylScal4::fd_order = "4th" + +#------------------------------------------------------------------------------ +# Output: +#------------------------------------------------------------------------------ + +IO::out_dir = $parfile +IO::out_fileinfo = "none" + +IOBasic::outInfo_every = 1 +IOBasic::outInfo_reductions = "maximum" +IOBasic::outInfo_vars = " + Carpet::physical_time_per_hour + HydroBase::rho + HydroBase::eps + ML_ADMConstraints::ML_Ham +" + +IOScalar::outScalar_every = 64 +IOScalar::one_file_per_group = "yes" +IOScalar::outScalar_reductions = "minimum maximum average norm1 norm2" +IOScalar::outScalar_vars = " + ADMBase::curv + ADMBase::lapse + ADMBase::metric + ADMBase::shift + GRHydro::dens + HydroBase::rho + HydroBase::vel + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom + ML_BSSN::ML_Ham + ML_BSSN::ML_mom +" + +IOASCII::one_file_per_group = "yes" +#IOASCII::output_symmetry_points = "no" +#IOASCII::output_ghost_points = "no" #hg version only! +#IOASCII::output_boundary_points = "no" #hg version only! +#IOASCII::out3D_ghosts = "no" #hg (DEPRECATED) +#IOASCII::out3D_outer_ghosts = "no" #hg (DEPRECATED) + +IOASCII::out0D_every = 256 +IOASCII::out0D_vars = " + Carpet::timing +" + +#Set these IOASCII options for initial data only: +IOASCII::out1D_every = 640 +IOASCII::out1D_d = "no" +IOASCII::out1D_vars = " + ADMBase::curv + ADMBase::lapse + ADMBase::metric + ADMBase::shift + GRHydro::dens + GRHydro::scon + GRHydro::tau + HydroBase::rho + HydroBase::vel + HydroBase::eps + ML_BSSN::ML_Ham + ML_BSSN::ML_mom + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom +" + +#CarpetIOASCII::one_file_per_group = "yes" +#CarpetIOASCII::open_one_input_file_at_a_time = "yes" +#CarpetIOASCII::out2D_every = 256 +#CarpetIOASCII::out2D_xy = "yes" +#CarpetIOASCII::out2D_xz = "no" +#CarpetIOASCII::out2D_yz = "no" +#CarpetIOASCII::out2D_xyplane_z = 0.0 +#CarpetIOASCII::out2D_vars = " +# CarpetReduce::weight +# GRHydro::GRHydro_tracers +# Grid::coordinates +# HydroBase::eps +# HydroBase::press +# HydroBase::rho +# HydroBase::vel +# HydroBase::w_lorentz +# ADMBase::curv +# ADMBase::lapse +# ADMBase::metric +# ADMBase::shift +# ML_ADMConstraints::ML_Ham +# ML_ADMConstraints::ML_Mom +# WeylScal4::Psi4i +# WeylScal4::Psi4r +# " + +IOHDF5::one_file_per_group = "yes" +IOHDF5::open_one_input_file_at_a_time = "yes" +IOHDF5::output_boundary_points = "yes" +IOHDF5::output_buffer_points = "yes" +IOHDF5::output_ghost_points = "yes" +IOHDF5::output_symmetry_points = "yes" + +IOHDF5::out2D_every = 64 +IOHDF5::out2D_vars = " + HydroBase::rho + HydroBase::vel + HydroBase::eps + GRHydro::dens + GRHydro::scon + ADMBase::curv + ADMBase::lapse + ADMBase::metric + ADMBase::shift + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_mom +" + +IOHDF5::out3D_every = 64 +IOHDF5::out3D_vars = " + ADMBase::curv + ADMBase::lapse + ADMBase::metric + ADMBase::shift + CarpetReduce::weight + GRHydro::GRHydro_atmosphere_mask + GRHydro::GRHydro_atmosphere_mask_real + GRHydro::dens + GRHydro::scon + GRHydro::tau + Grid::coordinates + HydroBase::eps + HydroBase::press + HydroBase::rho + HydroBase::vel + HydroBase::w_lorentz + ML_ADMConstraints::ML_Ham + ML_ADMConstraints::ML_Mom +# TwoPunctures::puncture_u +" + +#------------------------------------------------------------------------------ +# Checkpoint/Recovery: +#------------------------------------------------------------------------------ +IOHDF5::checkpoint = "yes" +#IO::checkpoint_dir = $parfile +IO::checkpoint_dir = "./bondi_sp_checkpoints" +IO::checkpoint_ID = "yes" +IO::checkpoint_every = 6144 +#IO::checkpoint_every_walltime_hours = 6.0 +IO::checkpoint_keep=3 +IO::checkpoint_on_terminate = "yes" + +IO::recover = "autoprobe" +#IO::recover_dir = $parfile +IO::recover_dir = "./bondi_sp_checkpoints" + +

1 0

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

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_AdvectedLoopM.F90, GRHydro_AlfvenWaveM.F90, GRHydro_Bondi.c, GRHydro_Bondi_new.F90 Log: Get rid of (some) tab characters * There are still a lot of committed tab characters in the code. I will try to slowly clean that up. Meanwhile, please teach your text editor to transform tab characters into equivalent blank spaces before saving file to disk. This avoids code looking unformatted to other users due to different personal or default text editor settings for tab characters.. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> Directory Changes: Directory: /svn:executable/ =========================== - * File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_AdvectedLoopM.F90 Delta lines: +10 -10 =================================================================== --- trunk/src/GRHydro_AdvectedLoopM.F90 2012-09-17 16:27:29 UTC (rev 167) +++ trunk/src/GRHydro_AdvectedLoopM.F90 2012-09-17 16:27:32 UTC (rev 168) @@ -83,7 +83,7 @@ rhoval = 1.0d0 pressval = 3.0d0 - if (CCTK_EQUALS(advectedloop_type,"2D")) then + if (CCTK_EQUALS(advectedloop_type,"2D")) then !!$ Vx, Vy and Vz values: @@ -105,7 +105,7 @@ call CCTK_WARN(0,"V^z component case not recognized!") end if - else if (CCTK_EQUALS(advectedloop_type,"3D")) then + else if (CCTK_EQUALS(advectedloop_type,"3D")) then vxval=0.2d0*sqrt(2.0d0) vyval=0.2d0 @@ -149,7 +149,7 @@ do i=1,nx do j=1,ny do k=1,nz - + rho(i,j,k)=rhoval press(i,j,k)=pressval eps(i,j,k)=press(i,j,k)/(gam-1.0d0)/rho(i,j,k) @@ -210,16 +210,16 @@ !!$ need to make x_d periodic! - if(x_d.gt.1.5*diaglength) then - x_d=x_d-2.0*diaglength + if(x_d.gt.1.5*diaglength) then + x_d=x_d-2.0*diaglength else if (x_d.gt.0.5*diaglength .and. x_d.lt.1.5*diaglength) then - x_d=x_d-diaglength - else if(x_d.lt.-1.5*diaglength) then - x_d=x_d+2.0*diaglength + x_d=x_d-diaglength + else if(x_d.lt.-1.5*diaglength) then + x_d=x_d+2.0*diaglength else if (x_d.lt.(-0.5*diaglength) .and. x_d.gt.(-1.5*diaglength)) then - x_d=x_d+diaglength + x_d=x_d+diaglength endif - + radius = sqrt(x_d**2+y_d**2) if (CCTK_EQUALS(advectedloop_delA,"Exact")) then File [modified]: GRHydro_AlfvenWaveM.F90 Delta lines: +8 -8 =================================================================== --- trunk/src/GRHydro_AlfvenWaveM.F90 2012-09-17 16:27:29 UTC (rev 167) +++ trunk/src/GRHydro_AlfvenWaveM.F90 2012-09-17 16:27:32 UTC (rev 168) @@ -125,13 +125,13 @@ do j=1,ny do k=1,nz - rho(i,j,k)=rhoval + rho(i,j,k)=rhoval press(i,j,k)=pressval eps(i,j,k)=epsval if (CCTK_EQUALS(alfvenwave_type,"1D")) then - wnbr = 2.0d0*pi/range_x + wnbr = 2.0d0*pi/range_x velx(i,j,k)=vxval vely(i,j,k)=-valf*AA*cos(wnbr*x(i,j,k)) @@ -142,22 +142,22 @@ else if (CCTK_EQUALS(alfvenwave_type,"2D")) then - diaglength=range_x*range_y/range_d + diaglength=range_x*range_y/range_d range_d = sqrt(range_x**2+range_y**2) cos_theta = range_y/range_d sin_theta = range_x/range_d wnbr = 2.0d0*pi/diaglength - xnew = cos_theta*x(i,j,k)+sin_theta*y(i,j,k) + xnew = cos_theta*x(i,j,k)+sin_theta*y(i,j,k) - vparallel=vxval - vperp=-valf*AA*cos(wnbr*xnew) - velx(i,j,k)=vparallel*cos_theta-vperp*sin_theta + vparallel=vxval + vperp=-valf*AA*cos(wnbr*xnew) + velx(i,j,k)=vparallel*cos_theta-vperp*sin_theta vely(i,j,k)=vparallel*sin_theta+vperp*cos_theta velz(i,j,k)=-valf*AA*sin(wnbr*xnew) Bparallel=Bxval Bperp=AA*Bxval*cos(wnbr*xnew) - Bvecx(i,j,k)=Bparallel*cos_theta-Bperp*sin_theta + Bvecx(i,j,k)=Bparallel*cos_theta-Bperp*sin_theta Bvecy(i,j,k)=Bparallel*sin_theta+Bperp*cos_theta Bvecz(i,j,k)=AA*Bxval*sin(wnbr*xnew) File [modified]: GRHydro_Bondi.c Delta lines: +19 -19 =================================================================== --- trunk/src/GRHydro_Bondi.c 2012-09-17 16:27:29 UTC (rev 167) +++ trunk/src/GRHydro_Bondi.c 2012-09-17 16:27:32 UTC (rev 168) @@ -350,7 +350,7 @@ + gcov[2][2] * vcon[2] * vcon[2] + gcov[3][3] * vcon[3] * vcon[3] + 2.*( gcov[1][2] * vcon[1] * vcon[2] - + gcov[1][3] * vcon[1] * vcon[3] + + gcov[1][3] * vcon[1] * vcon[3] + gcov[2][3] * vcon[2] * vcon[3] ); c += 1. ; /* vector is timelike */ @@ -385,7 +385,7 @@ r2 = r*r ; DD = 1. - 2.*M/r + asq/r2 ; mu = 1. + asq*cth*cth/r2 ; - + gcov[TT][TT] = -(1. - 2.*M/(r*mu)) ; gcov[TT][3] = -2.*M*a*s2/(r*mu) ; gcov[3][TT] = gcov[TT][3] ; @@ -456,17 +456,17 @@ #if( LTRACE ) CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"\n#######################################################\n"); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"Bondi Solution Parameters1: \n"); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"------------------------- \n\n"); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"M = %28.20e Mdot = %28.20e rs = %28.20e \n",M,Mdot,rs); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"vs = %28.20e cs = %28.20e rhos = %28.20e \n",vs,cs,rhos); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"hs = %28.20e K = %28.20e Qdot = %28.20e \n",hs,K,Qdot); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"gam= %28.20e r_sol= %28.20e \n",gamma_eos, r_sol); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"rs = : %28.20e \n", rs) ; - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"urs = : %28.20e \n", vs) ; - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"rhos = : %28.20e \n", rhos) ; - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"K = : %28.20e \n", K) ; - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"#######################################################\n\n"); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"Bondi Solution Parameters1: \n"); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"------------------------- \n\n"); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"M = %28.20e Mdot = %28.20e rs = %28.20e \n",M,Mdot,rs); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"vs = %28.20e cs = %28.20e rhos = %28.20e \n",vs,cs,rhos); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"hs = %28.20e K = %28.20e Qdot = %28.20e \n",hs,K,Qdot); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"gam= %28.20e r_sol= %28.20e \n",gamma_eos, r_sol); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"rs = : %28.20e \n", rs) ; + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"urs = : %28.20e \n", vs) ; + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"rhos = : %28.20e \n", rhos) ; + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"K = : %28.20e \n", K) ; + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"#######################################################\n\n"); #endif return; @@ -495,9 +495,9 @@ *****************************************************************/ static int gnr_bondi( CCTK_REAL x[], int n, - void (*funcd) (CCTK_REAL [], CCTK_REAL [], CCTK_REAL [], - CCTK_REAL [][NEWT_DIM_B], CCTK_REAL *, - CCTK_REAL *, int) ) + void (*funcd) (CCTK_REAL [], CCTK_REAL [], CCTK_REAL [], + CCTK_REAL [][NEWT_DIM_B], CCTK_REAL *, + CCTK_REAL *, int) ) { CCTK_REAL f, df, dx[NEWT_DIM_B], x_old[NEWT_DIM_B], resid[NEWT_DIM_B], jac[NEWT_DIM_B][NEWT_DIM_B]; @@ -560,7 +560,7 @@ if( doing_extra == 1 ) i_extra++ ; if( ((fabs(errx) <= NEWT_TOL_B)&&(doing_extra == 0)) || - (i_extra > EXTRA_NEWT_ITER_B) || (n_iter >= (MAX_NEWT_ITER_B-1)) ) { + (i_extra > EXTRA_NEWT_ITER_B) || (n_iter >= (MAX_NEWT_ITER_B-1)) ) { keep_iterating = 0; } @@ -704,8 +704,8 @@ retval = gnr_bondi( rho, NEWT_DIM_B, bondi_resid); if( retval ) { - CCTK_VWarn(CCTK_WARN_ALERT, __LINE__, __FILE__, CCTK_THORNSTRING,"find_bondi_solution: Incr. guess failed, decrease dfactor, retval = %d, r = %g, itry = %d \n", retval, r, itry); - return(10); + CCTK_VWarn(CCTK_WARN_ALERT, __LINE__, __FILE__, CCTK_THORNSTRING,"find_bondi_solution: Incr. guess failed, decrease dfactor, retval = %d, r = %g, itry = %d \n", retval, r, itry); + return(10); } } File [modified]: GRHydro_Bondi_new.F90 Delta lines: +0 -0 =================================================================== Property changes on: trunk/src/GRHydro_Bondi_new.F90 ___________________________________________________________________ Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2012-09-17 16:27:29 UTC (rev 167) +++ trunk/interface.ccl 2012-09-17 16:27:32 UTC (rev 168) @@ -151,7 +151,7 @@ void FUNCTION Con2PrimPolyM(CCTK_INT INOUT handle, CCTK_REAL INOUT gamma_eos, CCTK_REAL INOUT dens, \ CCTK_REAL INOUT sx, CCTK_REAL INOUT sy, CCTK_REAL INOUT sz, \ CCTK_REAL INOUT sc, CCTK_REAL INOUT Bconsx, CCTK_REAL INOUT Bconsy, CCTK_REAL INOUT Bconsz, \ - CCTK_REAL INOUT rho, \ + CCTK_REAL INOUT rho, \ CCTK_REAL INOUT velx, CCTK_REAL INOUT vely, CCTK_REAL INOUT velz, \ CCTK_REAL INOUT epsilon, CCTK_REAL INOUT pressure, \ CCTK_REAL INOUT Bvecx, CCTK_REAL INOUT Bvecy, CCTK_REAL INOUT Bvecz, \ File [modified]: param.ccl Delta lines: +33 -33 =================================================================== --- trunk/param.ccl 2012-09-17 16:27:29 UTC (rev 167) +++ trunk/param.ccl 2012-09-17 16:27:32 UTC (rev 168) @@ -10,9 +10,9 @@ EXTENDS KEYWORD initial_hydro "" { - "shocktube" :: "Shocktube type" - "shocktube_hot" :: "Shocktube with hot nuclear EOS" - "only_atmo" :: "Set only a low atmosphere" + "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)" "monopole" :: "Monopole at the center" @@ -28,38 +28,38 @@ EXTENDS KEYWORD initial_Bvec { - "shocktube" :: "Shocktube type" + "shocktube" :: "Shocktube type" "poloidalmagfield" :: "Poloidal Magnetic Field" } shares:ADMBase EXTENDS KEYWORD initial_data "" { -# "shocktube" :: "Shock tube initial data for GRHydro" - "con2primtest" :: "Testing the con -> prim conversion" - "con2prim2con_test" :: "Testing the con -> prim -> con conversion" - "prim2con2prim_test" :: "Testing the prim -> con -> prim conversion" - "prim2con2prim_polytype_test" :: "Testing the prim -> con -> prim conversion - polytype version" - "reconstruction_test" :: "Testing reconstruction" +# "shocktube" :: "Shock tube initial data for GRHydro" + "con2primtest" :: "Testing the con -> prim conversion" + "con2prim2con_test" :: "Testing the con -> prim -> con conversion" + "prim2con2prim_test" :: "Testing the prim -> con -> prim conversion" + "prim2con2prim_polytype_test" :: "Testing the prim -> con -> prim conversion - polytype version" + "reconstruction_test" :: "Testing reconstruction" } private: KEYWORD shocktube_type "Diagonal or parallel shock?" { - "diagshock" :: "Diagonal across all axes" - "diagshock2d" :: "Diagonal across x-y axes" - "xshock" :: "Parallel to x axis" - "yshock" :: "Parallel to y axis" - "zshock" :: "Parallel to z axis" + "diagshock" :: "Diagonal across all axes" + "diagshock2d" :: "Diagonal across x-y axes" + "xshock" :: "Parallel to x axis" + "yshock" :: "Parallel to y axis" + "zshock" :: "Parallel to z axis" "sphere" :: "spherically symmetric shock" } "xshock" KEYWORD shock_case "Simple, Sod's problem or other?" { - "Simple" :: "GRAstro_Hydro test case" - "Sod" :: "Sod's problem" - "Blast" :: "Strong blast wave" + "Simple" :: "GRAstro_Hydro test case" + "Sod" :: "Sod's problem" + "Blast" :: "Strong blast wave" "Balsaralike1" :: "Hydro version of Balsara Test #1" "Balsara0" :: "Balsara Test #1, but unmagnetized" "Balsara1" :: "Balsara Test #1" @@ -81,17 +81,17 @@ REAL shock_xpos "Position of shock plane: x" { - *:* :: "Anything" + *:* :: "Anything" } 0.0 REAL shock_ypos "Position of shock plane: y" { - *:* :: "Anything" + *:* :: "Anything" } 0.0 REAL shock_zpos "Position of shock plane: z" { - *:* :: "Anything" + *:* :: "Anything" } 0.0 REAL shock_radius "Radius of sperical shock" @@ -173,20 +173,20 @@ KEYWORD advectedloop_type "2-dimensional or 3-dimensional?" { - "2D" :: "2-dimensional (B^z=0)" - "3D" :: "3-dimensional (B^3=0, where B^3 || oblique cylinder axis." + "2D" :: "2-dimensional (B^z=0)" + "3D" :: "3-dimensional (B^3=0, where B^3 || oblique cylinder axis." } "2D" KEYWORD advectedloop_case "V^z=0 or not?" { - "V^z=0" :: "Useful to evaluate divB deviations" - "V^z/=0" :: "Useful to evaluate con2prim robustness in keeping V^z const." + "V^z=0" :: "Useful to evaluate divB deviations" + "V^z/=0" :: "Useful to evaluate con2prim robustness in keeping V^z const." } "V^z=0" KEYWORD advectedloop_delA "How to calculate B^i field from the potential A^b" { - "Exact" :: "Analytic, exact closed formula applied" - "Numeric" :: "Finite difference approximation of the derivatives applied" + "Exact" :: "Analytic, exact closed formula applied" + "Numeric" :: "Finite difference approximation of the derivatives applied" } "Exact" #################################3 @@ -194,8 +194,8 @@ ################################3 KEYWORD alfvenwave_type "1-dimensional or 2-dimensional?" { - "1D" :: "1-dimensional" - "2D" :: "2-dimensional (in x-y plane)" + "1D" :: "1-dimensional" + "2D" :: "2-dimensional (in x-y plane)" } "1D" CCTK_REAL alfvenwave_pressure "P_gas for the Alfven wave" @@ -279,22 +279,22 @@ CCTK_REAL poloidal_A_b "Vector potential strength" { - *:* :: "Anything." + *:* :: "Anything." } 0.1 CCTK_INT poloidal_n_p "Vector potential strength" { - (0:* :: "Any positive integer." + (0:* :: "Any positive integer." } 3 CCTK_REAL poloidal_P_cut "Pressure used to confine the B field inside a star" { - (0:* :: "Anything positive." + (0:* :: "Anything positive." } 1.0e-8 CCTK_REAL poloidal_rho_max "Maximum initial density" { - (0:* :: "Anything positive." + (0:* :: "Anything positive." } 1.0e-3 # for the Magnetic Rotor test: Property changes on: trunk/param.ccl ___________________________________________________________________ File [modified]: schedule.ccl Delta lines: +5 -5 =================================================================== --- trunk/schedule.ccl 2012-09-17 16:27:29 UTC (rev 167) +++ trunk/schedule.ccl 2012-09-17 16:27:32 UTC (rev 168) @@ -53,13 +53,13 @@ if(clean_divergence){ schedule GRHydro_Diagshock_BoundaryM IN ApplyBCs AFTER BoundaryConditions AFTER Boundary::Boundary_ClearSelection { - LANG: Fortran + LANG: Fortran SYNC: GRHydro::dens, GRHydro::tau, GRHydro::scon, GRHydro::Bcons, GRHydro::psidc } "Diagonal shock boundary conditions" } else { schedule GRHydro_Diagshock_BoundaryM IN ApplyBCs AFTER BoundaryConditions AFTER Boundary::Boundary_ClearSelection { - LANG: Fortran + LANG: Fortran SYNC: GRHydro::dens, GRHydro::tau, GRHydro::scon, GRHydro::Bcons } "Diagonal shock boundary conditions" } @@ -69,7 +69,7 @@ { schedule GRHydro_Diagshock2D_BoundaryM IN ApplyBCs AFTER BoundaryConditions AFTER Boundary::Boundary_ClearSelection { - LANG: Fortran + LANG: Fortran } "2-D Diagonal shock boundary conditions" } @@ -78,13 +78,13 @@ # if(clean_divergence){ # schedule GRHydro_Diagshock2D_BoundaryM IN ApplyBCs AFTER BoundaryConditions AFTER Boundary::Boundary_ClearSelection # { -# LANG: Fortran +# LANG: Fortran # SYNC: GRHydro::dens, GRHydro::tau, GRHydro::scon, GRHydro::Bcons, GRHydro::psidc # } "2-D Diagonal shock boundary conditions" # } else { # schedule GRHydro_Diagshock2D_BoundaryM IN ApplyBCs AFTER BoundaryConditions AFTER Boundary::Boundary_ClearSelection # { -# LANG: Fortran +# LANG: Fortran # SYNC: GRHydro::dens, GRHydro::tau, GRHydro::scon, GRHydro::Bcons # } "2-D Diagonal shock boundary conditions" # }

1 0

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

17 Sep '12

User: rhaas Date: 2012/09/17 11:27 AM Modified: /trunk/src/ GRHydro_Bondi_new.F90 Log: GRHydro_InitData: pump up the number of 1d grid points for bondi solution. From: Bruno Coutinho Mundim <bcmsma(a)astro.rit.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Bondi_new.F90 Delta lines: +4 -4 =================================================================== --- trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:27 UTC (rev 166) +++ trunk/src/GRHydro_Bondi_new.F90 2012-09-17 16:27:29 UTC (rev 167) @@ -52,7 +52,7 @@ CCTK_INT :: i, j, k, nx, ny, nz, imin, jb,N_points CCTK_REAL :: ONEmTINY, tiny - PARAMETER (N_points=2000,ONEmTINY=0.999999d0,tiny=1.0d-12) + PARAMETER (N_points=100000,ONEmTINY=0.999999d0,tiny=1.0d-12) CCTK_REAL :: M, Msq, Mdot, rs, gam, rmin_bondi, rmax_bondi, cs_sq,cs,vs_sq,vs,rhos,gtemp,hs, Kval, Qdot CCTK_REAL :: logrmin,dlogr,rhotmp,utmp,vtmp,rspher CCTK_REAL :: r_bondi(N_points), logr_bondi(N_points), rho_bondi(N_points), u_bondi(N_points), v_bondi(N_points) @@ -230,9 +230,9 @@ eps(i,j,k),press(i,j,k),w_lorentz(i,j,k)) ! if(riso.gt.1.014d0.and.riso.lt.1.015) then - if(z(i,j,k).ge.-2.0d-1.and.z(i,j,k).le.2.0d-1.and. & - x(i,j,k).ge.6.8d0.and.x(i,j,k).le.7.0d0.and. & - y(i,j,k).ge.1.2d0.and.y(i,j,k).le.1.4d0 ) then + if(z(i,j,k).ge.-1.0d0.and.z(i,j,k).le.1.0d0.and. & + x(i,j,k).ge.6.5d0.and.x(i,j,k).le.7.5d0.and. & + y(i,j,k).ge.1.0d0.and.y(i,j,k).le.1.5d0 ) then write(debug_message,'(a,15f22.14)') 'Point to check:', & x(i,j,k),y(i,j,k),z(i,j,k),riso,gxx(i,j,k),dens(i,j,k),& tau(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),rho(i,j,k),eps(i,j,k),&

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits