Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro_InitData/trunk/par/ (Rev. 141)
by rhaas＠tapir.caltech.edu 09 Aug '12

09 Aug '12

User: rhaas Date: 2012/08/09 01:26 AM Modified: /trunk/par/ rotor.par Log: GRHydro_InitData: adapt rotor parfile to current code From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/par/ ====================== File [modified]: rotor.par Delta lines: +60 -27 =================================================================== --- trunk/par/rotor.par 2012-08-09 06:26:40 UTC (rev 140) +++ trunk/par/rotor.par 2012-08-09 06:26:42 UTC (rev 141) @@ -1,15 +1,16 @@ ## -ActiveThorns = "time MoL cartgrid3d carpetioascii ioutil Fortran boundary hydrobase grhydro grhydro_initdata nanchecker eos_omni CoordBase LoopControl CarpetLib Carpet CarpetReduce spacemask ADMCoupling ADMMacros ADMBASE STATICCONFORMAL TMUNUBASE SymBase localreduce CarpetIOBasic initbase " +ActiveThorns = "time MoL cartgrid3d carpetioascii ioutil boundary hydrobase grhydro grhydro_initdata nanchecker eos_omni CoordBase LoopControl CarpetLib Carpet CarpetReduce spacemask ADMCoupling ADMMacros ADMBASE STATICCONFORMAL TMUNUBASE SymBase localreduce CarpetIOBasic initbase " ActiveThorns = "CarpetIOHDF5" -#This is a hack. ghost_size should be the same as grhydro::grhydro_stencil. -driver::ghost_size=3 -grhydro::grhydro_stencil=3 +driver::ghost_size=2 # for TVD +grhydro::grhydro_stencil=2 -time::dtfac = 0.25 +Time::dtfac = 0.25 # 0.5 see p 409 (0.25 from David Neilsen, Eric WHirschmann, and R Steven Millward arXiv:gr-qc/0512147v1) -methodoflines::ODE_Method = "rk2" -methodoflines::MoL_Intermediate_Steps=2 +# rk2 dies quite quickly +methodoflines::ODE_Method = "rk3" +methodoflines::MoL_Intermediate_Steps=3 +#methodoflines::MoL_Num_Scratch_Levels=1 ADMBase::initial_shift = "zero" @@ -19,11 +20,16 @@ HydroBase::evolution_method="grhydro" HydroBase::Bvec_evolution_method="grhydro" +# rotor problem from DelZanna +# needs to be before EOS_Omni +grhydro_initdata::rotor_use_smoothing = no + SpaceMask::use_mask="yes" -EOS_Omni::gl_gamma=2.0 +EOS_Omni::gl_gamma=5./3. # relativistic rotor problem of DelZanna & Buccianti & Londrille AaA_400_397_2003 +# try to mimic the core fluid +EOS_Omni::poly_k = "grhydro_initdata::rotor_pressin/grhydro_initdata::rotor_rhoin**EOS_Omni::gl_gamma" +EOS_Omni::poly_gamma="EOS_Omni::gl_gamma" grhydro::recon_method="tvd" -grhydro::method_type="RSA FV" -grhydro::recon_vars="primitive" grhydro::riemann_solver="HLLE" grhydro::tvd_limiter="vanleerMC" grhydro::bound="flat" @@ -31,29 +37,60 @@ grhydro::grhydro_eos_table="Ideal_Fluid" grhydro::Grhydro_MaxNumConstrainedVars=13 grhydro::GRHydro_MaxNumEvolvedVars=10 +grhydro::GRHydro_MaxNumSandRVars=0 # ADMBase is not evolved +grhydro::rho_abs_min = 1e-14 # need some reasonable value here, even though no density ever gets this low. This is about the same as GRHydro's default value from rho_central and rho_rel_min grhydro::clean_divergence = "yes" -grhydro::kap_dc = 1.0 +grhydro::transport_constraints = "no" +grhydro::decouple_normal_Bfield = "yes" +grhydro::kap_dc = 5.0 grhydro::track_divB = "yes" -grid::type = "BySpacing" +grid::type = "coordbase" grid::domain = "full" -grid::dxyz = 0.004 -driver::global_nx = 250 -driver::global_ny = 250 -driver::global_nz = 10 +CoordBase::domainsize = "minmax" +CoordBase::xmin = 0. +CoordBase::ymin = 0. +CoordBase::zmin = -0.0125 +CoordBase::xmax = 1.0 +CoordBase::ymax = 1.0 +CoordBase::zmax = 0.0125 +CoordBase::boundary_size_x_lower = carpet::ghost_size +CoordBase::boundary_size_y_lower = carpet::ghost_size +CoordBase::boundary_size_z_lower = carpet::ghost_size +CoordBase::boundary_size_x_upper = carpet::ghost_size +CoordBase::boundary_size_y_upper = carpet::ghost_size +CoordBase::boundary_size_z_upper = carpet::ghost_size + +CoordBase::spacing = "numcells" +CoordBase::ncells_x = 400 +CoordBase::ncells_y = 400 +CoordBase::ncells_z = 10 + +carpet::domain_from_coordbase = "yes" + Cactus::terminate = "time" -Cactus::cctk_final_time = 0.4 -#Cactus::terminate = "iteration" -#cactus::cctk_itlast = 2 +Cactus::cctk_final_time = 0.4 # see DelZanna p 410 IO::out_dir = $parfile -CarpetIOBasic::outInfo_vars="hydrobase::rho Hydrobase::bvec GRHydro::bcons" +CarpetIOBasic::outInfo_vars=" + hydrobase::rho + hydrobase::press + hydrobase::eps + hydrobase::vel[0] hydrobase::vel[1] + hydrobase::w_lorentz + GRHydro::bcons[0] GRHydro::bcons[1] + GRHydro::divB GRHydro::psidc +" CarpetIOBasic::outInfo_every=1 -CarpetIOASCII::out1D_every = 20 -CarpetIOASCII::out1D_vars = "HydroBase::rho HydroBase::press HydroBase::eps HydroBase::vel grhydro::dens grhydro::tau grhydro::scon HydroBase::Bvec grhydro::Bcons" +CarpetIOASCII::out1D_every = 10 +CarpetIOASCII::out1D_z = "no" +CarpetIOASCII::out1D_d = "no" +CarpetIOASCII::out1D_xline_y = 0.5 +CarpetIOASCII::out1D_yline_x = 0.5 +CarpetIOASCII::out1D_vars = "HydroBase::rho HydroBase::press HydroBase::eps HydroBase::vel grhydro::dens grhydro::tau grhydro::scon HydroBase::Bvec grhydro::Bcons grhydro::divB grhydro::psidc" CarpetIOHDF5::one_file_per_group = "yes" CarpetIOHDF5::open_one_input_file_at_a_time = "yes" @@ -63,9 +100,6 @@ CarpetIOHDF5::out2D_yz = "no" CarpetIOHDF5::out2D_xyplane_z = 0.0 CarpetIOHDF5::out2D_vars = " -# CarpetReduce::weight -# GRHydro::GRHydro_tracers -# Grid::coordinates GRHydro::Bcons GrHydro::dens GrHydro::divB @@ -77,6 +111,5 @@ HydroBase::rho HydroBase::vel HydroBase::w_lorentz + GRHydro::psidc " - -

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 140)
by rhaas＠tapir.caltech.edu 09 Aug '12

