Commits July 2010

commits@lists.einsteintoolkit.org

7 participants
92 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 141)
by cott＠tapir.caltech.edu 23 Jul '10

23 Jul '10

User: cott Date: 2010/07/23 10:29 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_Eigenproblem.F90, GRHydro_Eigenproblem_Marquina.F90, GRHydro_Marquina.F90, GRHydro_Prim2Con.F90, GRHydro_RoeSolver.F90 Log: * remove incomplete and slow NaN checks. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +2 -47 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-07-22 14:51:02 UTC (rev 140) +++ trunk/src/GRHydro_Con2Prim.F90 2010-07-23 15:29:56 UTC (rev 141) @@ -184,7 +184,7 @@ if (epsnegative) then -#if 1 +#if 0 ! cott 2010/03/30: ! Set point to atmosphere, but continue evolution -- this is better than using ! the poly EOS -- it will lead the code to crash if this happens inside a (neutron) star, @@ -333,7 +333,7 @@ pold = sqrt(s2 + c2p_reset_pressure_to_value) - utau - udens else !$OMP CRITICAL - call CCTK_WARN(GRHydro_NaN_verbose, "c2p failed and being told not to reset the pressure") +!!!! call CCTK_WARN(GRHydro_NaN_verbose, "c2p failed and being told not to reset the pressure") GRHydro_C2P_failed = 1 !$OMP END CRITICAL endif @@ -349,15 +349,6 @@ epsilon = (sqrt( (utau + pold + udens)**2 - s2) - pold * w_lorentz - & udens)/udens -!!$ BEGIN: Check for NaN value (1st check) - if (rho .ne. rho) then - !$OMP CRITICAL - write(warnline,'(a70,7g15.6)') 'NaN produced in sqrt(): (utau, pold, udens, s2, x, y, z)', utau, pold, udens, s2, x, y, z - call CCTK_WARN(GRHydro_NaN_verbose, warnline) - !$OMP END CRITICAL - endif -!!$ END: Check for NaN value (1st check) - !!$ Calculate the function #if USE_EOS_OMNI @@ -450,15 +441,6 @@ f = pnew - EOS_Pressure(handle, rho, epsilon) #endif - !check whether rho is NaN - if (rho .ne. rho) then - !$OMP CRITICAL - write(warnline,'(a20,g20.7)') 'rho is NaN: ',rho - call CCTK_WARN(GRHydro_NaN_verbose,warnline) - !$OMP END CRITICAL - goto 51 - end if - enddo !!$ Polish the root @@ -504,15 +486,6 @@ enddo -!!$ BEGIN: Check for NaN value (2nd check) - if (rho .ne. rho) then - !$OMP CRITICAL - write(warnline,'(a70,7g15.6)') 'NaN produced in sqrt(): (utau, pold, udens, s2, x, y, z)', utau, pold, udens, s2, x, y, z - call CCTK_WARN(GRHydro_NaN_verbose, warnline) - !$OMP END CRITICAL - endif -!!$ END: Check for NaN value (2nd check) - !!$ Calculate primitive variables from root if (rho .le. GRHydro_rho_min*(1.d0+GRHydro_atmo_tolerance) ) then @@ -997,15 +970,6 @@ w_lorentz = sqrt(1.d0 + s2 / ( (udens*enthalpy)**2 )) -!!$ BEGIN: Check for NaN value (1st check) - if (w_lorentz .ne. w_lorentz) then - !$OMP CRITICAL - write(warnline,'(a70,8g15.6)') 'NaN produced in sqrt(): (dens, det, s2, udens, enthalpy, x, y, z)', dens, det, s2, udens, enthalpy, x, y, z - call CCTK_WARN(GRHydro_NaN_verbose, warnline) - !$OMP END CRITICAL - endif -!!$ END: Check for NaN value (1st check) - #if USE_EOS_OMNI call EOS_Omni_press(poly_eoskey,keytemp,n,& rhoold,epsilon,xtemp,xye,press,keyerr,anyerr) @@ -1165,15 +1129,6 @@ w_lorentz = sqrt(1.d0 + s2 / ( (udens*enthalpy)**2 )) #endif -!!$ BEGIN: Check for NaN value (2nd check) - if (w_lorentz .ne. w_lorentz) then - !$OMP CRITICAL - write(warnline,'(a70,6g15.6)') 'NaN produced in sqrt(): (s2, udens, enthalpy, x, y, z)', s2, udens, enthalpy, x, y, z - call CCTK_WARN(GRHydro_NaN_verbose, warnline) - !$OMP END CRITICAL - endif -!!$ END: Check for NaN value (2nd check) - #if USE_EOS_OMNI call EOS_Omni_press(poly_eoskey,keytemp,n,& rhonew,epsilon,xtemp,xye,press,keyerr,anyerr) File [modified]: GRHydro_Eigenproblem.F90 Delta lines: +0 -64 =================================================================== --- trunk/src/GRHydro_Eigenproblem.F90 2010-07-22 14:51:02 UTC (rev 140) +++ trunk/src/GRHydro_Eigenproblem.F90 2010-07-23 15:29:56 UTC (rev 141) @@ -182,8 +182,6 @@ CCTK_REAL axp,axm,vxp,vxm,cxx,cxy,cxz,gam,xsi,dlt,vxa,vxb CCTK_INT handle - character(len=150) NaN_WarnLine - !!$ Warning, warning. Nasty hack follows #ifdef _EOS_BASE_INC_ @@ -253,13 +251,6 @@ lamm_nobeta = (velx*(one-cs2) - sqrt(cs2*(one-v2)*& (u*(one-v2*cs2) - velx**2*(one-cs2))))/(one-v2*cs2) -!!$ BEGIN: Check for NaN value (1st check) - if (lamm_nobeta .ne. lamm_nobeta) then - write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2 - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (1st check) - lamp = lamp_nobeta - beta/alp lamm = lamm_nobeta - beta/alp @@ -286,13 +277,6 @@ kappa = dpdeps / (dpdeps - rho * cs2) -!!$ BEGIN: Check for NaN value (2nd check) - if (kappa .ne. kappa) then - write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (dpdeps, rho, cs2)', dpdeps, rho, cs2 - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (2nd check) - reivec1(1) = kappa / (enthalpy * w) reivec1(2) = vlowx reivec1(3) = vlowy @@ -583,8 +567,6 @@ CCTK_REAL axp,axm,vxp,vxm,cxx,cxy,cxz,gam,xsi,dlt CCTK_INT handle - character(len=256) NaN_WarnLine - !!$ Warning, warning. Nasty hack follows #ifdef _EOS_BASE_INC_ @@ -645,13 +627,6 @@ lamm_nobeta = (velx*(one-cs2) - sqrt(cs2*(one-v2)*& (u*(one-v2*cs2) - velx**2*(one-cs2))))/(one-v2*cs2) -!!$ BEGIN: Check for NaN value (1st check) - if (lamm_nobeta .ne. lamm_nobeta) then - write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2 - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (1st check) - lamp = lamp_nobeta - beta/alp lamm = lamm_nobeta - beta/alp @@ -678,13 +653,6 @@ kappa = dpdeps / (dpdeps - rho * cs2) -!!$ BEGIN: Check for NaN value (2nd check) - if (kappa .ne. kappa) then - write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (dpdeps, rho, cs2)', dpdeps, rho, cs2 - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (2nd check) - reivec1(1) = kappa / (enthalpy * w) reivec1(2) = vlowx reivec1(3) = vlowy @@ -820,8 +788,6 @@ CCTK_REAL vlowx,vlowy,vlowz,v2,w CCTK_REAL lam1,lam2,lam3,lamm,lamp,lamm_nobeta,lamp_nobeta - character(len=256) NaN_WarnLine - one = 1.0d0 two = 2.0d0 @@ -834,13 +800,6 @@ w = one / sqrt(one - v2) -!!$ BEGIN: Check for NaN value (1st check) - if (w .ne. w) then - write(NaN_WarnLine,'(a50,2g15.6)') 'NaN produced: (one, v2)', one, v2 - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (1st check) - !!$ Calculate eigenvalues lam1 = velx - beta/alp @@ -851,13 +810,6 @@ lamm_nobeta = (velx*(one-cs2) - sqrt(cs2*(one-v2)*& (u*(one-v2*cs2) - velx**2*(one-cs2))))/(one-v2*cs2) -!!$ BEGIN: Check for NaN value (2nd check) - if (lamm_nobeta .ne. lamm_nobeta) then - write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2 - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (2nd check) - lamp = lamp_nobeta - beta/alp lamm = lamm_nobeta - beta/alp @@ -917,8 +869,6 @@ CCTK_REAL press,dpdeps,enthalpy,kappa CCTK_REAL axp,axm,vxp,vxm,cxx,cxy,cxz,gam,xsi,dlt,vxa,vxb - character(len=256) NaN_WarnLine - one = 1.0d0 two = 2.0d0 @@ -932,13 +882,6 @@ w = one / sqrt(one - v2) -!!$ BEGIN: Check for NaN value (1st check) - if (w .ne. w) then - write(NaN_WarnLine,'(a50,2g15.6)') 'NaN produced: (one, v2)', one, v2 - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (1st check) - !!$Calculate eigenvalues and put them in conventional order lam1 = velx - beta/alp @@ -950,13 +893,6 @@ lamm_nobeta = (velx*(one-cs2) - sqrt(cs2*(one-v2)*& (u*(one-v2*cs2) - velx**2*(one-cs2))))/(one-v2*cs2) -!!$ BEGIN: Check for NaN value (2nd check) - if (lamm_nobeta .ne. lamm_nobeta) then - write(NaN_WarnLine,'(a50,3g15.6)') 'NaN produced: (one, v2, cs2)', one, v2, cs2 - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (2nd check) - lamp = lamp_nobeta - beta/alp lamm = lamm_nobeta - beta/alp File [modified]: GRHydro_Eigenproblem_Marquina.F90 Delta lines: +0 -30 =================================================================== --- trunk/src/GRHydro_Eigenproblem_Marquina.F90 2010-07-22 14:51:02 UTC (rev 140) +++ trunk/src/GRHydro_Eigenproblem_Marquina.F90 2010-07-23 15:29:56 UTC (rev 141) @@ -61,8 +61,6 @@ CCTK_REAL flux1l,flux2l,flux3l,flux4l,flux5l CCTK_REAL flux1,flux2,flux3,flux4,flux5 - character(len=256) NaN_WarnLine - !!$ LOCAL VARS CCTK_REAL du(5),aa(5,5),qdiff1,qdiff2,qdiff3,qdiff4,qdiff5 @@ -154,13 +152,6 @@ wl = one / sqrt(one - v2l) -!!$ BEGIN: Check for NaN value (1st check) - if (wl .ne. wl) then - write(NaN_WarnLine,'(a100,2g15.6)') 'NaN produced: (one, v2l)', one, v2l - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (1st check) - !!$ EIGENVALUES betainvalp = beta / alp @@ -175,13 +166,6 @@ lamp_nobetal = (velxl*(one-cs2l) + sqrt(lamp_tmp))*invfacl lamm_nobetal = (velxl*(one-cs2l) - sqrt(lamp_tmp))*invfacl -!!$ BEGIN: Check for NaN value (2nd check) - if (lamp_nobetal .ne. lamp_nobetal) then - write(NaN_WarnLine,'(a150,5g15.6)') 'NaN produced: (cs2l, one, v2l, u, velxl)', cs2l, one, v2l, u, velxl - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (2nd check) - lampl = lamp_nobetal - betainvalp lamml = lamm_nobetal - betainvalp @@ -220,13 +204,6 @@ !!$ Assume consistent primitive data wr = one / sqrt(one - v2r) -!!$ BEGIN: Check for NaN value (3rd check) - if (wr .ne. wr) then - write(NaN_WarnLine,'(a100,2g15.6)') 'NaN produced: (one, v2r)', one, v2r - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (3rd check) - !!$ EIGENVALUES lam1r = velxr - betainvalp @@ -240,13 +217,6 @@ lamp_nobetar = (velxr*(one-cs2r) + sqrt(lamp_tmp))*invfacr lamm_nobetar = (velxr*(one-cs2r) - sqrt(lamp_tmp))*invfacr -!!$ BEGIN: Check for NaN value (4th check) - if (lamp_nobetar .ne. lamp_nobetar) then - write(NaN_WarnLine,'(a150,5g15.6)') 'NaN produced: (cs2r, one, v2r, u, velxr)', cs2r, one, v2r, u, velxr - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value (4th check) - lampr = lamp_nobetar - betainvalp lammr = lamm_nobetar - betainvalp File [modified]: GRHydro_Marquina.F90 Delta lines: +0 -20 =================================================================== --- trunk/src/GRHydro_Marquina.F90 2010-07-22 14:51:02 UTC (rev 140) +++ trunk/src/GRHydro_Marquina.F90 2010-07-23 15:29:56 UTC (rev 141) @@ -48,7 +48,6 @@ tmp_w_lorentzp, tmp_w_lorentzm_i, w_lorentzp,w_lorentzm_i, usendh, psi4h integer :: m integer :: i,j,k - character(len=256) NaN_WarnLine CCTK_INT :: type_bits, trivial, not_trivial @@ -207,16 +206,6 @@ endif -!!$ BEGIN: Check for NaN value (1st check) - if (w_lorentzp .ne. w_lorentzp) then - !$OMP CRITICAL - write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (primp(2), primp(3), primp(4))', primp(2), primp(3), primp(4) - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - !$OMP END CRITICAL - endif -!!$ END: Check for NaN value (1st check) - - !!$right state tmp_w_lorentzm_i = gxxh*primm_i(2)*primm_i(2) + & @@ -230,15 +219,6 @@ w_lorentzm_i = 1.d0 / sqrt(1.d0 - tmp_w_lorentzm_i); endif -!!$ BEGIN: Check for NaN value (2nd check) - if (w_lorentzm_i .ne. w_lorentzm_i) then - !$OMP CRITICAL - write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (primm_i(2), primm_i(3), primm_i(4))', primm_i(2), primm_i(3), primm_i(4) - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - !$OMP END CRITICAL - endif -!!$ END: Check for NaN value (2nd check) - !!$eigenvalues and right eigenvectors File [modified]: GRHydro_Prim2Con.F90 Delta lines: +0 -23 =================================================================== --- trunk/src/GRHydro_Prim2Con.F90 2010-07-22 14:51:02 UTC (rev 140) +++ trunk/src/GRHydro_Prim2Con.F90 2010-07-23 15:29:56 UTC (rev 141) @@ -128,7 +128,6 @@ CCTK_REAL :: ddens, dsx, dsy, dsz, dtau, drho, dvelx, dvely, dvelz,& deps, dpress, w, vlowx, vlowy, vlowz CCTK_INT :: handle - character(len=256) NaN_WarnLine #include "EOS_Base.inc" @@ -151,15 +150,6 @@ *dvelz*dvelz + 2*gxy*dvelx*dvely + 2*gxz*dvelx *dvelz + 2*gyz& *dvely*dvelz)) -!!$ BEGIN: Check for NaN value - if (w .ne. w) then - !$OMP CRITICAL - write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (dvelx,dvely,dvelz)', dvelx, dvely, dvelz - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - !$OMP END CRITICAL - endif -!!$ END: Check for NaN value - #if USE_EOS_OMNI call EOS_Omni_press(eoskey,keytemp,n,& drho,deps,xtemp,xye,dpress,keyerr,anyerr) @@ -316,14 +306,6 @@ rhoplus(i,j,k),velxplus(i,j,k),velyplus(i,j,k),& velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),& w_lorentzplus(i,j,k)) - if (densminus(i,j,k) .ne. densminus(i,j,k)) then - !$OMP CRITICAL - call CCTK_WARN(1, "NaN in densminus(i,j,k) (Prim2Con)") - write(warnline,' (a27,3g16.7)') 'avg_detl, velx, rhominus: ', & - avg_detl, velx(i,j,k), rhominus(i,j,k) - call CCTK_WARN(1, warnline) - !$OMP END CRITICAL - endif end do end do end do @@ -643,11 +625,6 @@ rhoplus(i,j,k),velxplus(i,j,k),velyplus(i,j,k),& velzplus(i,j,k),epsplus(i,j,k),pressplus(i,j,k),& w_lorentzplus(i,j,k)) - if (densminus(i,j,k) .ne. densminus(i,j,k)) then - !$OMP CRITICAL - call CCTK_WARN(1, "NaN in densminus(i,j,k) (Prim2Con)") - !$OMP END CRITICAL - endif end do end do end do File [modified]: GRHydro_RoeSolver.F90 Delta lines: +0 -9 =================================================================== --- trunk/src/GRHydro_RoeSolver.F90 2010-07-22 14:51:02 UTC (rev 140) +++ trunk/src/GRHydro_RoeSolver.F90 2010-07-23 15:29:56 UTC (rev 141) @@ -47,8 +47,6 @@ CCTK_INT :: type_bits, trivial, not_trivial - character(len=256) NaN_WarnLine - if (flux_direction == 1) then call SpaceMask_GetTypeBits(type_bits, "Hydro_RiemannProblemX") call SpaceMask_GetStateBits(trivial, "Hydro_RiemannProblemX", & @@ -222,13 +220,6 @@ gzzh*velzave*velzave + 2*gxyh*velxave*velyave + & 2*gxzh*velxave *velzave + 2*gyzh*velyave*velzave)) -!!$ BEGIN: Check for NaN value - if (w_lorentzave .ne. w_lorentzave) then - write(NaN_WarnLine,'(a100,3g15.6)') 'NaN produced in sqrt(): (velxave, velyave, velzave))', velxave, velyave, velzave - call CCTK_WARN(GRHydro_NaN_verbose, NaN_WarnLine) - endif -!!$ END: Check for NaN value - if (flux_direction == 1) then !!$ call prim2con(GRHydro_eos_handle,gxxh, gxyh, gxzh, gyyh, & !!$ gyzh, gzzh, avg_det, &

