Commits June 2011

commits@lists.einsteintoolkit.org

6 participants
38 discussions

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

11 Jun '11

User: cott Date: 2011/06/11 04:54 PM Modified: /trunk/ param.ccl Log: * add new parameters for hot EOS atmosphere handling File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +10 -0 =================================================================== --- trunk/param.ccl 2011-06-11 21:51:15 UTC (rev 249) +++ trunk/param.ccl 2011-06-11 21:54:46 UTC (rev 250) @@ -268,6 +268,16 @@ { } "no" +REAL GRHydro_hot_atmo_temp "Temperature of the hot atmosphere in MeV" STEERABLE=ALWAYS +{ + 0:* :: "Larger than 0 MeV" +} 0.5e0 + +REAL GRHydro_hot_atmo_Y_e "Y_e of the hot atmosphere" STEERABLE=ALWAYS +{ + 0:* :: "Larger than 0" +} 0.5e0 + ####################### Other Parameters ############################## #Parameters controlling conservative <-> primitive change.

1 0

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

11 Jun '11

User: cott Date: 2011/06/11 04:51 PM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Prim2Con.F90, GRHydro_UpdateMask.F90 Log: * improve atmosphere handling so that it is now possible to use hot EOS with an atmosphere File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +26 -11 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2011-05-23 22:31:18 UTC (rev 248) +++ trunk/src/GRHydro_Con2Prim.F90 2011-06-11 21:51:15 UTC (rev 249) @@ -88,7 +88,7 @@ GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) !$OMP PARALLEL DO PRIVATE(i,j,itracer,& - !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, epsnegative) + !$OMP uxx, uxy, uxz, uyy, uyz, uzz, det, epsnegative, anyerr, keyerr, keytemp) do k = 1, nz do j = 1, ny do i = 1, nx @@ -128,7 +128,6 @@ Y_e(i,j,k) = Y_e_con(i,j,k) / dens(i,j,k) endif - if ( dens(i,j,k) .le. sqrt(det)*GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then dens(i,j,k) = sqrt(det)*GRHydro_rho_min !/(1.d0+GRHydro_atmo_tolerance) @@ -137,15 +136,26 @@ vel(i,j,k,:) = 0.d0 w_lorentz(i,j,k) = 1.d0 - call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) + if(evolve_temper.ne.0) then + ! set hot atmosphere values + temperature(i,j,k) = grhydro_hot_atmo_temp + y_e(i,j,k) = grhydro_hot_atmo_Y_e + y_e_con(i,j,k) = y_e(i,j,k) * dens(i,j,k) + keytemp = 1 + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),temperature(i,j,k),y_e(i,j,k),& + press(i,j,k),keyerr,anyerr) + else + ! use polytropic EOS + call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) - call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& - rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),eps(i,j,k),keyerr,anyerr) + call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),eps(i,j,k),keyerr,anyerr) + endif - ! w_lorentz=1, so the expression for tau reduces to: tau(i,j,k) = sqrt(det) * (rho(i,j,k)+rho(i,j,k)*eps(i,j,k)) - dens(i,j,k) - + cycle end if @@ -196,6 +206,7 @@ endif endif + if (epsnegative) then #if 0 @@ -848,10 +859,14 @@ rho = GRHydro_rho_min udens = rho dens = sqrt(det) * rho -! epsilon = (sqrt( (utau + pnew + udens)**2) - pnew - udens)/udens - epsilon = epsminl + temp = GRHydro_hot_atmo_temp + ye = GRHydro_hot_atmo_Y_e + keytemp=1 + call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n, & + rho,epsilon,temp,ye,xpress,keyerr,anyerr) + keytemp=0 ! w_lorentz=1, so the expression for utau reduces to: - utau = rho + rho*epsminl - udens + utau = rho + rho*epsilon - udens sx = 0.d0 sy = 0.d0 sz = 0.d0 File [modified]: GRHydro_Prim2Con.F90 Delta lines: +0 -1 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2011-05-23 22:31:18 UTC (rev 248) +++ trunk/src/GRHydro_Prim2Con.F90 2011-06-11 21:51:15 UTC (rev 249) @@ -303,7 +303,6 @@ endif endif - vlowx = gxx*dvelx + gxy*dvely + gxz*dvelz vlowy = gxy*dvelx + gyy*dvely + gyz*dvelz vlowz = gxz*dvelx + gyz*dvely + gzz*dvelz File [modified]: GRHydro_UpdateMask.F90 Delta lines: +50 -23 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2011-05-23 22:31:18 UTC (rev 248) +++ trunk/src/GRHydro_UpdateMask.F90 2011-06-11 21:51:15 UTC (rev 249) @@ -219,13 +219,19 @@ CCTK_REAL :: det, psi4pt CCTK_INT :: type_bits, atmosphere, not_atmosphere +! begin EOS Omni vars + integer :: n,keytemp,anyerr,keyerr(1) + real*8 :: xpress,xeps,xtemp,xye + n=1;keytemp=0;anyerr=0;keyerr(1)=0 + xpress=0.0d0;xye=0.0d0;xeps=0.0d0;xtemp=0.0d0 +! end EOS Omni vars call SpaceMask_GetTypeBits(type_bits, "Hydro_Atmosphere") call SpaceMask_GetStateBits(atmosphere, "Hydro_Atmosphere",& "in_atmosphere") call SpaceMask_GetStateBits(not_atmosphere, "Hydro_Atmosphere",& "not_in_atmosphere") - +!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) @@ -235,37 +241,52 @@ atmosphere)) & &) then -!!$ write(*,*) 'Resetting at ',i,j,k, atmosphere_mask(i, j, k), & -!!$ & (SpaceMask_CheckStateBitsF90(space_mask,i, j, k, type_bits,\ -!!$ atmosphere)) - rho(i,j,k) = GRHydro_rho_min velx(i,j,k) = 0.0d0 vely(i,j,k) = 0.0d0 velz(i,j,k) = 0.0d0 det = SPATIAL_DETERMINANT(gxx(i,j,k), gxy(i,j,k), gxz(i,j,k), \ gyy(i,j,k), gyz(i,j,k), gzz(i,j,k)) - call prim2conpolytype(GRHydro_polytrope_handle, & - gxx(i,j,k), gxy(i,j,k), gxz(i,j,k), & - gyy(i,j,k), gyz(i,j,k), gzz(i,j,k), det, & - dens(i,j,k), scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), & - tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), & - velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k)) - if (wk_atmosphere .eq. 0) then - atmosphere_mask(i, j, k) = 0 - SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits,\ - not_atmosphere) - end if - end if + if(evolve_temper.ne.0) then +! ! set the temperature to be relatively low + temperature(i,j,k) = grhydro_hot_atmo_temp + y_e(i,j,k) = grhydro_hot_atmo_Y_e + keytemp = 1 + call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& + rho(i,j,k),eps(i,j,k),temperature(i,j,k),y_e(i,j,k),& + press(i,j,k),keyerr,anyerr) + call prim2con_hot(GRHydro_eos_handle, GRHydro_reflevel,& + i,j,k,x(i,j,k),y(i,j,k),z(i,j,k),gxx(i,j,k),gxy(i,j,k),& + gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k), & + det,dens(i,j,k),scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), & + tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), & + velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k),& + temperature(i,j,k),y_e(i,j,k)) + y_e_con(i,j,k) = dens(i,j,k) * y_e(i,j,k) + else + call prim2conpolytype(GRHydro_polytrope_handle, & + gxx(i,j,k), gxy(i,j,k), gxz(i,j,k), & + gyy(i,j,k), gyz(i,j,k), gzz(i,j,k), det, & + dens(i,j,k), scon(i,j,k,1), scon(i,j,k,2), scon(i,j,k,3), & + tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), & + velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k)) + if (wk_atmosphere .eq. 0) then + atmosphere_mask(i, j, k) = 0 + SpaceMask_SetStateBitsF90(space_mask, i, j, k, type_bits,\ + not_atmosphere) + end if + endif + + end if + end do end do end do +!$OMP END PARALLEL DO -!!$ call GRHydro_Boundaries(CCTK_PASS_FTOF) - end subroutine GRHydro_AtmosphereReset subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS) @@ -316,8 +337,9 @@ velz(i,j,k) = 0.0d0 if(evolve_temper.ne.0) then - ! set the temperature to be relatively low - temperature(i,j,k) = 0.1d0 +! ! set the temperature to be relatively low + temperature(i,j,k) = grhydro_hot_atmo_temp + y_e(i,j,k) = grhydro_hot_atmo_Y_e keytemp = 1 call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& rho(i,j,k),eps(i,j,k),temperature(i,j,k),y_e(i,j,k),& @@ -330,6 +352,7 @@ tau(i,j,k), rho(i,j,k), velx(i,j,k), vely(i,j,k), & velz(i,j,k), eps(i,j,k), press(i,j,k), w_lorentz(i,j,k),& temperature(i,j,k),y_e(i,j,k)) + y_e_con(i,j,k) = dens(i,j,k) * y_e(i,j,k) else call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) @@ -355,7 +378,8 @@ if(evolve_temper.ne.0) then ! set the temperature to be relatively low - temperature_p(i,j,k) = 0.1d0 + temperature_p(i,j,k) = grhydro_hot_atmo_temp + y_e_p(i,j,k) = grhydro_hot_atmo_Y_e keytemp = 1 call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& rho_p(i,j,k),eps_p(i,j,k),temperature_p(i,j,k),y_e_p(i,j,k),& @@ -368,6 +392,7 @@ tau_p(i,j,k), rho_p(i,j,k), velx_p(i,j,k), vely_p(i,j,k), & velz_p(i,j,k), eps_p(i,j,k), press_p(i,j,k), w_lorentz_p(i,j,k),& temperature_p(i,j,k),y_e_p(i,j,k)) + y_e_con_p(i,j,k) = dens_p(i,j,k) * y_e_p(i,j,k) else call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& rho_p(i,j,k),eps_p(i,j,k),xtemp,xye,press_p(i,j,k),keyerr,anyerr) @@ -394,7 +419,8 @@ if(evolve_temper.ne.0) then ! set the temperature to be relatively low - temperature_p_p(i,j,k) = 0.1d0 + temperature_p_p(i,j,k) = grhydro_hot_atmo_temp + y_e_p_p(i,j,k) = grhydro_hot_atmo_Y_e keytemp = 1 call EOS_Omni_press(GRHydro_eos_handle,keytemp,GRHydro_eos_rf_prec,n,& rho_p_p(i,j,k),eps_p_p(i,j,k),temperature_p_p(i,j,k),y_e_p_p(i,j,k),& @@ -406,6 +432,7 @@ tau_p_p(i,j,k), rho_p_p(i,j,k), velx_p_p(i,j,k), vely_p_p(i,j,k), & velz_p_p(i,j,k), eps_p_p(i,j,k), press_p_p(i,j,k), w_lorentz_p_p(i,j,k),& temperature_p_p(i,j,k),y_e_p_p(i,j,k)) + y_e_con_p_p(i,j,k) = dens_p_p(i,j,k) * y_e_p_p(i,j,k) else call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& rho_p_p(i,j,k),eps_p_p(i,j,k),xtemp,xye,press_p_p(i,j,k),keyerr,anyerr)

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/ (Rev. 48)
by cott＠tapir.caltech.edu 10 Jun '11

