Commits April 2011

commits@lists.einsteintoolkit.org

12 participants
208 discussions

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/examples/tov/ (Rev. 76)
by knarf＠cct.lsu.edu 28 Apr '11

28 Apr '11

User: knarf Date: 2011/04/28 12:47 PM Modified: /examples/tov/ tov.rpar Log: add perturbed tov parameters (not in ET yet File Changes: Directory: /examples/tov/ ========================= File [modified]: tov.rpar Delta lines: +13 -3 =================================================================== --- examples/tov/tov.rpar 2011-04-28 17:23:25 UTC (rev 75) +++ examples/tov/tov.rpar 2011-04-28 17:47:46 UTC (rev 76) @@ -1,9 +1,18 @@ #!/usr/bin/perl -w use strict; +foreach my $type (("", "pert")) { foreach my $res ((16, 8, 4, 2)) { my $out_every = 256/$res; + my $K_TOV = 100; + my $K_change = ""; + if ($type eq "pert") { + $K_TOV = 99; + $K_change = "TOVSolver::TOV_Transform_to_K = 100"; + } + + my $par = <<PAR_EOF; ## mclachlan tov_static ActiveThorns = "Time MoL" @@ -184,7 +193,8 @@ TOVSolver::TOV_Rho_Central[0] = 1.28e-3 TOVSolver::TOV_Gamma[0] = 2.0 -TOVSolver::TOV_K[0] = 100.0 +TOVSolver::TOV_K[0] = $K_TOV +$K_change # I/O @@ -225,8 +235,8 @@ " PAR_EOF - open(OUT, ">tov_${res}.par"); + open(OUT, ">tov_${res}_${type}.par"); print OUT "$par"; close(OUT); -} +}}

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/examples/tov/ (Rev. 75)
by knarf＠cct.lsu.edu 28 Apr '11

28 Apr '11

User: knarf Date: 2011/04/28 12:23 PM Modified: /examples/tov/ tov.rpar Log: output simulation speed File Changes: Directory: /examples/tov/ ========================= File [modified]: tov.rpar Delta lines: +1 -1 =================================================================== --- examples/tov/tov.rpar 2011-04-28 17:22:12 UTC (rev 74) +++ examples/tov/tov.rpar 2011-04-28 17:23:25 UTC (rev 75) @@ -191,7 +191,7 @@ IO::out_dir = \$parfile IOBasic::outInfo_every = $out_every -IOBasic::outInfo_vars = "HydroBase::rho ML_BSSN::ML_Ham" +IOBasic::outInfo_vars = "Carpet::physical_time_per_hour HydroBase::rho ML_BSSN::ML_Ham" IOScalar::outScalar_every = $out_every IOScalar::one_file_per_group = yes

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/examples/tov/ (Rev. 74)
by knarf＠cct.lsu.edu 28 Apr '11

28 Apr '11

User: knarf Date: 2011/04/28 12:22 PM Modified: /examples/tov/ tov.rpar Log: small updates File Changes: Directory: /examples/tov/ ========================= File [modified]: tov.rpar Delta lines: +10 -16 =================================================================== --- examples/tov/tov.rpar 2011-04-28 16:21:09 UTC (rev 73) +++ examples/tov/tov.rpar 2011-04-28 17:22:12 UTC (rev 74) @@ -1,7 +1,7 @@ #!/usr/bin/perl -w use strict; -foreach my $res ((8, 4, 2)) { +foreach my $res ((16, 8, 4, 2)) { my $out_every = 256/$res; my $par = <<PAR_EOF; @@ -15,8 +15,6 @@ ActiveThorns = "Carpet CarpetLib CarpetReduce CarpetRegrid2 CarpetInterp" ActiveThorns = "CarpetIOASCII CarpetIOScalar CarpetIOHDF5 CarpetIOBasic" -ActiveThorns = "ADMConstraints" - # grid parameters CartGrid3D::type = "coordbase" CartGrid3D::domain = "full" @@ -24,9 +22,9 @@ CoordBase::xmin = 0.0 CoordBase::ymin = 0.0 CoordBase::zmin = 0.0 -CoordBase::xmax = 240.0 -CoordBase::ymax = 240.0 -CoordBase::zmax = 240.0 +CoordBase::xmax = 320.0 +CoordBase::ymax = 320.0 +CoordBase::zmax = 320.0 CoordBase::dx = $res CoordBase::dy = $res CoordBase::dz = $res @@ -69,14 +67,10 @@ ADMBase::metric_type = "physical" -ADMConstraints::bound = "static" -ADMConstraints::constraints_timelevels = 3 -ADMConstraints::constraints_persist = yes - SpaceMask::use_mask = "yes" Cactus::terminate = "time" -Cactus::cctk_final_time = 1000 +Cactus::cctk_final_time = 10000 Carpet::domain_from_coordbase = "yes" Carpet::enable_all_storage = no @@ -197,7 +191,7 @@ IO::out_dir = \$parfile IOBasic::outInfo_every = $out_every -IOBasic::outInfo_vars = "HydroBase::rho ADMBase::lapse" +IOBasic::outInfo_vars = "HydroBase::rho ML_BSSN::ML_Ham" IOScalar::outScalar_every = $out_every IOScalar::one_file_per_group = yes @@ -209,8 +203,8 @@ ADMBase::lapse ADMBase::metric ADMBase::curv - ADMConstraints::ham - ADMConstraints::momentum + ML_BSSN::ML_Ham + ML_BSSN::ML_mom " IOASCII::out1D_every = $out_every @@ -226,8 +220,8 @@ ADMBase::lapse ADMBase::metric ADMBase::curv - ADMConstraints::ham - ADMConstraints::momentum + ML_BSSN::ML_Ham + ML_BSSN::ML_mom " PAR_EOF

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/src/ (Rev. 243)
by tanja.bode＠physics.gatech.edu 28 Apr '11

28 Apr '11

User: tbode Date: 2011/04/28 11:47 AM Modified: /branches/divclean/src/ GRHydro_CalcUpdate.F90, GRHydro_FluxM.F90, GRHydro_HLLEM.F90, GRHydro_Prim2ConM.F90, GRHydro_Reconstruct.F90, GRHydro_SourceM.F90 Log: Josh's fixes. File Changes: Directory: /branches/divclean/src/ ================================== File [modified]: GRHydro_CalcUpdate.F90 Delta lines: +7 -0 =================================================================== --- branches/divclean/src/GRHydro_CalcUpdate.F90 2011-04-28 01:28:55 UTC (rev 242) +++ branches/divclean/src/GRHydro_CalcUpdate.F90 2011-04-28 16:47:14 UTC (rev 243) @@ -102,6 +102,13 @@ Bvec(i+xoffset,j+yoffset,k+zoffset,flux_direction)) divB(i,j,k) = divB(i,j,k) + ( alp_l * Bvec_l - alp_r * Bvec_r ) * idx endif + +!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'update:', & +!!$ Bconsrhs(i,j,k,1),Bconsxflux(i,j,k), & +!!$ Bconsxflux(i-xoffset,j-yoffset,k-zoffset), & +!!$ Bconsrhs(i,j,k,3),Bconszflux(i,j,k), & +!!$ Bconszflux(i-xoffset,j-yoffset,k-zoffset) + endif if (evolve_tracer .ne. 0) then File [modified]: GRHydro_FluxM.F90 Delta lines: +7 -10 =================================================================== --- branches/divclean/src/GRHydro_FluxM.F90 2011-04-28 01:28:55 UTC (rev 242) +++ branches/divclean/src/GRHydro_FluxM.F90 2011-04-28 16:47:14 UTC (rev 243) @@ -23,13 +23,10 @@ CCTK_REAL :: vxt,vyt,vzt,bsubx,bsuby,bsubz,ab0,w CCTK_REAL :: det,alp,beta,pressstar CCTK_REAL :: velm - CCTK_REAL :: sdet,psipstar,psiBx,psiBy,psiBz + CCTK_REAL :: sdet,psipstar sdet=sqrt(det) psipstar=pressstar*sdet - psiBx=Bx*sdet - psiBy=By*sdet - psiBz=Bz*sdet !!$ We actually need all three values of vtilde = v^i - beta^i/alp, as well as velm=vxt+beta/alp @@ -38,19 +35,19 @@ !!$ In the notation of Anton et al.: [psi^6 D] vtilde^i densf = dens * vxt - sxf = sx*vxt+psipstar-bsubx*psiBx/w + sxf = sx*vxt+psipstar-bsubx*Bx/w - syf = sy*vxt-bsuby*psiBx/w + syf = sy*vxt-bsuby*Bx/w - szf = sz*vxt-bsubz*psiBx/w + szf = sz*vxt-bsubz*Bx/w !!$ [psi^6 tau] vtilde^i +p* v^i - alp b^0 B^i/w - tauf = tau*vxt + psipstar*velm - ab0*psiBx/w + tauf = tau*vxt + psipstar*velm - ab0*Bx/w !!$ [psi^6 (B^k vtilde^i - B^i vtilde^k)] bxf = 0.0 - byf = psiBy * vxt - psiBx*vyt - bzf = psiBz * vxt - psiBx*vzt + byf = By * vxt - Bx*vyt + bzf = Bz * vxt - Bx*vzt end subroutine num_x_fluxM File [modified]: GRHydro_HLLEM.F90 Delta lines: +88 -78 =================================================================== --- branches/divclean/src/GRHydro_HLLEM.F90 2011-04-28 01:28:55 UTC (rev 242) +++ branches/divclean/src/GRHydro_HLLEM.F90 2011-04-28 16:47:14 UTC (rev 243) @@ -40,10 +40,9 @@ DECLARE_CCTK_PARAMETERS integer :: i, j, k, m - CCTK_REAL, dimension(8) :: fplus,fminus,f1,qdiff - CCTK_REAL, dimension(7) :: prim_p, prim_m - CCTK_REAL, dimension(5) :: lamminus,lamplus,cons_p,cons_m - CCTK_REAL, dimension(3) :: mag_p,mag_m + CCTK_REAL, dimension(8) :: cons_p,cons_m,fplus,fminus,f1,qdiff + CCTK_REAL, dimension(10) :: prim_p, prim_m + CCTK_REAL, dimension(5) :: lamminus,lamplus CCTK_REAL :: charmin, charmax, charpm,avg_alp,avg_det, sdet CCTK_REAL :: gxxh, gxyh, gxzh, gyyh, gyzh, gzzh, uxxh, uxyh, & uxzh, uyyh, uyzh, uzzh, avg_beta, usendh, alp_l, alp_r, & @@ -83,8 +82,6 @@ lamplus = 0.d0 cons_p = 0.d0 cons_m = 0.d0 - mag_p=0.d0 - mag_m=0.d0 fplus = 0.d0 fminus = 0.d0 qdiff = 0.d0 @@ -101,20 +98,20 @@ cons_p(3) = syplus(i,j,k) cons_p(4) = szplus(i,j,k) cons_p(5) = tauplus(i,j,k) - - mag_p(1) = Bvecxplus(i,j,k) - mag_p(2) = Bvecyplus(i,j,k) - mag_p(3) = Bveczplus(i,j,k) + cons_p(6) = Bconsxplus(i,j,k) + cons_p(7) = Bconsyplus(i,j,k) + cons_p(8) = Bconszplus(i,j,k) cons_m(1) = densminus(i+xoffset,j+yoffset,k+zoffset) cons_m(2) = sxminus(i+xoffset,j+yoffset,k+zoffset) cons_m(3) = syminus(i+xoffset,j+yoffset,k+zoffset) cons_m(4) = szminus(i+xoffset,j+yoffset,k+zoffset) cons_m(5) = tauminus(i+xoffset,j+yoffset,k+zoffset) + cons_m(6) = Bconsxminus(i+xoffset,j+yoffset,k+zoffset) + cons_m(7) = Bconsyminus(i+xoffset,j+yoffset,k+zoffset) + cons_m(8) = Bconszminus(i+xoffset,j+yoffset,k+zoffset) - mag_m(1) = Bvecxminus(i+xoffset,j+yoffset,k+zoffset) - mag_m(2) = Bvecyminus(i+xoffset,j+yoffset,k+zoffset) - mag_m(3) = Bveczminus(i+xoffset,j+yoffset,k+zoffset) +!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'HLLEM0:',cons_m(6),cons_p(6),cons_m(7),cons_p(7),cons_m(8),cons_p(8) prim_p(1) = rhoplus(i,j,k) prim_p(2) = velxplus(i,j,k) @@ -123,6 +120,9 @@ prim_p(5) = epsplus(i,j,k) prim_p(6) = pressplus(i,j,k) prim_p(7) = w_lorentzplus(i,j,k) + prim_p(8) = Bvecxplus(i,j,k) + prim_p(9) = Bvecyplus(i,j,k) + prim_p(10) = Bveczplus(i,j,k) prim_m(1) = rhominus(i+xoffset,j+yoffset,k+zoffset) prim_m(2) = velxminus(i+xoffset,j+yoffset,k+zoffset) @@ -131,6 +131,9 @@ prim_m(5) = epsminus(i+xoffset,j+yoffset,k+zoffset) prim_m(6) = pressminus(i+xoffset,j+yoffset,k+zoffset) prim_m(7) = w_lorentzminus(i+xoffset,j+yoffset,k+zoffset) + prim_m(8) = Bvecxminus(i+xoffset,j+yoffset,k+zoffset) + prim_m(9) = Bvecyminus(i+xoffset,j+yoffset,k+zoffset) + prim_m(10)= Bveczminus(i+xoffset,j+yoffset,k+zoffset) if(clean_divergence.ne.0) then psidcp = psidcplus(i,j,k) @@ -191,11 +194,11 @@ vztm = prim_m(4)-avg_betaz/avg_alp call calc_vlow_blow(gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, & - prim_p(2),prim_p(3),prim_p(4),mag_p(1),mag_p(2),mag_p(3), & + prim_p(2),prim_p(3),prim_p(4),prim_p(8),prim_p(9),prim_p(10), & velxlowp,velylowp,velzlowp,Bvecxlowp,Bvecylowp,Bveczlowp, & bdotvp,b2p,v2p,wp,bxlowp,bylowp,bzlowp) call calc_vlow_blow(gxxh,gxyh,gxzh,gyyh,gyzh,gzzh, & - prim_m(2),prim_m(3),prim_m(4),mag_m(1),mag_m(2),mag_m(3), & + prim_m(2),prim_m(3),prim_m(4),prim_m(8),prim_m(9),prim_m(10), & velxlowm,velylowm,velzlowm,Bvecxlowm,Bvecylowm,Bveczlowm, & bdotvm,b2m,v2m,wm,bxlowm,bylowm,bzlowm) @@ -224,41 +227,41 @@ if (flux_direction == 1) then call num_x_fluxM(cons_p(1),cons_p(2),cons_p(3),cons_p(4),cons_p(5),& - mag_p(1),mag_p(2),mag_p(3),& + cons_p(6),cons_p(7),cons_p(8),& f1(1),f1(2),f1(3),f1(4),f1(5),f1(6),f1(7),f1(8),& vxtp,vytp,vztp,pressstarp,bxlowp,bylowp,bzlowp,ab0p,wp, & avg_det,avg_alp,avg_beta) if(clean_divergence.ne.0) then - f1(6)=f1(6) + avg_alp*sdet*uxxh*psidcp - sdet*mag_p(1)*avg_betax - f1(7)=f1(7) + avg_alp*sdet*uxyh*psidcp - sdet*mag_p(1)*avg_betay - f1(8)=f1(8) + avg_alp*sdet*uxzh*psidcp - sdet*mag_p(1)*avg_betaz - psidcf = avg_alp*mag_p(1)-psidcp*avg_betax + f1(6)=f1(6) + avg_alp*sdet*uxxh*psidcp - cons_p(6)*avg_betax + f1(7)=f1(7) + avg_alp*sdet*uxyh*psidcp - cons_p(6)*avg_betay + f1(8)=f1(8) + avg_alp*sdet*uxzh*psidcp - cons_p(6)*avg_betaz + psidcf = avg_alp*cons_p(6)/sdet-psidcp*avg_betax endif else if (flux_direction == 2) then call num_x_fluxM(cons_p(1),cons_p(3),cons_p(4),cons_p(2),cons_p(5),& - mag_p(2),mag_p(3),mag_p(1),& + cons_p(7),cons_p(8),cons_p(6),& f1(1),f1(3),f1(4),f1(2),f1(5),f1(7),f1(8),f1(6),& vytp,vztp,vxtp,pressstarp,bylowp,bzlowp,bxlowp,ab0p,wp, & avg_det,avg_alp,avg_beta) if(clean_divergence.ne.0) then - f1(6)=f1(6) + avg_alp*sdet*uxyh*psidcp - sdet*mag_p(2)*avg_betax - f1(7)=f1(7) + avg_alp*sdet*uyyh*psidcp - sdet*mag_p(2)*avg_betay - f1(8)=f1(8) + avg_alp*sdet*uyzh*psidcp - sdet*mag_p(2)*avg_betaz - psidcf = avg_alp*mag_p(2)-psidcp*avg_betay + f1(6)=f1(6) + avg_alp*sdet*uxyh*psidcp - cons_p(7)*avg_betax + f1(7)=f1(7) + avg_alp*sdet*uyyh*psidcp - cons_p(7)*avg_betay + f1(8)=f1(8) + avg_alp*sdet*uyzh*psidcp - cons_p(7)*avg_betaz + psidcf = avg_alp*cons_p(7)/sdet-psidcp*avg_betay endif else if (flux_direction == 3) then call num_x_fluxM(cons_p(1),cons_p(4),cons_p(2),cons_p(3),cons_p(5),& - mag_p(3),mag_p(1),mag_p(2),& + cons_p(8),cons_p(6),cons_p(7),& f1(1),f1(4),f1(2),f1(3),f1(5),f1(8),f1(6),f1(7), & vztp,vxtp,vytp,pressstarp,bzlowp,bxlowp,bylowp,ab0p,wp, & avg_det,avg_alp,avg_beta) if(clean_divergence.ne.0) then - f1(6)=f1(6) + avg_alp*sdet*uxzh*psidcp - sdet*mag_p(3)*avg_betax - f1(7)=f1(7) + avg_alp*sdet*uyzh*psidcp - sdet*mag_p(3)*avg_betay - f1(8)=f1(8) + avg_alp*sdet*uzzh*psidcp - sdet*mag_p(3)*avg_betaz - psidcf = avg_alp*mag_p(3)-psidcp*avg_betaz + f1(6)=f1(6) + avg_alp*sdet*uxzh*psidcp - cons_p(8)*avg_betax + f1(7)=f1(7) + avg_alp*sdet*uyzh*psidcp - cons_p(8)*avg_betay + f1(8)=f1(8) + avg_alp*sdet*uzzh*psidcp - cons_p(8)*avg_betaz + psidcf = avg_alp*cons_p(8)/sdet-psidcp*avg_betaz endif else @@ -284,11 +287,10 @@ qdiff(3) = cons_m(3) - cons_p(3) qdiff(4) = cons_m(4) - cons_p(4) qdiff(5) = cons_m(5) - cons_p(5) + qdiff(6) = cons_m(6) - cons_p(6) + qdiff(7) = cons_m(7) - cons_p(7) + qdiff(8) = cons_m(8) - cons_p(8) - qdiff(6) = mag_m(1) - mag_p(1) - qdiff(7) = mag_m(2) - mag_p(2) - qdiff(8) = mag_m(3) - mag_p(3) - if (clean_divergence.ne.0) then psidcdiff = psidcm - psidcp endif @@ -298,107 +300,108 @@ if (flux_direction == 1) then call eigenvaluesM(GRHydro_eos_handle,& prim_m(1),prim_m(2),prim_m(3),prim_m(4),prim_m(5),prim_m(7), & - mag_m(1),mag_m(2),mag_m(3),& + prim_m(8),prim_m(9),prim_m(10),& lamminus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & prim_p(1),prim_p(2),prim_p(3),prim_p(4),prim_p(5),prim_p(7), & - mag_p(1),mag_p(2),mag_p(3),& + prim_p(8),prim_p(9),prim_p(10),& lamplus,gxxh,gxyh,gxzh,gyyh,gyzh,gzzh,& usendh,avg_alp,avg_beta) call num_x_fluxM(cons_p(1),cons_p(2),cons_p(3),cons_p(4),cons_p(5),& - mag_p(1),mag_p(2),mag_p(3),& + cons_p(6),cons_p(7),cons_p(8),& fplus(1),fplus(2),fplus(3),fplus(4),fplus(5),fplus(6),fplus(7),fplus(8),& vxtp,vytp,vztp,pressstarp,bxlowp,bylowp,bzlowp,ab0p,wp, & avg_det,avg_alp,avg_beta) call num_x_fluxM(cons_m(1),cons_m(2),cons_m(3),cons_m(4),cons_m(5),& - mag_m(1),mag_m(2),mag_m(3),& + cons_m(6),cons_m(7),cons_m(8),& fminus(1),fminus(2),fminus(3),fminus(4),fminus(5),& fminus(6),fminus(7),fminus(8),& vxtm,vytm,vztm,pressstarm,bxlowm,bylowm,bzlowm,ab0m,wm, & avg_det,avg_alp,avg_beta) if(clean_divergence.ne.0) then - fminus(6)=fminus(6) + avg_alp*sdet*uxxh*psidcm - sdet*mag_m(1)*avg_betax - fminus(7)=fminus(7) + avg_alp*sdet*uxyh*psidcm - sdet*mag_m(1)*avg_betay - fminus(8)=fminus(8) + avg_alp*sdet*uxzh*psidcm - sdet*mag_m(1)*avg_betaz - fplus(6)=fplus(6) + avg_alp*sdet*uxxh*psidcp - sdet*mag_p(1)*avg_betax - fplus(7)=fplus(7) + avg_alp*sdet*uxyh*psidcp - sdet*mag_p(1)*avg_betay - fplus(8)=fplus(8) + avg_alp*sdet*uxzh*psidcp - sdet*mag_p(1)*avg_betaz - psidcfp = avg_alp*mag_p(1)-avg_betax*psidcp - psidcfm = avg_alp*mag_m(1)-avg_betax*psidcm + fminus(6)=fminus(6) + avg_alp*sdet*uxxh*psidcm - cons_m(6)*avg_betax + fminus(7)=fminus(7) + avg_alp*sdet*uxyh*psidcm - cons_m(6)*avg_betay + fminus(8)=fminus(8) + avg_alp*sdet*uxzh*psidcm - cons_m(6)*avg_betaz + fplus(6)=fplus(6) + avg_alp*sdet*uxxh*psidcp - cons_p(6)*avg_betax + fplus(7)=fplus(7) + avg_alp*sdet*uxyh*psidcp - cons_p(6)*avg_betay + fplus(8)=fplus(8) + avg_alp*sdet*uxzh*psidcp - cons_p(6)*avg_betaz + psidcfp = avg_alp*cons_p(6)/sdet-avg_betax*psidcp + psidcfm = avg_alp*cons_m(6)/sdet-avg_betax*psidcm endif else if (flux_direction == 2) then call eigenvaluesM(GRHydro_eos_handle,& prim_m(1),prim_m(3),prim_m(4),prim_m(2),prim_m(5),prim_m(7), & - mag_m(2),mag_m(3),mag_m(1),& + prim_m(9),prim_m(10),prim_m(8),& lamminus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle, & prim_p(1),prim_p(3),prim_p(4),prim_p(2),prim_p(5),prim_p(7), & - mag_p(2),mag_p(3),mag_p(1),& + prim_p(9),prim_p(10),prim_p(8),& lamplus,gyyh,gyzh,gxyh,gzzh,gxzh,gxxh,& usendh,avg_alp,avg_beta) call num_x_fluxM(cons_p(1),cons_p(3),cons_p(4),cons_p(2),cons_p(5),& - mag_p(2),mag_p(3),mag_p(1),& + cons_p(7),cons_p(8),cons_p(6),& fplus(1),fplus(3),fplus(4),fplus(2),fplus(5),fplus(7),fplus(8),fplus(6),& vytp,vztp,vxtp,pressstarp,bylowp,bzlowp,bxlowp,ab0p,wp, & avg_det,avg_alp,avg_beta) call num_x_fluxM(cons_m(1),cons_m(3),cons_m(4),cons_m(2),cons_m(5),& - mag_m(2),mag_m(3),mag_m(1),& + cons_m(7),cons_m(8),cons_m(6),& fminus(1),fminus(3),fminus(4),fminus(2),fminus(5),& fminus(7),fminus(8),fminus(6),& vytm,vztm,vxtm,pressstarm,bylowm,bzlowm,bxlowm,ab0m,wm, & avg_det,avg_alp,avg_beta) if(clean_divergence.ne.0) then - fminus(6)=fminus(6) + avg_alp*sdet*uxyh*psidcm - sdet*mag_m(2)*avg_betax - fminus(7)=fminus(7) + avg_alp*sdet*uyyh*psidcm - sdet*mag_m(2)*avg_betay - fminus(8)=fminus(8) + avg_alp*sdet*uyzh*psidcm - sdet*mag_m(2)*avg_betaz - fplus(6)=fplus(6) + avg_alp*sdet*uxyh*psidcp - sdet*mag_p(2)*avg_betax - fplus(7)=fplus(7) + avg_alp*sdet*uyyh*psidcp - sdet*mag_p(2)*avg_betay - fplus(8)=fplus(8) + avg_alp*sdet*uyzh*psidcp - sdet*mag_p(2)*avg_betaz - psidcfp = avg_alp*mag_p(2)-avg_betay*psidcp - psidcfm = avg_alp*mag_m(2)-avg_betay*psidcm + fminus(6)=fminus(6) + avg_alp*sdet*uxyh*psidcm - cons_m(7)*avg_betax + fminus(7)=fminus(7) + avg_alp*sdet*uyyh*psidcm - cons_m(7)*avg_betay + fminus(8)=fminus(8) + avg_alp*sdet*uyzh*psidcm - cons_m(7)*avg_betaz + fplus(6)=fplus(6) + avg_alp*sdet*uxyh*psidcp - cons_p(7)*avg_betax + fplus(7)=fplus(7) + avg_alp*sdet*uyyh*psidcp - cons_p(7)*avg_betay + fplus(8)=fplus(8) + avg_alp*sdet*uyzh*psidcp - cons_p(7)*avg_betaz + psidcfp = avg_alp*cons_p(7)/sdet-avg_betay*psidcp + psidcfm = avg_alp*cons_m(7)/sdet-avg_betay*psidcm endif else if (flux_direction == 3) then call eigenvaluesM(GRHydro_eos_handle,& prim_m(1),prim_m(4),prim_m(2),prim_m(3),prim_m(5),prim_m(7), & - mag_m(3),mag_m(1),mag_m(2),& + prim_m(10),prim_m(8),prim_m(9),& lamminus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& usendh,avg_alp,avg_beta) call eigenvaluesM(GRHydro_eos_handle,& prim_p(1),prim_p(4),prim_p(2),prim_p(3),prim_p(5),prim_p(7), & - mag_p(3),mag_p(1),mag_p(2),& + prim_p(10),prim_p(8),prim_p(9),& lamplus,gzzh,gxzh,gyzh,gxxh,gxyh,gyyh,& usendh,avg_alp,avg_beta) call num_x_fluxM(cons_p(1),cons_p(4),cons_p(2),cons_p(3),cons_p(5),& - mag_p(3),mag_p(1),mag_p(2),& + cons_p(8),cons_p(6),cons_p(7),& fplus(1),fplus(4),fplus(2),fplus(3),fplus(5),fplus(8),fplus(6),fplus(7), & vztp,vxtp,vytp,pressstarp,bzlowp,bxlowp,bylowp,ab0p,wp, & avg_det,avg_alp,avg_beta) call num_x_fluxM(cons_m(1),cons_m(4),cons_m(2),cons_m(3),cons_m(5),& - mag_m(3),mag_m(1),mag_m(2),& + cons_m(8),cons_m(6),cons_m(7),& fminus(1),fminus(4),fminus(2),fminus(3),fminus(5), & fminus(8),fminus(6),fminus(7), & vztm,vxtm,vytm,pressstarm,bzlowm,bxlowm,bylowm,ab0m,wm, & avg_det,avg_alp,avg_beta) if(clean_divergence.ne.0) then - fminus(6)=fminus(6) + avg_alp*sdet*uxzh*psidcm - sdet*mag_m(3)*avg_betax - fminus(7)=fminus(7) + avg_alp*sdet*uyzh*psidcm - sdet*mag_m(3)*avg_betay - fminus(8)=fminus(8) + avg_alp*sdet*uzzh*psidcm - sdet*mag_m(3)*avg_betaz - fplus(6)=fplus(6) + avg_alp*sdet*uxzh*psidcp - sdet*mag_p(3)*avg_betax - fplus(7)=fplus(7) + avg_alp*sdet*uyzh*psidcp - sdet*mag_p(3)*avg_betay - fplus(8)=fplus(8) + avg_alp*sdet*uzzh*psidcp - sdet*mag_p(3)*avg_betaz - psidcfp = avg_alp*mag_p(3)-avg_betaz*psidcp - psidcfm = avg_alp*mag_m(3)-avg_betaz*psidcm + fminus(6)=fminus(6) + avg_alp*sdet*uxzh*psidcm - cons_m(8)*avg_betax + fminus(7)=fminus(7) + avg_alp*sdet*uyzh*psidcm - cons_m(8)*avg_betay + fminus(8)=fminus(8) + avg_alp*sdet*uzzh*psidcm - cons_m(8)*avg_betaz + fplus(6)=fplus(6) + avg_alp*sdet*uxzh*psidcp - cons_p(8)*avg_betax + fplus(7)=fplus(7) + avg_alp*sdet*uyzh*psidcp - cons_p(8)*avg_betay + fplus(8)=fplus(8) + avg_alp*sdet*uzzh*psidcp - cons_p(8)*avg_betaz + psidcfp = avg_alp*cons_p(8)/sdet-avg_betaz*psidcp + psidcfm = avg_alp*cons_m(8)/sdet-avg_betaz*psidcm endif else call CCTK_WARN(0, "Flux direction not x,y,z") end if - + + !!$ Find minimum and maximum wavespeeds charmin = min(0.d0, lamplus(1), lamplus(2), lamplus(3), & @@ -410,18 +413,23 @@ lamminus(4),lamminus(5)) charpm = charmax - charmin + +!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'HLLEM:',fplus(6),fminus(6),fplus(8),fminus(8),charmax,charmin,cons_p(6),cons_m(6) !!$ Calculate flux by standard formula - do m = 1,8 - - qdiff(m) = cons_m(m) - cons_p(m) - - f1(m) = (charmax * fplus(m) - charmin * fminus(m) + & - charmax * charmin * qdiff(m)) / charpm - + do m = 1,8 + + qdiff(m) = cons_m(m) - cons_p(m) + + f1(m) = (charmax * fplus(m) - charmin * fminus(m) + & + charmax * charmin * qdiff(m)) / charpm + end do +!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'HLLEM2:',fplus(6),fminus(6),fplus(8),fminus(8),charmax,charmin,qdiff(6),qdiff(8),f1(6),f1(8) + + if(clean_divergence.ne.0) then psidcdiff = psidcm - psidcp @@ -448,6 +456,8 @@ Bconsyflux(i, j, k) = f1(7) Bconszflux(i, j, k) = f1(8) +!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'HLLEM2:',fplus(6),fminus(6),fplus(8),fminus(8),f1(6),f1(8) + if(clean_divergence.ne.0) then psidcflux(i,j,k) = psidcf endif File [modified]: GRHydro_Prim2ConM.F90 Delta lines: +2 -2 =================================================================== --- branches/divclean/src/GRHydro_Prim2ConM.F90 2011-04-28 01:28:55 UTC (rev 242) +++ branches/divclean/src/GRHydro_Prim2ConM.F90 2011-04-28 16:47:14 UTC (rev 243) @@ -88,10 +88,10 @@ call prim2conM(GRHydro_eos_handle, gxxr,gxyr,gxzr,gyyr,gyzr,gzzr, & avg_detr, densplus(i,j,k),sxplus(i,j,k),& syplus(i,j,k),szplus(i,j ,k),tauplus(i,j,k),& - Bvecxplus(i,j,k),Bvecyplus(i,j,k),Bveczplus(i,j,k), & + Bconsxplus(i,j,k),Bconsyplus(i,j,k),Bconszplus(i,j,k), & rhoplus(i,j,k),velxplus(i,j,k),velyplus(i,j,k),& velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),& - Bconsxminus(i,j,k), Bconsyminus(i,j,k), Bconszminus(i,j,k), & + Bvecxminus(i,j,k), Bvecyminus(i,j,k), Bveczminus(i,j,k), & w_lorentzplus(i,j,k)) end do File [modified]: GRHydro_Reconstruct.F90 Delta lines: +6 -0 =================================================================== --- branches/divclean/src/GRHydro_Reconstruct.F90 2011-04-28 01:28:55 UTC (rev 242) +++ branches/divclean/src/GRHydro_Reconstruct.F90 2011-04-28 16:47:14 UTC (rev 243) @@ -219,6 +219,9 @@ call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, & Bvec(:,:,:,3), Bveczplus, Bveczminus, trivial_rp, hydro_excision_mask) endif + +!!$ write(6,*)'recon0:',Bvecxplus(75,5,5),Bvecxminus(75,5,5) + else if (CCTK_EQUALS(recon_vars,"conservative")) then call tvdreconstruct(nx, ny, nz, xoffset, yoffset, zoffset, & dens, densplus, densminus, trivial_rp, hydro_excision_mask) @@ -920,6 +923,9 @@ CCTK_EQUALS(recon_method,"ppm")) then if(evolve_mhd.ne.0) then call primitive2conservativeM(CCTK_PASS_FTOF) + +!!$ write(6,*)'recon1:',Bvecxplus(75,5,5),Bvecxminus(75,5,5),Bconsxplus(75,5,5),Bconsxminus(75,5,5) + else call primitive2conservative(CCTK_PASS_FTOF) endif File [modified]: GRHydro_SourceM.F90 Delta lines: +7 -0 =================================================================== --- branches/divclean/src/GRHydro_SourceM.F90 2011-04-28 01:28:55 UTC (rev 242) +++ branches/divclean/src/GRHydro_SourceM.F90 2011-04-28 16:47:14 UTC (rev 243) @@ -442,6 +442,10 @@ srhs(i,j,k,2) = alp(i,j,k)*sqrtdet*sy_source srhs(i,j,k,3) = alp(i,j,k)*sqrtdet*sz_source taurhs(i,j,k) = alp(i,j,k)*sqrtdet*tau_source + +!!$ if(i.eq.75.and.j.eq.5.and.k.eq.5)write(6,*)'source:',i,j,k, & +!!$ Bconsrhs(i,j,k,1),Bconsrhs(i,j,k,3) + if(clean_divergence.ne.0) then psidcrhs(i,j,k) = -1.d0 * ( ch_dc*ch_dc/cp_dc/cp_dc*alp(i,j,k) + & dx_betax + dy_betay + dz_betaz ) * psidc(i,j,k) + & @@ -500,6 +504,9 @@ psidc(i,j,k)*alp(i,j,k)*sqrtdet*( uxz*gdg_x + uyz*gdg_y + & uzz*gdg_z ) +!!$ if(i.eq.5.and.j.eq.5.and.k.eq.5)write(6,*)'source:',i,j,k, & +!!$ bvcx_source,bvcz_source + Bconsrhsx(i,j,k) = bvcx_source Bconsrhsy(i,j,k) = bvcy_source Bconsrhsz(i,j,k) = bvcz_source

1 0

[svn:einsteintoolkit] Paper_EinsteinToolkit_2010/examples/tov/ (Rev. 73)
by knarf＠cct.lsu.edu 28 Apr '11

28 Apr '11

User: knarf Date: 2011/04/28 11:21 AM Modified: /examples/tov/ tov.rpar Log: remove parameter which isn't present anymore in the hg-version of Carpet File Changes: Directory: /examples/tov/ ========================= File [modified]: tov.rpar Delta lines: +0 -1 =================================================================== --- examples/tov/tov.rpar 2011-04-27 22:55:25 UTC (rev 72) +++ examples/tov/tov.rpar 2011-04-28 16:21:09 UTC (rev 73) @@ -84,7 +84,6 @@ Carpet::poison_new_timelevels = "yes" Carpet::check_for_poison = "no" -Carpet::poison_value = 113 Carpet::init_3_timelevels = no Carpet::init_fill_timelevels = "yes"

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/src/ (Rev. 242)
by bcmsma＠astro.rit.edu 27 Apr '11

27 Apr '11

User: bmundim Date: 2011/04/27 08:28 PM Modified: /branches/divclean/src/ GRHydro_RegisterVars.cc Log: Bcons is defined in GRHydro instead of HydroBase. PS: Con2Prim2Con test just passed! File Changes: Directory: /branches/divclean/src/ ================================== File [modified]: GRHydro_RegisterVars.cc Delta lines: +1 -1 =================================================================== --- branches/divclean/src/GRHydro_RegisterVars.cc 2011-04-28 01:16:05 UTC (rev 241) +++ branches/divclean/src/GRHydro_RegisterVars.cc 2011-04-28 01:28:55 UTC (rev 242) @@ -64,7 +64,7 @@ if (CCTK_EQUALS(Bvec_evolution_method, "GRHydro")) { register_constrained("HydroBase::Bvec"); - register_evolved("HydroBase::Bcons", "GRHydro::Bconsrhs"); + register_evolved("GRHydro::Bcons", "GRHydro::Bconsrhs"); if(clean_divergence) { register_evolved("GRHydro::psidc" , "GRHydro::psidcrhs"); }

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/ (Rev. 241)
by bcmsma＠astro.rit.edu 27 Apr '11

27 Apr '11

User: bmundim Date: 2011/04/27 08:16 PM Modified: /branches/divclean/ interface.ccl Log: Interface fix. File Changes: Directory: /branches/divclean/ ============================== File [modified]: interface.ccl Delta lines: +22 -3 =================================================================== --- branches/divclean/interface.ccl 2011-04-28 00:51:34 UTC (rev 240) +++ branches/divclean/interface.ccl 2011-04-28 01:16:05 UTC (rev 241) @@ -73,17 +73,18 @@ void FUNCTION Con2PrimGenM(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 tau, CCTK_REAL INOUT rho, \ + CCTK_REAL INOUT tau, CCTK_REAL INOUT Bconsx, CCTK_REAL INOUT Bconsy, CCTK_REAL INOUT Bconsz, \ + 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, \ + CCTK_REAL INOUT Bvecsq, \ CCTK_REAL INOUT w_lorentz, \ CCTK_REAL INOUT gxx, CCTK_REAL INOUT gxy, CCTK_REAL INOUT gxz, \ CCTK_REAL INOUT gyy, CCTK_REAL INOUT gyz, CCTK_REAL INOUT gzz, \ CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \ CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \ CCTK_REAL INOUT det, \ - CCTK_REAL INOUT Bvecx, CCTK_REAL INOUT Bvecy, CCTK_REAL INOUT Bvecz, \ - CCTK_REAL INOUT Bvecsq, \ CCTK_INT OUT epsnegative, \ CCTK_REAL OUT retval) @@ -101,6 +102,23 @@ CCTK_REAL IN r, CCTK_REAL IN rho_min, \ CCTK_INT IN GRHydro_reflevel, CCTK_REAL IN GRHydro_C2P_failed) +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 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, \ + CCTK_REAL INOUT Bvecsq, \ + CCTK_REAL INOUT w_lorentz, \ + CCTK_REAL INOUT gxx, CCTK_REAL INOUT gxy, CCTK_REAL INOUT gxz, \ + CCTK_REAL INOUT gyy, CCTK_REAL INOUT gyz, CCTK_REAL INOUT gzz, \ + CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \ + CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \ + CCTK_REAL INOUT det, \ + CCTK_INT OUT epsnegative, \ + CCTK_REAL OUT retval) + #void FUNCTION Prim2Con CCTK_INT handle, CCTK_REAL gxx, CCTK_REAL gxy, CCTK_REAL gxz, CCTK_REAL gyy, CCTK_REAL gyz, CCTK_REAL gzz, CCTK_REAL det, CCTK_REAL dens, CCTK_REAL sx, CCTK_REAL sy, CCTK_REAL sz, CCTK_REAL tau, CCTK_REAL rho, CCTK_REAL velx, CCTK_REAL vely, CCTK_REAL velz, CCTK_REAL epsilon, CCTK_REAL press, CCTK_REAL w_lorentz void FUNCTION Prim2ConGen(CCTK_INT IN handle, \ @@ -161,6 +179,7 @@ PROVIDES FUNCTION Con2PrimPoly WITH Con2Prim_ptPolytype LANGUAGE Fortran PROVIDES FUNCTION Con2PrimGenM WITH GRHydro_Con2PrimM_pt LANGUAGE Fortran PROVIDES FUNCTION Con2PrimGen WITH Con2Prim_pt LANGUAGE Fortran +PROVIDES FUNCTION Con2PrimPolyM WITH GRHydro_Con2PrimM_Polytype_pt LANGUAGE Fortran PROVIDES FUNCTION Prim2ConGen WITH prim2con LANGUAGE Fortran PROVIDES FUNCTION Prim2ConPoly WITH prim2conpolytype LANGUAGE Fortran PROVIDES FUNCTION Prim2ConGenM WITH prim2conM LANGUAGE Fortran

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 127)
by bcmsma＠astro.rit.edu 27 Apr '11

