Commits May 2010

commits@lists.einsteintoolkit.org

12 participants
48 discussions

[svn:einsteintoolkit] HydroBase/trunk/ (Rev. 28)
by schnetter＠cct.lsu.edu 30 May '10

30 May '10

User: eschnett Date: 2010/05/30 11:46 AM Modified: /trunk/ schedule.ccl Log: Schedule HydroBase_PostStep after ADMBase_SetADMVars. This change logically belongs to the previous change that added the schedule group ADMBase_SetADMVars to ADMBase. File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +1 -1 =================================================================== --- trunk/schedule.ccl 2010-04-29 07:20:58 UTC (rev 27) +++ trunk/schedule.ccl 2010-05-30 16:46:39 UTC (rev 28) @@ -91,7 +91,7 @@ { } "Groups for scheduling tasks for calculating RHS of hydro variables" -schedule group HydroBase_PostStep in MoL_PostStep before SetTmunu +schedule group HydroBase_PostStep in MoL_PostStep before SetTmunu after ADMBase_SetADMVars { } "Post step tasks for hydro thorns"

1 0

[svn:einsteintoolkit] ADMBase/trunk/ (Rev. 54)
by schnetter＠cct.lsu.edu 29 May '10

29 May '10

User: eschnett Date: 2010/05/29 04:14 PM Modified: /trunk/ schedule.ccl Log: Define a schedule group ADMBase_SetADMVars in ADMBase, and schedule it in MoL_PostStep. The ADM variables have to be set before this group, and they may only be used afterwards. This correct recovery problem with GRHydro and McLachlan. This group was already used by HydroBase and McLachlan, but was not defined in ADMBase. File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +11 -0 =================================================================== --- trunk/schedule.ccl 2010-01-23 22:04:37 UTC (rev 53) +++ trunk/schedule.ccl 2010-05-29 21:14:41 UTC (rev 54) @@ -226,3 +226,14 @@ LANG: C OPTIONS: global } "Set up GF symmetries" + + + +# TODO: Rename this group to "ADMBase_HaveBeenSet"? +SCHEDULE GROUP ADMBase_SetADMVars IN MoL_PostStep +{ +} "Set the ADM variables before this group, and use them afterwards" + +SCHEDULE GROUP ADMBase_SetADMVars IN MoL_PseudoEvolution +{ +} "Set the ADM variables before this group, and use them afterwards"

1 0

[svn:einsteintoolkit] Exact/trunk/src/ (Rev. 258)
by schnetter＠cct.lsu.edu 28 May '10

28 May '10

User: eschnett Date: 2010/05/28 04:01 PM Modified: /trunk/src/ slice_data.F, slice_evolve.F Log: Use CCTK_DELTA_SPACE instead of cctk_delta_space to acces the grid spacing. This was used in places that are not used for setting up initial conditions. File Changes: Directory: /trunk/src/ ====================== File [modified]: slice_data.F Delta lines: +3 -3 =================================================================== --- trunk/src/slice_data.F 2010-05-28 21:00:13 UTC (rev 257) +++ trunk/src/slice_data.F 2010-05-28 21:01:28 UTC (rev 258) @@ -28,9 +28,9 @@ ny = cctk_lsh(2) nz = cctk_lsh(3) - dx = cctk_delta_space(1) - dy = cctk_delta_space(2) - dz = cctk_delta_space(3) + dx = CCTK_DELTA_SPACE(1) + dy = CCTK_DELTA_SPACE(2) + dz = CCTK_DELTA_SPACE(3) C Sum over interior points on the slice. File [modified]: slice_evolve.F Delta lines: +4 -4 =================================================================== --- trunk/src/slice_evolve.F 2010-05-28 21:00:13 UTC (rev 257) +++ trunk/src/slice_evolve.F 2010-05-28 21:01:28 UTC (rev 258) @@ -32,11 +32,11 @@ ny = cctk_lsh(2) nz = cctk_lsh(3) - dx = cctk_delta_space(1) - dy = cctk_delta_space(2) - dz = cctk_delta_space(3) + dx = CCTK_DELTA_SPACE(1) + dy = CCTK_DELTA_SPACE(2) + dz = CCTK_DELTA_SPACE(3) - dt = cctk_delta_time + dt = CCTK_DELTA_TIME C Lax, or forward in time, step. C dxA/dt has previously been stored in slicetmp2