10 Jun '11

User: cott Date: 2011/06/10 07:32 PM Modified: /trunk/src/ EOS_Omni_SingleVarCalls.F90 Log: * fix dpdrho issue File Changes: Directory: /trunk/src/ ====================== File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +3 -1 =================================================================== --- trunk/src/EOS_Omni_SingleVarCalls.F90 2011-04-21 04:46:37 UTC (rev 47) +++ trunk/src/EOS_Omni_SingleVarCalls.F90 2011-06-11 00:32:35 UTC (rev 48) @@ -203,8 +203,10 @@ press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) - dpdrhoe(i) = hybrid_dp_poly + hybrid_dp_th1 + hybrid_dp_th2 + dpdrhoe(i) = hybrid_dp_poly + max(0.0d0,hybrid_dp_th1 + hybrid_dp_th2) + + enddo case (4)

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/examples/tov/ (Rev. 92)
by knarf＠cct.lsu.edu 10 Jun '11

10 Jun '11

User: knarf Date: 2011/06/10 05:52 PM Modified: /examples/tov/ tov.rpar Log: enable checkpointing File Changes: Directory: /examples/tov/ ========================= File [modified]: tov.rpar Delta lines: +12 -0 =================================================================== --- examples/tov/tov.rpar 2011-05-22 22:05:52 UTC (rev 91) +++ examples/tov/tov.rpar 2011-06-10 22:52:35 UTC (rev 92) @@ -235,6 +235,18 @@ ML_BSSN::ML_Ham ML_BSSN::ML_mom " + +IOHDF5::checkpoint = "yes" +IO::checkpoint_dir = \$parfile +IO::checkpoint_ID = "yes" +IO::checkpoint_every = 57600 +#IO::checkpoint_every_walltime_hours = 6.0 +IO::checkpoint_keep = 3 +IO::checkpoint_on_terminate = "yes" + +IO::recover = "autoprobe" +IO::recover_dir = \$parfile + PAR_EOF open(OUT, ">tov_${res}${type}.par");