1 0

[svn:einsteintoolkit] GRHydro/ (Rev. 140)
by knarf＠cct.lsu.edu 22 Jul '10

22 Jul '10

User: knarf Date: 2010/07/22 09:51 AM Added: /branches/ET_2010_06/test/ GRHydro_test_tov_ppm_disable_internal_excision, GRHydro_test_tov_ppm_disable_internal_excision.par Modified: /branches/ET_2010_06/ Log: merge with change r124 from /trunk: new testsuite Directory Changes: Directory: /branches/ET_2010_06/ ================================ Property changes on: branches/ET_2010_06 ___________________________________________________________________ Directory: /svn:mergeinfo/ ========================== - /trunk:123 + /trunk:123-124 File Changes: Directory: /branches/ET_2010_06/test/ ===================================== File [added]: GRHydro_test_tov_ppm_disable_internal_excision Delta lines: +1 -0 =================================================================== --- branches/ET_2010_06/test/GRHydro_test_tov_ppm_disable_internal_excision (rev 0) +++ branches/ET_2010_06/test/GRHydro_test_tov_ppm_disable_internal_excision 2010-07-22 14:51:02 UTC (rev 140) @@ -0,0 +1 @@ +link GRHydro_test_tov_ppm \ No newline at end of file File [added]: GRHydro_test_tov_ppm_disable_internal_excision.par Delta lines: +82 -0 =================================================================== --- branches/ET_2010_06/test/GRHydro_test_tov_ppm_disable_internal_excision.par (rev 0) +++ branches/ET_2010_06/test/GRHydro_test_tov_ppm_disable_internal_excision.par 2010-07-22 14:51:02 UTC (rev 140) @@ -0,0 +1,82 @@ +!DESC "TOV from TOVSolverC, ICN, Marquina, PPM, Polytrope" + +ActiveThorns = "time MoL pugh pughreduce pughslab coordbase symbase cartgrid3d ioutil ioascii iobasic boundary admbase staticconformal spacemask admcoupling coordgauge admmacros hydrobase grhydro grhydro_initdata tovsolver nanchecker eos_base eos_idealfluid eos_polytrope bssn_mol admconstraints Constants localreduce Tmunubase InitBase" + +TmunuBase::stress_energy_storage = yes +TmunuBase::stress_energy_at_RHS = yes +TmunuBase::timelevels = 1 +TmunuBase::prolongation_type = none + +time::dtfac = 0.375 + +hydrobase::timelevels = 2 +hydrobase::evolution_method = "GRHydro" + +admbase::evolution_method = "adm_bssn" +admbase::lapse_evolution_method = "1+log" +admbase::shift_evolution_method = "gamma0" + +adm_bssn::bound = "radiative" +adm_bssn::harmonic_f = 2.0 + +admconstraints::bound = "static" +ADMConstraints::constraints_persist = yes + +boundary::radpower = 2 + +SpaceMask::use_mask = "yes" + +grid::type = "byrange" +grid::domain = "full" +grid::xyzmin = -15.0 +grid::xyzmax = 15.001 +driver::ghost_size = 3 +driver::global_nsize = 33 + +cactus::cctk_itlast = 7 + +methodoflines::ode_method = "icn" + +GRHydro::riemann_solver = "Marquina" +GRHydro::GRHydro_eos_type = "Polytype" +GRHydro::GRHydro_eos_table = "2D_Polytrope" +GRHydro::recon_method = "ppm" +GRHydro::GRHydro_stencil = 3 +GRHydro::bound = "none" +GRHydro::rho_abs_min = 1.e-7 +GRHydro::initial_atmosphere_factor = 0.999 + +GRHydro::ppm_detect = "no" +GRHydro::ppm_epsilon = 0.0 +GRHydro::ppm_omega1 = 0.52 +GRHydro::ppm_omega2 = 0.0 +GRHydro::ppm_epsilon_shock = 0.1 +GRHydro::ppm_eta1 = 5.0 +GRHydro::ppm_k0 = 0.2 + +GRHydro::GRHydro_enable_internal_excision = "no" + +ADMBase::initial_data = "tov" +ADMBase::initial_lapse = "tov" +ADMBase::initial_shift = "tov" + +tovsolver::TOV_Rho_Central[0] = 1.28e-3 +tovsolver::TOV_Gamma[0] = 2.0 +tovsolver::TOV_K[0] = 100.0 +tovsolver::TOV_Combine_Method = "maximum" + +EOS_Polytrope::eos_gamma = 2.0 +EOS_Polytrope::eos_k = 100.0 + +IOBasic::outInfo_every = 1 +IOBasic::outInfo_vars = "HydroBase::rho" + +IO::out_fileinfo="none" +IO::out_dir = $parfile + +IOBasic::outScalar_every = 1 +IOBasic::outScalar_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admbase::lapse admbase::metric admbase::curv admconstraints::ham admconstraints::momentum" + +IOASCII::out1D_every = 1 +IOASCII::out1D_vars = "GRHydro::w_lorentz hydrobase::rho hydrobase::press hydrobase::eps HydroBase::vel GRHydro::dens GRHydro::tau GRHydro::scon admconstraints::ham admconstraints::momentum" +IOASCII::out_format = ".10e"

