Commits January 2013

commits@lists.einsteintoolkit.org

9 participants
94 discussions

[Carpet] branch, master, updated. carpet-6-init-107-ga39aff1
by Carpet git repositories 20 Jan '13

20 Jan '13

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 a39aff1ecb730b7e0d92788c7e208a008a7e659b (commit) from be371182348018905b897b47f3720940d426d516 (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 a39aff1ecb730b7e0d92788c7e208a008a7e659b Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sun Jan 20 12:55:22 2013 -0500 CarpetIOASCII: Update test results after domain decomposition change ----------------------------------------------------------------------- Summary of changes: .../test/compact/grid::coordinates..asc | 2 +- .../test/compact/grid::coordinates.d.asc | 24 +- .../test/compact/grid::coordinates.x.asc | 2 +- .../test/compact/grid::coordinates.xy.asc | 530 +- .../test/compact/grid::coordinates.xyz.asc |10385 ++++++++++---------- .../test/compact/grid::coordinates.xz.asc | 698 +-- .../test/compact/grid::coordinates.y.asc | 68 +- .../test/compact/grid::coordinates.yz.asc | 843 +- .../test/compact/grid::coordinates.z.asc | 79 +- .../test/compact/interptoarray::arrays1d..asc | 4 +- .../test/compact/interptoarray::arrays1d.x.asc | 4 +- .../test/compact/interptoarray::arrays1d.y.asc | 2 +- .../test/compact/interptoarray::arrays2d..asc | 4 +- .../test/compact/interptoarray::arrays2d.x.asc | 4 +- .../test/compact/interptoarray::arrays2d.xy.asc | 4 +- .../test/compact/interptoarray::arrays2d.y.asc | 2 +- .../test/compact/interptoarray::arrays2d.z.asc | 2 +- .../test/compact/interptoarray::arrays3d..asc | 4 +- .../test/compact/interptoarray::arrays3d.d.asc | 2 +- .../test/compact/interptoarray::arrays3d.x.asc | 4 +- .../test/compact/interptoarray::arrays3d.xy.asc | 4 +- .../test/compact/interptoarray::arrays3d.xyz.asc | 4 +- .../test/compact/interptoarray::arrays3d.xz.asc | 2 +- .../test/compact/interptoarray::arrays3d.y.asc | 2 +- .../test/compact/interptoarray::arrays3d.yz.asc | 2 +- .../test/compact/interptoarray::arrays3d.z.asc | 2 +- .../test/compact/interptoarray::scalars..asc | 2 +- .../test/coords/grid::coordinates..asc | 2 +- .../test/coords/grid::coordinates.d.asc | 46 +- .../test/coords/grid::coordinates.x.asc | 2 +- .../test/coords/grid::coordinates.xy.asc | 530 +- .../test/coords/grid::coordinates.xyz.asc | 5997 ++++++------ .../test/coords/grid::coordinates.xz.asc | 618 +-- .../test/coords/grid::coordinates.y.asc | 68 +- .../test/coords/grid::coordinates.yz.asc | 827 +- .../test/coords/grid::coordinates.z.asc | 79 +- .../test/coords/interptoarray::arrays1d..asc | 2 +- .../test/coords/interptoarray::arrays1d.x.asc | 2 +- .../test/coords/interptoarray::arrays1d.y.asc | 2 +- .../test/coords/interptoarray::arrays2d..asc | 2 +- .../test/coords/interptoarray::arrays2d.x.asc | 2 +- .../test/coords/interptoarray::arrays2d.xy.asc | 2 +- .../test/coords/interptoarray::arrays2d.y.asc | 2 +- .../test/coords/interptoarray::arrays2d.z.asc | 2 +- .../test/coords/interptoarray::arrays3d..asc | 2 +- .../test/coords/interptoarray::arrays3d.d.asc | 2 +- .../test/coords/interptoarray::arrays3d.x.asc | 2 +- .../test/coords/interptoarray::arrays3d.xy.asc | 2 +- .../test/coords/interptoarray::arrays3d.xyz.asc | 2 +- .../test/coords/interptoarray::arrays3d.xz.asc | 2 +- .../test/coords/interptoarray::arrays3d.y.asc | 2 +- .../test/coords/interptoarray::arrays3d.yz.asc | 2 +- .../test/coords/interptoarray::arrays3d.z.asc | 2 +- .../test/coords/interptoarray::scalars..asc | 2 +- .../test/grid-coords/grid::coordinates..asc | 4 +- .../test/grid-coords/grid::coordinates.d.asc | 26 +- .../test/grid-coords/grid::coordinates.x.asc | 4 +- .../test/grid-coords/grid::coordinates.xy.asc | 532 +- .../test/grid-coords/grid::coordinates.xyz.asc |10387 ++++++++++---------- .../test/grid-coords/grid::coordinates.xz.asc | 700 +-- .../test/grid-coords/grid::coordinates.y.asc | 70 +- .../test/grid-coords/grid::coordinates.yz.asc | 845 +- .../test/grid-coords/grid::coordinates.z.asc | 81 +- .../test/grid-coords/interptoarray::arrays1d..asc | 4 +- .../test/grid-coords/interptoarray::arrays1d.x.asc | 4 +- .../test/grid-coords/interptoarray::arrays1d.y.asc | 4 +- .../test/grid-coords/interptoarray::arrays2d..asc | 4 +- .../test/grid-coords/interptoarray::arrays2d.x.asc | 4 +- .../grid-coords/interptoarray::arrays2d.xy.asc | 4 +- .../test/grid-coords/interptoarray::arrays2d.y.asc | 4 +- .../test/grid-coords/interptoarray::arrays2d.z.asc | 4 +- .../test/grid-coords/interptoarray::arrays3d..asc | 4 +- .../test/grid-coords/interptoarray::arrays3d.d.asc | 4 +- .../test/grid-coords/interptoarray::arrays3d.x.asc | 4 +- .../grid-coords/interptoarray::arrays3d.xy.asc | 4 +- .../grid-coords/interptoarray::arrays3d.xyz.asc | 4 +- .../grid-coords/interptoarray::arrays3d.xz.asc | 4 +- .../test/grid-coords/interptoarray::arrays3d.y.asc | 4 +- .../grid-coords/interptoarray::arrays3d.yz.asc | 4 +- .../test/grid-coords/interptoarray::arrays3d.z.asc | 4 +- .../test/grid-coords/interptoarray::scalars..asc | 4 +- 81 files changed, 16129 insertions(+), 17482 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. carpet-6-init-106-gbe37118
by Carpet git repositories 20 Jan '13

20 Jan '13

1 0

[svn:einsteintoolkit] WeylScal4/trunk/src/ (Rev. 131)
by schnetter＠cct.lsu.edu 20 Jan '13

20 Jan '13

User: eschnett Date: 2013/01/20 09:10 AM Modified: /trunk/src/ WeylScal4_invars_calc_2nd.cc, WeylScal4_invars_calc_4th.cc, WeylScal4_invars_calc_Nth.cc, WeylScal4_psi4_calc_2nd.cc, WeylScal4_psi4_calc_4th.cc, WeylScal4_psi4_calc_Nth.cc, WeylScal4_psis_calc_2nd.cc, WeylScal4_psis_calc_4th.cc, WeylScal4_psis_calc_Nth.cc Log: Regenerate code after Kranc change File Changes: Directory: /trunk/src/ ====================== File [modified]: WeylScal4_invars_calc_2nd.cc Delta lines: <Unavailable> File [modified]: WeylScal4_invars_calc_4th.cc Delta lines: <Unavailable> File [modified]: WeylScal4_invars_calc_Nth.cc Delta lines: <Unavailable> File [modified]: WeylScal4_psi4_calc_2nd.cc Delta lines: <Unavailable> File [modified]: WeylScal4_psi4_calc_4th.cc Delta lines: <Unavailable> File [modified]: WeylScal4_psi4_calc_Nth.cc Delta lines: <Unavailable> File [modified]: WeylScal4_psis_calc_2nd.cc Delta lines: <Unavailable> File [modified]: WeylScal4_psis_calc_4th.cc Delta lines: <Unavailable> File [modified]: WeylScal4_psis_calc_Nth.cc Delta lines: <Unavailable>

1 0

[McLachlan]McLachlan branch, master, updated. d5e202b1879cba4befc471c5c958a3ee2b8568a1
by Carpet git repositories 20 Jan '13

20 Jan '13

1 0

[McLachlan]McLachlan branch, master, updated. 6720d80eab38f9f24584bcf657bc85c1708ab701
by Carpet git repositories 19 Jan '13

19 Jan '13

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 "McLachlan". The branch, master has been updated via 6720d80eab38f9f24584bcf657bc85c1708ab701 (commit) from b457ddc6338d15f4a9c8109619f39a88698ebbf7 (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 6720d80eab38f9f24584bcf657bc85c1708ab701 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Sat Jan 19 22:45:29 2013 -0500 Regenerate code after Kranc change ----------------------------------------------------------------------- Summary of changes: ML_ADM/src/ML_ADM_Minkowski.cc | 4 ++-- ML_ADM/src/ML_ADM_RHS.cc | 4 ++-- ML_ADM/src/ML_ADM_boundary.cc | 4 ++-- ML_ADM/src/ML_ADM_constraints.cc | 4 ++-- ML_ADM/src/ML_ADM_constraints_boundary.cc | 4 ++-- ML_ADM/src/ML_ADM_convertFromADMBase.cc | 4 ++-- ML_ADM/src/ML_ADM_convertToADMBase.cc | 4 ++-- ML_BSSN/src/ML_BSSN_Advect.cc | 4 ++-- ML_BSSN/src/ML_BSSN_Dissipation.cc | 4 ++-- ML_BSSN/src/ML_BSSN_InitGamma.cc | 4 ++-- ML_BSSN/src/ML_BSSN_InitRHS.cc | 4 ++-- ML_BSSN/src/ML_BSSN_Minkowski.cc | 4 ++-- ML_BSSN/src/ML_BSSN_RHS1.cc | 4 ++-- ML_BSSN/src/ML_BSSN_RHS2.cc | 4 ++-- ML_BSSN/src/ML_BSSN_RHSStaticBoundary.cc | 4 ++-- ML_BSSN/src/ML_BSSN_boundary.cc | 4 ++-- ML_BSSN/src/ML_BSSN_constraints1.cc | 4 ++-- ML_BSSN/src/ML_BSSN_constraints2.cc | 4 ++-- ML_BSSN/src/ML_BSSN_convertFromADMBase.cc | 4 ++-- ML_BSSN/src/ML_BSSN_convertFromADMBaseGamma.cc | 4 ++-- ML_BSSN/src/ML_BSSN_convertToADMBase.cc | 4 ++-- .../src/ML_BSSN_convertToADMBaseDtLapseShift.cc | 4 ++-- ...ML_BSSN_convertToADMBaseDtLapseShiftBoundary.cc | 4 ++-- .../ML_BSSN_convertToADMBaseFakeDtLapseShift.cc | 4 ++-- ML_BSSN/src/ML_BSSN_enforce.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_Advect.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_Dissipation.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_InitGamma.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_InitRHS.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_Minkowski.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_RHS1.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_RHS2.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_RHSStaticBoundary.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_boundary.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_constraints1.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_constraints2.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_convertFromADMBase.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_convertFromADMBaseGamma.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_convertToADMBase.cc | 4 ++-- .../src/ML_CCZ4_convertToADMBaseDtLapseShift.cc | 4 ++-- ...ML_CCZ4_convertToADMBaseDtLapseShiftBoundary.cc | 4 ++-- .../ML_CCZ4_convertToADMBaseFakeDtLapseShift.cc | 4 ++-- ML_CCZ4/src/ML_CCZ4_enforce.cc | 4 ++-- ML_WaveToy/src/WT_Dirichlet.cc | 4 ++-- ML_WaveToy/src/WT_Energy.cc | 4 ++-- ML_WaveToy/src/WT_EnergyBoundary.cc | 4 ++-- ML_WaveToy/src/WT_Gaussian.cc | 4 ++-- ML_WaveToy/src/WT_RHS.cc | 4 ++-- ML_WaveToy/src/WT_Standing.cc | 4 ++-- ML_WaveToy_CL/src/WT_CL_Dirichlet.cc | 6 +++--- ML_WaveToy_CL/src/WT_CL_Energy.cc | 6 +++--- ML_WaveToy_CL/src/WT_CL_EnergyBoundary.cc | 6 +++--- ML_WaveToy_CL/src/WT_CL_Gaussian.cc | 6 +++--- ML_WaveToy_CL/src/WT_CL_RHS.cc | 6 +++--- ML_WaveToy_CL/src/WT_CL_Standing.cc | 6 +++--- 55 files changed, 116 insertions(+), 116 deletions(-) hooks/post-receive -- McLachlan

1 0

[Carpet] branch, master, updated. carpet-6-init-105-g16d80f8
by Carpet git repositories 19 Jan '13

19 Jan '13

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 470)
by schnetter＠cct.lsu.edu 19 Jan '13

19 Jan '13

User: eschnett Date: 2013/01/19 08:38 PM Modified: /trunk/ interface.ccl Log: Correct syntax error in interface.ccl File Changes: Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- trunk/interface.ccl 2013-01-20 00:25:48 UTC (rev 469) +++ trunk/interface.ccl 2013-01-20 02:38:30 UTC (rev 470) @@ -559,7 +559,7 @@ Avecxplus,Avecyplus,Aveczplus,Avecxminus,Avecyminus,Aveczminus } "Vector potential extended to the cell boundaries" -real GRHydro_Aphi_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no" +real GRHydro_Aphi_bext type = GF Timelevels = 1 tags='Prolongation="None" checkpoint="no"' { Aphiplus,Aphiminus } "Vector potential phi extended to the cell boundaries"