09 Aug '12

User: rhaas Date: 2012/08/09 01:26 AM Modified: /trunk/src/ GRHydro_Bondi.c, GRHydro_BondiM.c Log: GRHydro_InitData: change 2d array access to avoid compiler warnings * don't access 2d array as 1d array through second index * always assign something to rho_guess in Bondi solution From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Bondi.c Delta lines: +29 -12 =================================================================== --- trunk/src/GRHydro_Bondi.c 2012-08-09 06:26:39 UTC (rev 139) +++ trunk/src/GRHydro_Bondi.c 2012-08-09 06:26:40 UTC (rev 140) @@ -123,13 +123,17 @@ for Kerr-Schild coordinates. ******************************************************************************/ -static void dxc_dxs_ks_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[][NDIM] ) +static void dxc_dxs_ks_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[NDIM][NDIM] ) { - int i; + int i, j; CCTK_REAL r, th, ph; CCTK_REAL sth,cth,sph,cph; - for( i = 0 ; i < NDIM*NDIM ; i++ ) { dxc_dxs[0][i] = 0. ; } + for( i = 0 ; i < NDIM ; i++ ) { + for( j = 0 ; j < NDIM ; j++ ) { + dxc_dxs[0][i] = 0. ; + } + } r = x_spher[RR]; th = x_spher[TH]; @@ -165,13 +169,17 @@ for Boyer-Lindquist coordinates. ******************************************************************************/ -static void dxc_dxs_bl_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[][NDIM] ) +static void dxc_dxs_bl_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[NDIM][NDIM] ) { - int i; + int i, j; CCTK_REAL r, th, ph, rterm, dr; CCTK_REAL sth,cth,sph,cph; - for( i = 0 ; i < NDIM*NDIM ; i++ ) { dxc_dxs[0][i] = 0. ; } + for( i = 0 ; i < NDIM ; i++ ) { + for( j = 0 ; j < NDIM ; j++ ) { + dxc_dxs[j][i] = 0. ; + } + } r = x_spher[RR]; th = x_spher[TH]; @@ -210,13 +218,17 @@ for "Isotropic" coordinates. ******************************************************************************/ -static void dxc_dxs_iso_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[][NDIM] ) +static void dxc_dxs_iso_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[NDIM][NDIM] ) { - int i; + int i, j; CCTK_REAL th, ph,r_iso; CCTK_REAL sth,cth,sph,cph; - for( i = 0 ; i < NDIM*NDIM ; i++ ) { dxc_dxs[0][i] = 0. ; } + for( i = 0 ; i < NDIM ; i++ ) { + for( j = 0 ; j < NDIM ; j++ ) { + dxc_dxs[j][i] = 0. ; + } + } /* BL spherical coordinates : */ th = x_spher[TH]; @@ -355,13 +367,17 @@ --------------- -- Covariant Kerr metric in Boyer-Lindquist coordinates. ****************************************************************************/ -static void bl_gcov_func( CCTK_REAL *x, CCTK_REAL gcov[][NDIM]) +static void bl_gcov_func( CCTK_REAL *x, CCTK_REAL gcov[NDIM][NDIM]) { int i,j,k ; CCTK_REAL sth,cth,s2,r2,DD,mu ; CCTK_REAL r,th; - for( i = 0 ; i < NDIM*NDIM ; i++ ) { gcov[0][i] = 0. ; } + for( i = 0 ; i < NDIM ; i++ ) { + for( j = 0 ; j < NDIM ; j++ ) { + gcov[i][j] = 0. ; + } + } r = x[RR]; th = x[TH]; @@ -648,7 +664,8 @@ if( *rho < 0. ) { if( r > 0.9*rs && r < 1.1*rs ) { - *rho = rhos; + rho_guess = rhos; + *rho = rho_guess; } else { // rhotmp = (sqrt(Qdot) - 1.) * (gamma_eos - 1.) / ( gamma_eos * K ); File [modified]: GRHydro_BondiM.c Delta lines: +28 -11 =================================================================== --- trunk/src/GRHydro_BondiM.c 2012-08-09 06:26:39 UTC (rev 139) +++ trunk/src/GRHydro_BondiM.c 2012-08-09 06:26:40 UTC (rev 140) @@ -125,11 +125,15 @@ ******************************************************************************/ static void dxc_dxs_ks_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[][NDIM] ) { - int i; + int i, j; CCTK_REAL r, th, ph; CCTK_REAL sth,cth,sph,cph; - for( i = 0 ; i < NDIM*NDIM ; i++ ) { dxc_dxs[0][i] = 0. ; } + for( i = 0 ; i < NDIM ; i++ ) { + for( j = 0 ; j < NDIM ; j++ ) { + dxc_dxs[j][i] = 0. ; + } + } r = x_spher[RR]; th = x_spher[TH]; @@ -165,13 +169,17 @@ for Boyer-Lindquist coordinates. ******************************************************************************/ -static void dxc_dxs_bl_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[][NDIM] ) +static void dxc_dxs_bl_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[NDIM][NDIM] ) { - int i; + int i, j; CCTK_REAL r, th, ph, rterm, dr; CCTK_REAL sth,cth,sph,cph; - for( i = 0 ; i < NDIM*NDIM ; i++ ) { dxc_dxs[0][i] = 0. ; } + for( i = 0 ; i < NDIM ; i++ ) { + for( j = 0 ; j < NDIM ; j++ ) { + dxc_dxs[j][i] = 0. ; + } + } r = x_spher[RR]; th = x_spher[TH]; @@ -210,13 +218,17 @@ for "Isotropic" coordinates. ******************************************************************************/ -static void dxc_dxs_iso_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[][NDIM] ) +static void dxc_dxs_iso_calc(CCTK_REAL *x_cart, CCTK_REAL *x_spher, CCTK_REAL dxc_dxs[NDIM][NDIM] ) { - int i; + int i, j; CCTK_REAL th, ph,r_iso; CCTK_REAL sth,cth,sph,cph; - for( i = 0 ; i < NDIM*NDIM ; i++ ) { dxc_dxs[0][i] = 0. ; } + for( i = 0 ; i < NDIM ; i++ ) { + for( j = 0 ; j < NDIM ; j++ ) { + dxc_dxs[j][i] = 0. ; + } + } /* BL spherical coordinates : */ th = x_spher[TH]; @@ -355,13 +367,17 @@ --------------- -- Covariant Kerr metric in Boyer-Lindquist coordinates. ****************************************************************************/ -static void bl_gcov_func( CCTK_REAL *x, CCTK_REAL gcov[][NDIM]) +static void bl_gcov_func( CCTK_REAL *x, CCTK_REAL gcov[NDIM][NDIM]) { int i,j,k ; CCTK_REAL sth,cth,s2,r2,DD,mu ; CCTK_REAL r,th; - for( i = 0 ; i < NDIM*NDIM ; i++ ) { gcov[0][i] = 0. ; } + for( i = 0 ; i < NDIM ; i++ ) { + for( j = 0 ; j < NDIM ; j++ ) { + gcov[i][j] = 0. ; + } + } r = x[RR]; th = x[TH]; @@ -648,7 +664,8 @@ if( *rho < 0. ) { if( r > 0.9*rs && r < 1.1*rs ) { - *rho = rhos; + rho_guess = rhos; + *rho = rho_guess; } else { // rhotmp = (sqrt(Qdot) - 1.) * (gamma_eos - 1.) / ( gamma_eos * K );

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 139)
by rhaas＠tapir.caltech.edu 09 Aug '12