1 0

[svn:einsteintoolkit] GRHydro/ (Rev. 139)
by knarf＠cct.lsu.edu 22 Jul '10

22 Jul '10

User: knarf Date: 2010/07/22 09:50 AM Modified: /branches/ET_2010_06/ /branches/ET_2010_06/src/ GRHydro_PPM.F90 Log: merge with change r123 from /trunk: Fix error in ppm when using GRHydro_enable_internal_excision == no (which is _not_ the default setting). Thanks go to Christian Ott. Directory Changes: Directory: /branches/ET_2010_06/ ================================ Property changes on: branches/ET_2010_06 ___________________________________________________________________ Directory: /svn:mergeinfo/ ========================== + /trunk:123 File Changes: Directory: /branches/ET_2010_06/src/ ==================================== File [modified]: GRHydro_PPM.F90 Delta lines: +11 -11 =================================================================== --- branches/ET_2010_06/src/GRHydro_PPM.F90 2010-07-21 15:36:31 UTC (rev 138) +++ branches/ET_2010_06/src/GRHydro_PPM.F90 2010-07-22 14:50:23 UTC (rev 139) @@ -441,8 +441,8 @@ !!$ Do not optimize cond away by combining the 'if's. Fortran does not !!$ have to follow the order of sub-expressions given here and might !!$ access outside the array range - cond = i .gt. 1 - if (cond .and. GRHydro_enable_internal_excision /= 0) then + cond = .false. + if (i .gt. 1 .and. GRHydro_enable_internal_excision /= 0) then cond = hydro_excision_mask(i-1) .ne. 0 end if if (cond) then @@ -469,9 +469,9 @@ epsplus(i-1)=eps(i) end if else - cond = (i.gt.2) .and. (i.lt.nx) - if (cond .and. GRHydro_enable_internal_excision /= 0) then - cond = (ppm_mppm .eq. 0) .and. (hydro_excision_mask(i-2) .ne. 0) + cond = .false. + if ((i.gt.2) .and. (i.lt.nx) .and. GRHydro_enable_internal_excision /= 0) then + cond = (ppm_mppm .eq. 0) .and. (hydro_excision_mask(i-2) .ne. 0) end if if (cond) then call PPM_TVD(rho(i-1), rho(i), rho(i+1), rhominus(i), rhoplus(i)) @@ -483,9 +483,9 @@ end if end if end if - cond = i.lt.nx - if (cond .and. GRHydro_enable_internal_excision /= 0) then - cond = hydro_excision_mask(i+1) .ne. 0 + cond = .false. + if (i .lt. nx .and. GRHydro_enable_internal_excision /= 0) then + cond = hydro_excision_mask(i+1) .ne. 0 end if if (cond) then rhominus(i)=rho(i) @@ -511,9 +511,9 @@ epsplus(i+1)=eps(i) endif else - cond = (i.lt.nx-1) .and. (i.gt.1) - if (cond .and. GRHydro_enable_internal_excision /= 0) then - cond = (ppm_mppm .eq. 0) .and. (hydro_excision_mask(i+2) .ne. 0) + cond = .false. + if ((i.lt.nx-1) .and. (i.gt.1) .and. GRHydro_enable_internal_excision /= 0) then + cond = (ppm_mppm .eq. 0) .and. (hydro_excision_mask(i+2) .ne. 0) end if if (cond) then call PPM_TVD(rho(i-1), rho(i), rho(i+1), rhominus(i), rhoplus(i))

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 138)
by knarf＠cct.lsu.edu 21 Jul '10