1 0

[svn:einsteintoolkit] AHFinderDirect/trunk/test/ (Rev. 1558)
by schnetter＠cct.lsu.edu 09 Jun '11

09 Jun '11

User: eschnett Date: 2011/06/09 02:27 PM Modified: /trunk/test/ Kerr-Cartoon.par Log: Use PUGH instead of Carpet for test case to ensure symmetries are working File Changes: Directory: /trunk/test/ ======================= File [modified]: Kerr-Cartoon.par Delta lines: +2 -2 =================================================================== --- trunk/test/Kerr-Cartoon.par 2011-04-21 04:46:17 UTC (rev 1557) +++ trunk/test/Kerr-Cartoon.par 2011-06-09 19:27:17 UTC (rev 1558) @@ -9,7 +9,7 @@ IO::out_dir = $parfile IO::parfile_write = "no" -ActiveThorns = "Carpet CarpetLib" +ActiveThorns = "PUGH" driver::ghost_size = 3 driver::global_nx = 19 driver::global_ny = 7 @@ -42,7 +42,7 @@ ActiveThorns = "SphericalSurface" -ActiveThorns = "LocalInterp AEILocalInterp CarpetInterp GSL LoopControl CarpetReduce AHFinderDirect" +ActiveThorns = "LocalInterp AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect" AHFinderDirect::print_timing_stats = "true"