09 Aug '12

User: rhaas Date: 2012/08/09 01:26 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_RotorM.F90 Log: GRHydro_InitData: make rotor parameters Cactus parameters * cite paper with description of system * reverse sense of rotation * add openmp statements From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_RotorM.F90 Delta lines: +56 -74 =================================================================== --- trunk/src/GRHydro_RotorM.F90 2012-08-09 06:26:37 UTC (rev 138) +++ trunk/src/GRHydro_RotorM.F90 2012-08-09 06:26:39 UTC (rev 139) @@ -44,93 +44,82 @@ subroutine GRHydro_RotorM(CCTK_ARGUMENTS) + use cctk + implicit none - + DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS - + CCTK_INT :: i, j, k, nx, ny, nz - CCTK_REAL :: radius, det, v_max - CCTK_REAL :: rhoin, rhoout, pressin, pressout - CCTK_REAL :: bvcxl,bvcyl,bvczl - CCTK_REAL :: tmp,tmp2,gam,r_rot + CCTK_REAL :: radius, det, rfact - CCTK_INT :: use_smoothing - CCTK_REAL :: rsmooth_rel,rfact + !begin EOS_Omni stuff + CCTK_REAL :: tempEOS(1), yeEOS(1), xepsEOS(1) + CCTK_INT :: keyerr(1), anyerr + CCTK_INT, parameter :: have_temp = 0, n = 1 + !end EOS_Omni -!!$Hardwired bfield and gamma values - bvcxl = 1.0 - bvcyl = 0.0 - bvczl = 0.0 - -!!$Adiabatic index for test - gam = (5.d0/3.d0) - -!!$radius of rotor is 0.1 - r_rot = 0.1 - -!!$Maximum velocity is 0.995 - v_max = 0.995 - -!!$Inner values - rhoin = 10.d0 - pressin = 1.d0 - -!!$Outer values - rhoout = 1.d0 - pressout = 1.d0 - - -!!$ Smooth the edge? Define the radius in relative terms if so - use_smoothing = 0 - rsmooth_rel = 0.05 - nx = cctk_lsh(1) ny = cctk_lsh(2) nz = cctk_lsh(3) - - if(v_max>1.0) then - write(*,*)"No superluminal speeds!!!! v_max=",v_max," reset to 0.995" - v_max=0.995 - endif + !$OMP PARALLEL DO PRIVATE(i,j,k,radius,det,rfact,tempEOS,yeEOS,xepsEOS,keyerr,anyerr) & + !$OMP default(none) & + !$OMP firstprivate(nx,ny,nz,GRHydro_eos_handle, GRHydro_eos_rf_prec, grhydro_eos_type, & + !$OMP rotor_xc,rotor_yc, rotor_rsmooth_rel, rotor_use_smoothing, & + !$OMP rotor_r_rot, rotor_rhoin,rotor_pressin,rotor_rhoout,rotor_pressout, & + !$OMP rotor_v_max, rotor_bvcxl, rotor_bvcyl, rotor_bvczl) & + !$OMP shared(x,y,z,rho,press,eps,vel,Bvec,w_lorentz,dens,Scon,tau,Bcons, & + !$OMP gxx,gxy,gxz,gyy,gyz,gzz) do i=1,nx do j=1,ny do k=1,nz - - radius = sqrt(x(i,j,k)**2+y(i,j,k)**2) - - if(radius.le.r_rot) then - rho(i,j,k) = rhoin - press(i,j,k) = pressin - velx(i,j,k) = v_max/r_rot*y(i,j,k) - vely(i,j,k) = -1.d0*v_max/r_rot*x(i,j,k) + + radius = sqrt((x(i,j,k)-rotor_xc)**2+(y(i,j,k)-rotor_yc)**2) + + if(radius.le.rotor_r_rot) then + rho(i,j,k) = rotor_rhoin + press(i,j,k) = rotor_pressin + velx(i,j,k) = -1.d0*rotor_v_max/rotor_r_rot*(y(i,j,k)-rotor_yc) + vely(i,j,k) = +1.d0*rotor_v_max/rotor_r_rot*(x(i,j,k)-rotor_xc) velz(i,j,k) = 0.d0 - else if((use_smoothing.eq.1) .and. & - ((radius.gt.r_rot) .and. & - (radius.le.((1.0+rsmooth_rel)*r_rot)))) then - rfact = (radius/r_rot - 1.d0) / rsmooth_rel - rho(i,j,k) = rfact*rhoout + (1.d0-rfact)*rhoin - press(i,j,k) = rfact*pressout + (1.d0-rfact)*pressin - velx(i,j,k) = (1.d0-rfact)*v_max * y(i,j,k) / radius - velx(i,j,k) = -1.d0*(1.d0-rfact)*v_max * x(i,j,k) / radius + else if((rotor_use_smoothing.eq.1) .and. & + ((radius.gt.rotor_r_rot) .and. & + (radius.le.((1.0+rotor_rsmooth_rel)*rotor_r_rot)))) then + rfact = (radius/rotor_r_rot - 1.d0) / rotor_rsmooth_rel + rho(i,j,k) = rfact*rotor_rhoout + (1.d0-rfact)*rotor_rhoin + press(i,j,k) = rfact*rotor_pressout + (1.d0-rfact)*rotor_pressin + velx(i,j,k) = -1.d0*(1.d0-rfact)*rotor_v_max * (y(i,j,k)-rotor_yc) / radius + velx(i,j,k) = +1.d0*(1.d0-rfact)*rotor_v_max * (x(i,j,k)-rotor_xc) / radius velz(i,j,k) = 0.d0 else - rho(i,j,k) = rhoout - press(i,j,k) = pressout + rho(i,j,k) = rotor_rhoout + press(i,j,k) = rotor_pressout velx(i,j,k) = 0.d0 vely(i,j,k) = 0.d0 velz(i,j,k) = 0.d0 endif - eps(i,j,k)=press(i,j,k)/(gam-1.d0)/rho(i,j,k) - - Bvecx(i,j,k)=bvcxl - Bvecy(i,j,k)=bvcyl - Bvecz(i,j,k)=bvczl - + keyerr = 0; anyerr = 0 + call EOS_Omni_EpsFromPress(GRHydro_eos_handle, have_temp, GRHydro_eos_rf_prec, & + n, rho(i:i,j:j,k:k), eps(i:i,j:j,k:k), & + tempEOS, yeEOS, press(i:i,j:j,k:k), & + eps(i:i,j:j,k:k), & ! xeps argument + keyerr, anyerr) + if(anyerr .ne. 0) then + call CCTK_WARN(0, "Error when calling EOS. After stopping swearing at me, add a decent output text.") + end if + + Bvecx(i,j,k)=rotor_bvcxl + Bvecy(i,j,k)=rotor_bvcyl + Bvecz(i,j,k)=rotor_bvczl + 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)) - + if(abs(det - 1d0) .gt. 1e-8) then + call CCTK_WARN(0, "Rotor initial data only supports flat spacetime right now") + end if + if (CCTK_EQUALS(GRHydro_eos_type,"Polytype")) then call Prim2ConPolyM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& @@ -148,19 +137,12 @@ eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& w_lorentz(i,j,k)) end if - + enddo enddo enddo - - densrhs = 0.d0 - srhs = 0.d0 - taurhs = 0.d0 - Bconsrhs = 0.d0 + !$OMP END PARALLEL DO - - return - end subroutine GRHydro_RotorM Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +70 -1 =================================================================== --- trunk/param.ccl 2012-08-09 06:26:37 UTC (rev 138) +++ trunk/param.ccl 2012-08-09 06:26:39 UTC (rev 139) @@ -14,7 +14,7 @@ "simple_wave" :: "Set initial data from Anile Miller Motta, Phys.Fluids. 26, 1450 (1983)" "monopole" :: "Monopole at the center" "cylexp" :: "Cylindrical Explosion" - "rotor" :: "Magnetic Rotor test" + "rotor" :: "Magnetic Rotor test from DelZanna,Bucciantini, and Londrillo A&A 400, 397â413 (2003)" "advectedloop":: "Magnetic advected loop test" "alfvenwave" :: "Circularly polarized Alfven wave" "hydro_bondi_solution" :: "Spherical single black hole Bondi solution" @@ -275,6 +275,75 @@ (0:* :: "Anything positive." } 1.0e-3 +# for the Magnetic Rotor test: +# default values are from DelZanna,Bucciantini, and Londrillo A&A 400, 397â413 (2003) though notation differs + +CCTK_REAL rotor_xc "center of rotation" +{ + *:* :: "Any location" +} 0.5 + +CCTK_REAL rotor_yc "center of rotation" +{ + *:* :: "Any location" +} 0.5 + +CCTK_REAL rotor_bvcxl "intial component of Bvec[0]" +{ + *:* :: "any real number" +} 1.0 + +CCTK_REAL rotor_bvcyl "intial component of Bvec[1]" +{ + *:* :: "any real number" +} 0.0 + +CCTK_REAL rotor_bvczl "intial component of Bvec[2]" +{ + *:* :: "any real number" +} 0.0 + +CCTK_REAL rotor_r_rot "radius of rotor" +{ + (0:* :: "any positive number" +} 0.1 + +CCTK_REAL rotor_v_max "Maximum velocity" +{ + (-1:1) :: "any subluminal speed (negative is clockwise)" +} 0.995 + + +CCTK_REAL rotor_rhoin "initial density inside rotor" +{ + (0:* :: "any positive number" +} 10.d0 + +CCTK_REAL rotor_pressin "initial pressure inside rotor" +{ + (0:* :: "any positive number" +} 1.d0 + +CCTK_REAL rotor_rhoout "initial density outside rotor" +{ + (0:* :: "any positive number" +} 1.d0 + +CCTK_REAL rotor_pressout "initial pressure outside rotor" +{ + (0:* :: "any positive number" +} 1.d0 + +CCTK_BOOLEAN rotor_use_smoothing "Smooth the edge?" +{ +} yes + +CCTK_REAL rotor_rsmooth_rel "Define the radius in relative terms if so" +{ + (0:* :: "any positive number" +} 0.05 + + shares:GRHydro USES real GRHydro_eos_rf_prec

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 138)
by rhaas＠tapir.caltech.edu 09 Aug '12

