Commits August 2013

commits@lists.einsteintoolkit.org

4 participants
46 discussions

[svn:einsteintoolkit] GRHydro/trunk/par/ (Rev. 570)
by rhaas＠tapir.caltech.edu 13 Aug '13

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Added: /trunk/par/ TOVstar_simple16d-mag.par Log: GRHydro: Adding parfile for vector potential TOV. From: Philipp Moesta <pmoesta(a)tapir.caltech.edu> File Changes: Directory: /trunk/par/ ====================== File [added]: TOVstar_simple16d-mag.par Delta lines: +305 -0 =================================================================== --- trunk/par/TOVstar_simple16d-mag.par (rev 0) +++ trunk/par/TOVstar_simple16d-mag.par 2013-08-13 14:56:16 UTC (rev 570) @@ -0,0 +1,305 @@ +## mclachlan tov_static +ActiveThorns = "Time MoL" +ActiveThorns = "Coordbase CartGrid3d Boundary StaticConformal" +ActiveThorns = "SymBase ADMBase TmunuBase HydroBase InitBase ADMCoupling ADMMacros" +ActiveThorns = "IOUtil" +ActiveThorns = "Formaline" +ActiveThorns = "SpaceMask CoordGauge Constants LocalReduce aeilocalinterp LoopControl" +ActiveThorns = "Carpet CarpetLib CarpetReduce CarpetRegrid2 CarpetInterp" +ActiveThorns = "CarpetIOASCII CarpetIOScalar CarpetIOHDF5 CarpetIOBasic" + +# grid parameters +CartGrid3D::type = "coordbase" +CartGrid3D::domain = "full" +CartGrid3D::avoid_origin = "no" +CoordBase::domainsize = "minmax" +CoordBase::xmin = 0.0 +CoordBase::ymin = 0.0 +CoordBase::zmin = 0.0 +CoordBase::xmax = 320.0 +CoordBase::ymax = 320.0 +CoordBase::zmax = 320.0 +CoordBase::dx = 8 +CoordBase::dy = 8 +CoordBase::dz = 8 + +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 + +ActiveThorns = "Slab ReflectionSymmetry" +ActiveThorns = "RotatingSymmetry90" + +CarpetRegrid2::ensure_proper_nesting = yes +CarpetRegrid2::symmetry_rotating90 = "yes" + +ReflectionSymmetry::reflection_x = "no" +ReflectionSymmetry::reflection_y = "no" +ReflectionSymmetry::reflection_z = "yes" +ReflectionSymmetry::avoid_origin_x = "no" +ReflectionSymmetry::avoid_origin_y = "no" +ReflectionSymmetry::avoid_origin_z = "no" + +TmunuBase::stress_energy_storage = yes +TmunuBase::stress_energy_at_RHS = yes +TmunuBase::timelevels = 1 +TmunuBase::prolongation_type = none + +HydroBase::timelevels = 3 + +ADMMacros::spatial_order = 4 + +ADMBase::metric_type = "physical" + +SpaceMask::use_mask = "yes" + +Cactus::terminate = "time" +Cactus::cctk_final_time = 1400 + +Carpet::domain_from_coordbase = "yes" +Carpet::enable_all_storage = no +Carpet::use_buffer_zones = "yes" +Carpet::use_overlap_zones = "yes" + +Carpet::poison_new_timelevels = "yes" +Carpet::check_for_poison = "no" + +Carpet::init_3_timelevels = no +Carpet::init_fill_timelevels = "yes" + +CarpetLib::poison_new_memory = "yes" +CarpetLib::poison_value = 114 + +# system specific Carpet paramters +Carpet::max_refinement_levels = 10 +driver::ghost_size = 3 +Carpet::prolongation_order_space = 5 +Carpet::prolongation_order_time = 2 + +CarpetRegrid2::regrid_every = 0 +CarpetRegrid2::num_centres = 1 + +CarpetRegrid2::num_levels_1 = 5 +CarpetRegrid2::radius_1[1] =120.0 +CarpetRegrid2::radius_1[2] = 60.0 +CarpetRegrid2::radius_1[3] = 30.0 +CarpetRegrid2::radius_1[4] = 15.0 + + +time::dtfac = 0.25 +MoL::ODE_Method = "rk4" +MoL::MoL_Intermediate_Steps = 4 +MoL::MoL_Num_Scratch_Levels = 1 + +# check all physical variables for NaNs +ActiveThorns = "NaNChecker" +NaNChecker::check_every = 1 +NaNChecker::action_if_found = "terminate" #"terminate", "just warn", "abort" +NaNChecker::check_vars = "ADMBase::metric ADMBase::lapse ADMBase::shift HydroBase::rho HydroBase::eps HydroBase::press HydroBase::vel HydroBase::Bvec" + +## Lapse Condition: \partial_t alpha = - alpha K +## Shift Condition: \partial_t beta^i = 0 + +# Hydro paramters +ActiveThorns = "EOS_Omni" +ActiveThorns = "GRHydro GRHydro_InitData" + + +HydroBase::evolution_method = "GRHydro" +HydroBase::Bvec_evolution_method = "GRHydro_Avec" + +GRHydro::method_type = "RSA FV" +GRHydro::riemann_solver = "HLLE" +#GRHydro::GRHydro_eos_type = "Polytype" +#GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::recon_method = "ppm" +GRHydro::recon_vars = "primitive" +GRHydro::GRHydro_stencil = 3 +#GRHydro::bound = "none" +GRHydro::bound = "flat" +GRHydro::rho_abs_min = 1.e-10 +#GRHydro::GRHydro = 18 # Tmunu(10), rho,press,eps,w_lorentz,vel, tau +#GRHydro::GRHydro = 10 # gij(6), alpha, beta(3) + +GRHydro::GRHydro_eos_type = "General" +GRHydro::GRHydro_eos_table = "Ideal_Fluid" + +GRHydro::Grhydro_MaxNumConstrainedVars = 33 +GRHydro::GRHydro_MaxNumEvolvedVars = 10 + +#GRHydro::clean_divergence = "yes" +#GRHydro::transport_constraints = "yes" +#GRHydro::kap_dc = 1.0 +GRHydro::track_divB = "yes" +GRHydro::calculate_bcom = "yes" + +GRHydro::c2p_reset_pressure = "yes" +#GRHydro::GRHydro_atmo_tolerance = 1 + +grhydro::grhydro_c2p_warnlevel = 0 +grhydro::grhydro_c2p_warn_from_reflevel = 2 +grhydro::con2prim_oct_hack = yes + +ActiveThorns = "GenericFD NewRad" +ActiveThorns = "ML_BSSN ML_BSSN_Helper" +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" + +TmunuBase::support_old_CalcTmunu_mechanism = "no" + +ML_BSSN::timelevels = 3 + +ML_BSSN::harmonicN = 1 # 1+log +ML_BSSN::harmonicF = 1.0 # 1+log +ML_BSSN::LapseACoeff = 1.0 +ML_BSSN::ShiftBCoeff = 1.0 +ML_BSSN::ShiftGammaCoeff = 0.0 +ML_BSSN::AlphaDriver = 0.0 +ML_BSSN::BetaDriver = 0.0 +ML_BSSN::LapseAdvectionCoeff = 0.0 +ML_BSSN::ShiftAdvectionCoeff = 0.0 + +ML_BSSN::MinimumLapse = 1.0e-8 + +ML_BSSN::my_initial_boundary_condition = "extrapolate-gammas" +ML_BSSN::my_rhs_boundary_condition = "NewRad" + +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" + +ActiveThorns = "SphericalSurface Dissipation" + +SphericalSurface::nsurfaces = 2 +SphericalSurface::maxntheta = 39 +SphericalSurface::maxnphi = 76 + +SphericalSurface::ntheta [0] = 39 +SphericalSurface::nphi [0] = 76 +SphericalSurface::nghoststheta[0] = 2 +SphericalSurface::nghostsphi [0] = 2 + +SphericalSurface::ntheta [1] = 39 +SphericalSurface::nphi [1] = 76 +SphericalSurface::nghoststheta[1] = 2 +SphericalSurface::nghostsphi [1] = 2 + +Dissipation::verbose = "no" +Dissipation::epsdis = 0.1 +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 + HydroBase::Avec +" + + +# init parameters +InitBase::initial_data_setup_method = "init_some_levels" + +ActiveThorns = "TOVSolver" + +ADMBase::initial_data = "tov" +ADMBase::initial_lapse = "tov" +ADMBase::initial_shift = "tov" +ADMBase::initial_dtlapse = "zero" +ADMBase::initial_dtshift = "zero" + +TOVSolver::TOV_Rho_Central[0] = 1.28e-3 +#TOVSolver::TOV_Mass[0] = 1.4 +TOVSolver::TOV_Gamma[0] = 2.0 +TOVSolver::TOV_K[0] = 100 + +HydroBase::initial_hydro = "tov" +HydroBase::initial_Bvec = "poloidalmagfield" +HydroBase::initial_Avec = "poloidalmagfield" +GRHydro::Avec_gauge = "algebraic" +GRHydro_InitData::poloidal_A_b = 0.1 +GRHydro_InitData::poloidal_n_p = 1 +GRHydro_InitData::poloidal_P_cut = 1.0e-6 +GRHydro_InitData::poloidal_rho_max = 1.221209344680609e-03 + +EOS_Omni::poly_K = 1.019575500488281e+02 +EOS_Omni::poly_gamma = 2.0 +EOS_Omni::gl_K = 1.019575500488281e+02 +EOS_Omni::gl_gamma = 2.0 +GRHydro::initial_Gamma = 2.0 + +# I/O + +IO::out_dir = $parfile + +IOBasic::outInfo_every = 8 +IOBasic::outInfo_vars = "Carpet::physical_time_per_hour HydroBase::rho ML_BSSN::ML_Ham HydroBase::bvec GRHydro::divb" + +IOScalar::outScalar_every = 8 +IOScalar::one_file_per_group = yes +IOScalar::outScalar_vars = " + HydroBase::rho + HydroBase::press + HydroBase::eps + HydroBase::vel + ADMBase::lapse + ADMBase::metric + ADMBase::curv + ML_BSSN::ML_Ham + ML_BSSN::ML_mom + GRHydro::dens +" + +IOASCII::out1D_every = 64 +IOASCII::one_file_per_group = yes +IOASCII::output_symmetry_points = no +IOASCII::out3D_ghosts = no +IOASCII::out3D_outer_ghosts = no +IOASCII::out1D_vars = " + HydroBase::rho + HydroBase::press + HydroBase::eps + HydroBase::vel + HydroBase::Bvec + ADMBase::lapse + ADMBase::metric + ADMBase::curv + ML_BSSN::ML_Ham + ML_BSSN::ML_mom + GRHydro::divb + GRHydro::bcons + GRHydro::bcom + GRHydro::bcom0 + GRHydro::bcom_sq +" + +IOHDF5::checkpoint = "yes" +IO::checkpoint_dir = $parfile +IO::checkpoint_ID = "yes" +IO::checkpoint_every = 2048 +#IO::checkpoint_every_walltime_hours = 6.0 +IO::checkpoint_keep = 3 +IO::checkpoint_on_terminate = "yes" + +IO::recover = "no" +IO::recover_dir = $parfile +