1 0

[svn:einsteintoolkit] Exact/trunk/src/ (Rev. 257)
by schnetter＠cct.lsu.edu 28 May '10

28 May '10

User: eschnett Date: 2010/05/28 04:00 PM Modified: /trunk/src/ blended_boundary.F77, boundary.F77, gauge.F77, initialize.F77, xyz_blended_boundary.F77 Log: Initialise the variable exact_psiyy, which was not initialised before. Instead, exact_psixx was initialised twice. This should have affected only simulations with a static conformal factor, and where its second derivative has storage. File Changes: Directory: /trunk/src/ ====================== File [modified]: blended_boundary.F77 Delta lines: +1 -1 =================================================================== --- trunk/src/blended_boundary.F77 2010-05-22 13:28:53 UTC (rev 256) +++ trunk/src/blended_boundary.F77 2010-05-28 21:00:13 UTC (rev 257) @@ -101,7 +101,7 @@ exact_psiy = 0.0D0 exact_psiz = 0.0D0 exact_psixx = 0.0D0 - exact_psixx = 0.0D0 + exact_psiyy = 0.0D0 exact_psizz = 0.0D0 exact_psixy = 0.0D0 exact_psiyz = 0.0D0 File [modified]: boundary.F77 Delta lines: +1 -1 =================================================================== --- trunk/src/boundary.F77 2010-05-22 13:28:53 UTC (rev 256) +++ trunk/src/boundary.F77 2010-05-28 21:00:13 UTC (rev 257) @@ -49,7 +49,7 @@ exact_psiy = 0.0D0 exact_psiz = 0.0D0 exact_psixx = 0.0D0 - exact_psixx = 0.0D0 + exact_psiyy = 0.0D0 exact_psizz = 0.0D0 exact_psixy = 0.0D0 exact_psiyz = 0.0D0 File [modified]: gauge.F77 Delta lines: +1 -1 =================================================================== --- trunk/src/gauge.F77 2010-05-22 13:28:53 UTC (rev 256) +++ trunk/src/gauge.F77 2010-05-28 21:00:13 UTC (rev 257) @@ -126,7 +126,7 @@ exact_psiy = 0.0D0 exact_psiz = 0.0D0 exact_psixx = 0.0D0 - exact_psixx = 0.0D0 + exact_psiyy = 0.0D0 exact_psizz = 0.0D0 exact_psixy = 0.0D0 exact_psiyz = 0.0D0 File [modified]: initialize.F77 Delta lines: +1 -1 =================================================================== --- trunk/src/initialize.F77 2010-05-22 13:28:53 UTC (rev 256) +++ trunk/src/initialize.F77 2010-05-28 21:00:13 UTC (rev 257) @@ -98,7 +98,7 @@ exact_psiy = 0.0D0 exact_psiz = 0.0D0 exact_psixx = 0.0D0 - exact_psixx = 0.0D0 + exact_psiyy = 0.0D0 exact_psizz = 0.0D0 exact_psixy = 0.0D0 exact_psiyz = 0.0D0 File [modified]: xyz_blended_boundary.F77 Delta lines: +1 -1 =================================================================== --- trunk/src/xyz_blended_boundary.F77 2010-05-22 13:28:53 UTC (rev 256) +++ trunk/src/xyz_blended_boundary.F77 2010-05-28 21:00:13 UTC (rev 257) @@ -102,7 +102,7 @@ exact_psiy = 0.0D0 exact_psiz = 0.0D0 exact_psixx = 0.0D0 - exact_psixx = 0.0D0 + exact_psiyy = 0.0D0 exact_psizz = 0.0D0 exact_psixy = 0.0D0 exact_psiyz = 0.0D0