27 Apr '11

User: bmundim Date: 2011/04/27 08:14 PM Modified: /trunk/src/ GRHydro_CylindricalExplosionM.F90, GRHydro_MonopoleM.F90, GRHydro_P2C2PM.F90, GRHydro_ShockTubeM.F90 Log: A few fixes on the interface calls and related bugs. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_CylindricalExplosionM.F90 Delta lines: +12 -6 =================================================================== --- trunk/src/GRHydro_CylindricalExplosionM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_CylindricalExplosionM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -22,6 +22,9 @@ #define Bvecx(i,j,k) Bvec(i,j,k,1) #define Bvecy(i,j,k) Bvec(i,j,k,2) #define Bvecz(i,j,k) Bvec(i,j,k,3) +#define Bconsx(i,j,k) Bcons(i,j,k,1) +#define Bconsy(i,j,k) Bcons(i,j,k,2) +#define Bconsz(i,j,k) Bcons(i,j,k,3) /*@@ @@ -117,25 +120,28 @@ 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),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(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),w_lorentz(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)) else call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(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),w_lorentz(i,j,k)) + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) end if + + enddo enddo - enddo enddo densrhs = 0.d0 srhs = 0.d0 taurhs = 0.d0 - Bvecrhs = 0.d0 + Bconsrhs = 0.d0 return File [modified]: GRHydro_MonopoleM.F90 Delta lines: +22 -17 =================================================================== --- trunk/src/GRHydro_MonopoleM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_MonopoleM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -22,6 +22,9 @@ #define Bvecx(i,j,k) Bvec(i,j,k,1) #define Bvecy(i,j,k) Bvec(i,j,k,2) #define Bvecz(i,j,k) Bvec(i,j,k,3) +#define Bconsx(i,j,k) Bcons(i,j,k,1) +#define Bconsy(i,j,k) Bcons(i,j,k,2) +#define Bconsz(i,j,k) Bcons(i,j,k,3) /*@@ @routine GRHydro_MonopoleM @@ -77,23 +80,25 @@ Bvecz(i,j,k)=0.0 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 (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),& - det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(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)) - else - call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& - gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& - det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(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)) - 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),& + 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)) + else + call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& + gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& + det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& + tau(i,j,k),Bconsx(i,j,k),Bconsy(i,j,k),Bconsz(i,j,k),rho(i,j,k),& + velx(i,j,k),vely(i,j,k),velz(i,j,k),& + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) + end if + enddo enddo enddo @@ -101,7 +106,7 @@ densrhs = 0.d0 srhs = 0.d0 taurhs = 0.d0 - Bvecrhs = 0.d0 + Bconsrhs = 0.d0 return File [modified]: GRHydro_P2C2PM.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_P2C2PM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_P2C2PM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -131,7 +131,7 @@ call Prim2ConGenM(GRHydro_eos_handle,& gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,det, & dens_send,sx_send,sy_send,sz_send,tau_send, & - bconsx_send,bcibsy_send,bconsz_send, & + bconsx_send,bconsy_send,bconsz_send, & rho_send(1),velx_send,vely_send,velz_send,eps_send(1),press_send(1), & bvcx_send,bvcy_send,bvcz_send,w_lorentz_send) File [modified]: GRHydro_ShockTubeM.F90 Delta lines: +10 -5 =================================================================== --- trunk/src/GRHydro_ShockTubeM.F90 2011-04-28 00:50:07 UTC (rev 126) +++ trunk/src/GRHydro_ShockTubeM.F90 2011-04-28 01:14:57 UTC (rev 127) @@ -22,6 +22,9 @@ #define Bvecx(i,j,k) Bvec(i,j,k,1) #define Bvecy(i,j,k) Bvec(i,j,k,2) #define Bvecz(i,j,k) Bvec(i,j,k,3) +#define Bconsx(i,j,k) Bcons(i,j,k,1) +#define Bconsy(i,j,k) Bcons(i,j,k,2) +#define Bconsz(i,j,k) Bcons(i,j,k,3) #define OOSQRT2 (0.7071067811865475244008442) #define OOSQRT3 (0.5773502691896257645091489) @@ -611,16 +614,18 @@ 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),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(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),w_lorentz(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)) else call Prim2ConGenM(GRHydro_eos_handle,gxx(i,j,k),gxy(i,j,k),& gxz(i,j,k),gyy(i,j,k),gyz(i,j,k),gzz(i,j,k),& det, dens(i,j,k),sx(i,j,k),sy(i,j,k),sz(i,j,k),& - tau(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),rho(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),w_lorentz(i,j,k)) + eps(i,j,k),press(i,j,k),Bvecx(i,j,k),Bvecy(i,j,k),Bvecz(i,j,k),& + w_lorentz(i,j,k)) end if enddo enddo @@ -629,7 +634,7 @@ densrhs = 0.d0 srhs = 0.d0 taurhs = 0.d0 - Bvecrhs = 0.d0 + Bconsrhs = 0.d0 return