21 Jul '10

User: knarf Date: 2010/07/21 10:36 AM Added: /trunk/src/ GRHydro_Interfaces.h Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: put fortran module interfaces into separate file File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +1 -88 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-07-12 14:50:27 UTC (rev 137) +++ trunk/src/GRHydro_Con2Prim.F90 2010-07-21 15:36:31 UTC (rev 138) @@ -12,95 +12,8 @@ #include "cctk_Arguments.h" #include "cctk_Functions.h" #include "SpaceMask.h" +#include "GRHydro_Interfaces.h" -module Con2Prim_fortran_interfaces - implicit none - - interface - - subroutine Con2Prim_pt(handle, & - dens, & - sx, sy, sz, & - tau, & - rho, & - velx, vely, velz, & - epsilon, press, & - w_lorentz, & - uxx, uxy, uxz, & - uyy, uyz, uzz, & - det, & - x, y, z, r, & - epsnegative, & - GRHydro_rho_min, pmin, epsmin, & - GRHydro_reflevel, GRHydro_C2P_failed) - - implicit none - CCTK_INT handle - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL epsilon, press - CCTK_REAL w_lorentz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_REAL x, y, z, r - logical epsnegative - CCTK_REAL GRHydro_rho_min, pmin, epsmin - CCTK_INT GRHydro_reflevel - CCTK_REAL GRHydro_C2P_failed - end subroutine Con2Prim_pt - - subroutine Con2Prim_ptPolytype(GRHydro_polytrope_handle, & - dens, & - sx, sy, sz, & - tau, & - rho, & - velx, vely, velz, & - eps, press, & - w_lorentz, & - uxx, uxy, uxz, uyy, uyz, uzz, & - det, & - x, y, z, r, & - GRHydro_rho_min, & - GRHydro_reflevel, GRHydro_C2P_failed) - - implicit none - CCTK_INT GRHydro_polytrope_handle - CCTK_REAL dens - CCTK_REAL sx, sy, sz - CCTK_REAL tau - CCTK_REAL rho - CCTK_REAL velx, vely, velz - CCTK_REAL eps, press - CCTK_REAL w_lorentz - CCTK_REAL uxx, uxy, uxz - CCTK_REAL uyy, uyz, uzz - CCTK_REAL det - CCTK_REAL x, y, z, r - CCTK_REAL GRHydro_rho_min - CCTK_INT GRHydro_reflevel - CCTK_REAL GRHydro_C2P_failed - end subroutine Con2Prim_ptPolytype - - subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens) - implicit none - CCTK_REAL cons_tracer, tracer, dens - end subroutine Con2Prim_ptTracer - - subroutine Con2Prim_ptBoundsTracer(cons_tracer, tracer, rho, one_over_w_lorentz, det) - implicit none - CCTK_REAL cons_tracer, tracer, rho, one_over_w_lorentz, det - end subroutine Con2Prim_ptBoundsTracer - - end interface - -end module Con2Prim_fortran_interfaces - - - /*@@ @routine Conservative2Primitive @date Sat Jan 26 01:08:33 2002 File [added]: GRHydro_Interfaces.h Delta lines: +107 -0 =================================================================== --- trunk/src/GRHydro_Interfaces.h (rev 0) +++ trunk/src/GRHydro_Interfaces.h 2010-07-21 15:36:31 UTC (rev 138) @@ -0,0 +1,107 @@ +module Con2Prim_fortran_interfaces + implicit none + + interface + + subroutine Con2Prim_pt(handle, & + dens, & + sx, sy, sz, & + tau, & + rho, & + velx, vely, velz, & + epsilon, press, & + w_lorentz, & + uxx, uxy, uxz, & + uyy, uyz, uzz, & + det, & + x, y, z, r, & + epsnegative, & + GRHydro_rho_min, pmin, epsmin, & + GRHydro_reflevel, GRHydro_C2P_failed) + + implicit none + CCTK_INT handle + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL tau + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL epsilon, press + CCTK_REAL w_lorentz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_REAL x, y, z, r + logical epsnegative + CCTK_REAL GRHydro_rho_min, pmin, epsmin + CCTK_INT GRHydro_reflevel + CCTK_REAL GRHydro_C2P_failed + end subroutine Con2Prim_pt + + subroutine Con2Prim_ptPolytype(GRHydro_polytrope_handle, & + dens, & + sx, sy, sz, & + tau, & + rho, & + velx, vely, velz, & + eps, press, & + w_lorentz, & + uxx, uxy, uxz, uyy, uyz, uzz, & + det, & + x, y, z, r, & + GRHydro_rho_min, & + GRHydro_reflevel, GRHydro_C2P_failed) + + implicit none + CCTK_INT GRHydro_polytrope_handle + CCTK_REAL dens + CCTK_REAL sx, sy, sz + CCTK_REAL tau + CCTK_REAL rho + CCTK_REAL velx, vely, velz + CCTK_REAL eps, press + CCTK_REAL w_lorentz + CCTK_REAL uxx, uxy, uxz + CCTK_REAL uyy, uyz, uzz + CCTK_REAL det + CCTK_REAL x, y, z, r + CCTK_REAL GRHydro_rho_min + CCTK_INT GRHydro_reflevel + CCTK_REAL GRHydro_C2P_failed + end subroutine Con2Prim_ptPolytype + + subroutine Con2Prim_ptTracer(cons_tracer, tracer, dens) + implicit none + CCTK_REAL cons_tracer, tracer, dens + end subroutine Con2Prim_ptTracer + + subroutine Con2Prim_ptBoundsTracer(cons_tracer, tracer, rho, one_over_w_lorentz, det) + implicit none + CCTK_REAL cons_tracer, tracer, rho, one_over_w_lorentz, det + end subroutine Con2Prim_ptBoundsTracer + + end interface + +end module Con2Prim_fortran_interfaces + +module Eigenproblem_interfaces + implicit none + + interface + + subroutine eigenvalues(handle,rho,velx,vely,velz,eps,w_lorentz,& + lam,gxx,gxy,gxz,gyy,gyz,gzz,u,alp,beta) + + implicit none + + CCTK_REAL rho,velx,vely,velz,eps,w_lorentz + CCTK_REAL lam(5) + CCTK_REAL gxx,gxy,gxz,gyy,gyz,gzz + CCTK_REAL alp,beta,u + CCTK_INT handle + end subroutine + + end interface + +end module Eigenproblem_interfaces +

1 0

[svn:einsteintoolkit] TwoPunctures/branches/momentum_constraint/src/ (Rev. 114)
by roland.haas＠physics.gatech.edu 19 Jul '10

19 Jul '10