1 0

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

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Modified: /trunk/ interface.ccl Log: add interface use OMP version of ESO_Omni_press function From: Christian Ott <cott(a)tapir.caltech.edu> File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +14 -0 =================================================================== --- trunk/interface.ccl 2013-08-13 14:56:11 UTC (rev 568) +++ trunk/interface.ccl 2013-08-13 14:56:13 UTC (rev 569) @@ -258,6 +258,20 @@ USES FUNCTION EOS_Omni_GetHandle +void FUNCTION EOS_Omni_pressOMP(CCTK_INT IN eoskey, \ + CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY rho, \ + CCTK_REAL INOUT ARRAY eps, \ + CCTK_REAL INOUT ARRAY temp, \ + CCTK_REAL IN ARRAY ye, \ + CCTK_REAL OUT ARRAY press, \ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) + +USES FUNCTION EOS_Omni_pressOMP + void FUNCTION EOS_Omni_press(CCTK_INT IN eoskey, \ CCTK_INT IN havetemp, \ CCTK_REAL IN rf_precision, \

1 0

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

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Modified: /trunk/src/ GRHydro_Prim2Con.c Log: GRHydro: avoid allocating large arrays on the stack From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Prim2Con.c Delta lines: +12 -8 =================================================================== --- trunk/src/GRHydro_Prim2Con.c 2013-08-13 14:56:08 UTC (rev 567) +++ trunk/src/GRHydro_Prim2Con.c 2013-08-13 14:56:11 UTC (rev 568) @@ -69,8 +69,9 @@ // EOS calls (now GF-wide) if(!*evolve_temper) { - int n = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; - int keyerr[n]; int anyerr = 0; + int n = cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; + int *keyerr = malloc(sizeof(*keyerr)*n); + int anyerr = 0; int keytemp = 0; // don't need special error handling for analytic EOS @@ -80,12 +81,12 @@ EOS_Omni_pressOMP(*GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n, rhoplus,epsplus,NULL,NULL,pressplus,keyerr,&anyerr); + free(keyerr); } else { if(reconstruct_temper) { - int n = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; - // Linux usually offers ~8MB of stack which is good for ~1M points. - // We should consider malloc() if we ever smash the stack. - int keyerr[n]; int anyerr = 0; + int n = cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; + int *keyerr = malloc(sizeof(*keyerr)*n); + int anyerr = 0; int keytemp = 1; // ensure Y_e and temperature within bounds @@ -140,10 +141,12 @@ CCTK_VWarn(0, __LINE__, __FILE__, CCTK_THORNSTRING, "Aborting!"); } + free(keyerr); } else { // ******************** EPS RECONSTRUCTION BRANCH ****************** - int n = cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; - int keyerr[n]; int anyerr = 0; + int n = cctk_ash[0]*cctk_ash[1]*cctk_ash[2]; + int *keyerr = malloc(sizeof(*keyerr)*n); + int anyerr = 0; int keytemp = 0; // ensure Y_e and temperature within bounds @@ -236,6 +239,7 @@ } } // for i, i<n error checking } + free(keyerr); } // end branch for no temp reconsturction } // end of evolve temper branch

1 0

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

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Modified: /trunk/src/ GRHydro_Con2PrimHot.F90 Log: expand warnings in GRHydro_Con2PrimHot * compute reflevel in GRHydro_Con2PrimHot to be sure it is current * only output warnings if we want them From: Christian Ott <cott(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimHot.F90 Delta lines: +20 -16 =================================================================== --- trunk/src/GRHydro_Con2PrimHot.F90 2013-08-13 14:56:05 UTC (rev 566) +++ trunk/src/GRHydro_Con2PrimHot.F90 2013-08-13 14:56:08 UTC (rev 567) @@ -28,6 +28,7 @@ CCTK_REAL :: local_min_tracer CCTK_REAL :: local_perc_ptol + integer :: reflevel ! save memory when MP is not used CCTK_INT :: GRHydro_UseGeneralCoordinates @@ -42,6 +43,7 @@ ! end EOS Omni vars myproc = CCTK_MyProc(cctkGH) + reflevel = int(log10(dble(cctk_levfac(1)))/log10(2.0d0)) ! save memory when MP is not used if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then @@ -155,7 +157,7 @@ press(i,j,k),w_lorentz(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,sdet,x(i,j,k),y(i,j,k), & z(i,j,k),r(i,j,k),epsnegative,GRHydro_rho_min,pmin, epsmin, & - GRHydro_reflevel, GRHydro_C2P_failed(i,j,k), GRHydro_perc_ptol) + reflevel, GRHydro_C2P_failed(i,j,k), GRHydro_perc_ptol) if(temperature(i,j,k).gt.GRHydro_max_temp) then !$OMP CRITICAL @@ -172,7 +174,7 @@ call CCTK_WARN(1,warnline) write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(1,warnline) - write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel + write(warnline,"(A10,i5)") "reflevel: ", reflevel call CCTK_WARN(1,warnline) call CCTK_WARN(0,"Aborting!!!") !$OMP END CRITICAL @@ -200,12 +202,12 @@ temperature(i,j,k),y_e(i,j,k),press(i,j,k),w_lorentz(i,j,k), & uxx,uxy,uxz,uyy,uyz,uzz,sdet,x(i,j,k),y(i,j,k), & z(i,j,k),r(i,j,k),epsnegative,GRHydro_rho_min,pmin, epsmin, & - GRHydro_reflevel, GRHydro_C2P_failed(i,j,k), local_perc_ptol) + reflevel, GRHydro_C2P_failed(i,j,k), local_perc_ptol) if( abs(GRHydro_C2P_failed(i,j,k)-2.0d0) .lt. 1.0d-10) then !$OMP CRITICAL - if (GRHydro_reflevel.ge.GRHydro_c2p_warn_from_reflevel) then + if (reflevel.ge.GRHydro_c2p_warn_from_reflevel) then call CCTK_WARN(1,"Convergence problem in c2p") - write(warnline,"(A10,i5)") "reflevel: ",GRHydro_reflevel + write(warnline,"(A10,i5)") "reflevel: ",reflevel call CCTK_WARN(1,warnline) write(warnline,"(A10,i10)") "iteration: ",cctk_iteration call CCTK_WARN(1,warnline) @@ -228,17 +230,19 @@ ! the temperature of the atmosphere. ! Now reset this point to minimum temperature. GRHydro_C2P_failed(i,j,k) = 0 - !$OMP CRITICAL - write(warnline,"(A10,i7,4i5,1P10E15.6)") "reset T:",& - cctk_iteration,GRHydro_Reflevel,& - i,j,k,rho(i,j,k),& - eps(i,j,k),temperature(i,j,k),y_e(i,j,k) - call CCTK_WARN(1,warnline) - write(warnline,"(A10,i7,4i5,1P10E15.6)") "reset T:",& - cctk_iteration,GRHydro_Reflevel,& - i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k) - call CCTK_WARN(1,warnline) - !$OMP END CRITICAL + if (reflevel.ge.GRHydro_c2p_warn_from_reflevel) then + !$OMP CRITICAL + write(warnline,"(A10,i7,4i5,1P10E15.6)") "reset T:",& + cctk_iteration,GRHydro_Reflevel,& + i,j,k,rho(i,j,k),& + eps(i,j,k),temperature(i,j,k),y_e(i,j,k) + call CCTK_WARN(1,warnline) + write(warnline,"(A10,i7,4i5,1P10E15.6)") "reset T:",& + cctk_iteration,GRHydro_Reflevel,& + i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),r(i,j,k) + call CCTK_WARN(1,warnline) + !$OMP END CRITICAL + endif temperature(i,j,k) = GRHydro_hot_atmo_temp keytemp = 1 call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,&