1 0

[svn:einsteintoolkit] WeylScal4/trunk/ (Rev. 76)
by schnetter＠cct.lsu.edu 08 Jun '11

08 Jun '11

User: eschnett Date: 2011/06/08 07:58 AM Modified: /trunk/ configuration.ccl, interface.ccl /trunk/src/ psis_calc_2nd.cc, psis_calc_4th.cc Log: Re-generate code File Changes: Directory: /trunk/src/ ====================== File [modified]: psis_calc_2nd.cc Delta lines: <Unavailable> File [modified]: psis_calc_4th.cc Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: configuration.ccl Delta lines: <Unavailable> File [modified]: interface.ccl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] WeylScal4/trunk/m/ (Rev. 75)
by schnetter＠cct.lsu.edu 08 Jun '11

08 Jun '11

User: eschnett Date: 2011/06/08 07:57 AM Modified: /trunk/m/ WeylScal4.m Log: Use LoopControl File Changes: Directory: /trunk/m/ ==================== File [modified]: WeylScal4.m Delta lines: +1 -0 =================================================================== --- trunk/m/WeylScal4.m 2011-06-07 15:24:48 UTC (rev 74) +++ trunk/m/WeylScal4.m 2011-06-08 12:57:58 UTC (rev 75) @@ -296,6 +296,7 @@ Calculations -> calculations, DeclaredGroups -> declaredGroupNames, PartialDerivatives -> derivatives, + UseLoopControl -> True, KeywordParameters -> keywordParameters, RealParameters -> realParameters, InheritedImplementations -> {"admbase", "methodoflines"}];

1 0

[svn:einsteintoolkit] WeylScal4/trunk/test/ (Rev. 74)
by roland.haas＠physics.gatech.edu 07 Jun '11

07 Jun '11