1 0

[svn:einsteintoolkit] TOVSolver/trunk/ (Rev. 111)
by roland.haas＠physics.gatech.edu 28 May '10

28 May '10

User: rhaas Date: 2010/05/28 07:07 AM Modified: /trunk/ param.ccl /trunk/src/ external.inc Log: TOVSolver: fix computation of Lorentz factor Use the Valencia three velocity to compute the Lorentz factor. Add references to the definitions to code and param.ccl. Makes no difference for initial data that is at rest, so the testsuites are unchanged. File Changes: Directory: /trunk/src/ ====================== File [modified]: external.inc Delta lines: +22 -15 =================================================================== --- trunk/src/external.inc 2010-05-03 03:53:11 UTC (rev 110) +++ trunk/src/external.inc 2010-05-28 12:07:30 UTC (rev 111) @@ -91,9 +91,10 @@ 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); - w_lorentz_2 = 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]; + /* 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 + @@ -160,9 +161,10 @@ rho = pow(press/TOV_K[star], 1.0/TOV_Gamma[star]); gxx = r / (r_to_star + 1.0e-30) * r / (r_to_star + 1.0e-30); psip = pow(gxx, TOV_Momentum_Psi_Power/4.); - w_lorentz_2 = 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]; + /* 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]); rho_eps = w_lorentz_2 * rho + w_lorentz_2*TOV_Gamma[star]/(TOV_Gamma[star]-1.) * press; switch(dir) @@ -266,7 +268,8 @@ *vz = mom_source_z/my_psi4/ (source/my_psi4/my_psi4+K * pow(*rhonew, Gamma)); *v_2 = my_psi4*(*vx**vx+*vy**vy+*vz**vz); - *w_lorentz_2 = 1.- *v_2; + /* velocity components as in gr-qc/9811015 */ + *w_lorentz_2 = 1./(1.- *v_2); f = my_psi4*my_psi4*( *w_lorentz_2 * *rhonew + (*w_lorentz_2*Gamma/(Gamma-1.)-1.) * @@ -316,15 +319,17 @@ my_psi4, x, y, z, rho_orig); return; } - *w_lorentz_2 = 1.- *v_2; + /* velocity components as in gr-qc/9811015 */ + *w_lorentz_2 = 1./(1.- *v_2); f = my_psi4*my_psi4*( *w_lorentz_2 * *rhonew + (*w_lorentz_2*Gamma/(Gamma-1.)-1.) * K * pow(*rhonew, Gamma)) - source; + /* d_w_lorentz_2/drhonew */ d_w_lorentz_2 = - 2. * (*w_lorentz_2 - 1.) / - (source/my_psi4/my_psi4+K*pow(*rhonew, Gamma)) * - K * Gamma * pow(*rhonew, Gamma-1.); + -2 * (*w_lorentz_2)*(*w_lorentz_2) * + (*v_2) * K*Gamma*pow(*rhonew, Gamma-1) / + (source/my_psi4/my_psi4 + K*pow(*rhonew, Gamma)); df = my_psi4*my_psi4*( d_w_lorentz_2**rhonew + *w_lorentz_2 + d_w_lorentz_2*Gamma/(Gamma-1.)* @@ -475,7 +480,8 @@ " orig_rho:%g rho:%g, v^2=%g, rel_diff=%g", \ x[i3D], y[i3D], z[i3D], rho[i3D], rhonew, v_2, fabs(rhonew-rhoold)/fabs(rhonew)); - w_lorentz_2 = 1.- v_2; + /* velocity components as in gr-qc/9811015 */ + w_lorentz_2 = 1./(1.- v_2); /* f = TOV_K[0] / (TOV_Gamma[0]-1.0) * pow(rhonew, TOV_Gamma[0]) + rhonew - source[i3D]; @@ -491,10 +497,11 @@ (w_lorentz_2*TOV_Gamma[0]/(TOV_Gamma[0]-1.)-1.) * TOV_K[0] * TOV_Gamma[0] * pow(rhonew, TOV_Gamma[0]-1.); */ + /* d_w_lorentz_2/drhonew */ d_w_lorentz_2 = - 2. * (w_lorentz_2 - 1.) / - (source[i3D]/my_psi4/my_psi4+TOV_K[0]*pow(rhonew, TOV_Gamma[0])) * - TOV_K[0] * TOV_Gamma[0] * pow(rhonew, TOV_Gamma[0]-1.); + -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])); df = my_psi4*my_psi4*( d_w_lorentz_2*rhonew + w_lorentz_2 + d_w_lorentz_2*TOV_Gamma[0]/(TOV_Gamma[0]-1.)* Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +3 -0 =================================================================== --- trunk/param.ccl 2010-05-03 03:53:11 UTC (rev 110) +++ trunk/param.ccl 2010-05-28 12:07:30 UTC (rev 111) @@ -63,6 +63,9 @@ *:* :: "real" } 0.0 +# contravariant fluid three velocity as measured by the Eulerian observers: v^i = u^i / (alpha u^t) + beta^i / alpha +# as used by HydroBase. Follows the Valencia formulation eg. eqs. 26 and 27 of Font et al's paper (gr-qc/9811015) or +# below Equ. 31 in http://relativity.livingreviews.org/Articles/lrr-2008-7/articlesu1.html#x6-… CCTK_REAL TOV_Velocity_x[10] "(fixed) Velocity of neutron star, x coordinate (caution!)" STEERABLE=always { *:* :: "real"

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 117)
by cott＠tapir.caltech.edu 27 May '10