1 0

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

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Modified: /trunk/src/ GRHydro_Boundaries.F90 Log: don't specify boundaries twice From: Frank Loeffler <knarf(a)cct.lsu.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +0 -7 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2013-08-13 14:56:03 UTC (rev 565) +++ trunk/src/GRHydro_Boundaries.F90 2013-08-13 14:56:05 UTC (rev 566) @@ -235,13 +235,6 @@ if (CCTK_EQUALS(Bvec_evolution_method, "GRHydro_Avec")) then ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & "HydroBase::Avec", "Flat") - if (general_coordinates .ne. 0) then - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "GRHydro::lBvec", "Flat") - else - ierr = ierr + Boundary_SelectGroupForBC(cctkGH, faces, GRHydro_stencil, -ione, & - "HydroBase::Bvec", "Flat") - endif endif if(evolve_tracer.ne.0) then

1 0

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

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Modified: /trunk/ schedule.ccl Log: GRHydro: explicitly recompute SqrtDetg after RECOVERY this is usually not required, unless MoL_run_MoL_PostStep_in_PostRecoverVariables is set to false. From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +5 -0 =================================================================== --- trunk/schedule.ccl 2013-08-13 14:56:00 UTC (rev 564) +++ trunk/schedule.ccl 2013-08-13 14:56:03 UTC (rev 565) @@ -1084,7 +1084,12 @@ LANG: Fortran } "Calculate sdetg" +schedule GRHydro_SqrtSpatialDeterminant AT CCTK_POST_RECOVER_VARIABLES +{ + LANG: Fortran +} "Calculate sdetg" + #debug ###schedule GRHydro_Debug IN HydroBase_PostStep ###{