User: rhaas Date: 2011/06/07 10:24 AM Modified: /trunk/test/ teukolsky.par, teukolskyID.par Log: WeylScal4: replace CarpetRegrid by CarpetRegrid2 * This still passes the two testsuites with the release version of Carpet. * It fails (in points close to/at the edge of refinement levels) with the development version of Carpet (all non-Carpet thorns were development versions in both cases). File Changes: Directory: /trunk/test/ ======================= File [modified]: teukolsky.par Delta lines: +11 -6 =================================================================== --- trunk/test/teukolsky.par 2011-04-21 04:46:23 UTC (rev 73) +++ trunk/test/teukolsky.par 2011-06-07 15:24:48 UTC (rev 74) @@ -4,7 +4,7 @@ # $Header$ # Required thorns -ActiveThorns = "CartGrid3D CoordBase SymBase Boundary Time Carpet CarpetLib CarpetSlab CarpetRegrid CarpetReduce InitBase CarpetIOAscii IOUtil IOBasic ADMBase ADMMacros ADMConstraints GenericFD TmunuBase ADMCoupling StaticConformal CoordGauge SpaceMask IDLinearWaves LoopControl GSL WeylScal4 ML_BSSN_O2 ML_BSSN_O2_Helper NewRad GenericFD MoL ReflectionSymmetry" +ActiveThorns = "CartGrid3D CoordBase SymBase Boundary Time Carpet CarpetLib CarpetSlab CarpetRegrid2 CarpetReduce InitBase CarpetIOAscii IOUtil IOBasic ADMBase ADMMacros ADMConstraints GenericFD TmunuBase ADMCoupling StaticConformal CoordGauge SpaceMask IDLinearWaves LoopControl GSL WeylScal4 ML_BSSN_O2 ML_BSSN_O2_Helper NewRad GenericFD MoL ReflectionSymmetry" # Grid driver::ghost_size = 2 @@ -24,11 +24,16 @@ InitBase::initial_data_setup_method = init_some_levels Carpet::init_fill_timelevels = yes -CarpetRegrid::refinement_levels = 3 -CarpetRegrid::regrid_every = 0 -CarpetRegrid::refined_regions = "manual-coordinate-list" -CarpetRegrid::coordinates = "[[([-1.0625,-1.0625,0.0]:[0.9375,0.9375,1.0]:[0.25,0.25,0.25])],[([-0.5625,-0.5625,0.0]:[0.4375,0.4375,0.5]:[0.125,0.125,0.125])]]" -CarpetRegrid::smart_outer_boundaries = "yes" +CarpetRegrid2::min_distance = 0 +CarpetRegrid2::ensure_proper_nesting = "yes" +CarpetRegrid2::regrid_every = 0 +CarpetRegrid2::num_centres = 1 +CarpetRegrid2::num_levels_1 = 3 +CarpetRegrid2::position_x_1 = -0.0625 +CarpetRegrid2::position_y_1 = -0.0625 +CarpetRegrid2::position_z_1 = 0 +CarpetRegrid2::radius_1[1] = 1.0 +CarpetRegrid2::radius_1[2] = 0.5 Grid::type = "coordbase" File [modified]: teukolskyID.par Delta lines: +11 -6 =================================================================== --- trunk/test/teukolskyID.par 2011-04-21 04:46:23 UTC (rev 73) +++ trunk/test/teukolskyID.par 2011-06-07 15:24:48 UTC (rev 74) @@ -4,7 +4,7 @@ # $Header$ # Required thorns -ActiveThorns = "CartGrid3D CoordBase SymBase Boundary Time Carpet CarpetLib CarpetSlab CarpetRegrid CarpetReduce InitBase CarpetIOAscii IOUtil IOBasic ADMBase ADMMacros ADMConstraints GenericFD TmunuBase ADMCoupling StaticConformal CoordGauge SpaceMask IDLinearWaves LoopControl GSL WeylScal4 ReflectionSymmetry MoL" +ActiveThorns = "CartGrid3D CoordBase SymBase Boundary Time Carpet CarpetLib CarpetSlab CarpetRegrid2 CarpetReduce InitBase CarpetIOAscii IOUtil IOBasic ADMBase ADMMacros ADMConstraints GenericFD TmunuBase ADMCoupling StaticConformal CoordGauge SpaceMask IDLinearWaves LoopControl GSL WeylScal4 ReflectionSymmetry MoL" # Grid driver::ghost_size = 1 @@ -24,11 +24,16 @@ InitBase::initial_data_setup_method = init_some_levels Carpet::init_fill_timelevels = yes -CarpetRegrid::refinement_levels = 3 -CarpetRegrid::regrid_every = 0 -CarpetRegrid::refined_regions = "manual-coordinate-list" -CarpetRegrid::coordinates = "[[([-1.0625,-1.0625,0.0]:[0.9375,0.9375,1.0]:[0.25,0.25,0.25])],[([-0.5625,-0.5625,0.0]:[0.4375,0.4375,0.5]:[0.125,0.125,0.125])]]" -CarpetRegrid::smart_outer_boundaries = "yes" +CarpetRegrid2::min_distance = 0 +CarpetRegrid2::ensure_proper_nesting = "yes" +CarpetRegrid2::regrid_every = 0 +CarpetRegrid2::num_centres = 1 +CarpetRegrid2::num_levels_1 = 3 +CarpetRegrid2::position_x_1 = -0.0625 +CarpetRegrid2::position_y_1 = -0.0625 +CarpetRegrid2::position_z_1 = 0 +CarpetRegrid2::radius_1[1] = 1.0 +CarpetRegrid2::radius_1[2] = 0.5 Grid::type = "coordbase"

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits June 2011