27 May '10

User: cott Date: 2010/05/27 06:54 PM Modified: /trunk/ interface.ccl Log: * fix typo in interface.ccl File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2010-05-26 23:44:55 UTC (rev 116) +++ trunk/interface.ccl 2010-05-27 23:54:08 UTC (rev 117) @@ -186,7 +186,7 @@ real tau type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "internal energy" -real scon[3] type = GF Timelevels = 3 tags='Prolongation="HydroBase::prolongation_type" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "generalized momenta" +real scon[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "generalized momenta" real bcom[3] type = GF Timelevels = 3 tags='Prolongation="none" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "comoving magnetic field components"

1 0

[svn:einsteintoolkit] manifest/ (Rev. 16)
by schnetter＠cct.lsu.edu 27 May '10

27 May '10

User: eschnett Date: 2010/05/27 01:38 PM Modified: / einsteintoolkit.th Log: Update Kranc location File Changes: Directory: / ============ File [modified]: einsteintoolkit.th Delta lines: +2 -2 =================================================================== --- einsteintoolkit.th 2010-04-27 08:53:36 UTC (rev 15) +++ einsteintoolkit.th 2010-05-27 18:38:18 UTC (rev 16) @@ -203,8 +203,8 @@ # From Kranc (required e.g. by McLachlan) !TARGET = $ARR !TYPE = git -!URL = git://carpetcode.dyndns.org/kranc.git -!AUTH_URL = carpetgit@carpetcode.dyndns.org:kranc.git +!URL = http://github.com/ianhinder/Kranc.git +!AUTH_URL = git@github.com:ianhinder/Kranc.git !REPO_PATH= Auxiliary/Cactus !CHECKOUT = KrancNumericalTools/GenericFD

1 0

[svn:einsteintoolkit] AHFinderDirect/trunk/test/ (Rev. 1547)
by diener＠cct.lsu.edu 26 May '10

26 May '10