1 0

[svn:einsteintoolkit] GRHydro/branches/divclean/src/ (Rev. 240)
by tanja.bode＠physics.gatech.edu 27 Apr '11

27 Apr '11

User: tbode Date: 2011/04/27 07:51 PM Modified: /branches/divclean/src/ GRHydro_SourceM.F90 Log: Remove di_psidc. File Changes: Directory: /branches/divclean/src/ ================================== File [modified]: GRHydro_SourceM.F90 Delta lines: +1 -2 =================================================================== --- branches/divclean/src/GRHydro_SourceM.F90 2011-04-28 00:47:43 UTC (rev 239) +++ branches/divclean/src/GRHydro_SourceM.F90 2011-04-28 00:51:34 UTC (rev 240) @@ -82,7 +82,6 @@ CCTK_REAL :: halfshiftdgx, halfshiftdgy, halfshiftdgz CCTK_REAL :: halfTdgx, halfTdgy, halfTdgz CCTK_REAL :: invalp, invalp2 - !!CCTK_REAL :: dx_psidc, dy_psidc, dz_psidc CCTK_REAL :: bvcx_source, bvcy_source, bvcz_source CCTK_REAL :: dx_det_bydet, dy_det_bydet, dz_det_bydet CCTK_REAL :: gdg_x, gdg_y, gdg_z !! g^{ik} d_k g_{ij} @@ -165,7 +164,7 @@ !$OMP vlowx,vlowy,vlowz,Bvecxlow,Bvecylow,Bveczlow, & !$OMP bdotv,b2,dum,bxlow,bylow,bzlow,bt,bx,by,bz,rhohstarW2,pstar,& !$OMP t00,t0x,t0y,t0z,txx,txy,txz,tyy,tyz,tzz,& - !$OMP dx_alp,dy_alp,dz_alp,dx_psidc,dy_psidc,dz_psidc,& + !$OMP dx_alp,dy_alp,dz_alp,& !$OMP tau_source,sx_source,sy_source,sz_source,& !$OMP bvcx_source,bvcy_source,bvcz_source,& !$OMP uxx, uxy, uxz, uyy, uyz, uzz,&

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/ (Rev. 126)
by bcmsma＠astro.rit.edu 27 Apr '11