User: rhaas Date: 2010/07/19 03:57 PM Modified: /branches/momentum_constraint/src/ TP_utilities.c Log: TwoPunctures: add caching of cos() to chebft_Zeros For grid_setup_method = "evolution" and npoints_A=npoints_B=20, npoints_phi=4 TwoPunctures spends about 90% (of about 2h) of the time in chebft_Zeros. With this patch it is about 77% (of 10min). For taylor-expansion most of the time is spend in LinRelax, which is fine. Best might be to actually construct the full set of spectral coefficients and then only to chebev/fourev instead of always going from collocation points to spectral rep. then evaluate (trades memory for speed). File Changes: Directory: /branches/momentum_constraint/src/ ============================================= File [modified]: TP_utilities.c Delta lines: +33 -2 =================================================================== --- branches/momentum_constraint/src/TP_utilities.c 2010-07-19 13:46:41 UTC (rev 113) +++ branches/momentum_constraint/src/TP_utilities.c 2010-07-19 20:57:25 UTC (rev 114) @@ -244,12 +244,43 @@ } /*--------------------------------------------------------------------------*/ +#define COSCACHE_N_MAX 256 +static CCTK_REAL * +chebft_Zeros_cache (int n) + /* caches values of cos (Pi/n * j * (k + 0.5)) */ +{ + int j, k; + CCTK_REAL Pion; + static CCTK_REAL *cache[COSCACHE_N_MAX]; + assert(n <= COSCACHE_N_MAX); + + if(cache[n-1] == NULL) + { +#pragma omp critical + if(cache[n-1] == NULL) /* check again in case some other thread allocated storage in omp critical sync */ + { + /* set up new cache */ + cache[n-1] = dvector(0, n*n-1); + /* TODO: add method to free allocated memory */ + Pion = Pi/n; + for (j = 0; j < n; j++) + for (k = 0; k < n; k++) + cache[n-1][j+k*n] = cos (Pion * j * (k + 0.5)); + } + } + + assert(cache[n-1]); + return cache[n-1]; +} + +/*--------------------------------------------------------------------------*/ void chebft_Zeros (CCTK_REAL u[], int n, int inv) /* eq. 5.8.7 and 5.8.8 at x = (5.8.4) of 2nd edition C++ NR */ { int k, j, isignum; CCTK_REAL fac, sum, Pion, *c; + CCTK_REAL *Cos = chebft_Zeros_cache(n); c = dvector (0, n); Pion = Pi / n; @@ -261,7 +292,7 @@ { sum = 0.0; for (k = 0; k < n; k++) - sum += u[k] * cos (Pion * j * (k + 0.5)); + sum += u[k] * Cos[j+k*n]; /*cos (Pion * j * (k + 0.5))*/ c[j] = fac * sum * isignum; isignum = -isignum; } @@ -274,7 +305,7 @@ isignum = 1; for (k = 0; k < n; k++) { - sum += u[k] * cos (Pion * (j + 0.5) * k) * isignum; + sum += u[k] * Cos[k+j*n] * isignum; /*cos (Pion * (j + 0.5) * k)*/ isignum = -isignum; } c[j] = sum;

1 0

[svn:einsteintoolkit] TwoPunctures/branches/momentum_constraint/ (Rev. 113)
by roland.haas＠physics.gatech.edu 19 Jul '10

19 Jul '10