User: diener Date: 2010/05/26 06:50 PM Added: /trunk/test/ Kerr-modification-radius2.brokenpar Removed: /trunk/test/ Kerr-modification-radius2.par Log: Temporarily disable this test until we find out why it doesn't converge and produce any output files. File Changes: Directory: /trunk/test/ ======================= File [added]: Kerr-modification-radius2.brokenpar Delta lines: +66 -0 =================================================================== --- trunk/test/Kerr-modification-radius2.brokenpar (rev 0) +++ trunk/test/Kerr-modification-radius2.brokenpar 2010-05-26 23:50:46 UTC (rev 1547) @@ -0,0 +1,66 @@ +# This parameter file sets up Kerr/Kerr-Schild initial data, then +# finds the apparent horizon in it. The local coordinate system origin +# and the initial guess are both deliberately de-centered with respect +# to the black hole, to make this a non-trivial test for the apparent +# horizon finder. + +# flesh +cactus::cctk_itlast = 0 + +ActiveThorns = "PUGH" +driver::ghost_size = 3 +driver::global_nx = 31 +driver::global_ny = 31 +driver::global_nz = 19 + +ActiveThorns = "CartGrid3D CoordBase SymBase" +grid::domain = "bitant" +grid::avoid_origin = "false" +grid::type = "byspacing" +grid::dxyz = 0.4 # 0.2 + +ActiveThorns = "ADMBase ADMCoupling StaticConformal CoordGauge SpaceMask Exact" +ADMBase::initial_lapse = "exact" +ADMBase::initial_shift = "exact" +ADMBase::initial_data = "exact" +ADMBase::lapse_evolution_method = "static" +ADMBase::shift_evolution_method = "static" +ADMBase::metric_type = "physical" +Exact::exact_model = "Kerr/Kerr-Schild" +Exact::Kerr_KerrSchild__mass = 1.0 +Exact::Kerr_KerrSchild__spin = 0.6 + +# automagically create output directory +ActiveThorns = "IOUtil" +IO::out_dir = $parfile +IO::parfile_write = "no" + +######################################## + +ActiveThorns = "SphericalSurface" + +ActiveThorns = "LocalInterp AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect" + +AHFinderDirect::print_timing_stats = "true" + +AHFinderDirect::h_base_file_name = "h" +AHFinderDirect::BH_diagnostics_base_file_name = "BH_diagnostics" +AHFinderDirect::output_OpenDX_control_files = "no" +AHFinderDirect::Theta_norm_for_convergence = 1.0e-12 + +AHFinderDirect::geometry_interpolator_name = "Lagrange polynomial interpolation" +AHFinderDirect::geometry_interpolator_pars = "order=4" + +AHFinderDirect::N_horizons = 1 +AHFinderDirect::origin_x[1] = 0.5 +AHFinderDirect::origin_y[1] = 0.7 +AHFinderDirect::origin_z[1] = 0.0 + +AHFinderDirect::initial_guess_method[1] = "coordinate sphere" +AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2 +AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.3 +AHFinderDirect::initial_guess__coord_sphere__z_center[1] = 0.0 +AHFinderDirect::initial_guess__coord_sphere__radius[1] = 4.0 # 2.0 + +AHFinderDirect::surface_modification[1] = "radius^2" +AHFinderDirect::desired_value[1] = 2.0 File [removed]: Kerr-modification-radius2.par Delta lines: +0 -66 =================================================================== --- trunk/test/Kerr-modification-radius2.par 2010-05-26 19:51:14 UTC (rev 1546) +++ trunk/test/Kerr-modification-radius2.par 2010-05-26 23:50:46 UTC (rev 1547) @@ -1,66 +0,0 @@ -# This parameter file sets up Kerr/Kerr-Schild initial data, then -# finds the apparent horizon in it. The local coordinate system origin -# and the initial guess are both deliberately de-centered with respect -# to the black hole, to make this a non-trivial test for the apparent -# horizon finder. - -# flesh -cactus::cctk_itlast = 0 - -ActiveThorns = "PUGH" -driver::ghost_size = 3 -driver::global_nx = 31 -driver::global_ny = 31 -driver::global_nz = 19 - -ActiveThorns = "CartGrid3D CoordBase SymBase" -grid::domain = "bitant" -grid::avoid_origin = "false" -grid::type = "byspacing" -grid::dxyz = 0.4 # 0.2 - -ActiveThorns = "ADMBase ADMCoupling StaticConformal CoordGauge SpaceMask Exact" -ADMBase::initial_lapse = "exact" -ADMBase::initial_shift = "exact" -ADMBase::initial_data = "exact" -ADMBase::lapse_evolution_method = "static" -ADMBase::shift_evolution_method = "static" -ADMBase::metric_type = "physical" -Exact::exact_model = "Kerr/Kerr-Schild" -Exact::Kerr_KerrSchild__mass = 1.0 -Exact::Kerr_KerrSchild__spin = 0.6 - -# automagically create output directory -ActiveThorns = "IOUtil" -IO::out_dir = $parfile -IO::parfile_write = "no" - -######################################## - -ActiveThorns = "SphericalSurface" - -ActiveThorns = "LocalInterp AEILocalInterp PUGHInterp PUGHReduce AHFinderDirect" - -AHFinderDirect::print_timing_stats = "true" - -AHFinderDirect::h_base_file_name = "h" -AHFinderDirect::BH_diagnostics_base_file_name = "BH_diagnostics" -AHFinderDirect::output_OpenDX_control_files = "no" -AHFinderDirect::Theta_norm_for_convergence = 1.0e-12 - -AHFinderDirect::geometry_interpolator_name = "Lagrange polynomial interpolation" -AHFinderDirect::geometry_interpolator_pars = "order=4" - -AHFinderDirect::N_horizons = 1 -AHFinderDirect::origin_x[1] = 0.5 -AHFinderDirect::origin_y[1] = 0.7 -AHFinderDirect::origin_z[1] = 0.0 - -AHFinderDirect::initial_guess_method[1] = "coordinate sphere" -AHFinderDirect::initial_guess__coord_sphere__x_center[1] = -0.2 -AHFinderDirect::initial_guess__coord_sphere__y_center[1] = 0.3 -AHFinderDirect::initial_guess__coord_sphere__z_center[1] = 0.0 -AHFinderDirect::initial_guess__coord_sphere__radius[1] = 4.0 # 2.0 - -AHFinderDirect::surface_modification[1] = "radius^2" -AHFinderDirect::desired_value[1] = 2.0

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 116)
by cott＠einsteintoolkit.org 26 May '10