27 Apr '11

User: bmundim Date: 2011/04/27 07:50 PM Modified: /trunk/ interface.ccl /trunk/src/ GRHydro_C2P2CM.F90, GRHydro_P2C2PM.F90, GRHydro_P2C2PM_polytype.F90 Log: Change of Con2Prim and Prim2Con interface. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_C2P2CM.F90 Delta lines: +14 -5 =================================================================== --- trunk/src/GRHydro_C2P2CM.F90 2011-04-27 22:37:50 UTC (rev 125) +++ trunk/src/GRHydro_C2P2CM.F90 2011-04-28 00:50:07 UTC (rev 126) @@ -41,6 +41,7 @@ CCTK_REAL :: uxx,uxy,uxz,uyy,uyz,uzz CCTK_REAL :: gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send CCTK_REAL :: dens_send,sx_send,sy_send,sz_send,tau_send + CCTK_REAL :: bconsx_send, bconsy_send, bconsz_send CCTK_REAL :: rho_send,velx_send,vely_send,velz_send,eps_send CCTK_REAL :: press_send,w_lorentz_send,x_send,y_send,z_send,r_send CCTK_REAL :: bvcx_send, bvcy_send, bvcz_send, b2_send @@ -93,6 +94,9 @@ bvcx_send = Bx_init bvcy_send = By_init bvcz_send = Bz_init + bconsx_send = Bx_init + bconsy_send = By_init + bconsz_send = Bz_init eps_send = 1.0d-6 press_send = 6.666666666666667d-7 @@ -124,6 +128,9 @@ write(*,*) ' sy : ',sy_send write(*,*) ' sz : ',sz_send write(*,*) ' tau : ',tau_send + write(*,*) ' Bconsx : ',bconsx_send + write(*,*) ' Bconsy : ',bconsy_send + write(*,*) ' Bconsz : ',bconsz_send write(*,*) ' eps : ',eps_send write(*,*) ' W : ',w_lorentz_send write(*,*) ' Bvecx : ',bvcx_send @@ -132,11 +139,10 @@ write(*,*) 'C2P2CM test: getting the associated primitive variables.' call Con2PrimGenM(GRHydro_eos_handle,local_gam(1),dens_send,sx_send,sy_send,sz_send, & - tau_send,rho_send,velx_send,vely_send,velz_send, & - eps_send,press_send,w_lorentz_send, & + tau_send,bconsx_send,bconsy_send,bconsz_send,rho_send,velx_send,vely_send,velz_send, & + eps_send,press_send,bvcx_send,bvcy_send,bvcz_send,b2_send,w_lorentz_send, & gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,& uxx,uxy,uxz,uyy,uyz,uzz,det,& - bvcx_send,bvcy_send,bvcz_send,b2_send,& epsnegative,C2P_failed) write(*,*) 'C2P2CM test: the primitive variables are' @@ -155,8 +161,8 @@ write(*,*) 'C2P2CM test: converting back to conserved variables.' call Prim2ConGenM(GRHydro_eos_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, & - dens_send, sx_send, sy_send, sz_send, tau_send, bvcx_send, bvcy_send, bvcz_send, rho_send, & - velx_send, vely_send, velz_send, eps_send, press_send, w_lorentz_send) + dens_send, sx_send, sy_send, sz_send, tau_send, bconsx_send, bconsy_send, bconsz_send, rho_send, & + velx_send, vely_send, velz_send, eps_send, press_send, bvcx_send, bvcy_send, bvcz_send, w_lorentz_send) write(*,*) 'C2P2CM test: the conserved variables are' write(*,*) ' conservative variables: ' @@ -165,6 +171,9 @@ write(*,*) ' sy : ',sy_send write(*,*) ' sz : ',sz_send write(*,*) ' tau : ',tau_send + write(*,*) ' Bconsx : ',bconsx_send + write(*,*) ' Bconsy : ',bconsy_send + write(*,*) ' Bconsz : ',bconsz_send write(*,*) ' eps : ',eps_send write(*,*) ' W : ',w_lorentz_send write(*,*) ' Bvecx : ',bvcx_send File [modified]: GRHydro_P2C2PM.F90 Delta lines: +15 -5 =================================================================== --- trunk/src/GRHydro_P2C2PM.F90 2011-04-27 22:37:50 UTC (rev 125) +++ trunk/src/GRHydro_P2C2PM.F90 2011-04-28 00:50:07 UTC (rev 126) @@ -40,6 +40,7 @@ CCTK_REAL :: uxx,uxy,uxz,uyy,uyz,uzz CCTK_REAL :: gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send CCTK_REAL :: dens_send,sx_send,sy_send,sz_send,tau_send + CCTK_REAL :: bconsx_send,bconsy_send,bconsz_send CCTK_REAL :: rho_send(1),velx_send,vely_send,velz_send,eps_send(1) CCTK_REAL :: press_send(1),w_lorentz_send,x_send,y_send,z_send,r_send CCTK_REAL :: bvcx_send,bvcy_send,bvcz_send,b2_send @@ -86,6 +87,9 @@ bvcx_send = Bx_init bvcy_send = By_init bvcz_send = Bz_init + bconsx_send = Bx_init + bconsy_send = By_init + bconsz_send = Bz_init w_lorentz_send = 1.d0/sqrt(1.0d0-velx_send*velx_send-vely_send*vely_send-velz_send*velz_send) @@ -127,8 +131,9 @@ call Prim2ConGenM(GRHydro_eos_handle,& gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,det, & dens_send,sx_send,sy_send,sz_send,tau_send, & - bvcx_send,bvcy_send,bvcz_send,rho_send(1), & - velx_send,vely_send,velz_send,eps_send(1),press_send(1),w_lorentz_send) + bconsx_send,bcibsy_send,bconsz_send, & + rho_send(1),velx_send,vely_send,velz_send,eps_send(1),press_send(1), & + bvcx_send,bvcy_send,bvcz_send,w_lorentz_send) write(*,*) 'P2C2PM test: initial values.' write(*,*) ' conservative variables: ' @@ -137,6 +142,9 @@ write(*,*) ' sy : ',sy_send write(*,*) ' sz : ',sz_send write(*,*) ' tau : ',tau_send + write(*,*) ' Bconsx : ',bconsx_send + write(*,*) ' Bconsy : ',bconsy_send + write(*,*) ' Bconsz : ',bconsz_send write(*,*) ' eps : ',eps_send write(*,*) ' W : ',w_lorentz_send write(*,*) ' Bvecx : ',bvcx_send @@ -146,11 +154,13 @@ write(*,*) 'P2C2PM test: getting the associated primitive variables.' call Con2PrimGenM(GRHydro_eos_handle,local_gam(1),dens_send,sx_send,sy_send,sz_send, & - tau_send,rho_send(1),velx_send,vely_send,velz_send, & - eps_send(1),press_send(1),w_lorentz_send, & + tau_send,bconsx_send,bconsy_send,bconsz_send,& + rho_send(1),velx_send,vely_send,velz_send, & + eps_send(1),press_send(1), & + bvcx_send,bvcy_send,bvcz_send,b2_send,& + w_lorentz_send, & gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,& uxx,uxy,uxz,uyy,uyz,uzz,det,& - bvcx_send,bvcy_send,bvcz_send,b2_send,& epsnegative,C2P_failed) write(*,*) 'P2C2PM test: the primitive variables are' File [modified]: GRHydro_P2C2PM_polytype.F90 Delta lines: +11 -5 =================================================================== --- trunk/src/GRHydro_P2C2PM_polytype.F90 2011-04-27 22:37:50 UTC (rev 125) +++ trunk/src/GRHydro_P2C2PM_polytype.F90 2011-04-28 00:50:07 UTC (rev 126) @@ -39,6 +39,7 @@ CCTK_REAL uxx,uxy,uxz,uyy,uyz,uzz CCTK_REAL gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send CCTK_REAL dens_send,sx_send,sy_send,sz_send,tau_send + CCTK_REAL bconsx_send,bconsy_send,bconsz_send CCTK_REAL rho_send,velx_send,vely_send,velz_send,eps_send CCTK_REAL press_send,w_lorentz_send,x_send,y_send,z_send,r_send CCTK_REAL bvcx_send,bvcy_send,bvcz_send,b2_send @@ -93,6 +94,9 @@ bvcx_send = Bx_init bvcy_send = By_init bvcz_send = Bz_init + bconsx_send = Bx_init + bconsy_send = By_init + bconsz_send = Bz_init w_lorentz_send = 1.d0/sqrt(1.0d0-velx_send*velx_send-vely_send*vely_send-velz_send*velz_send) @@ -133,8 +137,8 @@ write(*,*) 'P2C2PM test: converting back to conserved variables.' call prim2conpolytypeM(GRHydro_polytrope_handle,gxx_send, gxy_send, gxz_send, gyy_send, gyz_send, gzz_send, det, & - dens_send, sx_send, sy_send, sz_send, tau_send, bvcx_send, bvcy_send, bvcz_send, rho_send, & - velx_send, vely_send, velz_send, eps_send, press_send, w_lorentz_send) + dens_send, sx_send, sy_send, sz_send, tau_send, bconsx_send, bconsy_send, bconsz_send, rho_send, & + velx_send, vely_send, velz_send, eps_send, press_send, bvcx_send, bvcy_send, bvcz_send, w_lorentz_send) write(*,*) 'P2C2PM test: initial values.' write(*,*) ' conservative variables: ' @@ -143,6 +147,9 @@ write(*,*) ' sy : ',sy_send write(*,*) ' sz : ',sz_send write(*,*) ' tau : ',tau_send + write(*,*) ' Bconsx : ',bconsx_send + write(*,*) ' Bconsy : ',bconsy_send + write(*,*) ' Bconsz : ',bconsz_send write(*,*) ' eps : ',eps_send write(*,*) ' W : ',w_lorentz_send write(*,*) ' Bvecx : ',bvcx_send @@ -154,11 +161,10 @@ write(*,*) 'P2C2PM test: getting the associated primitive variables.' call GRHydro_Con2PrimM_Polytype_pt(GRHydro_polytrope_handle,local_gam,dens_send,sx_send,sy_send,sz_send, & - sc_send,rho_send,velx_send,vely_send,velz_send, & - eps_send,press_send,w_lorentz_send, & + sc_send,bconsx_send,bconsy_send,bconsz_send,rho_send,velx_send,vely_send,velz_send, & + eps_send,press_send,bvcx_send,bvcy_send,bvcz_send,b2_send,w_lorentz_send, & gxx_send,gxy_send,gxz_send,gyy_send,gyz_send,gzz_send,& uxx,uxy,uxz,uyy,uyz,uzz,det,& - bvcx_send,bvcy_send,bvcz_send,b2_send,& epsnegative,C2P_failed) write(*,*) 'P2C2PM test: the primitive variables are' Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +20 -1 =================================================================== --- trunk/interface.ccl 2011-04-27 22:37:50 UTC (rev 125) +++ trunk/interface.ccl 2011-04-28 00:50:07 UTC (rev 126) @@ -101,17 +101,35 @@ void FUNCTION Con2PrimGenM(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 tau, CCTK_REAL INOUT rho, \ + CCTK_REAL INOUT tau, CCTK_REAL INOUT Bconsx, CCTK_REAL INOUT Bconsy, CCTK_REAL INOUT Bconsz, \ + 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, \ + CCTK_REAL INOUT Bvecsq, \ CCTK_REAL INOUT w_lorentz, \ CCTK_REAL INOUT gxx, CCTK_REAL INOUT gxy, CCTK_REAL INOUT gxz, \ CCTK_REAL INOUT gyy, CCTK_REAL INOUT gyz, CCTK_REAL INOUT gzz, \ CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \ CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \ CCTK_REAL INOUT det, \ + CCTK_INT OUT epsnegative, \ + CCTK_REAL OUT retval) + +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 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, \ CCTK_REAL INOUT Bvecsq, \ + CCTK_REAL INOUT w_lorentz, \ + CCTK_REAL INOUT gxx, CCTK_REAL INOUT gxy, CCTK_REAL INOUT gxz, \ + CCTK_REAL INOUT gyy, CCTK_REAL INOUT gyz, CCTK_REAL INOUT gzz, \ + CCTK_REAL INOUT uxx, CCTK_REAL INOUT uxy, CCTK_REAL INOUT uxz, \ + CCTK_REAL INOUT uyy, CCTK_REAL INOUT uyz, CCTK_REAL INOUT uzz, \ + CCTK_REAL INOUT det, \ CCTK_INT OUT epsnegative, \ CCTK_REAL OUT retval) @@ -123,6 +141,7 @@ USES FUNCTION Con2PrimPoly USES FUNCTION Con2PrimGen USES FUNCTION Con2PrimGenM +USES FUNCTION Con2PrimPolyM CCTK_INT FUNCTION EOS_Omni_GetHandle(CCTK_STRING IN name) USES FUNCTION EOS_Omni_GetHandle

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits April 2011