User: rhaas Date: 2010/07/19 08:46 AM Added: /branches/momentum_constraint/test/ bhns_momentum_fd.par /branches/momentum_constraint/test/bhns_momentum_fd/ alp.d.asc, alp.maximum.asc, alp.minimum.asc, alp.norm1.asc, alp.norm2.asc, alp.x.asc, alp.y.asc, alp.z.asc, betax.d.asc, betax.maximum.asc, betax.minimum.asc, betax.norm1.asc, betax.norm2.asc, betax.x.asc, betax.y.asc, betax.z.asc, betay.d.asc, betay.maximum.asc, betay.minimum.asc, betay.norm1.asc, betay.norm2.asc, betay.x.asc, betay.y.asc, betay.z.asc, betaz.d.asc, betaz.maximum.asc, betaz.minimum.asc, betaz.norm1.asc, betaz.norm2.asc, betaz.x.asc, betaz.y.asc, betaz.z.asc, dens.d.asc, dens.maximum.asc, dens.minimum.asc, dens.norm1.asc, dens.norm2.asc, dens.x.asc, dens.y.asc, dens.z.asc, eps.d.asc, eps.maximum.asc, eps.minimum.asc, eps.norm1.asc, eps.norm2.asc, eps.x.asc, eps.y.asc, eps.z.asc, gxx.d.asc, gxx.maximum.asc, gxx.minimum.asc, gxx.norm1.asc, gxx.norm2.asc, gxx.x.asc, gxx.y.asc, gxx.z.asc, gxy.d.asc, gxy.maximum.asc, gxy.minimum.asc, gxy.norm1.asc, gxy.norm2.asc, gxy.x.asc, gxy.y.asc, gxy.z.asc, gxz.d.asc, gxz.maximum.asc, gxz.minimum.asc, gxz.norm1.asc, gxz.norm2.asc, gxz.x.asc, gxz.y.asc, gxz.z.asc, gyy.d.asc, gyy.maximum.asc, gyy.minimum.asc, gyy.norm1.asc, gyy.norm2.asc, gyy.x.asc, gyy.y.asc, gyy.z.asc, gyz.d.asc, gyz.maximum.asc, gyz.minimum.asc, gyz.norm1.asc, gyz.norm2.asc, gyz.x.asc, gyz.y.asc, gyz.z.asc, gzz.d.asc, gzz.maximum.asc, gzz.minimum.asc, gzz.norm1.asc, gzz.norm2.asc, gzz.x.asc, gzz.y.asc, gzz.z.asc, kxx.d.asc, kxx.maximum.asc, kxx.minimum.asc, kxx.norm1.asc, kxx.norm2.asc, kxx.x.asc, kxx.y.asc, kxx.z.asc, kxy.d.asc, kxy.maximum.asc, kxy.minimum.asc, kxy.norm1.asc, kxy.norm2.asc, kxy.x.asc, kxy.y.asc, kxy.z.asc, kxz.d.asc, kxz.maximum.asc, kxz.minimum.asc, kxz.norm1.asc, kxz.norm2.asc, kxz.x.asc, kxz.y.asc, kxz.z.asc, kyy.d.asc, kyy.maximum.asc, kyy.minimum.asc, kyy.norm1.asc, kyy.norm2.asc, kyy.x.asc, kyy.y.asc, kyy.z.asc, kyz.d.asc, kyz.maximum.asc, kyz.minimum.asc, kyz.norm1.asc, kyz.norm2.asc, kyz.x.asc, kyz.y.asc, kyz.z.asc, kzz.d.asc, kzz.maximum.asc, kzz.minimum.asc, kzz.norm1.asc, kzz.norm2.asc, kzz.x.asc, kzz.y.asc, kzz.z.asc, press.d.asc, press.maximum.asc, press.minimum.asc, press.norm1.asc, press.norm2.asc, press.x.asc, press.y.asc, press.z.asc, puncture_u.d.asc, puncture_u.maximum.asc, puncture_u.minimum.asc, puncture_u.norm1.asc, puncture_u.norm2.asc, puncture_u.x.asc, puncture_u.y.asc, puncture_u.z.asc, rho.d.asc, rho.maximum.asc, rho.minimum.asc, rho.norm1.asc, rho.norm2.asc, rho.x.asc, rho.y.asc, rho.z.asc, scon[0].d.asc, scon[0].maximum.asc, scon[0].minimum.asc, scon[0].norm1.asc, scon[0].norm2.asc, scon[0].x.asc, scon[0].y.asc, scon[0].z.asc, scon[1].d.asc, scon[1].maximum.asc, scon[1].minimum.asc, scon[1].norm1.asc, scon[1].norm2.asc, scon[1].x.asc, scon[1].y.asc, scon[1].z.asc, scon[2].d.asc, scon[2].maximum.asc, scon[2].minimum.asc, scon[2].norm1.asc, scon[2].norm2.asc, scon[2].x.asc, scon[2].y.asc, scon[2].z.asc, tau.d.asc, tau.maximum.asc, tau.minimum.asc, tau.norm1.asc, tau.norm2.asc, tau.x.asc, tau.y.asc, tau.z.asc, vel[0].d.asc, vel[0].maximum.asc, vel[0].minimum.asc, vel[0].norm1.asc, vel[0].norm2.asc, vel[0].x.asc, vel[0].y.asc, vel[0].z.asc, vel[1].d.asc, vel[1].maximum.asc, vel[1].minimum.asc, vel[1].norm1.asc, vel[1].norm2.asc, vel[1].x.asc, vel[1].y.asc, vel[1].z.asc, vel[2].d.asc, vel[2].maximum.asc, vel[2].minimum.asc, vel[2].norm1.asc, vel[2].norm2.asc, vel[2].x.asc, vel[2].y.asc, vel[2].z.asc, w_lorentz.d.asc, w_lorentz.maximum.asc, w_lorentz.minimum.asc, w_lorentz.norm1.asc, w_lorentz.norm2.asc, w_lorentz.x.asc, w_lorentz.y.asc, w_lorentz.z.asc Modified: /branches/momentum_constraint/ param.ccl /branches/momentum_constraint/src/ Source.c, TwoPunctures.c, TwoPunctures.h Log: TwoPunctures: add option to compute Aij using finite differencing Adds an option use_finite_differencing_for_Aij (defaults to no) which computes the extrinsic curvature via finite differencing when putting it onto the Cactus grid. Gives smoother results than using the spectral values directly. Test suite (and example parameter file) are included in this commit. Currently terribly inefficient since it evaluates the spectral representation nine times for each Cactus grid point. File Changes: Directory: /branches/momentum_constraint/test/bhns_momentum_fd/ =============================================================== File [added]: alp.d.asc Delta lines: <Unavailable> File [added]: alp.maximum.asc Delta lines: <Unavailable> File [added]: alp.minimum.asc Delta lines: <Unavailable> File [added]: alp.norm1.asc Delta lines: <Unavailable> File [added]: alp.norm2.asc Delta lines: <Unavailable> File [added]: alp.x.asc Delta lines: <Unavailable> File [added]: alp.y.asc Delta lines: <Unavailable> File [added]: alp.z.asc Delta lines: <Unavailable> File [added]: betax.d.asc Delta lines: <Unavailable> File [added]: betax.maximum.asc Delta lines: <Unavailable> File [added]: betax.minimum.asc Delta lines: <Unavailable> File [added]: betax.norm1.asc Delta lines: <Unavailable> File [added]: betax.norm2.asc Delta lines: <Unavailable> File [added]: betax.x.asc Delta lines: <Unavailable> File [added]: betax.y.asc Delta lines: <Unavailable> File [added]: betax.z.asc Delta lines: <Unavailable> File [added]: betay.d.asc Delta lines: <Unavailable> File [added]: betay.maximum.asc Delta lines: <Unavailable> File [added]: betay.minimum.asc Delta lines: <Unavailable> File [added]: betay.norm1.asc Delta lines: <Unavailable> File [added]: betay.norm2.asc Delta lines: <Unavailable> File [added]: betay.x.asc Delta lines: <Unavailable> File [added]: betay.y.asc Delta lines: <Unavailable> File [added]: betay.z.asc Delta lines: <Unavailable> File [added]: betaz.d.asc Delta lines: <Unavailable> File [added]: betaz.maximum.asc Delta lines: <Unavailable> File [added]: betaz.minimum.asc Delta lines: <Unavailable> File [added]: betaz.norm1.asc Delta lines: <Unavailable> File [added]: betaz.norm2.asc Delta lines: <Unavailable> File [added]: betaz.x.asc Delta lines: <Unavailable> File [added]: betaz.y.asc Delta lines: <Unavailable> File [added]: betaz.z.asc Delta lines: <Unavailable> File [added]: dens.d.asc Delta lines: <Unavailable> File [added]: dens.maximum.asc Delta lines: <Unavailable> File [added]: dens.minimum.asc Delta lines: <Unavailable> File [added]: dens.norm1.asc Delta lines: <Unavailable> File [added]: dens.norm2.asc Delta lines: <Unavailable> File [added]: dens.x.asc Delta lines: <Unavailable> File [added]: dens.y.asc Delta lines: <Unavailable> File [added]: dens.z.asc Delta lines: <Unavailable> File [added]: eps.d.asc Delta lines: <Unavailable> File [added]: eps.maximum.asc Delta lines: <Unavailable> File [added]: eps.minimum.asc Delta lines: <Unavailable> File [added]: eps.norm1.asc Delta lines: <Unavailable> File [added]: eps.norm2.asc Delta lines: <Unavailable> File [added]: eps.x.asc Delta lines: <Unavailable> File [added]: eps.y.asc Delta lines: <Unavailable> File [added]: eps.z.asc Delta lines: <Unavailable> File [added]: gxx.d.asc Delta lines: <Unavailable> File [added]: gxx.maximum.asc Delta lines: <Unavailable> File [added]: gxx.minimum.asc Delta lines: <Unavailable> File [added]: gxx.norm1.asc Delta lines: <Unavailable> File [added]: gxx.norm2.asc Delta lines: <Unavailable> File [added]: gxx.x.asc Delta lines: <Unavailable> File [added]: gxx.y.asc Delta lines: <Unavailable> File [added]: gxx.z.asc Delta lines: <Unavailable> File [added]: gxy.d.asc Delta lines: <Unavailable> File [added]: gxy.maximum.asc Delta lines: <Unavailable> File [added]: gxy.minimum.asc Delta lines: <Unavailable> File [added]: gxy.norm1.asc Delta lines: <Unavailable> File [added]: gxy.norm2.asc Delta lines: <Unavailable> File [added]: gxy.x.asc Delta lines: <Unavailable> File [added]: gxy.y.asc Delta lines: <Unavailable> File [added]: gxy.z.asc Delta lines: <Unavailable> File [added]: gxz.d.asc Delta lines: <Unavailable> File [added]: gxz.maximum.asc Delta lines: <Unavailable> File [added]: gxz.minimum.asc Delta lines: <Unavailable> File [added]: gxz.norm1.asc Delta lines: <Unavailable> File [added]: gxz.norm2.asc Delta lines: <Unavailable> File [added]: gxz.x.asc Delta lines: <Unavailable> File [added]: gxz.y.asc Delta lines: <Unavailable> File [added]: gxz.z.asc Delta lines: <Unavailable> File [added]: gyy.d.asc Delta lines: <Unavailable> File [added]: gyy.maximum.asc Delta lines: <Unavailable> File [added]: gyy.minimum.asc Delta lines: <Unavailable> File [added]: gyy.norm1.asc Delta lines: <Unavailable> File [added]: gyy.norm2.asc Delta lines: <Unavailable> File [added]: gyy.x.asc Delta lines: <Unavailable> File [added]: gyy.y.asc Delta lines: <Unavailable> File [added]: gyy.z.asc Delta lines: <Unavailable> File [added]: gyz.d.asc Delta lines: <Unavailable> File [added]: gyz.maximum.asc Delta lines: <Unavailable> File [added]: gyz.minimum.asc Delta lines: <Unavailable> File [added]: gyz.norm1.asc Delta lines: <Unavailable> File [added]: gyz.norm2.asc Delta lines: <Unavailable> File [added]: gyz.x.asc Delta lines: <Unavailable> File [added]: gyz.y.asc Delta lines: <Unavailable> File [added]: gyz.z.asc Delta lines: <Unavailable> File [added]: gzz.d.asc Delta lines: <Unavailable> File [added]: gzz.maximum.asc Delta lines: <Unavailable> File [added]: gzz.minimum.asc Delta lines: <Unavailable> File [added]: gzz.norm1.asc Delta lines: <Unavailable> File [added]: gzz.norm2.asc Delta lines: <Unavailable> File [added]: gzz.x.asc Delta lines: <Unavailable> File [added]: gzz.y.asc Delta lines: <Unavailable> File [added]: gzz.z.asc Delta lines: <Unavailable> File [added]: kxx.d.asc Delta lines: <Unavailable> File [added]: kxx.maximum.asc Delta lines: <Unavailable> File [added]: kxx.minimum.asc Delta lines: <Unavailable> File [added]: kxx.norm1.asc Delta lines: <Unavailable> File [added]: kxx.norm2.asc Delta lines: <Unavailable> File [added]: kxx.x.asc Delta lines: <Unavailable> File [added]: kxx.y.asc Delta lines: <Unavailable> File [added]: kxx.z.asc Delta lines: <Unavailable> File [added]: kxy.d.asc Delta lines: <Unavailable> File [added]: kxy.maximum.asc Delta lines: <Unavailable> File [added]: kxy.minimum.asc Delta lines: <Unavailable> File [added]: kxy.norm1.asc Delta lines: <Unavailable> File [added]: kxy.norm2.asc Delta lines: <Unavailable> File [added]: kxy.x.asc Delta lines: <Unavailable> File [added]: kxy.y.asc Delta lines: <Unavailable> File [added]: kxy.z.asc Delta lines: <Unavailable> File [added]: kxz.d.asc Delta lines: <Unavailable> File [added]: kxz.maximum.asc Delta lines: <Unavailable> File [added]: kxz.minimum.asc Delta lines: <Unavailable> File [added]: kxz.norm1.asc Delta lines: <Unavailable> File [added]: kxz.norm2.asc Delta lines: <Unavailable> File [added]: kxz.x.asc Delta lines: <Unavailable> File [added]: kxz.y.asc Delta lines: <Unavailable> File [added]: kxz.z.asc Delta lines: <Unavailable> File [added]: kyy.d.asc Delta lines: <Unavailable> File [added]: kyy.maximum.asc Delta lines: <Unavailable> File [added]: kyy.minimum.asc Delta lines: <Unavailable> File [added]: kyy.norm1.asc Delta lines: <Unavailable> File [added]: kyy.norm2.asc Delta lines: <Unavailable> File [added]: kyy.x.asc Delta lines: <Unavailable> File [added]: kyy.y.asc Delta lines: <Unavailable> File [added]: kyy.z.asc Delta lines: <Unavailable> File [added]: kyz.d.asc Delta lines: <Unavailable> File [added]: kyz.maximum.asc Delta lines: <Unavailable> File [added]: kyz.minimum.asc Delta lines: <Unavailable> File [added]: kyz.norm1.asc Delta lines: <Unavailable> File [added]: kyz.norm2.asc Delta lines: <Unavailable> File [added]: kyz.x.asc Delta lines: <Unavailable> File [added]: kyz.y.asc Delta lines: <Unavailable> File [added]: kyz.z.asc Delta lines: <Unavailable> File [added]: kzz.d.asc Delta lines: <Unavailable> File [added]: kzz.maximum.asc Delta lines: <Unavailable> File [added]: kzz.minimum.asc Delta lines: <Unavailable> File [added]: kzz.norm1.asc Delta lines: <Unavailable> File [added]: kzz.norm2.asc Delta lines: <Unavailable> File [added]: kzz.x.asc Delta lines: <Unavailable> File [added]: kzz.y.asc Delta lines: <Unavailable> File [added]: kzz.z.asc Delta lines: <Unavailable> File [added]: press.d.asc Delta lines: <Unavailable> File [added]: press.maximum.asc Delta lines: <Unavailable> File [added]: press.minimum.asc Delta lines: <Unavailable> File [added]: press.norm1.asc Delta lines: <Unavailable> File [added]: press.norm2.asc Delta lines: <Unavailable> File [added]: press.x.asc Delta lines: <Unavailable> File [added]: press.y.asc Delta lines: <Unavailable> File [added]: press.z.asc Delta lines: <Unavailable> File [added]: puncture_u.d.asc Delta lines: <Unavailable> File [added]: puncture_u.maximum.asc Delta lines: <Unavailable> File [added]: puncture_u.minimum.asc Delta lines: <Unavailable> File [added]: puncture_u.norm1.asc Delta lines: <Unavailable> File [added]: puncture_u.norm2.asc Delta lines: <Unavailable> File [added]: puncture_u.x.asc Delta lines: <Unavailable> File [added]: puncture_u.y.asc Delta lines: <Unavailable> File [added]: puncture_u.z.asc Delta lines: <Unavailable> File [added]: rho.d.asc Delta lines: <Unavailable> File [added]: rho.maximum.asc Delta lines: <Unavailable> File [added]: rho.minimum.asc Delta lines: <Unavailable> File [added]: rho.norm1.asc Delta lines: <Unavailable> File [added]: rho.norm2.asc Delta lines: <Unavailable> File [added]: rho.x.asc Delta lines: <Unavailable> File [added]: rho.y.asc Delta lines: <Unavailable> File [added]: rho.z.asc Delta lines: <Unavailable> File [added]: scon[0].d.asc Delta lines: <Unavailable> File [added]: scon[0].maximum.asc Delta lines: <Unavailable> File [added]: scon[0].minimum.asc Delta lines: <Unavailable> File [added]: scon[0].norm1.asc Delta lines: <Unavailable> File [added]: scon[0].norm2.asc Delta lines: <Unavailable> File [added]: scon[0].x.asc Delta lines: <Unavailable> File [added]: scon[0].y.asc Delta lines: <Unavailable> File [added]: scon[0].z.asc Delta lines: <Unavailable> File [added]: scon[1].d.asc Delta lines: <Unavailable> File [added]: scon[1].maximum.asc Delta lines: <Unavailable> File [added]: scon[1].minimum.asc Delta lines: <Unavailable> File [added]: scon[1].norm1.asc Delta lines: <Unavailable> File [added]: scon[1].norm2.asc Delta lines: <Unavailable> File [added]: scon[1].x.asc Delta lines: <Unavailable> File [added]: scon[1].y.asc Delta lines: <Unavailable> File [added]: scon[1].z.asc Delta lines: <Unavailable> File [added]: scon[2].d.asc Delta lines: <Unavailable> File [added]: scon[2].maximum.asc Delta lines: <Unavailable> File [added]: scon[2].minimum.asc Delta lines: <Unavailable> File [added]: scon[2].norm1.asc Delta lines: <Unavailable> File [added]: scon[2].norm2.asc Delta lines: <Unavailable> File [added]: scon[2].x.asc Delta lines: <Unavailable> File [added]: scon[2].y.asc Delta lines: <Unavailable> File [added]: scon[2].z.asc Delta lines: <Unavailable> File [added]: tau.d.asc Delta lines: <Unavailable> File [added]: tau.maximum.asc Delta lines: <Unavailable> File [added]: tau.minimum.asc Delta lines: <Unavailable> File [added]: tau.norm1.asc Delta lines: <Unavailable> File [added]: tau.norm2.asc Delta lines: <Unavailable> File [added]: tau.x.asc Delta lines: <Unavailable> File [added]: tau.y.asc Delta lines: <Unavailable> File [added]: tau.z.asc Delta lines: <Unavailable> File [added]: vel[0].d.asc Delta lines: <Unavailable> File [added]: vel[0].maximum.asc Delta lines: <Unavailable> File [added]: vel[0].minimum.asc Delta lines: <Unavailable> File [added]: vel[0].norm1.asc Delta lines: <Unavailable> File [added]: vel[0].norm2.asc Delta lines: <Unavailable> File [added]: vel[0].x.asc Delta lines: <Unavailable> File [added]: vel[0].y.asc Delta lines: <Unavailable> File [added]: vel[0].z.asc Delta lines: <Unavailable> File [added]: vel[1].d.asc Delta lines: <Unavailable> File [added]: vel[1].maximum.asc Delta lines: <Unavailable> File [added]: vel[1].minimum.asc Delta lines: <Unavailable> File [added]: vel[1].norm1.asc Delta lines: <Unavailable> File [added]: vel[1].norm2.asc Delta lines: <Unavailable> File [added]: vel[1].x.asc Delta lines: <Unavailable> File [added]: vel[1].y.asc Delta lines: <Unavailable> File [added]: vel[1].z.asc Delta lines: <Unavailable> File [added]: vel[2].d.asc Delta lines: <Unavailable> File [added]: vel[2].maximum.asc Delta lines: <Unavailable> File [added]: vel[2].minimum.asc Delta lines: <Unavailable> File [added]: vel[2].norm1.asc Delta lines: <Unavailable> File [added]: vel[2].norm2.asc Delta lines: <Unavailable> File [added]: vel[2].x.asc Delta lines: <Unavailable> File [added]: vel[2].y.asc Delta lines: <Unavailable> File [added]: vel[2].z.asc Delta lines: <Unavailable> File [added]: w_lorentz.d.asc Delta lines: <Unavailable> File [added]: w_lorentz.maximum.asc Delta lines: <Unavailable> File [added]: w_lorentz.minimum.asc Delta lines: <Unavailable> File [added]: w_lorentz.norm1.asc Delta lines: <Unavailable> File [added]: w_lorentz.norm2.asc Delta lines: <Unavailable> File [added]: w_lorentz.x.asc Delta lines: <Unavailable> File [added]: w_lorentz.y.asc Delta lines: <Unavailable> File [added]: w_lorentz.z.asc Delta lines: <Unavailable> Directory: /branches/momentum_constraint/ ========================================= File [modified]: param.ccl Delta lines: <Unavailable> Directory: /branches/momentum_constraint/src/ ============================================= File [modified]: Source.c Delta lines: <Unavailable> File [modified]: TwoPunctures.c Delta lines: <Unavailable> File [modified]: TwoPunctures.h Delta lines: <Unavailable> Directory: /branches/momentum_constraint/test/ ============================================== File [added]: bhns_momentum_fd.par Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] www/ (Rev. 316)
by gallen＠cct.lsu.edu 15 Jul '10