1 0

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

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Modified: /trunk/ schedule.ccl /trunk/src/ Utils.F90 Log: GRHydro: fix metric GF used for sqrtdetg in multipatch runs fix some scheduling From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: Utils.F90 Delta lines: +32 -5 =================================================================== --- trunk/src/Utils.F90 2013-08-13 14:55:54 UTC (rev 563) +++ trunk/src/Utils.F90 2013-08-13 14:56:00 UTC (rev 564) @@ -74,10 +74,37 @@ subroutine GRHydro_SqrtSpatialDeterminant(CCTK_ARGUMENTS) implicit none + + ! save memory when MP is not used + ! TARGET as to be before DECLARE_CCTK_ARGUMENTS for gcc 4.1 + TARGET gaa, gab, gac, gbb, gbc, gcc + TARGET gxx, gxy, gxz, gyy, gyz, gzz + DECLARE_CCTK_ARGUMENTS integer i,j,k integer nx, ny, nz + ! save memory when MP is not used + CCTK_INT :: GRHydro_UseGeneralCoordinates + CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 + + ! save memory when MP is not used + if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then + g11 => gaa + g12 => gab + g13 => gac + g22 => gbb + g23 => gbc + g33 => gcc + else + g11 => gxx + g12 => gxy + g13 => gxz + g22 => gyy + g23 => gyz + g33 => gzz + end if + nx = cctk_lsh(1) ny = cctk_lsh(2) nz = cctk_lsh(3) @@ -86,11 +113,11 @@ do k=1,nz do j=1,ny do i=1,nx - sdetg(i,j,k) = -(gxz(i,j,k)**2)*gyy(i,j,k) + & - 2.0d0*gxy(i,j,k)*gxz(i,j,k)*gyz(i,j,k) - & - gxx(i,j,k)*(gyz(i,j,k)**2) - & - (gxy(i,j,k)**2)*gzz(i,j,k) + & - (gxx(i,j,k)*gyy(i,j,k))*gzz(i,j,k) + sdetg(i,j,k) = -(g13(i,j,k)**2)*g22(i,j,k) + & + 2.0d0*g12(i,j,k)*g13(i,j,k)*g23(i,j,k) - & + g11(i,j,k)*(g23(i,j,k)**2) - & + (g12(i,j,k)**2)*g33(i,j,k) + & + (g11(i,j,k)*g22(i,j,k))*g33(i,j,k) sdetg(i,j,k) = sqrt(sdetg(i,j,k)) enddo enddo Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +1 -1 =================================================================== --- trunk/schedule.ccl 2013-08-13 14:55:54 UTC (rev 563) +++ trunk/schedule.ccl 2013-08-13 14:56:00 UTC (rev 564) @@ -605,7 +605,7 @@ # Early atmosphere reset. This will not capture relative atmosphere settings (rho_rel_min) which # is scheduled later. However, this will ensure that all time and refinement levels are handled # correctly for rho_abs_min set. -schedule GRHydro_InitialAtmosphereReset AT CCTK_Initial AFTER HydroBase_Initial BEFORE HydroBase_Prim2ConInitial +schedule GRHydro_InitialAtmosphereReset AT CCTK_Initial AFTER HydroBase_Initial BEFORE HydroBase_Prim2ConInitial AFTER GRHydro_SqrtSpatialDeterminant { LANG: Fortran } "Use mask to enforce atmosphere at initial time"