09 Aug '12

User: rhaas Date: 2012/08/09 01:26 AM Added: /trunk/ configuration.ccl Log: GRHydro_InitData: REQUIRE EOS_Omni From: Roland Haas <roland.haas(a)physics.gatech.edu> File Changes: Directory: /trunk/ ================== File [added]: configuration.ccl Delta lines: +2 -0 =================================================================== --- trunk/configuration.ccl (rev 0) +++ trunk/configuration.ccl 2012-08-09 06:26:37 UTC (rev 138) @@ -0,0 +1,2 @@ +REQUIRES EOS_Omni +

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 137)
by rhaas＠tapir.caltech.edu 09 Aug '12

09 Aug '12

User: rhaas Date: 2012/08/09 01:21 AM Modified: /trunk/src/ GRHydro_PoloidalMagFieldM.F90 Log: A couple of changes: 1) Calculate divergence of B in MoL PseudoEvolution and set its Prolongation="Restrict". 2) Correct the source terms and fluxes for the Bfield and the divergence cleaning field when having a non-flat space-time. 3) Make sure alpha factors match between UpdateCalculation and fluxes definition. 4) Include 1/sqrt(detg) factor in calculation of \epsilon^{\muijk} in the cross product to obtain the Bfield form the vector potential. From: Philipp Moesta <pmoesta(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PoloidalMagFieldM.F90 Delta lines: +7 -4 =================================================================== --- trunk/src/GRHydro_PoloidalMagFieldM.F90 2012-08-09 06:11:31 UTC (rev 136) +++ trunk/src/GRHydro_PoloidalMagFieldM.F90 2012-08-09 06:21:04 UTC (rev 137) @@ -58,6 +58,7 @@ CCTK_INT :: i, j, k, nx, ny, nz CCTK_REAL :: det + CCTK_REAL :: sdet CCTK_REAL :: dx,dy,dz CCTK_REAL :: rhofac, delPcut, maxP_Pcut CCTK_REAL :: Aphi, Ax, Ay, Az @@ -112,12 +113,14 @@ Ay_dx = Aphi + x(i,j,k)*Aphi_dx Ay_dz = x(i,j,k)*Aphi_dz - Bvecx(i,j,k) = alp(i,j,k)*Ay_dz - Bvecy(i,j,k) = -alp(i,j,k)*Ax_dz - Bvecz(i,j,k) = alp(i,j,k)*(Ax_dy-Ay_dx) 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)) - + sdet = sqrt(det) + + Bvecx(i,j,k) = Ay_dz/sdet + Bvecy(i,j,k) = - Ax_dz/sdet + Bvecz(i,j,k) = (Ax_dy-Ay_dx)/sdet + if (CCTK_EQUALS(GRHydro_eos_type,"Polytype")) then call Prim2ConPolyM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),&

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 136)
by rhaas＠tapir.caltech.edu 09 Aug '12