26 May '10

User: cott Date: 2010/05/26 06:44 PM Modified: /trunk/src/ GRHydro_Con2PrimM.F90 Log: * tiny File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +2 -0 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2010-05-26 23:40:05 UTC (rev 115) +++ trunk/src/GRHydro_Con2PrimM.F90 2010-05-26 23:44:55 UTC (rev 116) @@ -12,5 +12,7 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS + + end subroutine Conservative2PrimitiveM

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 115)
by cott＠einsteintoolkit.org 26 May '10

26 May '10

User: cott Date: 2010/05/26 06:40 PM Added: /trunk/src/ GRHydro_Con2PrimM.F90 Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ GRHydro_ParamCheck.F90, make.code.defn Log: * initial structural modifications to start with MHD development (Noble/Ott) -> add comoving b-field: bcom[3] and bcom0 -> add integer variable MHD which is set in ParamCheck to 0 or 1 according to HydroBase::Bvec_evolution_method being GRHydro or something else (don't want to do string comparisons very often) -> skeleton routine Conservative2PrimitiveM in separate .F90 file -> extend keyword Bvec_evolution_method with "GRHydro" * code compiles, should not hurt anything already there, does not do anyting (yet) File Changes: Directory: /trunk/src/ ====================== File [added]: GRHydro_Con2PrimM.F90 Delta lines: +16 -0 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 (rev 0) +++ trunk/src/GRHydro_Con2PrimM.F90 2010-05-26 23:40:05 UTC (rev 115) @@ -0,0 +1,16 @@ +#include "cctk.h" +#include "cctk_Parameters.h" +#include "cctk_Arguments.h" +#include "cctk_Functions.h" +#include "SpaceMask.h" + + +subroutine Conservative2PrimitiveM(CCTK_ARGUMENTS) + + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + + +end subroutine Conservative2PrimitiveM File [modified]: GRHydro_ParamCheck.F90 Delta lines: +9 -0 =================================================================== --- trunk/src/GRHydro_ParamCheck.F90 2010-05-03 03:59:34 UTC (rev 114) +++ trunk/src/GRHydro_ParamCheck.F90 2010-05-26 23:40:05 UTC (rev 115) @@ -90,5 +90,14 @@ if (CCTK_EQUALS(bound,"static")) then call CCTK_PARAMWARN("GRHydro::bound = 'static' is no longer supported, use 'none' instead"); end if + + if (CCTK_EQUALS(Bvec_evolution_method,"GRHydro")) then + MHD = 1 + else + MHD = 0 + endif + + + end subroutine GRHydro_ParamCheck File [modified]: make.code.defn Delta lines: +1 -0 =================================================================== --- trunk/src/make.code.defn 2010-05-03 03:59:34 UTC (rev 114) +++ trunk/src/make.code.defn 2010-05-26 23:40:05 UTC (rev 115) @@ -7,6 +7,7 @@ GRHydro_Boundaries.F90 \ GRHydro_CalcUpdate.F90 \ GRHydro_Con2Prim.F90 \ + GRHydro_Con2PrimM.F90 \ GRHydro_Eigenproblem.F90 \ GRHydro_Eigenproblem_Marquina.F90 \ GRHydro_ENOReconstruct.F90 \ Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +6 -1 =================================================================== --- trunk/interface.ccl 2010-05-03 03:59:34 UTC (rev 114) +++ trunk/interface.ccl 2010-05-26 23:40:05 UTC (rev 115) @@ -186,9 +186,12 @@ real tau type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar" tensorweight=+1.0 interpolator="matter"' "internal energy" -real scon[3] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "generalized momenta" +real scon[3] type = GF Timelevels = 3 tags='Prolongation="HydroBase::prolongation_type" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "generalized momenta" +real bcom[3] type = GF Timelevels = 3 tags='Prolongation="none" tensortypealias="D" tensorweight=+1.0 interpolator="matter"' "comoving magnetic field components" +real bcom0 type = GF Timelevels = 3 tags='Prolongation="none" tensortypealias="Scalar"' "0 component of the comoving magnetic field" + real GRHydro_tracers[number_of_tracers] type = GF Timelevels = 3 tags='ProlongationParameter="HydroBase::prolongation_type" tensortypealias="Scalar"' { tracer @@ -257,6 +260,8 @@ private: +int MHD type = SCALAR tags='checkpoint="no"' "Are we doing MHD? Set in ParamCheck" + int GRHydro_reflevel type = SCALAR tags='checkpoint="no"' "Refinement level GRHydro is working on right now" real GRHydro_con_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2010-05-03 03:59:34 UTC (rev 114) +++ trunk/param.ccl 2010-05-26 23:40:05 UTC (rev 115) @@ -30,6 +30,10 @@ { "GRHydro" :: "Use GRHydro to evolve the hydro variables" } +EXTENDS KEYWORD Bvec_evolution_method "" +{ + "GRHydro" :: "Use GRHydro to evolve the MHD variables" +} ######################################### ### PARAMETRES SHARED FROM MoL ### File [modified]: schedule.ccl Delta lines: +11 -0 =================================================================== --- trunk/schedule.ccl 2010-05-03 03:59:34 UTC (rev 114) +++ trunk/schedule.ccl 2010-05-26 23:40:05 UTC (rev 115) @@ -23,6 +23,11 @@ } STORAGE: ADMBase::metric[3], ADMBase::curv[3] STORAGE: ADMBase::lapse[3] + if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) + { + STORAGE:bcom0[3] + STORAGE:bcom[3] + } } else { @@ -36,7 +41,13 @@ } STORAGE: ADMBase::metric[2], ADMBase::curv[2] STORAGE: ADMBase::lapse[2] + if(CCTK_Equals(Bvec_evolution_method,"GRHydro")) + { + STORAGE:bcom0[2] + STORAGE:bcom[2] + } } +STORAGE:MHD STORAGE:GRHydro_reflevel STORAGE:densrhs STORAGE:taurhs

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits May 2010