15 Jul '10

User: gallen Date: 2010/07/15 06:45 PM Added: /about/ funding.php Log: Just prototyping a page for comments Directory Changes: Directory: /svn:executable/ =========================== + * File Changes: Directory: /about/ ================== File [added]: funding.php Delta lines: +23 -0 =================================================================== --- about/funding.php (rev 0) +++ about/funding.php 2010-07-15 23:45:09 UTC (rev 316) @@ -0,0 +1,23 @@ +<?php $title='Funding'; +include_once($_SERVER['DOCUMENT_ROOT'].'/global/header.php');?> + +The development and support of the Einstein Toolkit components and packages have been funded from multiple sources, some of which are listed below. Please + write to the <a href="mailto:maintainers@einsteintoolkit.org">maintainers</a> to add an item to this page. + +<ul> + +<li> NSF #0904015: <a href="">Collaborative Research: Community Infrastructure for General Relativity MHD (CIGR)</a> +Core development and support of the community software for general relativistic MHD</li> + +<li> NSF #1005165: <a href="">Interdisciplinary Research Experience in Computational Sciences</a> + Development of GetComponents for code assembly</li> + +<li> NSF #0932251: <a href="http://www.nsf.gov/awardsearch/showAward.do?AwardNumber=0932251">TeraGrid Extension: Bridging to XD</a> +Development of SimFactory into a science gateway for TeraGrid</li> + + + +</ul> + + +<?php include_once($_SERVER['DOCUMENT_ROOT'].'/global/footer.php');?> Property changes on: about/funding.php ___________________________________________________________________