1 0

[Carpet] branch, master, updated. carpet-6-init-103-g63308ac
by Carpet git repositories 19 Jan '13

19 Jan '13

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 469)
by rhaas＠tapir.caltech.edu 19 Jan '13

19 Jan '13

User: rhaas Date: 2013/01/19 06:25 PM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_Con2Prim.F90, GRHydro_EvolutionMask.F90, GRHydro_ParamCheck.F90 /trunk/test/ tov_carpetevolutionmask.par Log: GRHydro: add option to automatically use Evolution_Mask if possible From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +4 -2 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2013-01-18 02:03:15 UTC (rev 468) +++ trunk/src/GRHydro_Con2Prim.F90 2013-01-20 00:25:48 UTC (rev 469) @@ -2244,8 +2244,10 @@ CCTK_REAL, DIMENSION(cctk_ash1,cctk_ash2,cctk_ash3) :: evolution_mask CCTK_POINTER_TO_CONST :: evolution_mask_ptr pointer (evolution_mask_ptr, evolution_mask) + CCTK_INT :: check_evolution_mask - call GRHydro_DeclareEvolutionMask(cctkGH, evolution_mask_ptr) + call GRHydro_DeclareEvolutionMask(cctkGH, evolution_mask_ptr, & + check_evolution_mask) ! call CCTK_INFO("Checking the C2P failure mask.") @@ -2276,7 +2278,7 @@ end if ! do not collapse conditions since Fortran does not guarantee an order - if (use_evolution_mask.ne.0) then + if (check_evolution_mask.ne.0) then if (evolution_mask(i,j,k).eq.0d0) then cycle end if File [modified]: GRHydro_EvolutionMask.F90 Delta lines: +22 -2 =================================================================== --- trunk/src/GRHydro_EvolutionMask.F90 2013-01-18 02:03:15 UTC (rev 468) +++ trunk/src/GRHydro_EvolutionMask.F90 2013-01-20 00:25:48 UTC (rev 469) @@ -56,11 +56,19 @@ @vcomment @endvar + @var evolution_mask_valid + @vdesc set to 1 if evolution_mask is valid, 0 otherwise + @vtype CCTK_INT + @vio out + @vcomment + @endvar + @returntype none @returndesc @endreturndesc @@*/ - subroutine GRHydro_DeclareEvolutionMask(cctkGH, evolution_mask) + subroutine GRHydro_DeclareEvolutionMask(cctkGH, evolution_mask, & + evolution_mask_valid) implicit none @@ -69,9 +77,19 @@ CCTK_POINTER_TO_CONST :: cctkGH CCTK_POINTER :: evolution_mask + CCTK_INT :: evolution_mask_valid + integer, save :: evolution_mask_idx = -1 + logical :: try_use_mask + integer :: evolution_mask_active - if (use_evolution_mask.ne.0) then + call CCTK_IsImplementationActive(evolution_mask_active, & + "CarpetEvolutionMask") + try_use_mask = CCTK_EQUALS(use_evolution_mask, "always") .or. & + (CCTK_EQUALS(use_evolution_mask, "auto") .and. & + evolution_mask_active .ne. 0) + + if (try_use_mask) then if (evolution_mask_idx .eq. -1) then call CCTK_VarIndex(evolution_mask_idx,& "CarpetEvolutionMask::evolution_mask") @@ -80,8 +98,10 @@ if (evolution_mask .eq. CCTK_NullPointer()) then call CCTK_Warn(CCTK_WARN_ABORT, "Could not get pointer to evolution_mask. Is CarpetEvolutionMask active?") end if + evolution_mask_valid = 1 else evolution_mask = CCTK_NullPointer() + evolution_mask_valid = 0 end if end subroutine File [modified]: GRHydro_ParamCheck.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_ParamCheck.F90 2013-01-18 02:03:15 UTC (rev 468) +++ trunk/src/GRHydro_ParamCheck.F90 2013-01-20 00:25:48 UTC (rev 469) @@ -152,10 +152,10 @@ end if end if - if(use_evolution_mask.ne.0) then + if(CCTK_EQUALS(use_evolution_mask, "always")) then call CCTK_VarIndex(evolution_mask_idx, "CarpetEvolutionMask::evolution_mask") if(evolution_mask_idx .lt. 0) then - call CCTK_PARAMWARN("You activated use_evolution_mask but I cannot find 'CarpetEvolutionMask::evolution_mask'. If you use Carpet, then you should activate thorn 'CarpetEvolutionMask', if using PUGH then evolution_mask makes no sense and you should disable this option.") + call CCTK_PARAMWARN("You set use_evolution_mask='always' but I cannot find 'CarpetEvolutionMask::evolution_mask'. If you use Carpet, then you should activate thorn 'CarpetEvolutionMask', if using PUGH then evolution_mask makes no sense and you should disable this option.") end if end if Directory: /trunk/test/ ======================= File [modified]: tov_carpetevolutionmask.par Delta lines: +1 -1 =================================================================== --- trunk/test/tov_carpetevolutionmask.par 2013-01-18 02:03:15 UTC (rev 468) +++ trunk/test/tov_carpetevolutionmask.par 2013-01-20 00:25:48 UTC (rev 469) @@ -97,7 +97,7 @@ CarpetEvolutionMask::enforce_vars = " GRHydro::dens GRHydro::scon " -GRHydro::use_evolution_mask = yes +GRHydro::use_evolution_mask = always IO::out_dir = $parfile Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +5 -2 =================================================================== --- trunk/param.ccl 2013-01-18 02:03:15 UTC (rev 468) +++ trunk/param.ccl 2013-01-20 00:25:48 UTC (rev 469) @@ -83,9 +83,12 @@ restricted: -BOOLEAN use_evolution_mask "Set this to 'true' to skip validity tests in regions where CarpetEvolutionMask::evolution_mask vanishes." STEERABLE=ALWAYS +KEYWORD use_evolution_mask "Set this to 'true' to skip validity tests in regions where CarpetEvolutionMask::evolution_mask vanishes." STEERABLE=ALWAYS { -} "false" + "always" :: "use the mask" + "auto" :: "check if CarpetEvolutionMask is active, then use the mask" + "never" :: "do not use the mask" +} "never" BOOLEAN GRHydro_enable_internal_excision "Set this to 'false' to disable the thorn-internal excision." STEERABLE=ALWAYS {

1 0

[Carpet] branch, master, updated. carpet-6-init-102-g871a76f
by Carpet git repositories 19 Jan '13

19 Jan '13

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 January 2013