1 0

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

13 Aug '13

User: rhaas Date: 2013/08/13 09:55 AM Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ GRHydro_Reconstruct.F90, GRHydro_WENOReconstruct.F90 Log: GRHydro: Implemented WENO-z. Ability to choose between standard WENO5 and "adaptive epsilon"-variant from WHAM. From: Christian Reisswig <reisswig(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Reconstruct.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Reconstruct.F90 2013-07-15 22:33:13 UTC (rev 562) +++ trunk/src/GRHydro_Reconstruct.F90 2013-08-13 14:55:54 UTC (rev 563) @@ -135,7 +135,7 @@ ! this handles MHD and non-MHD call GRHydro_ENOReconstruct_drv(CCTK_PASS_FTOF) - else if (CCTK_EQUALS(recon_method,"weno")) then + else if (CCTK_EQUALS(recon_method,"weno") .or. CCTK_EQUALS(recon_method,"weno-z")) then ! this handles MHD and non-MHD call GRHydro_WENOReconstruct_drv(CCTK_PASS_FTOF) File [modified]: GRHydro_WENOReconstruct.F90 Delta lines: +111 -59 =================================================================== --- trunk/src/GRHydro_WENOReconstruct.F90 2013-07-15 22:33:13 UTC (rev 562) +++ trunk/src/GRHydro_WENOReconstruct.F90 2013-08-13 14:55:54 UTC (rev 563) @@ -11,6 +11,7 @@ #include "cctk.h" #include "cctk_Parameters.h" #include "cctk_Arguments.h" +#include "cctk_Functions.h" /*@@ @routine GRHydro_WENOSetup @@ -39,6 +40,7 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS CCTK_INT :: allocstat @@ -51,24 +53,44 @@ endif ! Set stencils - weno_coeffs(1,1) = 3.0d0/8.0d0 - weno_coeffs(1,2) = -5.0d0/4.0d0 - weno_coeffs(1,3) = 15.0d0/8.0d0 - weno_coeffs(1,4) = 0.0d0 - weno_coeffs(1,5) = 0.0d0 - - weno_coeffs(2,1) = 0.0d0 - weno_coeffs(2,2) = -1.0d0/8.0d0 - weno_coeffs(2,3) = 3.0d0/4.0d0 - weno_coeffs(2,4) = 3.0d0/8.0d0 - weno_coeffs(2,5) = 0.0d0 - - weno_coeffs(3,1) = 0.0d0 - weno_coeffs(3,2) = 0.0d0 - weno_coeffs(3,3) = 3.0d0/8.0d0 - weno_coeffs(3,4) = 3.0d0/4.0d0 - weno_coeffs(3,5) = -1.0d0/8.0d0 - + if (CCTK_EQUALS(recon_method,"weno-z")) then + weno_coeffs(1,1) = 2.0d0/6.0d0 + weno_coeffs(1,2) = -7.0d0/6.0d0 + weno_coeffs(1,3) = 11.0d0/6.0d0 + weno_coeffs(1,4) = 0.0d0 + weno_coeffs(1,5) = 0.0d0 + + weno_coeffs(2,1) = 0.0d0 + weno_coeffs(2,2) = -1.0d0/6.0d0 + weno_coeffs(2,3) = 5.0d0/6.0d0 + weno_coeffs(2,4) = 2.0d0/6.0d0 + weno_coeffs(2,5) = 0.0d0 + + weno_coeffs(3,1) = 0.0d0 + weno_coeffs(3,2) = 0.0d0 + weno_coeffs(3,3) = 2.0d0/6.0d0 + weno_coeffs(3,4) = 5.0d0/6.0d0 + weno_coeffs(3,5) = -1.0d0/6.0d0 + else + weno_coeffs(1,1) = 3.0d0/8.0d0 + weno_coeffs(1,2) = -5.0d0/4.0d0 + weno_coeffs(1,3) = 15.0d0/8.0d0 + weno_coeffs(1,4) = 0.0d0 + weno_coeffs(1,5) = 0.0d0 + + weno_coeffs(2,1) = 0.0d0 + weno_coeffs(2,2) = -1.0d0/8.0d0 + weno_coeffs(2,3) = 3.0d0/4.0d0 + weno_coeffs(2,4) = 3.0d0/8.0d0 + weno_coeffs(2,5) = 0.0d0 + + weno_coeffs(3,1) = 0.0d0 + weno_coeffs(3,2) = 0.0d0 + weno_coeffs(3,3) = 3.0d0/8.0d0 + weno_coeffs(3,4) = 3.0d0/4.0d0 + weno_coeffs(3,5) = -1.0d0/8.0d0 + endif + ! Shu smoothness indicator stencil coefficients beta_shu(1,1) = 4.0d0/3.0d0 beta_shu(1,2) = -19.0d0/3.0d0 @@ -152,7 +174,8 @@ implicit none DECLARE_CCTK_PARAMETERS - + DECLARE_CCTK_FUNCTIONS + CCTK_INT :: order, nx, i, j CCTK_REAL, dimension(nx) :: v, vplus, vminus @@ -160,6 +183,7 @@ logical, dimension(nx) :: trivial_rp logical, dimension(nx) :: excise logical :: normal_weno + logical :: wenoZ CCTK_REAL :: beta1, beta2, beta3, vnorm, betanorm CCTK_REAL :: wplus1, wplus2, wplus3, wbarplus1, wbarplus2, wbarplus3 @@ -171,6 +195,12 @@ excise = .false. trivial_rp = .false. + if (CCTK_EQUALS(recon_method,"weno-z")) then + wenoZ = .true. + else + wenoZ = .false. + endif + !!$ Initialize excision do i = 1, nx if (GRHydro_enable_internal_excision /= 0 .and. (hydro_excision_mask(i) .ne. 0)) then @@ -202,58 +232,80 @@ if (normal_weno) then -!!$ Compute smoothness indicators -!!$ This is from Tchekhovskoy et al 2007 (WHAM code paper). - beta1 = beta_shu(1,1)*v(i-2)**2 & - + beta_shu(1,2)*v(i-2)*v(i-1) & - + beta_shu(1,3)*v(i-1)**2 & - + beta_shu(1,4)*v(i-2)*v(i) & - + beta_shu(1,5)*v(i-1)*v(i) & - + beta_shu(1,6)*v(i)**2 - - beta2 = beta_shu(2,1)*v(i-1)**2 & - + beta_shu(2,2)*v(i-1)*v(i) & - + beta_shu(2,3)*v(i)**2 & - + beta_shu(2,4)*v(i-1)*v(i+1) & - + beta_shu(2,5)*v(i)*v(i+1) & - + beta_shu(2,6)*v(i+1)**2 - - beta3 = beta_shu(3,1)*v(i)**2 & - + beta_shu(3,2)*v(i)*v(i+1) & - + beta_shu(3,3)*v(i+1)**2 & - + beta_shu(3,4)*v(i)*v(i+2) & - + beta_shu(3,5)*v(i+1)*v(i+2) & - + beta_shu(3,6)*v(i+2)**2 - + if (wenoZ) then + + beta1 = 13.0d0/12.d0*(v(i-2)-2.0d0*v(i-1)+v(i))**2 + 1.0d0/4.d0*(v(i-2)-4.0d0*v(i-1)+3.0d0*v(i))**2 + beta2 = 13.0d0/12.d0*(v(i-1)-2.0d0*v(i)+v(i+1))**2 + 1.0d0/4.d0*(v(i-1)-v(i+1))**2 + beta3 = 13.0d0/12.d0*(v(i)-2.0d0*v(i+1)+v(i+2))**2 + 1.0d0/4.d0*(3.0d0*v(i)-4.0d0*v(i+1)+v(i+2))**2 - vnorm = (v(i-2)**2 + v(i-1)**2 + v(i)**2 + v(i+1)**2 + v(i+2)**2) - beta1 = beta1 + 100.0d0*weno_eps*(vnorm + 1.0d0) - beta2 = beta2 + 100.0d0*weno_eps*(vnorm + 1.0d0) - beta3 = beta3 + 100.0d0*weno_eps*(vnorm + 1.0d0) + !!$ Compute weights according to weno-z alorithm + wbarplus1 = 1.0d0/10.0d0 * (1.0d0 + abs(beta1-beta3) / (weno_eps + beta1)) + wbarplus2 = 3.0d0/5.0d0 * (1.0d0 + abs(beta1-beta3) / (weno_eps + beta2)) + wbarplus3 = 3.0d0/10.0d0 * (1.0d0 + abs(beta1-beta3) / (weno_eps + beta3)) + + wbarminus1 = 3.0d0/10.0d0 * (1.0d0 + abs(beta1-beta3) / (weno_eps + beta1)) + wbarminus2 = 3.0d0/5.0d0 * (1.0d0 + abs(beta1-beta3) / (weno_eps + beta2)) + wbarminus3 = 1.0d0/10.0d0 * (1.0d0 + abs(beta1-beta3) / (weno_eps + beta3)) + - betanorm = beta1 + beta2 + beta3 + else - beta1 = beta1 / betanorm - beta2 = beta2 / betanorm - beta3 = beta3 / betanorm + !!$ Compute smoothness indicators + beta1 = beta_shu(1,1)*v(i-2)**2 & + + beta_shu(1,2)*v(i-2)*v(i-1) & + + beta_shu(1,3)*v(i-1)**2 & + + beta_shu(1,4)*v(i-2)*v(i) & + + beta_shu(1,5)*v(i-1)*v(i) & + + beta_shu(1,6)*v(i)**2 - wbarplus1 = 1.0d0/16.0d0 / (weno_eps + beta1)**2 - wbarplus2 = 5.0d0/8.0d0 / (weno_eps + beta2)**2 - wbarplus3 = 5.0d0/16.0d0 / (weno_eps + beta3)**2 - + beta2 = beta_shu(2,1)*v(i-1)**2 & + + beta_shu(2,2)*v(i-1)*v(i) & + + beta_shu(2,3)*v(i)**2 & + + beta_shu(2,4)*v(i-1)*v(i+1) & + + beta_shu(2,5)*v(i)*v(i+1) & + + beta_shu(2,6)*v(i+1)**2 + + beta3 = beta_shu(3,1)*v(i)**2 & + + beta_shu(3,2)*v(i)*v(i+1) & + + beta_shu(3,3)*v(i+1)**2 & + + beta_shu(3,4)*v(i)*v(i+2) & + + beta_shu(3,5)*v(i+1)*v(i+2) & + + beta_shu(3,6)*v(i+2)**2 + + !!$ This is modification is suggested by Tchekhovskoy et al 2007 (WHAM code paper). + if (weno_adaptive_epsilon.ne.0) then + vnorm = (v(i-2)**2 + v(i-1)**2 + v(i)**2 + v(i+1)**2 + v(i+2)**2) + + beta1 = beta1 + 100.0d0*weno_eps*(vnorm + 1.0d0) + beta2 = beta2 + 100.0d0*weno_eps*(vnorm + 1.0d0) + beta3 = beta3 + 100.0d0*weno_eps*(vnorm + 1.0d0) + + betanorm = beta1 + beta2 + beta3 + + beta1 = beta1 / betanorm + beta2 = beta2 / betanorm + beta3 = beta3 / betanorm + endif + + wbarplus1 = 1.0d0/16.0d0 / (weno_eps + beta1)**2 + wbarplus2 = 5.0d0/8.0d0 / (weno_eps + beta2)**2 + wbarplus3 = 5.0d0/16.0d0 / (weno_eps + beta3)**2 + + wbarminus1 = 5.0d0/16.0d0 / (weno_eps + beta1)**2 + wbarminus2 = 5.0d0/8.0d0 / (weno_eps + beta2)**2 + wbarminus3 = 1.0d0/16.0d0 / (weno_eps + beta3)**2 + + endif + wplus1 = wbarplus1 / (wbarplus1 + wbarplus2 + wbarplus3) wplus2 = wbarplus2 / (wbarplus1 + wbarplus2 + wbarplus3) wplus3 = wbarplus3 / (wbarplus1 + wbarplus2 + wbarplus3) - - wbarminus1 = 5.0d0/16.0d0 / (weno_eps + beta1)**2 - wbarminus2 = 5.0d0/8.0d0 / (weno_eps + beta2)**2 - wbarminus3 = 1.0d0/16.0d0 / (weno_eps + beta3)**2 wminus1 = wbarminus1 / (wbarminus1 + wbarminus2 + wbarminus3) wminus2 = wbarminus2 / (wbarminus1 + wbarminus2 + wbarminus3) wminus3 = wbarminus3 / (wbarminus1 + wbarminus2 + wbarminus3) - + !!$ Calculate the reconstruction do j = 1, 5 vplus(i) = vplus(i) + wplus1 * weno_coeffs(1,j)*v(i-3+j) & Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +10 -5 =================================================================== --- trunk/param.ccl 2013-07-15 22:33:13 UTC (rev 562) +++ trunk/param.ccl 2013-08-13 14:55:54 UTC (rev 563) @@ -136,11 +136,12 @@ keyword recon_method "Which reconstruction method to use" STEERABLE=RECOVER { - "tvd" :: "Slope limited TVD" - "ppm" :: "PPM reconstruction" - "eno" :: "ENO reconstruction" - "weno" :: "WENO reconstruction" - "mp5" :: "MP5 reconstruction" + "tvd" :: "Slope limited TVD" + "ppm" :: "PPM reconstruction" + "eno" :: "ENO reconstruction" + "weno" :: "WENO reconstruction" + "weno-z" :: "WENO-Z reconstruction" + "mp5" :: "MP5 reconstruction" } "tvd" keyword method_type "Which type of method to use" @@ -286,6 +287,10 @@ 0:* :: "small and positive" } 1e-26 +boolean weno_adaptive_epsilon "use modified smoothness indicators that take into account scale of solution (adaptive epsilon)" +{ +} yes + keyword riemann_solver "Which Riemann solver to use" STEERABLE=always { "Roe" :: "Standard Roe solver" File [modified]: schedule.ccl Delta lines: +1 -1 =================================================================== --- trunk/schedule.ccl 2013-07-15 22:33:13 UTC (rev 562) +++ trunk/schedule.ccl 2013-08-13 14:55:54 UTC (rev 563) @@ -471,7 +471,7 @@ } -if (CCTK_Equals(recon_method,"weno")) +if (CCTK_Equals(recon_method,"weno") || CCTK_Equals(recon_method,"weno-z")) { schedule GRHydro_WENOSetup AT CCTK_Basegrid

1 0

[Carpet] branch, master, updated. carpet-6-init-345-gfdadb2c
by Carpet git repositories 12 Aug '13

12 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via fdadb2cfc19a42ada49fc91c12e56646848ca8b9 (commit) from dff327351eb8642931e7d7b328224e29a9133eca (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 fdadb2cfc19a42ada49fc91c12e56646848ca8b9 Author: Roland Haas <rhaas(a)tapir.caltech.edu> Date: Sun Aug 11 20:15:28 2013 -0700 CarpetIOHDF5: use simple_extents rather than storage size on disk storage size is literally the amount of space used on disk, so if eg compression is used, this is much smaller than the amount of space required to hold the data in memory. Also change type of data read in to what the memory dataspace is not what the dataspace on disk is. This way HDF5 actually converts from the on-disk representation to the in-memory one. ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetIOHDF5/src/Input.cc | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. carpet-6-init-344-gdff3273
by Carpet git repositories 12 Aug '13

12 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via dff327351eb8642931e7d7b328224e29a9133eca (commit) via ecb3547afa2f9904e4c4df720413e4685d2b51e2 (commit) from 7671fa71925aebfd787497bae61cf6da6ddeac54 (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 dff327351eb8642931e7d7b328224e29a9133eca Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon Aug 12 10:56:32 2013 -0400 CarpetLib: Correct memory allocation error in communication buffers commit ecb3547afa2f9904e4c4df720413e4685d2b51e2 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Mon Aug 12 10:56:16 2013 -0400 CarpetLib: Optimize memory allocation when message_count_multiplier>1 ----------------------------------------------------------------------- Summary of changes: Carpet/CarpetLib/src/commstate.cc | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits August 2013