1 0

[svn:einsteintoolkit] www/about/members/ (Rev. 315)
by gallen＠cct.lsu.edu 15 Jul '10

15 Jul '10

User: gallen Date: 2010/07/15 04:58 PM Modified: /about/members/ index.php Log: Billy Vazquez and Mew Bing Wan File Changes: Directory: /about/members/ ========================== File [modified]: index.php Delta lines: +6 -0 =================================================================== --- about/members/index.php 2010-07-10 14:10:23 UTC (rev 314) +++ about/members/index.php 2010-07-15 21:58:54 UTC (rev 315) @@ -34,6 +34,11 @@ <li>Bela Szilagyi</li> </ul> + <li>Chinese Academy of Sciences</li> + <ul> + <li>Mew Bing Wan</li> + </ul> + <li><a href="http://www.cct.lsu.edu/numerical/" class="nostyle">Louisiana State University</a></li> <ul> <li>Ernazar Abdikamalov</li> @@ -86,6 +91,7 @@ <li>Scott Noble</li> <li>Marcelo Ponce</li> <li>David Saroff</li> + <li>Billy Vazquez</li> <li>Yosef Zlochower</li> </ul>

1 0

[svn:einsteintoolkit] TOVSolver/trunk/src/ (Rev. 117)
by knarf＠cct.lsu.edu 13 Jul '10

13 Jul '10

User: knarf Date: 2010/07/13 10:47 AM Modified: /trunk/src/ external.inc, tov.c Log: fix compiler warnings File Changes: Directory: /trunk/src/ ====================== File [modified]: external.inc Delta lines: +6 -7 =================================================================== --- trunk/src/external.inc 2010-07-13 15:41:27 UTC (rev 116) +++ trunk/src/external.inc 2010-07-13 15:47:07 UTC (rev 117) @@ -367,10 +367,10 @@ *vel0_p_p, *vel1_p_p, *vel2_p_p, *scon0_p_p, *scon1_p_p, *scon2_p_p; CCTK_REAL *u, *source, *mom_source[3]; CCTK_REAL psip, my_psi4, sqrt_det, vx, vy, vz, v_2, - w_lorentz_2, d_w_lorentz_2, D_h_w; + w_lorentz_2, D_h_w; CCTK_REAL vlowx, vlowy, vlowz; - CCTK_INT i, type; - CCTK_REAL rhoold, rhonew, f, df; + CCTK_INT type; + CCTK_REAL rhoold, rhonew; int i3D; static int debug = 1; FILE *debugfile = NULL; @@ -440,7 +440,6 @@ { if (source[i3D]>0.0) { - int count=0; if (debug && (fabs(z[i3D])<1.e-15)) { fprintf(debugfile, @@ -464,8 +463,10 @@ rho[i3D] = 1.e-10; rhoold = rhonew = rho[i3D]; #ifdef OLD_NR + int count=0; do { + CCTK_REAL f, df; count++; vx = mom_source[0][i3D]/my_psi4/ (source[i3D]/my_psi4/my_psi4+TOV_K[0] * pow(rhonew, TOV_Gamma[0])); @@ -498,7 +499,7 @@ TOV_K[0] * TOV_Gamma[0] * pow(rhonew, TOV_Gamma[0]-1.); */ /* d_w_lorentz_2/drhonew */ - d_w_lorentz_2 = + CCTK_REAL d_w_lorentz_2 = -2 * w_lorentz_2*w_lorentz_2 * v_2 * TOV_K[0]*TOV_Gamma[0]*pow(rhonew, TOV_Gamma[0]-1) / (source[i3D]/my_psi4/my_psi4 + TOV_K[0]*pow(rhonew, TOV_Gamma[0])); @@ -647,8 +648,6 @@ void TOVSolverC_export_local_variables(CCTK_REAL **exported_TOV_press_1d, CCTK_REAL **exported_TOV_m_1d, CCTK_REAL **exported_TOV_phi_1d, CCTK_REAL **exported_TOV_rbar_1d, CCTK_REAL **exported_TOV_r_1d) { - int i; - *exported_TOV_press_1d = TOV_press_1d; *exported_TOV_m_1d = TOV_m_1d; *exported_TOV_phi_1d = TOV_phi_1d; File [modified]: tov.c Delta lines: +4 -4 =================================================================== --- trunk/src/tov.c 2010-07-13 15:41:27 UTC (rev 116) +++ trunk/src/tov.c 2010-07-13 15:47:07 UTC (rev 117) @@ -149,7 +149,7 @@ r_minus_two_m = r - 2.0 * m; - if ((r==0.0) && (m==0.0)) + if ((r<=0.0) && (m<=0.0)) { source_data[1] = 0.0; source_data[2] = 0.0; @@ -219,7 +219,7 @@ star_i = star * TOV_Num_Radial; /* check for parameters */ - if ((TOV_Rho_Central[star]==0.0) && (GRHydro_rho_central>0.0)) + if ((TOV_Rho_Central[star]<=0.0) && (GRHydro_rho_central>0.0)) rho_central=GRHydro_rho_central; else rho_central=TOV_Rho_Central[star]; @@ -283,7 +283,7 @@ old_data[0] = TOV_press_1d[i]; old_data[1] = TOV_m_1d[i]; old_data[2] = TOV_phi_1d[i]; - if (TOV_rbar_1d[i]==TOV_r_1d[i]) + if (fabs(TOV_rbar_1d[i] - TOV_r_1d[i]) < LOCAL_TINY) old_data[3] = 0.0; else old_data[3] = log(TOV_rbar_1d[i] / TOV_r_1d[i]); @@ -377,7 +377,7 @@ CCTK_VInfo(CCTK_THORNSTRING, "Information about the TOVs used:"); CCTK_VInfo("", "TOV radius mass bary_mass mass(g) cent.rho rho(cgi) K K(cgi) Gamma"); for (i=0; i<TOV_Num_TOVs; i++) - if (TOV_Gamma[i]==2.0) + if (fabs(TOV_Gamma[i] - 2.0) < LOCAL_TINY) CCTK_VInfo(""," %d %8g %8g %8g %8.3g %8g %8.3g %8g %8.3g %8g", i+1, TOV_R_Surface[i], TOV_m_1d[(i+1)*TOV_Num_Radial-1],

1 0

[svn:einsteintoolkit] TOVSolver/trunk/src/ (Rev. 116)
by knarf＠cct.lsu.edu 13 Jul '10

13 Jul '10

User: knarf Date: 2010/07/13 10:41 AM Modified: /trunk/src/ external.inc Log: combine error messages File Changes: Directory: /trunk/src/ ====================== File [modified]: external.inc Delta lines: +3 -3 =================================================================== --- trunk/src/external.inc 2010-07-12 14:50:50 UTC (rev 115) +++ trunk/src/external.inc 2010-07-13 15:41:27 UTC (rev 116) @@ -308,11 +308,11 @@ if (count > 100) { CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING, \ - "Failed to converge IVP rescaling\nat (%.3g %.3g %.3g)\n"\ - " orig_rho:%g rho:%g, v^2=%g, rel_diff=%g", \ + "Failed to converge IVP rescaling, trying slow bisection method\n"\ + " at (%.3g %.3g %.3g)\n"\ + " orig_rho:%g rho:%g, v^2=%g, rel_diff=%g", \ x, y, z, rho_orig, *rhonew, *v_2, fabs(*rhonew-*rhoold)/fabs(*rhonew)); - CCTK_WARN(1, "trying slow bisection method"); bisection(vx,vy,vz,rhoold,rhonew,w_lorentz_2,v_2, Gamma, K, source, mom_source_x, mom_source_y, mom_source_z,

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits July 2010