09 Aug '12

User: rhaas Date: 2012/08/09 01:11 AM Modified: /trunk/src/ GRHydro_PoloidalMagFieldM.F90 Log: Fix a sign error in the poloidal mag field idata From: Philipp Moesta <pmoesta(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PoloidalMagFieldM.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_PoloidalMagFieldM.F90 2012-08-09 06:10:15 UTC (rev 135) +++ trunk/src/GRHydro_PoloidalMagFieldM.F90 2012-08-09 06:11:31 UTC (rev 136) @@ -108,7 +108,7 @@ ( rhofac*press_dz/delPcut - poloidal_n_p*rho_dz/poloidal_rho_max ) Ax_dy = -Aphi - y(i,j,k)*Aphi_dy - Ax_dz = y(i,j,k)*Aphi_dz + Ax_dz = -y(i,j,k)*Aphi_dz Ay_dx = Aphi + x(i,j,k)*Aphi_dx Ay_dz = x(i,j,k)*Aphi_dz

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 135)
by rhaas＠tapir.caltech.edu 09 Aug '12

09 Aug '12

User: rhaas Date: 2012/08/09 01:10 AM Modified: /trunk/ schedule.ccl /trunk/par/ balsara1d.par /trunk/src/ GRHydro_ShockTubeM.F90 Log: Introduce a better treatment of the shocktube boundaries. * The 2d diagonal boundary conditions are correctly applied when using multiprocessors. * The ymin (ymax) surfaces have their points in the region indsum < minsum (indsum > maxsum) fixed after a first sync operation. A second sync guarantees the neighbour grid receives the correct value of the boundary on those regions. * Mirror symmetries applied at the faces intercepting the upper right corner assumed cubic local domain. However, rectangular local domains are common after domain decomposition. This commit fixes the indexes applying this symmetry for these cases. * Upper right corner/edge/surface condition should use sten instead of stenp1. Thanks for catching this Josh! * Attempt at a 3d diagonal boundary treatment (Josh's commit) File Changes: Directory: /trunk/par/ ====================== File [modified]: balsara1d.par Delta lines: <Unavailable> Directory: /trunk/src/ ====================== File [modified]: GRHydro_ShockTubeM.F90 Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 134)
by rhaas＠tapir.caltech.edu 09 Aug '12

09 Aug '12

User: rhaas Date: 2012/08/09 01:08 AM Added: /trunk/par/ MagTOVstar.par, TOVstar.par, advectedloop2D.par, advectedloop3D.par, balsara1_1d.par, balsara1b.par, balsara1c.par, bondi-ks.par, bondi-punc-iso.par, bondi-punc.par, bondi-punc2.par, bondi-sch.par, bondi-sch2.par, cylexp.par, rotor.par /trunk/src/ GRHydro_AdvectedLoopM.F90, GRHydro_AlfvenWaveM.F90, GRHydro_Bondi.c, GRHydro_BondiM.c, GRHydro_BondiM_new.F90, GRHydro_Bondi_new.F90, GRHydro_C2P2CM_eosomni.F90, GRHydro_P2C2PM_eosomni.F90, GRHydro_PoloidalMagFieldM.F90, GRHydro_RotorM.F90 Modified: /trunk/ param.ccl, schedule.ccl /trunk/src/ CheckParam.c, GRHydro_CylindricalExplosionM.F90, GRHydro_MonopoleM.F90, GRHydro_ShockTubeM.F90, make.code.defn Log: Snapshot of ET GRHydro_InitData rev. 132 with a poloidal magnetic field routine added. File Changes: Directory: /trunk/par/ ====================== File [added]: MagTOVstar.par Delta lines: <Unavailable> File [added]: TOVstar.par Delta lines: <Unavailable> File [added]: advectedloop2D.par Delta lines: <Unavailable> File [added]: advectedloop3D.par Delta lines: <Unavailable> File [added]: balsara1_1d.par Delta lines: <Unavailable> File [added]: balsara1b.par Delta lines: <Unavailable> File [added]: balsara1c.par Delta lines: <Unavailable> File [added]: bondi-ks.par Delta lines: <Unavailable> File [added]: bondi-punc-iso.par Delta lines: <Unavailable> File [added]: bondi-punc.par Delta lines: <Unavailable> File [added]: bondi-punc2.par Delta lines: <Unavailable> File [added]: bondi-sch.par Delta lines: <Unavailable> File [added]: bondi-sch2.par Delta lines: <Unavailable> File [added]: cylexp.par Delta lines: <Unavailable> File [added]: rotor.par Delta lines: <Unavailable> Directory: /trunk/src/ ====================== File [modified]: CheckParam.c Delta lines: <Unavailable> File [added]: GRHydro_AdvectedLoopM.F90 Delta lines: <Unavailable> File [added]: GRHydro_AlfvenWaveM.F90 Delta lines: <Unavailable> File [added]: GRHydro_Bondi.c Delta lines: <Unavailable> File [added]: GRHydro_BondiM.c Delta lines: <Unavailable> File [added]: GRHydro_BondiM_new.F90 Delta lines: <Unavailable> File [added]: GRHydro_Bondi_new.F90 Delta lines: <Unavailable> File [added]: GRHydro_C2P2CM_eosomni.F90 Delta lines: <Unavailable> File [modified]: GRHydro_CylindricalExplosionM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_MonopoleM.F90 Delta lines: <Unavailable> File [added]: GRHydro_P2C2PM_eosomni.F90 Delta lines: <Unavailable> File [added]: GRHydro_PoloidalMagFieldM.F90 Delta lines: <Unavailable> File [added]: GRHydro_RotorM.F90 Delta lines: <Unavailable> File [modified]: GRHydro_ShockTubeM.F90 Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

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

08 Aug '12

changeset: 3616:bffbe6c03780 tag: tip user: Erik Schnetter <schnetter(a)gmail.com> date: Wed Aug 08 16:49:28 2012 -0400 summary: Carpet: Move CCTK_INFO calls out of OpenMP parallel region

1 0

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

04 Aug '12

User: rhaas Date: 2012/08/04 02:41 AM Modified: /trunk/src/ GRHydro_Eigenproblem.F90, GRHydro_PPMMReconstruct_drv.F90, GRHydro_UpdateMask.F90 Log: GRHydro: add forgotten label in error message, whitespace change File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2012-08-04 07:18:51 UTC (rev 406) +++ trunk/src/GRHydro_Eigenproblem.F90 2012-08-04 07:41:17 UTC (rev 407) @@ -88,7 +88,7 @@ if(cs2.lt.0.0d0) then !$OMP CRITICAL if (abs(cs2) .gt. 1.0d-4) then - write(warnline,'(a50,6g16.7)') 'rho, dpdrho, press*dpdeps/rho**2, eps, press/rho: ', abs(cs2), rho, dpdrho, press * dpdeps / (rho**2), eps, press/rho + write(warnline,'(a50,6g16.7)') 'abs(cs2), rho, dpdrho, press*dpdeps/rho**2, eps, press/rho: ', abs(cs2), rho, dpdrho, press * dpdeps / (rho**2), eps, press/rho call CCTK_WARN(1,warnline) call CCTK_WARN(1,"cs2 < 0! Check speed of sound calculation!") cs2 = 0.0d0 File [modified]: GRHydro_PPMMReconstruct_drv.F90 Delta lines: +1 -0 =================================================================== --- trunk/src/GRHydro_PPMMReconstruct_drv.F90 2012-08-04 07:18:51 UTC (rev 406) +++ trunk/src/GRHydro_PPMMReconstruct_drv.F90 2012-08-04 07:41:17 UTC (rev 407) @@ -240,6 +240,7 @@ end do !$OMP END PARALLEL DO end if + if(evolve_Y_e.ne.0) then !$OMP PARALLEL DO PRIVATE(j, k) do k = GRHydro_stencil, nz - GRHydro_stencil + 1 File [modified]: GRHydro_UpdateMask.F90 Delta lines: +2 -0 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2012-08-04 07:18:51 UTC (rev 406) +++ trunk/src/GRHydro_UpdateMask.F90 2012-08-04 07:41:17 UTC (rev 407) @@ -48,6 +48,7 @@ densrhs(i,j,k) = 0.0d0 srhs(i,j,k,:) = 0.0d0 taurhs(i,j,k) = 0.0d0 + ! Set real-valued mask! This will be sync'ed and right after syncing translated to ! our standard integer based mask (so that atmosphere_mask is still valid!). atmosphere_mask_real(i,j,k) = 1 @@ -69,6 +70,7 @@ densrhs(i,j,k) = 0.0d0 srhs(i,j,k,:) = 0.0d0 taurhs(i,j,k) = 0.0d0 + ! Set real-valued mask! This will be sync'ed and right after syncing translated to ! our standard integer based mask (so that atmosphere_mask is still valid!). atmosphere_mask_real(i,j,k) = 1

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits