Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 440)
by knarf＠cct.lsu.edu 23 Nov '12

23 Nov '12

User: knarf Date: 2012/11/23 03:25 PM Modified: /trunk/src/ Utils.F90 Log: remove unused variable; instead of using aint which truncates but doesn't convert type, use int which does both -> silences compiler warning File Changes: Directory: /trunk/src/ ====================== File [modified]: Utils.F90 Delta lines: +2 -3 =================================================================== --- trunk/src/Utils.F90 2012-11-09 01:53:23 UTC (rev 439) +++ trunk/src/Utils.F90 2012-11-23 21:25:35 UTC (rev 440) @@ -34,7 +34,7 @@ integer i,j,k integer nx, ny, nz - GRHydro_reflevel = aint(log10(dble(cctk_levfac(1)))/log10(2.0d0)) + GRHydro_reflevel = int(log10(dble(cctk_levfac(1)))/log10(2.0d0)) nx = cctk_lsh(1) ny = cctk_lsh(2) @@ -67,7 +67,7 @@ implicit none DECLARE_CCTK_ARGUMENTS - GRHydro_reflevel = aint(log10(dble(cctk_levfac(1)))/log10(2.0d0)) + GRHydro_reflevel = int(log10(dble(cctk_levfac(1)))/log10(2.0d0)) end subroutine GRHydro_RefinementLevel @@ -169,7 +169,6 @@ DECLARE_CCTK_PARAMETERS CCTK_INT :: i, j, k, nx, ny, nz - CCTK_REAL :: psi4pt nx = cctk_lsh(1) ny = cctk_lsh(2)

1 0

[svn:einsteintoolkit] ADMMacros/trunk/src/ (Rev. 115)
by knarf＠cct.lsu.edu 23 Nov '12

23 Nov '12

User: knarf Date: 2012/11/23 02:49 PM Modified: /trunk/src/ SetLocalSpatialOrder.c Log: only output order for root processor, not on every File Changes: Directory: /trunk/src/ ====================== File [modified]: SetLocalSpatialOrder.c Delta lines: +3 -2 =================================================================== --- trunk/src/SetLocalSpatialOrder.c 2012-11-05 14:45:17 UTC (rev 114) +++ trunk/src/SetLocalSpatialOrder.c 2012-11-23 20:49:32 UTC (rev 115) @@ -65,8 +65,9 @@ *local_spatial_order = spatial_order; - CCTK_VInfo(CCTK_THORNSTRING, "Spatial finite differencing order: %d", - (int)spatial_order); + if (CCTK_MyProc(cctkGH)==0) + CCTK_VInfo(CCTK_THORNSTRING, "Spatial finite differencing order: %d", + (int)spatial_order); return; }

1 0

[svn:einsteintoolkit] www/about/ (Rev. 914)
by knarf＠cct.lsu.edu 23 Nov '12

23 Nov '12

User: knarf Date: 2012/11/23 09:45 AM Modified: /about/ index.php Log: update thornlist File Changes: Directory: /about/ ================== File [modified]: index.php Delta lines: +1 -1 =================================================================== --- about/index.php 2012-11-08 17:06:40 UTC (rev 913) +++ about/index.php 2012-11-23 15:45:47 UTC (rev 914) @@ -30,7 +30,7 @@ <p>The tools and thorns comprising the Einstein Toolkit are provided in a standard Cactus - thornlist: <a href="https://svn.einsteintoolkit.org/manifest/branches/ET_2011_10/einsteintoolki…">Einstein + thornlist: <a href="https://svn.einsteintoolkit.org/manifest/branches/ET_2012_11/einsteintoolki…">Einstein Toolkit Thornlist</a>. A <a href="http://docs.einsteintoolkit.org/et-docs/Tutorial_for_New_Users">tutorial</a> describes in easy steps how to download, compile, and run the

1 0

[Carpet] branch, master, updated. carpet-6-init-62-g6b5c318
by Carpet git repositories 22 Nov '12

22 Nov '12

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 6b5c318bb1057851d0ee1b5bba6e633c5cf31ca6 (commit) via 4b29366c791d5fad2e10a1da1f1c20ecd91515a8 (commit) via 722ed3ff29b6bf58649c56fac25ac11e8aecb6fd (commit) via ec25e62821c80cfcdfeb5c6331899df8e655b34c (commit) via 338b03b9e9254785aad9e506c66efdd6867cc188 (commit) via 22f99d40d514e1b223b034cb9dfb928984451632 (commit) via bf5e78ebd64631f6f92d2c239c5ae234cac8b49a (commit) via 53a1c146bc09c67ea709c14dab4c73ebebed86dc (commit) via df843816d07d18e2c0407915d1b8113bfe7ab720 (commit) from 0daa31b71f78a8c07f7ef2401b2b4cf041be6c63 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6b5c318bb1057851d0ee1b5bba6e633c5cf31ca6 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Wed Nov 21 16:29:18 2012 -0500 CarpetLib: Support padding in enovol prolongation operator commit 4b29366c791d5fad2e10a1da1f1c20ecd91515a8 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Wed Nov 21 12:09:54 2012 -0500 Carpet: Turn time level / prolongation operator warning into an info message This warning has many false positives, and is informational only. commit 722ed3ff29b6bf58649c56fac25ac11e8aecb6fd Author: Erik Schnetter <schnetter(a)gmail.com> Date: Wed Nov 21 12:08:51 2012 -0500 Carpet: Simplify code commit ec25e62821c80cfcdfeb5c6331899df8e655b34c Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Nov 18 17:43:00 2012 -0500 CarpetIOF5: Various improvements commit 338b03b9e9254785aad9e506c66efdd6867cc188 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Nov 18 17:41:45 2012 -0500 CarpetLib: Make th::time_interpolation_during_regridding public commit 22f99d40d514e1b223b034cb9dfb928984451632 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sat Nov 17 20:37:15 2012 -0500 CarpetLib: Set up all timers on all processes all the time Set up timers even on processes that won't use them, so that reducing timers across processes works. commit bf5e78ebd64631f6f92d2c239c5ae234cac8b49a Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sat Nov 17 20:36:27 2012 -0500 CarpetLib: Re-enable OpenMP collapse clauses commit 53a1c146bc09c67ea709c14dab4c73ebebed86dc Author: Erik Schnetter <schnetter(a)gmail.com> Date: Fri Nov 16 18:55:47 2012 -0500 Allow padding in transport operators Rewrite padding infrastructure. Add padded array extents to transport operator APIs. commit df843816d07d18e2c0407915d1b8113bfe7ab720 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Fri Nov 16 18:50:30 2012 -0500 CarpetIONirvana: Require MPI ----------------------------------------------------------------------- Summary of changes: Carpet/Carpet/interface.ccl | 1 + Carpet/Carpet/src/Storage.cc | 22 +- Carpet/Carpet/src/modes.cc | 6 +- Carpet/CarpetIOHDF5/src/Input.cc | 12 +- Carpet/CarpetIOHDF5/src/Output.cc | 40 ++- Carpet/CarpetInterp2/interface.ccl | 1 + Carpet/CarpetInterp2/src/fasterp.cc | 150 ++++--- Carpet/CarpetInterp2/src/fasterp.hh | 45 ++- Carpet/CarpetLib/configuration.ccl | 2 +- Carpet/CarpetLib/interface.ccl | 1 + Carpet/CarpetLib/param.ccl | 111 +++++- Carpet/CarpetLib/src/cacheinfo.cc | 162 +++++++ Carpet/CarpetLib/src/cacheinfo.hh | 158 +++++++ Carpet/CarpetLib/src/copy_3d.cc | 26 +- Carpet/CarpetLib/src/copy_4d.cc | 29 +- Carpet/CarpetLib/src/data.cc | 442 +++++++++++--------- Carpet/CarpetLib/src/dh.cc | 62 ++-- Carpet/CarpetLib/src/gdata.cc | 40 +- Carpet/CarpetLib/src/gdata.hh | 18 +- Carpet/CarpetLib/src/interpolate_3d_2tl.cc | 54 ++- Carpet/CarpetLib/src/interpolate_3d_3tl.cc | 58 ++-- Carpet/CarpetLib/src/interpolate_3d_4tl.cc | 62 ++-- Carpet/CarpetLib/src/interpolate_3d_5tl.cc | 66 ++-- Carpet/CarpetLib/src/interpolate_eno_3d_3tl.cc | 30 +- Carpet/CarpetLib/src/make.code.defn | 1 + Carpet/CarpetLib/src/mem.cc | 25 +- Carpet/CarpetLib/src/mem.hh | 6 + Carpet/CarpetLib/src/operator_prototypes_3d.hh | 173 +++------ Carpet/CarpetLib/src/operator_prototypes_4d.hh | 9 +- Carpet/CarpetLib/src/prolongate_3d_cc_eno_rf2.cc | 42 ++- .../CarpetLib/src/prolongate_3d_cc_enovol_rf2.cc | 123 +++--- .../CarpetLib/src/prolongate_3d_cc_real8_tvd.F90 | 13 +- Carpet/CarpetLib/src/prolongate_3d_cc_rf2.cc | 50 ++- Carpet/CarpetLib/src/prolongate_3d_dgfe_rf2.cc | 62 ++- .../CarpetLib/src/prolongate_3d_o5_monotone_rf2.cc | 22 +- Carpet/CarpetLib/src/prolongate_3d_real8_eno.F90 | 13 +- Carpet/CarpetLib/src/prolongate_3d_real8_tvd.F90 | 13 +- Carpet/CarpetLib/src/prolongate_3d_real8_weno.F90 | 13 +- Carpet/CarpetLib/src/prolongate_3d_rf2.cc | 45 ++- Carpet/CarpetLib/src/prolongate_4d_o1_rf2.cc | 29 +- Carpet/CarpetLib/src/restrict_3d_cc_o3_rf2.cc | 63 ++-- Carpet/CarpetLib/src/restrict_3d_cc_o5_rf2.cc | 62 ++-- Carpet/CarpetLib/src/restrict_3d_cc_rf2.cc | 47 ++- Carpet/CarpetLib/src/restrict_3d_dgfe_rf2.cc | 41 ++- Carpet/CarpetLib/src/restrict_3d_rf2.cc | 21 +- Carpet/CarpetLib/src/restrict_3d_vc_rf2.cc | 37 ++- Carpet/CarpetLib/src/restrict_4d_rf2.cc | 25 +- Carpet/CarpetLib/src/th.cc | 18 +- Carpet/CarpetLib/src/th.hh | 6 +- CarpetDev/CarpetIOF5/interface.ccl | 1 + CarpetDev/CarpetIOF5/par/iof5-array.par | 8 +- .../par/iof5-multipatch-kerrschild-input.par | 2 + .../CarpetIOF5/par/iof5-multipatch-kerrschild.par | 2 + CarpetDev/CarpetIOF5/param.ccl | 11 +- CarpetDev/CarpetIOF5/schedule.ccl | 28 -- CarpetDev/CarpetIOF5/src/distribute.cc | 129 +++++- CarpetDev/CarpetIOF5/src/distribute.hh | 26 +- CarpetDev/CarpetIOF5/src/input.cc | 54 ++- CarpetDev/CarpetIOF5/src/iof5.cc | 90 ++-- CarpetDev/CarpetIOF5/src/iof5.hh | 8 +- CarpetDev/CarpetIOF5/src/output.cc | 34 ++- CarpetDev/CarpetIOF5/src/util.cc | 221 ++++++++++- CarpetDev/CarpetIONirvana/configuration.ccl | 4 +- 63 files changed, 2158 insertions(+), 1017 deletions(-) create mode 100644 Carpet/CarpetLib/src/cacheinfo.cc create mode 100644 Carpet/CarpetLib/src/cacheinfo.hh hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. carpet-6-init-53-g0daa31b
by Carpet git repositories 22 Nov '12

22 Nov '12

1 0

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 188)
by tanja.bode＠physics.gatech.edu 21 Nov '12

21 Nov '12

User: tbode Date: 2012/11/21 04:57 PM Modified: /trunk/src/ GRHydro_PoloidalMagFieldM.F90 Log: Rename conflicting temporary Aphi File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PoloidalMagFieldM.F90 Delta lines: +7 -7 =================================================================== --- trunk/src/GRHydro_PoloidalMagFieldM.F90 2012-11-09 01:59:28 UTC (rev 187) +++ trunk/src/GRHydro_PoloidalMagFieldM.F90 2012-11-21 22:57:45 UTC (rev 188) @@ -61,7 +61,7 @@ CCTK_REAL :: sdet CCTK_REAL :: dx,dy,dz CCTK_REAL :: rhofac, delPcut, maxP_Pcut - CCTK_REAL :: Aphi, Ax, Ay, Az + CCTK_REAL :: AphiL, Ax, Ay, Az CCTK_REAL :: rho_dx, rho_dy, rho_dz CCTK_REAL :: press_dx, press_dy, press_dz CCTK_REAL :: Aphi_dx, Aphi_dy, Aphi_dz @@ -84,14 +84,14 @@ rhofac = 1.0d0-rho(i,j,k)/poloidal_rho_max delPcut = press(i,j,k)-poloidal_P_cut maxP_Pcut = max(delPcut,0.0d0) - Aphi = poloidal_A_b*rhofac**poloidal_n_p*maxP_Pcut - Ax = -y(i,j,k)*Aphi - Ay = x(i,j,k)*Aphi + AphiL = poloidal_A_b*rhofac**poloidal_n_p*maxP_Pcut + Ax = -y(i,j,k)*AphiL + Ay = x(i,j,k)*AphiL Az = 0.0 !! write(*,*)'Before accessing rho(i,k,k)' !! write(*,*)'rho(',i,',',j,',',k,') = ', rho(i,j,k) -!! write(*,*)'Ax, Ay, Az, Aphi = ', Ax, Ay, Az,Aphi +!! write(*,*)'Ax, Ay, Az, Aphi = ', Ax, Ay, Az,AphiL !! write(*,*)'rhofac = ', rhofac !! write(*,*)'delPcut = ', delPcut !! write(*,*)'maxP_Pcut = ', maxP_Pcut @@ -110,9 +110,9 @@ Aphi_dz = poloidal_A_b*rhofac**(poloidal_n_p-1)*maxP_Pcut* & ( rhofac*press_dz/delPcut - poloidal_n_p*rho_dz/poloidal_rho_max ) - Ax_dy = -Aphi - y(i,j,k)*Aphi_dy + Ax_dy = -AphiL - y(i,j,k)*Aphi_dy Ax_dz = -y(i,j,k)*Aphi_dz - Ay_dx = Aphi + x(i,j,k)*Aphi_dx + Ay_dx = AphiL + x(i,j,k)*Aphi_dx Ay_dz = x(i,j,k)*Aphi_dz

1 0

[svn:einsteintoolkit] HydroBase/trunk/ (Rev. 59)
by tanja.bode＠physics.gatech.edu 21 Nov '12

21 Nov '12

User: tbode Date: 2012/11/21 02:50 PM Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ Initialisation.c Log: Add gridfunctions and boilerplate for vector potential. File Changes: Directory: /trunk/src/ ====================== File [modified]: Initialisation.c Delta lines: +100 -0 =================================================================== --- trunk/src/Initialisation.c 2012-11-19 18:43:49 UTC (rev 58) +++ trunk/src/Initialisation.c 2012-11-21 20:50:20 UTC (rev 59) @@ -213,6 +213,106 @@ } } +void HydroBase_Avec_zero (CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; + + int const np = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; + +#pragma omp parallel for + for (int i=0; i<np; ++i) { + Avec[i] = 0.0; + Avec[i+ np] = 0.0; + Avec[i+2*np] = 0.0; + } + + if (CCTK_EQUALS (initial_data_setup_method, "init_some_levels") || + CCTK_EQUALS (initial_data_setup_method, "init_single_level")) + { + /* do nothing */ + } + else if (CCTK_EQUALS (initial_data_setup_method, "init_all_levels")) + { + + if (CCTK_ActiveTimeLevels(cctkGH, "HydroBase::Avec") >= 2) { +#pragma omp parallel for + for (int i=0; i<np; ++i) { + Avec_p[i] = 0.0; + Avec_p[i+ np] = 0.0; + Avec_p[i+2*np] = 0.0; + } + } + + if (CCTK_ActiveTimeLevels(cctkGH, "HydroBase::Avec") >= 3) { +#pragma omp parallel for + for (int i=0; i<np; ++i) { + Avec_p_p[i] = 0.0; + Avec_p_p[i+ np] = 0.0; + Avec_p_p[i+2*np] = 0.0; + } + } + + if (CCTK_ActiveTimeLevels(cctkGH, "HydroBase::Avec") >= 4) { + CCTK_WARN (CCTK_WARN_ABORT, + "Too many active time levels for HydroBase::Avec"); + } + + } + else + { + CCTK_WARN (CCTK_WARN_ABORT, + "Unsupported parameter value for InitBase::initial_data_setup_method"); + } +} + +void HydroBase_Aphi_zero (CCTK_ARGUMENTS) +{ + DECLARE_CCTK_ARGUMENTS; + DECLARE_CCTK_PARAMETERS; + + int const np = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; + +#pragma omp parallel for + for (int i=0; i<np; ++i) { + Aphi[i] = 0.0; + } + + if (CCTK_EQUALS (initial_data_setup_method, "init_some_levels") || + CCTK_EQUALS (initial_data_setup_method, "init_single_level")) + { + /* do nothing */ + } + else if (CCTK_EQUALS (initial_data_setup_method, "init_all_levels")) + { + + if (CCTK_ActiveTimeLevels(cctkGH, "HydroBase::Aphi") >= 2) { +#pragma omp parallel for + for (int i=0; i<np; ++i) { + Aphi_p[i] = 0.0; + } + } + + if (CCTK_ActiveTimeLevels(cctkGH, "HydroBase::Aphi") >= 3) { +#pragma omp parallel for + for (int i=0; i<np; ++i) { + Aphi_p_p[i] = 0.0; + } + } + + if (CCTK_ActiveTimeLevels(cctkGH, "HydroBase::Aphi") >= 4) { + CCTK_WARN (CCTK_WARN_ABORT, + "Too many active time levels for HydroBase::Aphi"); + } + + } + else + { + CCTK_WARN (CCTK_WARN_ABORT, + "Unsupported parameter value for InitBase::initial_data_setup_method"); + } +} + void HydroBase_InitExcisionMask (CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +3 -0 =================================================================== --- trunk/interface.ccl 2012-11-19 18:43:49 UTC (rev 58) +++ trunk/interface.ccl 2012-11-21 20:50:20 UTC (rev 59) @@ -42,6 +42,9 @@ CCTK_REAL entropy type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" interpolator="matter"' "Specific Entropy [k_b/baryon]" CCTK_REAL Bvec[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="U" tensorparity=-1 interpolator="matter"' "Magnetic field components B^i" +CCTK_REAL Avec[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="D" jacobian="jacobian" interpolator="matter"' "Vector potential" +CCTK_REAL Aphi type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" jacobian="jacobian" interpolator="matter"' "Electric potential for Lorentz Gauge" + # This may become CCTK_BYTE when Carpet enables it by default CCTK_INT hydro_excision_mask type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' "Mask for hydro excision" File [modified]: param.ccl Delta lines: +12 -0 =================================================================== --- trunk/param.ccl 2012-11-19 18:43:49 UTC (rev 58) +++ trunk/param.ccl 2012-11-21 20:50:20 UTC (rev 59) @@ -59,6 +59,18 @@ "zero" :: "initially set to zero" } "none" +KEYWORD initial_Avec "Initial value for Avec" +{ + "none" :: "inactive" + "zero" :: "initially set to zero" +} "none" + +KEYWORD initial_Aphi "Initial value for Aphi" +{ + "none" :: "inactive" + "zero" :: "initially set to zero" +} "none" + KEYWORD Bvec_evolution_method "Evolution method for Bvec" { "none" :: "Evolution for Bvec is disabled" File [modified]: schedule.ccl Delta lines: +40 -0 =================================================================== --- trunk/schedule.ccl 2012-11-19 18:43:49 UTC (rev 58) +++ trunk/schedule.ccl 2012-11-21 20:50:20 UTC (rev 59) @@ -15,6 +15,14 @@ { STORAGE: Bvec[1] } + if (!CCTK_EQUALS(initial_Avec, "none")) + { + STORAGE: Avec[1] + } + if (!CCTK_EQUALS(initial_Aphi, "none")) + { + STORAGE: Aphi[1] + } if (!CCTK_EQUALS(initial_temperature, "none")) { STORAGE: temperature[1] @@ -39,6 +47,14 @@ { STORAGE: Bvec[2] } + if (!CCTK_EQUALS(initial_Avec, "none")) + { + STORAGE: Avec[2] + } + if (!CCTK_EQUALS(initial_Aphi, "none")) + { + STORAGE: Aphi[2] + } if (!CCTK_EQUALS(initial_temperature, "none")) { STORAGE: temperature[2] @@ -63,6 +79,14 @@ { STORAGE: Bvec[3] } + if (!CCTK_EQUALS(initial_Avec, "none")) + { + STORAGE: Avec[3] + } + if (!CCTK_EQUALS(initial_Aphi, "none")) + { + STORAGE: Aphi[3] + } if (!CCTK_EQUALS(initial_temperature, "none")) { STORAGE: temperature[3] @@ -166,6 +190,22 @@ } "Set magnetic field to 0" } +if (CCTK_Equals(initial_Avec, "zero")) +{ + SCHEDULE HydroBase_Avec_zero in HydroBase_Initial + { + LANG: C + } "Set vector potential to 0" +} + +if (CCTK_Equals(initial_Aphi, "zero")) +{ + SCHEDULE HydroBase_Aphi_zero in HydroBase_Initial + { + LANG: C + } "Set vector potential Phi to 0" +} + if (hydro_excision) { schedule GROUP HydroBase_ExcisionMaskSetup in HydroBase_Initial

1 0

[svn:einsteintoolkit] TOVSolver/trunk/src/ (Rev. 134)
by knarf＠cct.lsu.edu 21 Nov '12

21 Nov '12

User: knarf Date: 2012/11/21 02:39 PM Modified: /trunk/src/ external.inc, tov.c, utils.inc Log: remove some compiler warnings File Changes: Directory: /trunk/src/ ====================== File [modified]: external.inc Delta lines: +28 -9 =================================================================== --- trunk/src/external.inc 2012-11-05 16:05:33 UTC (rev 133) +++ trunk/src/external.inc 2012-11-21 20:39:25 UTC (rev 134) @@ -3,6 +3,10 @@ void TOV_debug_input_points(CCTK_INT size, const CCTK_REAL *x, const CCTK_REAL *y, + const CCTK_REAL *z); +void TOV_debug_input_points(CCTK_INT size, + const CCTK_REAL *x, + const CCTK_REAL *y, const CCTK_REAL *z) { FILE *f; @@ -69,7 +73,7 @@ for (CCTK_INT i=0; i<size; i++) { CCTK_REAL r_to_star, press, phi, r; - CCTK_REAL rho, eps, gxx, w_lorentz_2; + CCTK_REAL rho, gxx, w_lorentz_2; CCTK_INT star_i=0, star=0; /* calculate the distance to the star */ star=get_nearest_star(x,y,z,i); @@ -88,14 +92,12 @@ &press, &phi, &r); press = (press > 0.0) ? press : 0.0; rho = pow(press/TOV_K[star], 1.0/TOV_Gamma[star]); - eps = (rho > 0.0) ? press/(TOV_Gamma[star] - 1.0) / rho : 0.0; gxx = r / (r_to_star + 1.0e-30) * r / (r_to_star + 1.0e-30); /* velocity components as in gr-qc/9811015 */ w_lorentz_2 = 1. / (1. - gxx*TOV_Velocity_x[star]*TOV_Velocity_x[star] - gxx*TOV_Velocity_y[star]*TOV_Velocity_y[star] - gxx*TOV_Velocity_z[star]*TOV_Velocity_z[star]); if (rho > 0.0) - /* source[i]=gxx*gxx*rho*(1.0+eps); */ source[i]=gxx*gxx* (w_lorentz_2*rho + (w_lorentz_2*TOV_Gamma[star]/(TOV_Gamma[star]-1.)-1.)* press); @@ -212,7 +214,7 @@ /* loop over all points we got */ for (i=0; i<size; i++) { - CCTK_REAL rho, eps, gxx; + CCTK_REAL gxx; /* calculate the distance to the stars and choose the closest */ star=get_nearest_star(x,y,z,i); star_i = star * TOV_Num_Radial; @@ -228,11 +230,6 @@ &(TOV_rbar_1d[star_i]), &(TOV_r_1d[star_i]), &r_to_star, TOV_Surface[star], &press, &phi, &r); - rho = pow(press/TOV_K[star], 1.0/TOV_Gamma[star]); - if (rho>0.0) - eps = press/(TOV_Gamma[star] - 1.0) / rho; - else - eps = 0.0; gxx = r / (r_to_star + 1.0e-30) * r / (r_to_star + 1.0e-30); u[i]=pow(gxx, 0.25) - 1.0; } @@ -249,6 +246,16 @@ CCTK_REAL mom_source_y, CCTK_REAL mom_source_z, CCTK_REAL my_psi4, + CCTK_REAL x, CCTK_REAL y, CCTK_REAL z, CCTK_REAL rho_orig); +void bisection (CCTK_REAL *vx, CCTK_REAL *vy, CCTK_REAL *vz, + CCTK_REAL *rhoold, CCTK_REAL *rhonew, + CCTK_REAL *w_lorentz_2, CCTK_REAL *v_2, + CCTK_REAL Gamma, CCTK_REAL K, + CCTK_REAL source, + CCTK_REAL mom_source_x, + CCTK_REAL mom_source_y, + CCTK_REAL mom_source_z, + CCTK_REAL my_psi4, CCTK_REAL x, CCTK_REAL y, CCTK_REAL z, CCTK_REAL rho_orig) { CCTK_REAL lb, ub, f; @@ -287,6 +294,16 @@ CCTK_REAL mom_source_y, CCTK_REAL mom_source_z, CCTK_REAL my_psi4, + CCTK_REAL x, CCTK_REAL y, CCTK_REAL z, CCTK_REAL rho_orig); +void newton_raphson(CCTK_REAL *vx, CCTK_REAL *vy, CCTK_REAL *vz, + CCTK_REAL *rhoold, CCTK_REAL *rhonew, + CCTK_REAL *w_lorentz_2, CCTK_REAL *v_2, + CCTK_REAL Gamma, CCTK_REAL K, + CCTK_REAL source, + CCTK_REAL mom_source_x, + CCTK_REAL mom_source_y, + CCTK_REAL mom_source_z, + CCTK_REAL my_psi4, CCTK_REAL x, CCTK_REAL y, CCTK_REAL z, CCTK_REAL rho_orig) { int count=0; @@ -581,6 +598,7 @@ { case 3: TOV_Copy(size, rho_p_p, rho); + TOV_Copy(size, press_p_p,press); TOV_Copy(size, eps_p_p, eps); TOV_Copy(size, vel0_p_p, vel0); TOV_Copy(size, vel1_p_p, vel1); @@ -593,6 +611,7 @@ TOV_Copy(size, w_lorentz_p_p, w_lorentz); case 2: TOV_Copy(size, rho_p, rho); + TOV_Copy(size, press_p,press); TOV_Copy(size, eps_p, eps); TOV_Copy(size, vel0_p, vel0); TOV_Copy(size, vel1_p, vel1); File [modified]: tov.c Delta lines: +20 -6 =================================================================== --- trunk/src/tov.c 2012-11-05 16:05:33 UTC (rev 133) +++ trunk/src/tov.c 2012-11-21 20:39:25 UTC (rev 134) @@ -125,11 +125,13 @@ @endhistory @@*/ void TOV_C_Source_RHS(CCTK_REAL r, CCTK_REAL K, CCTK_REAL Gamma, + CCTK_REAL old_data[NUMVARS], CCTK_REAL source_data[NUMVARS]); +void TOV_C_Source_RHS(CCTK_REAL r, CCTK_REAL K, CCTK_REAL Gamma, CCTK_REAL old_data[NUMVARS], CCTK_REAL source_data[NUMVARS]) { CCTK_REAL LOCAL_TINY, PI; - CCTK_REAL press, rho, eps, mu, m, phi, mbary, rprop; - CCTK_REAL log_rbar_over_r, r_minus_two_m; + CCTK_REAL press, rho, eps, mu, m; + CCTK_REAL r_minus_two_m; LOCAL_TINY = 1.0e-35; PI=4.0*atan(1.0); @@ -138,10 +140,6 @@ if (press < LOCAL_TINY) press = LOCAL_TINY; m = old_data[1]; - phi = old_data[2]; - log_rbar_over_r = old_data[3]; - mbary = old_data[4]; - rprop = old_data[5]; rho = pow(press / K, 1.0 / Gamma); eps = press / (Gamma - 1.0) / rho; @@ -414,6 +412,11 @@ CCTK_REAL *array, CCTK_REAL goal, CCTK_INT lower_index, + CCTK_INT upper_index); +CCTK_INT TOV_C_find_index(CCTK_INT array_size, + CCTK_REAL *array, + CCTK_REAL goal, + CCTK_INT lower_index, CCTK_INT upper_index) { CCTK_INT middle_index; @@ -442,6 +445,17 @@ CCTK_REAL surface, CCTK_REAL *press_point, CCTK_REAL *phi_point, + CCTK_REAL *r_point); +void TOV_C_interp_tov_isotropic( + CCTK_INT star, + CCTK_REAL *TOV_press_1d_local, + CCTK_REAL *TOV_phi_1d_local, + CCTK_REAL *TOV_rbar_1d_local, + CCTK_REAL *TOV_r_1d_local, + CCTK_REAL *r, + CCTK_REAL surface, + CCTK_REAL *press_point, + CCTK_REAL *phi_point, CCTK_REAL *r_point) { DECLARE_CCTK_PARAMETERS File [modified]: utils.inc Delta lines: +2 -0 =================================================================== --- trunk/src/utils.inc 2012-11-05 16:05:33 UTC (rev 133) +++ trunk/src/utils.inc 2012-11-21 20:39:25 UTC (rev 134) @@ -76,12 +76,14 @@ /* - utility routine - fills an real-array 'var' of size 'i' with value 'r' */ +void TOV_C_fill(CCTK_REAL *var, CCTK_INT i, CCTK_REAL r); void TOV_C_fill(CCTK_REAL *var, CCTK_INT i, CCTK_REAL r) { for (i-- ;i >= 0; i--) var[i]=r; } +void TOV_Copy(CCTK_INT size, CCTK_REAL *var_p, CCTK_REAL *var); void TOV_Copy(CCTK_INT size, CCTK_REAL *var_p, CCTK_REAL *var) { #pragma omp parallel for

1 0

[svn:einsteintoolkit] EOS_Hybrid/trunk/src/ (Rev. 15)
by knarf＠cct.lsu.edu 21 Nov '12

21 Nov '12

User: knarf Date: 2012/11/21 02:17 PM Modified: /trunk/src/ EOS_Hybrid.F, EOS_Hybrid_Analysis.F Log: remove unused variables or declare them as such File Changes: Directory: /trunk/src/ ====================== File [modified]: EOS_Hybrid.F Delta lines: +6 -3 =================================================================== --- trunk/src/EOS_Hybrid.F 2012-11-05 14:45:43 UTC (rev 14) +++ trunk/src/EOS_Hybrid.F 2012-11-21 20:17:26 UTC (rev 15) @@ -60,7 +60,8 @@ implicit none DECLARE_CCTK_PARAMETERS - CCTK_REAL rho, press + CCTK_DECLARE(CCTK_REAL, rho, ) + CCTK_DECLARE(CCTK_REAL, press, ) c$$$ if (rho > rho_nuc) then c$$$ EOS_Hybrid_SpecificIE = eos_k_cgs / (eos_gamma_2 - 1.d0) * @@ -85,7 +86,8 @@ implicit none DECLARE_CCTK_PARAMETERS - CCTK_REAL eps, press + CCTK_DECLARE(CCTK_REAL, eps, ) + CCTK_DECLARE(CCTK_REAL, press, ) EOS_Hybrid_RestMassDens = 1.23456789d0 @@ -137,7 +139,8 @@ implicit none DECLARE_CCTK_PARAMETERS - CCTK_REAL rho, eps + CCTK_REAL rho + CCTK_DECLARE(CCTK_REAL, eps, ) EOS_Hybrid_DPressByDEps = (eos_gamma_th - 1.d0) * rho File [modified]: EOS_Hybrid_Analysis.F Delta lines: +1 -2 =================================================================== --- trunk/src/EOS_Hybrid_Analysis.F 2012-11-05 14:45:43 UTC (rev 14) +++ trunk/src/EOS_Hybrid_Analysis.F 2012-11-21 20:17:26 UTC (rev 15) @@ -39,8 +39,7 @@ CCTK_INT :: i,j,k - CCTK_REAL local_eos_gamma, local_eos_k_cgs, d_p_poly, d_p_th_1, - . d_p_th_2, zero + CCTK_REAL local_eos_gamma, local_eos_k_cgs do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2)

1 0

[svn:einsteintoolkit] Exact/trunk/src/include/ (Rev. 283)
by knarf＠cct.lsu.edu 21 Nov '12

21 Nov '12

User: knarf Date: 2012/11/21 02:10 PM Modified: /trunk/src/include/ Scalar_CalcTmunu_temps.inc Log: get rid of some unused variabless File Changes: Directory: /trunk/src/include/ ============================== File [modified]: Scalar_CalcTmunu_temps.inc Delta lines: +1 -1 =================================================================== --- trunk/src/include/Scalar_CalcTmunu_temps.inc 2012-11-05 14:46:13 UTC (rev 282) +++ trunk/src/include/Scalar_CalcTmunu_temps.inc 2012-11-21 20:10:41 UTC (rev 283) @@ -2,7 +2,7 @@ c c temporary variables for code in "Scalar_CalcTmunu.inc" c - CCTK_REAL unu,doi,trei,rr,sum,rr2,aha1,aha2,kkkk,riih,rii2 + CCTK_REAL unu,doi,trei,rr,kkkk CCTK_REAL aaaa,bbbb,aaaa1,bbbb1,kkkk1,r3,bass,term1,term2 CCTK_REAL unu1, raz, raz2, razsch2, coefsch, pppsch, unusch CCTK_REAL treiori

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits