Commits August 2010

commits@lists.einsteintoolkit.org

5 participants
29 discussions

[svn:einsteintoolkit] GRHydro_InitData/trunk/src/ (Rev. 109)
by knarf＠cct.lsu.edu 16 Aug '10

16 Aug '10

User: knarf Date: 2010/08/16 08:45 AM Modified: /trunk/src/ GRHydro_C2P2C.F90, GRHydro_Con2Prim.F90, GRHydro_ReadConformalData.F90, GRHydro_SimpleWave.F90 Log: add USE_EOS_OMNI checks File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_C2P2C.F90 Delta lines: +25 -0 =================================================================== --- trunk/src/GRHydro_C2P2C.F90 2010-07-12 14:50:33 UTC (rev 108) +++ trunk/src/GRHydro_C2P2C.F90 2010-08-16 13:45:31 UTC (rev 109) @@ -34,10 +34,12 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS +#if !USE_EOS_OMNI #ifdef _EOS_BASE_INC_ #undef _EOS_BASE_INC_ #endif #include "EOS_Base.inc" +#endif integer didit,i,j,k,nx,ny,nz CCTK_REAL det @@ -50,6 +52,21 @@ CCTK_INT C2P_failed logical epsnegative +#if USE_EOS_OMNI +! begin EOS Omni vars + integer :: n = 1 + integer :: poly_eoskey = 0 + integer :: keytemp = 0 + integer :: anyerr = 0 + integer :: keyerr(1) = 0 + real*8 :: xpress = 0.0d0 + real*8 :: xeps = 0.0d0 + real*8 :: xtemp = 0.0d0 + real*8 :: xye = 0.0d0 + poly_eoskey = GRHydro_poly_eoskey +! end EOS Omni vars +#endif + call CCTK_WARN(1,"This test works only with Ideal_Fluid EoS") nx = cctk_lsh(1) @@ -90,8 +107,16 @@ epsnegative = .false. GRHydro_rho_min = 1.e-10 +#if USE_EOS_OMNI + call EOS_Omni_press(poly_eoskey,keytemp,n,& + GRHydro_rho_min,1.0d0,xtemp,xye,pmin,keyerr,anyerr) + + call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) +#else pmin = EOS_Pressure(GRHydro_eos_handle, GRHydro_rho_min, 1.0d0) epsmin = EOS_SpecificIntEnergy(GRHydro_eos_handle, GRHydro_rho_min, pmin) +#endif C2P_failed = 0 write(*,*) 'C2P2C test: initial values.' File [modified]: GRHydro_Con2Prim.F90 Delta lines: +25 -0 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2010-07-12 14:50:33 UTC (rev 108) +++ trunk/src/GRHydro_Con2Prim.F90 2010-08-16 13:45:31 UTC (rev 109) @@ -52,11 +52,28 @@ CCTK_INT C2P_failed logical epsnegative +#ifndef USE_EOS_OMNI #ifdef _EOS_BASE_INC_ #undef _EOS_BASE_INC_ #endif #include "EOS_Base.inc" +#endif +#if USE_EOS_OMNI +! begin EOS Omni vars + integer :: n = 1 + integer :: poly_eoskey = 0 + integer :: keytemp = 0 + integer :: anyerr = 0 + integer :: keyerr(1) = 0 + real*8 :: xpress = 0.0d0 + real*8 :: xeps = 0.0d0 + real*8 :: xtemp = 0.0d0 + real*8 :: xye = 0.0d0 + poly_eoskey = GRHydro_poly_eoskey +! end EOS Omni vars +#endif + call CCTK_WARN(1,"For this test, remember to use a polytropic EoS and to set eos_gamma = 2.0 and eos_k = 100.0") nx = cctk_lsh(1) @@ -92,8 +109,16 @@ epsnegative = .false. +#if USE_EOS_OMNI + call EOS_Omni_press(poly_eoskey,keytemp,n,& + GRHydro_rho_min,1.0d0,xtemp,xye,pmin,keyerr,anyerr) + + call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + GRHydro_rho_min,xeps,xtemp,xye,pmin,epsmin,keyerr,anyerr) +#else pmin = EOS_Pressure(GRHydro_eos_handle, GRHydro_rho_min, 1.0d0) epsmin = EOS_SpecificIntEnergy(GRHydro_eos_handle, GRHydro_rho_min, pmin) +#endif C2P_failed = 0 write(*,*) 'Con2Prim test: converting to primitive variables' File [modified]: GRHydro_ReadConformalData.F90 Delta lines: +24 -4 =================================================================== --- trunk/src/GRHydro_ReadConformalData.F90 2010-07-12 14:50:33 UTC (rev 108) +++ trunk/src/GRHydro_ReadConformalData.F90 2010-08-16 13:45:31 UTC (rev 109) @@ -51,9 +51,23 @@ CCTK_INT :: i,j,k,handle,ierr - CCTK_REAL :: eos_k, eos_gamma, rho_min, det +! CCTK_REAL :: eos_k, eos_gamma + CCTK_REAL :: rho_min, det - +#if USE_EOS_OMNI +! begin EOS Omni vars + integer :: n = 1 + integer :: poly_eoskey = 0 + integer :: keytemp = 0 + integer :: anyerr = 0 + integer :: keyerr(1) = 0 + real*8 :: xpress = 0.0d0 + real*8 :: xeps = 0.0d0 + real*8 :: xtemp = 0.0d0 + real*8 :: xye = 0.0d0 + poly_eoskey = GRHydro_poly_eoskey +! end EOS Omni vars +#endif ! only gxx has been read in; copy it into gyy and gzz as well gyy = gxx @@ -131,8 +145,8 @@ ! if (handle < 0) call CCTK_WARN(0,"For this hack you need to compile with EOS_Polytrope") - eos_k = EOS_Pressure(GRHydro_eos_handle, 1.0, 1.0) - eos_gamma = 1.0 + eos_k / EOS_SpecificIntEnergy(GRHydro_eos_handle,1.0,1.0) +! eos_k = EOS_Pressure(GRHydro_eos_handle, 1.0, 1.0) +! eos_gamma = 1.0 + eos_k / EOS_SpecificIntEnergy(GRHydro_eos_handle,1.0,1.0) ! press = eos_k * rho**eos_gamma @@ -140,7 +154,13 @@ do i=1,cctk_lsh(1) do j=1,cctk_lsh(2) do k=1,cctk_lsh(3) +#ifdef USE_EOS_OMNI + call EOS_Omni_EpsFromPress(poly_eoskey,keytemp,n,& + rho(i,j,k),xeps,xtemp,xye,press(i,j,k),eps(i,j,k),keyerr,anyerr) + +#else eps(i,j,k) = EOS_SpecificIntEnergy(GRHydro_eos_handle,rho(i,j,k),press(i,j,k)) +#endif end do end do end do File [modified]: GRHydro_SimpleWave.F90 Delta lines: +23 -1 =================================================================== --- trunk/src/GRHydro_SimpleWave.F90 2010-07-12 14:50:33 UTC (rev 108) +++ trunk/src/GRHydro_SimpleWave.F90 2010-08-16 13:45:31 UTC (rev 109) @@ -46,14 +46,31 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_FUNCTIONS +#ifndef USE_EOS_OMNI #ifdef _EOS_BASE_INC_ #undef _EOS_BASE_INC_ #endif #include "EOS_Base.inc" - +#endif + CCTK_INT :: i, j, k, nx, ny, nz CCTK_REAL :: dr, k1, k2, k3, k4, in_data, old_data, source_data, new_data, c_0, det, pi +#if USE_EOS_OMNI +! begin EOS Omni vars + integer :: n = 1 + integer :: poly_eoskey = 0 + integer :: keytemp = 0 + integer :: anyerr = 0 + integer :: keyerr(1) = 0 + real*8 :: xpress = 0.0d0 + real*8 :: xeps = 0.0d0 + real*8 :: xtemp = 0.0d0 + real*8 :: xye = 0.0d0 + poly_eoskey = GRHydro_poly_eoskey +! end EOS Omni vars +#endif + call CCTK_INFO("Setting initial data for a simple wave as Anile Miller Motta") call CCTK_WARN(1, "The simple-wave initial-data routine works only for unigrid and on one node.") @@ -133,7 +150,12 @@ eps(i,1,1) = rho_abs_min**(1.d0/3.d0) velx(i,1,1) = 0.d0 w_lorentz(i,1,1) = 1.d0 +#if USE_EOS_OMNI + call EOS_Omni_press(poly_eoskey,keytemp,n,& + rho(i,1,1),1.0d0,xtemp,xye,press(i,1,1),keyerr,anyerr) +#else press(i,1,1) = EOS_Pressure(GRHydro_polytrope_handle, rho(i,1,1), 1.0d0) +#endif ! polytrope only (initial data) end if

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 36)
by schnetter＠cct.lsu.edu 10 Aug '10

10 Aug '10

User: eschnett Date: 2010/08/10 10:15 PM Modified: /trunk/ einsteintoolkit.th Log: Undo adding CactusTest and CactusWave thorns; not all test cases pass. File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.th Delta lines: +0 -41 =================================================================== --- trunk/einsteintoolkit.th 2010-08-11 01:37:59 UTC (rev 35) +++ trunk/einsteintoolkit.th 2010-08-11 03:15:13 UTC (rev 36) @@ -98,51 +98,17 @@ CactusPUGH/PUGHInterp CactusPUGH/PUGHReduce CactusPUGH/PUGHSlab - CactusPUGHIO/IOHDF5Util CactusPUGHIO/IOHDF5 -#CactusTest/TestAllTypes -CactusTest/TestArrays -CactusTest/TestComplex -CactusTest/TestCoordinates -CactusTest/TestFortranDependencies1 -CactusTest/TestFortranDependencies2 -CactusTest/TestFpointerNULL -CactusTest/TestFreeF90 -CactusTest/TestGlobalReduce -CactusTest/TestInclude1 -CactusTest/TestInclude2 -CactusTest/TestLocalReduce -CactusTest/TestLoop -CactusTest/TestPar -CactusTest/TestReduce -CactusTest/TestSchedule -CactusTest/TestStrings -CactusTest/TestTable -CactusTest/TestTimers -CactusTest/TestTypes - CactusUtils/Formaline CactusUtils/NaNChecker CactusUtils/Nice CactusUtils/TerminationTrigger CactusUtils/TimerReport -CactusWave/IDScalarWave -CactusWave/IDScalarWaveC -CactusWave/IDScalarWaveCXX -CactusWave/IDScalarWaveElliptic -CactusWave/WaveBinarySource -CactusWave/WaveToyC -CactusWave/WaveToyCXX -CactusWave/WaveToyExtra -CactusWave/WaveToyF77 -CactusWave/WaveToyF90 -CactusWave/WaveToyFreeF90 - # The Einstein Toolkit !TARGET = $ARR !TYPE = svn @@ -293,10 +259,3 @@ Carpet/CarpetSlab Carpet/CarpetTracker Carpet/LoopControl - - - -# Private thorns -!TARGET = $ARR -!TYPE = ignore -!CHECKOUT =

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 35)
by schnetter＠cct.lsu.edu 10 Aug '10

10 Aug '10

User: eschnett Date: 2010/08/10 08:37 PM Modified: /trunk/ einsteintoolkit.th Log: Add CactusTest arrangement, which contains many good test cases. Add CactusWave barrangement, which contains our example application. Add (empty) example for adding local thorns. File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.th Delta lines: +41 -0 =================================================================== --- trunk/einsteintoolkit.th 2010-07-12 14:48:59 UTC (rev 34) +++ trunk/einsteintoolkit.th 2010-08-11 01:37:59 UTC (rev 35) @@ -98,17 +98,51 @@ CactusPUGH/PUGHInterp CactusPUGH/PUGHReduce CactusPUGH/PUGHSlab + CactusPUGHIO/IOHDF5Util CactusPUGHIO/IOHDF5 +#CactusTest/TestAllTypes +CactusTest/TestArrays +CactusTest/TestComplex +CactusTest/TestCoordinates +CactusTest/TestFortranDependencies1 +CactusTest/TestFortranDependencies2 +CactusTest/TestFpointerNULL +CactusTest/TestFreeF90 +CactusTest/TestGlobalReduce +CactusTest/TestInclude1 +CactusTest/TestInclude2 +CactusTest/TestLocalReduce +CactusTest/TestLoop +CactusTest/TestPar +CactusTest/TestReduce +CactusTest/TestSchedule +CactusTest/TestStrings +CactusTest/TestTable +CactusTest/TestTimers +CactusTest/TestTypes + CactusUtils/Formaline CactusUtils/NaNChecker CactusUtils/Nice CactusUtils/TerminationTrigger CactusUtils/TimerReport +CactusWave/IDScalarWave +CactusWave/IDScalarWaveC +CactusWave/IDScalarWaveCXX +CactusWave/IDScalarWaveElliptic +CactusWave/WaveBinarySource +CactusWave/WaveToyC +CactusWave/WaveToyCXX +CactusWave/WaveToyExtra +CactusWave/WaveToyF77 +CactusWave/WaveToyF90 +CactusWave/WaveToyFreeF90 + # The Einstein Toolkit !TARGET = $ARR !TYPE = svn @@ -259,3 +293,10 @@ Carpet/CarpetSlab Carpet/CarpetTracker Carpet/LoopControl + + + +# Private thorns +!TARGET = $ARR +!TYPE = ignore +!CHECKOUT =

1 0

[svn:einsteintoolkit] AHFinderDirect/trunk/ (Rev. 1551)
by knarf＠cct.lsu.edu 10 Aug '10

10 Aug '10

User: knarf Date: 2010/08/10 09:12 AM Modified: /trunk/ schedule.ccl Log: only whitespace change: replace tabs by spaces for consistent intending File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +241 -241 =================================================================== --- trunk/schedule.ccl 2010-08-10 14:10:23 UTC (rev 1550) +++ trunk/schedule.ccl 2010-08-10 14:12:17 UTC (rev 1551) @@ -7,66 +7,66 @@ # # setup # -schedule AHFinderDirect_setup at CCTK_BASEGRID \ +schedule AHFinderDirect_setup at CCTK_BASEGRID \ after SpatialCoordinates - { - lang: C - options: global - } "setup data structures" + { + lang: C + options: global + } "setup data structures" # # checkpoint/recover support # schedule AHFinderDirect_recover at CCTK_POST_RECOVER_VARIABLES - { - lang: C - options: global - } "import horizon data from Cactus variables" + { + lang: C + options: global + } "import horizon data from Cactus variables" # # find horizons # if (run_at_CCTK_ANALYSIS != 0) - { - schedule AHFinderDirect_find_horizons at CCTK_ANALYSIS - { - lang: C - options: global - } "find apparent horizon(s) after this time step" - } + { + schedule AHFinderDirect_find_horizons at CCTK_ANALYSIS + { + lang: C + options: global + } "find apparent horizon(s) after this time step" + } if (run_at_CCTK_POSTSTEP != 0) - { - schedule AHFinderDirect_find_horizons at CCTK_POSTSTEP - { - lang: C - options: global - } "find apparent horizon(s) after this time step" - } + { + schedule AHFinderDirect_find_horizons at CCTK_POSTSTEP + { + lang: C + options: global + } "find apparent horizon(s) after this time step" + } if (run_at_CCTK_POSTINITIAL != 0) - { - schedule AHFinderDirect_find_horizons at CCTK_POSTINITIAL - { - lang: C - options: global - } "find apparent horizon(s) after this time step" - } + { + schedule AHFinderDirect_find_horizons at CCTK_POSTINITIAL + { + lang: C + options: global + } "find apparent horizon(s) after this time step" + } if (run_at_CCTK_POSTPOSTINITIAL != 0) - { - schedule AHFinderDirect_find_horizons at CCTK_POSTPOSTINITIAL - { - lang: C - options: global - } "find apparent horizon(s) after this time step" - } + { + schedule AHFinderDirect_find_horizons at CCTK_POSTPOSTINITIAL + { + lang: C + options: global + } "find apparent horizon(s) after this time step" + } if (run_at_CCTK_POST_RECOVER_VARIABLES != 0) - { - schedule AHFinderDirect_find_horizons at CCTK_POST_RECOVER_VARIABLES \ + { + schedule AHFinderDirect_find_horizons at CCTK_POST_RECOVER_VARIABLES \ after MoL_PostStep - { - lang: C - options: global - } "find apparent horizon(s) after this time step" - } + { + lang: C + options: global + } "find apparent horizon(s) after this time step" + } # # find horizons, set excision mask, maybe announce centroid to other thorns @@ -75,245 +75,245 @@ # AHFinderDirect_do_masks would be more apt # # We use two Cactus Groups here: -# group_for_mask_stuff -# group_where_mask_is_set -# AHFinderDirect_maybe_do_masks +# group_for_mask_stuff +# group_where_mask_is_set +# AHFinderDirect_maybe_do_masks # this way other thorns can schedule routines which need to run immediately # before/after we set the mask in group_for_mask_stuff before/after # group_where_mask_is_set, without having to know in what higher-level # Cactus schedule bins/groups this thorn runs. # if (run_at_CCTK_ANALYSIS != 0) - { - schedule AHFinderDirect_import_mask at CCTK_ANALYSIS \ - before AHFinderDirect_find_horizons - { - lang: C - options: global loop-local - } "import the excision mask" + { + schedule AHFinderDirect_import_mask at CCTK_ANALYSIS \ + before AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "import the excision mask" - schedule AHFinderDirect_store at CCTK_ANALYSIS \ - after AHFinderDirect_find_horizons \ - before SphericalSurface_HasBeenSet - { - lang: C - options: global - } "store apparent horizon(s) into spherical surface(s)" + schedule AHFinderDirect_store at CCTK_ANALYSIS \ + after AHFinderDirect_find_horizons \ + before SphericalSurface_HasBeenSet + { + lang: C + options: global + } "store apparent horizon(s) into spherical surface(s)" - schedule AHFinderDirect_save at CCTK_ANALYSIS \ - after AHFinderDirect_find_horizons \ - { - lang: C - options: global - } "save apparent horizon(s) into Cactus variables" + schedule AHFinderDirect_save at CCTK_ANALYSIS \ + after AHFinderDirect_find_horizons \ + { + lang: C + options: global + } "save apparent horizon(s) into Cactus variables" - if (which_horizon_to_announce_centroid != 0) - { - schedule AHFinderDirect_announce at CCTK_ANALYSIS \ - before DriftCorrect \ - after AHFinderDirect_find_horizons - { - lang: C - options: global - } "announce horizon position(s) to other thorns" - } + if (which_horizon_to_announce_centroid != 0) + { + schedule AHFinderDirect_announce at CCTK_ANALYSIS \ + before DriftCorrect \ + after AHFinderDirect_find_horizons + { + lang: C + options: global + } "announce horizon position(s) to other thorns" + } - schedule AHFinderDirect_maybe_do_masks at CCTK_ANALYSIS \ - after AHFinderDirect_find_horizons - { - lang: C - options: global loop-local - } "set mask(s) based on apparent horizon position(s)" - } + schedule AHFinderDirect_maybe_do_masks at CCTK_ANALYSIS \ + after AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "set mask(s) based on apparent horizon position(s)" + } if (run_at_CCTK_POSTSTEP != 0) - { - schedule AHFinderDirect_import_mask at CCTK_POSTSTEP \ - before AHFinderDirect_find_horizons - { - lang: C - options: global loop-local - } "import the excision mask" + { + schedule AHFinderDirect_import_mask at CCTK_POSTSTEP \ + before AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "import the excision mask" - schedule AHFinderDirect_store at CCTK_POSTSTEP \ - after AHFinderDirect_find_horizons \ - before SphericalSurface_HasBeenSet - { - lang: C - options: global - } "store apparent horizon(s) into spherical surface(s)" + schedule AHFinderDirect_store at CCTK_POSTSTEP \ + after AHFinderDirect_find_horizons \ + before SphericalSurface_HasBeenSet + { + lang: C + options: global + } "store apparent horizon(s) into spherical surface(s)" - schedule AHFinderDirect_save at CCTK_POSTSTEP \ - after AHFinderDirect_find_horizons \ - { - lang: C - options: global - } "save apparent horizon(s) into Cactus variables" + schedule AHFinderDirect_save at CCTK_POSTSTEP \ + after AHFinderDirect_find_horizons \ + { + lang: C + options: global + } "save apparent horizon(s) into Cactus variables" - if (which_horizon_to_announce_centroid != 0) - { - schedule AHFinderDirect_announce at CCTK_POSTSTEP \ - before DriftCorrect \ - after AHFinderDirect_find_horizons - { - lang: C - options: global - } "announce horizon position(s) to other thorns" - } + if (which_horizon_to_announce_centroid != 0) + { + schedule AHFinderDirect_announce at CCTK_POSTSTEP \ + before DriftCorrect \ + after AHFinderDirect_find_horizons + { + lang: C + options: global + } "announce horizon position(s) to other thorns" + } - schedule AHFinderDirect_maybe_do_masks at CCTK_POSTSTEP \ - after AHFinderDirect_find_horizons - { - lang: C - options: global loop-local - } "set mask(s) based on apparent horizon position(s)" - } + schedule AHFinderDirect_maybe_do_masks at CCTK_POSTSTEP \ + after AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "set mask(s) based on apparent horizon position(s)" + } if (run_at_CCTK_POSTINITIAL != 0) - { - schedule AHFinderDirect_import_mask at CCTK_POSTINITIAL \ - before AHFinderDirect_find_horizons - { - lang: C - options: global loop-local - } "import the excision mask" + { + schedule AHFinderDirect_import_mask at CCTK_POSTINITIAL \ + before AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "import the excision mask" - schedule AHFinderDirect_store at CCTK_POSTINITIAL \ - after AHFinderDirect_find_horizons \ - before SphericalSurface_HasBeenSet - { - lang: C - options: global - } "store apparent horizon(s) into spherical surface(s)" + schedule AHFinderDirect_store at CCTK_POSTINITIAL \ + after AHFinderDirect_find_horizons \ + before SphericalSurface_HasBeenSet + { + lang: C + options: global + } "store apparent horizon(s) into spherical surface(s)" - schedule AHFinderDirect_save at CCTK_POSTINITIAL \ - after AHFinderDirect_find_horizons \ - { - lang: C - options: global - } "save apparent horizon(s) into Cactus variables" + schedule AHFinderDirect_save at CCTK_POSTINITIAL \ + after AHFinderDirect_find_horizons \ + { + lang: C + options: global + } "save apparent horizon(s) into Cactus variables" - if (which_horizon_to_announce_centroid != 0) - { - schedule AHFinderDirect_announce at CCTK_POSTINITIAL \ - before DriftCorrect \ - after AHFinderDirect_find_horizons - { - lang: C - options: global - } "announce horizon position(s) to other thorns" - } + if (which_horizon_to_announce_centroid != 0) + { + schedule AHFinderDirect_announce at CCTK_POSTINITIAL \ + before DriftCorrect \ + after AHFinderDirect_find_horizons + { + lang: C + options: global + } "announce horizon position(s) to other thorns" + } - schedule AHFinderDirect_maybe_do_masks at CCTK_POSTINITIAL \ - after AHFinderDirect_find_horizons - { - lang: C - options: global loop-local - } "set mask(s) based on apparent horizon position(s)" - } + schedule AHFinderDirect_maybe_do_masks at CCTK_POSTINITIAL \ + after AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "set mask(s) based on apparent horizon position(s)" + } if (run_at_CCTK_POSTPOSTINITIAL != 0) - { - schedule AHFinderDirect_import_mask at CCTK_POSTPOSTINITIAL \ - before AHFinderDirect_find_horizons - { - lang: C - options: global loop-local - } "import the excision mask" + { + schedule AHFinderDirect_import_mask at CCTK_POSTPOSTINITIAL \ + before AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "import the excision mask" - schedule AHFinderDirect_store at CCTK_POSTPOSTINITIAL \ - after AHFinderDirect_find_horizons \ - before SphericalSurface_HasBeenSet - { - lang: C - options: global - } "store apparent horizon(s) into spherical surface(s)" + schedule AHFinderDirect_store at CCTK_POSTPOSTINITIAL \ + after AHFinderDirect_find_horizons \ + before SphericalSurface_HasBeenSet + { + lang: C + options: global + } "store apparent horizon(s) into spherical surface(s)" - schedule AHFinderDirect_save at CCTK_POSTPOSTINITIAL \ - after AHFinderDirect_find_horizons \ - { - lang: C - options: global - } "save apparent horizon(s) into Cactus variables" + schedule AHFinderDirect_save at CCTK_POSTPOSTINITIAL \ + after AHFinderDirect_find_horizons \ + { + lang: C + options: global + } "save apparent horizon(s) into Cactus variables" - if (which_horizon_to_announce_centroid != 0) - { - schedule AHFinderDirect_announce at CCTK_POSTPOSTINITIAL \ - before DriftCorrect \ - after AHFinderDirect_find_horizons - { - lang: C - options: global - } "announce horizon position(s) to other thorns" - } + if (which_horizon_to_announce_centroid != 0) + { + schedule AHFinderDirect_announce at CCTK_POSTPOSTINITIAL \ + before DriftCorrect \ + after AHFinderDirect_find_horizons + { + lang: C + options: global + } "announce horizon position(s) to other thorns" + } - schedule AHFinderDirect_maybe_do_masks at CCTK_POSTPOSTINITIAL \ - after AHFinderDirect_find_horizons - { - lang: C - options: global loop-local - } "set mask(s) based on apparent horizon position(s)" - } + schedule AHFinderDirect_maybe_do_masks at CCTK_POSTPOSTINITIAL \ + after AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "set mask(s) based on apparent horizon position(s)" + } if (run_at_CCTK_POST_RECOVER_VARIABLES != 0) - { - schedule AHFinderDirect_import_mask at CCTK_POST_RECOVER_VARIABLES \ - before AHFinderDirect_find_horizons - { - lang: C - options: global loop-local - } "import the excision mask" + { + schedule AHFinderDirect_import_mask at CCTK_POST_RECOVER_VARIABLES \ + before AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "import the excision mask" - schedule AHFinderDirect_store at CCTK_POST_RECOVER_VARIABLES \ - after AHFinderDirect_find_horizons \ - before SphericalSurface_HasBeenSet - { - lang: C - options: global - } "store apparent horizon(s) into spherical surface(s)" + schedule AHFinderDirect_store at CCTK_POST_RECOVER_VARIABLES \ + after AHFinderDirect_find_horizons \ + before SphericalSurface_HasBeenSet + { + lang: C + options: global + } "store apparent horizon(s) into spherical surface(s)" - schedule AHFinderDirect_save at CCTK_POST_RECOVER_VARIABLES \ - after AHFinderDirect_find_horizons \ - { - lang: C - options: global - } "save apparent horizon(s) into Cactus variables" + schedule AHFinderDirect_save at CCTK_POST_RECOVER_VARIABLES \ + after AHFinderDirect_find_horizons \ + { + lang: C + options: global + } "save apparent horizon(s) into Cactus variables" - if (which_horizon_to_announce_centroid != 0) - { - schedule AHFinderDirect_announce at CCTK_POST_RECOVER_VARIABLES \ - before DriftCorrect \ - after AHFinderDirect_find_horizons - { - lang: C - options: global - } "announce horizon position(s) to other thorns" - } + if (which_horizon_to_announce_centroid != 0) + { + schedule AHFinderDirect_announce at CCTK_POST_RECOVER_VARIABLES \ + before DriftCorrect \ + after AHFinderDirect_find_horizons + { + lang: C + options: global + } "announce horizon position(s) to other thorns" + } - schedule AHFinderDirect_maybe_do_masks at CCTK_POST_RECOVER_VARIABLES \ - after AHFinderDirect_find_horizons - { - lang: C - options: global loop-local - } "set mask(s) based on apparent horizon position(s)" - } + schedule AHFinderDirect_maybe_do_masks at CCTK_POST_RECOVER_VARIABLES \ + after AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "set mask(s) based on apparent horizon position(s)" + } # TODO: Don't call this, since no horizon has been found yet schedule AHFinderDirect_maybe_do_masks at CCTK_POSTREGRIDINITIAL \ after (MaskOne MaskZero) - { - lang: C - options: global loop-local - } "set mask(s) based on apparent horizon position(s)" + { + lang: C + options: global loop-local + } "set mask(s) based on apparent horizon position(s)" schedule AHFinderDirect_maybe_do_masks at CCTK_POSTREGRID \ after (MaskOne MaskZero) - { - lang: C - options: global loop-local - } "set mask(s) based on apparent horizon position(s)" + { + lang: C + options: global loop-local + } "set mask(s) based on apparent horizon position(s)" ######################################## ## ## uncomment this if you want to use the test driver -## src/util/test_patch_system.cc +## src/util/test_patch_system.cc ## ##schedule test_patch_system at CCTK_POSTINITIAL ##{

1 0

[svn:einsteintoolkit] AHFinderDirect/trunk/ (Rev. 1550)
by knarf＠cct.lsu.edu 10 Aug '10

10 Aug '10

User: knarf Date: 2010/08/10 09:10 AM Modified: /trunk/ param.ccl, schedule.ccl Log: Patch from Bruno Giacomazzo: the patch allows the possibility to schedule AHFinderDirect also at POSTPOSTINITIAL by adding the parameter run_at_CCTK_POSTPOSTINITIAL (default equals to false). I have used it to be sure that an AH was found after initial data computation and before the last call to the Con2Prim routine of Whisky before evolution was started (in order to have hydro variables properly excised before the beginning of the evolution). File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +3 -0 =================================================================== --- trunk/param.ccl 2010-07-12 14:49:57 UTC (rev 1549) +++ trunk/param.ccl 2010-08-10 14:10:23 UTC (rev 1550) @@ -114,6 +114,9 @@ Boolean run_at_CCTK_POSTINITIAL "should we run at CCTK_POSTINITIAL?" { } false +Boolean run_at_CCTK_POSTPOSTINITIAL "should we run at CCTK_POSTPOSTINITIAL?" +{ +} false Boolean run_at_CCTK_POST_RECOVER_VARIABLES \ "should we run at CCTK_POST_RECOVER_VARIABLES?" { File [modified]: schedule.ccl Delta lines: +50 -0 =================================================================== --- trunk/schedule.ccl 2010-07-12 14:49:57 UTC (rev 1549) +++ trunk/schedule.ccl 2010-08-10 14:10:23 UTC (rev 1550) @@ -50,6 +50,14 @@ options: global } "find apparent horizon(s) after this time step" } +if (run_at_CCTK_POSTPOSTINITIAL != 0) + { + schedule AHFinderDirect_find_horizons at CCTK_POSTPOSTINITIAL + { + lang: C + options: global + } "find apparent horizon(s) after this time step" + } if (run_at_CCTK_POST_RECOVER_VARIABLES != 0) { schedule AHFinderDirect_find_horizons at CCTK_POST_RECOVER_VARIABLES \ @@ -201,6 +209,48 @@ options: global loop-local } "set mask(s) based on apparent horizon position(s)" } +if (run_at_CCTK_POSTPOSTINITIAL != 0) + { + schedule AHFinderDirect_import_mask at CCTK_POSTPOSTINITIAL \ + before AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "import the excision mask" + + schedule AHFinderDirect_store at CCTK_POSTPOSTINITIAL \ + after AHFinderDirect_find_horizons \ + before SphericalSurface_HasBeenSet + { + lang: C + options: global + } "store apparent horizon(s) into spherical surface(s)" + + schedule AHFinderDirect_save at CCTK_POSTPOSTINITIAL \ + after AHFinderDirect_find_horizons \ + { + lang: C + options: global + } "save apparent horizon(s) into Cactus variables" + + if (which_horizon_to_announce_centroid != 0) + { + schedule AHFinderDirect_announce at CCTK_POSTPOSTINITIAL \ + before DriftCorrect \ + after AHFinderDirect_find_horizons + { + lang: C + options: global + } "announce horizon position(s) to other thorns" + } + + schedule AHFinderDirect_maybe_do_masks at CCTK_POSTPOSTINITIAL \ + after AHFinderDirect_find_horizons + { + lang: C + options: global loop-local + } "set mask(s) based on apparent horizon position(s)" + } if (run_at_CCTK_POST_RECOVER_VARIABLES != 0) { schedule AHFinderDirect_import_mask at CCTK_POST_RECOVER_VARIABLES \

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/src/ (Rev. 4)
by cott＠tapir.caltech.edu 09 Aug '10

09 Aug '10

User: cott Date: 2010/08/09 09:20 AM Modified: /EOS_Omni/src/ EOS_Omni_Startup.F90 Log: * fix a bug in the Hybrid part of OmniEOS File Changes: Directory: /EOS_Omni/src/ ========================= File [modified]: EOS_Omni_Startup.F90 Delta lines: +1 -1 =================================================================== --- EOS_Omni/src/EOS_Omni_Startup.F90 2010-07-02 21:41:51 UTC (rev 3) +++ EOS_Omni/src/EOS_Omni_Startup.F90 2010-08-09 14:20:16 UTC (rev 4) @@ -17,7 +17,7 @@ hybrid_k1_cgs = hybrid_k1 * rho_gf**poly_gamma_ini / press_gf - hybrid_k2_cgs = hybrid_k1 * (hybrid_rho_nuc * inv_rho_gf)**(hybrid_gamma1-hybrid_gamma2) + hybrid_k2_cgs = hybrid_k1_cgs * (hybrid_rho_nuc * inv_rho_gf)**(hybrid_gamma1-hybrid_gamma2) end subroutine EOS_Omni_Startup

1 0

[svn:einsteintoolkit] Meudon_Bin_NS/trunk/ (Rev. 9)
by knarf＠cct.lsu.edu 04 Aug '10

04 Aug '10

User: knarf Date: 2010/08/04 10:34 PM Removed: /trunk/src/ check_parameters.cc Modified: /trunk/ README, configuration.ccl, interface.ccl, param.ccl, schedule.ccl /trunk/src/ Bin_NS.cc, make.code.defn Log: Major cleanup and fixes. The current version is able to read in example Meudon data and converges in both hamiltonian and momentum constraint on the Cactus grid until it hits the spectral residuum File Changes: Directory: /trunk/src/ ====================== File [modified]: Bin_NS.cc Delta lines: +109 -122 =================================================================== --- trunk/src/Bin_NS.cc 2010-07-30 03:19:48 UTC (rev 8) +++ trunk/src/Bin_NS.cc 2010-08-05 03:34:36 UTC (rev 9) @@ -1,3 +1,6 @@ +/* (c) 2009 Erik Schnetter + * (c) 2010 Frank Loeffler */ + #include <cstdio> #include <cassert> #include <vector> @@ -7,23 +10,23 @@ #include <cctk_Parameters.h> #include <bin_ns.h> +#include <unites.h> using namespace std; - static void set_dt_from_domega (CCTK_ARGUMENTS, CCTK_REAL const* const var, CCTK_REAL * const dtvar, CCTK_REAL const& omega) { DECLARE_CCTK_ARGUMENTS; - + int const npoints = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; vector<CCTK_REAL> dxvar(npoints), dyvar(npoints); - + Diff_gv (cctkGH, 0, var, &dxvar[0], -1); Diff_gv (cctkGH, 1, var, &dyvar[0], -1); - + #pragma omp parallel for for (int i=0; i<npoints; ++i) { CCTK_REAL const ephix = +y[i]; @@ -33,59 +36,52 @@ } } - - extern "C" -void ID_Bin_NS_initialise (CCTK_ARGUMENTS) +void Meudon_Bin_NS_initialise (CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - + CCTK_INFO ("Setting up LORENE Bin_NS initial data"); - + // Meudon data are distributed in SI units (MKSA). Here are some // conversion factors. - - // Defined constants - CCTK_REAL const c_light = 299792458.0; // speed of light [m/s] - - // Constants of nature (IAU, CODATA): - CCTK_REAL const G_grav = 6.67428e-11; // gravitational constant [m^3/kg/s^2] - CCTK_REAL const M_sun = 1.98892e+30; // solar mass [kg] - + // Be aware: these are the constants Lorene uses. They do differ from other + // conventions, but they gave the best results in some tests. + + CCTK_REAL const c_light = Unites::c_si; // speed of light [m/s] + CCTK_REAL const nuc_dens = Unites::rhonuc_si; // Nuclear density as used in Lorene units [kg/m^3] + CCTK_REAL const G_grav = Unites::g_si; // gravitational constant [m^3/kg/s^2] + CCTK_REAL const M_sun = Unites::msol_si; // solar mass [kg] + // Cactus units in terms of SI units: // (These are derived from M = M_sun, c = G = 1, and using 1/M_sun // for the magnetic field) CCTK_REAL const cactusM = M_sun; CCTK_REAL const cactusL = cactusM * G_grav / pow(c_light,2); CCTK_REAL const cactusT = cactusL / c_light; - + // Other quantities in terms of Cactus units - CCTK_REAL const coord_unit = cactusL / 1.0e+3; // from km + CCTK_REAL const coord_unit = cactusL / 1.0e+3; // from km (~1.477) CCTK_REAL const rho_unit = cactusM / pow(cactusL,3); // from kg/m^3 - CCTK_REAL const ener_unit = pow(cactusL,2); // from c^2 - CCTK_REAL const vel_unit = cactusL / cactusT / c_light; // from c - - - + + CCTK_INFO ("Setting up coordinates"); - + int const npoints = cctk_lsh[0] * cctk_lsh[1] * cctk_lsh[2]; vector<double> xx(npoints), yy(npoints), zz(npoints); - + #pragma omp parallel for for (int i=0; i<npoints; ++i) { xx[i] = x[i] * coord_unit; yy[i] = y[i] * coord_unit; zz[i] = z[i] * coord_unit; } - - - + CCTK_VInfo (CCTK_THORNSTRING, "Reading from file \"%s\"", filename); - + Bin_NS bin_ns (npoints, &xx[0], &yy[0], &zz[0], filename); - + CCTK_VInfo (CCTK_THORNSTRING, "omega [rad/s]: %g", bin_ns.omega); CCTK_VInfo (CCTK_THORNSTRING, "dist [km]: %g", bin_ns.dist); CCTK_VInfo (CCTK_THORNSTRING, "dist_mass [km]: %g", bin_ns.dist_mass); @@ -101,113 +97,104 @@ CCTK_VInfo (CCTK_THORNSTRING, "rad2_y [km]: %g", bin_ns.rad2_y); CCTK_VInfo (CCTK_THORNSTRING, "rad2_z [km]: %g", bin_ns.rad2_z); CCTK_VInfo (CCTK_THORNSTRING, "rad2_x_opp [km]: %g", bin_ns.rad2_x_opp); + double K = bin_ns.kappa_poly1 * pow(c_light, 6.0) / + ( pow(G_grav, 3.0) * M_sun * M_sun * + pow(nuc_dens, bin_ns.gamma_poly1-1.) ); + CCTK_VInfo (CCTK_THORNSTRING, "K [ET unit]: %.15g", K); + assert (bin_ns.np == npoints); - - - + CCTK_INFO ("Filling in Cactus grid points"); - + #pragma omp parallel for for (int i=0; i<npoints; ++i) { - - alp[i] = bin_ns.nnn[i]; - - betax[i] = -bin_ns.beta_x[i]; - betay[i] = -bin_ns.beta_y[i]; - betaz[i] = -bin_ns.beta_z[i]; - - CCTK_REAL g[3][3]; - g[0][0] = bin_ns.g_xx[i]; - g[0][1] = bin_ns.g_xy[i]; - g[0][2] = bin_ns.g_xz[i]; - g[1][1] = bin_ns.g_yy[i]; - g[1][2] = bin_ns.g_yz[i]; - g[2][2] = bin_ns.g_zz[i]; - g[1][0] = g[0][1]; - g[2][0] = g[0][2]; - g[2][1] = g[1][2]; - - CCTK_REAL ku[3][3]; - ku[0][0] = bin_ns.k_xx[i]; - ku[0][1] = bin_ns.k_xy[i]; - ku[0][2] = bin_ns.k_xz[i]; - ku[1][1] = bin_ns.k_yy[i]; - ku[1][2] = bin_ns.k_yz[i]; - ku[2][2] = bin_ns.k_zz[i]; - ku[1][0] = ku[0][1]; - ku[2][0] = ku[0][2]; - ku[2][1] = ku[1][2]; - - CCTK_REAL k[3][3]; - for (int a=0; a<3; ++a) { - for (int b=0; b<3; ++b) { - k[a][b] = 0.0; - for (int c=0; c<3; ++c) { - for (int d=0; d<3; ++d) { - k[a][b] += g[a][c] * g[b][d] * ku[c][d]; - } - } - } + + if (CCTK_EQUALS(initial_lapse, "Meudon_Bin_NS")) { + alp[i] = bin_ns.nnn[i]; } - - gxx[i] = g[0][0]; - gxy[i] = g[0][1]; - gxz[i] = g[0][2]; - gyy[i] = g[1][1]; - gyz[i] = g[1][2]; - gzz[i] = g[2][2]; - - kxx[i] = ku[0][0] * coord_unit; - kxy[i] = ku[0][1] * coord_unit; - kxz[i] = ku[0][2] * coord_unit; - kyy[i] = ku[1][1] * coord_unit; - kyz[i] = ku[1][2] * coord_unit; - kzz[i] = ku[2][2] * coord_unit; - - rho[i] = bin_ns.nbar[i] / rho_unit; - eps[i] = rho[i] * bin_ns.ener_spec[i] / ener_unit; - - vel[i ] = bin_ns.u_euler_x[i] / vel_unit; - vel[i+ npoints] = bin_ns.u_euler_y[i] / vel_unit; - vel[i+2*npoints] = bin_ns.u_euler_z[i] / vel_unit; + if (CCTK_EQUALS(initial_shift, "Meudon_Bin_NS")) { + betax[i] = -bin_ns.beta_x[i]; + betay[i] = -bin_ns.beta_y[i]; + betaz[i] = -bin_ns.beta_z[i]; + } - if (rho[i] < 1.e-20) { - rho[i ] = 1.e-20; - vel[i ] = 0.0; - vel[i+ npoints] = 0.0; - vel[i+2*npoints] = 0.0; + if (CCTK_EQUALS(initial_data, "Meudon_Bin_NS")) { + gxx[i] = bin_ns.g_xx[i]; + gxy[i] = bin_ns.g_xy[i]; + gxz[i] = bin_ns.g_xz[i]; + gyy[i] = bin_ns.g_yy[i]; + gyz[i] = bin_ns.g_yz[i]; + gzz[i] = bin_ns.g_zz[i]; + + kxx[i] = bin_ns.k_xx[i] * coord_unit; + kxy[i] = bin_ns.k_xy[i] * coord_unit; + kxz[i] = bin_ns.k_xz[i] * coord_unit; + kyy[i] = bin_ns.k_yy[i] * coord_unit; + kyz[i] = bin_ns.k_yz[i] * coord_unit; + kzz[i] = bin_ns.k_zz[i] * coord_unit; } + if (CCTK_EQUALS(initial_data, "Meudon_Bin_NS")) { + rho[i] = bin_ns.nbar[i] / rho_unit; + eps[i] = bin_ns.ener_spec[i]; + // The following would recompute eps using the polytopic EOS, but + // setting eps directly seems to work as well + // eps[i] = K * pow(rho[i], bin_ns.gamma_poly1-1.) / (bin_ns.gamma_poly1-1.); + + // TODO: we should really use some EOS calls for the pressure, but for the + // moment this works with polytropes at least + press[i] = K * pow(rho[i], bin_ns.gamma_poly1); + + vel[i ] = bin_ns.u_euler_x[i]; + vel[i+ npoints] = bin_ns.u_euler_y[i]; + vel[i+2*npoints] = bin_ns.u_euler_z[i]; + + // Especially the velocity is set to strange values outside of the + // matter region, so take care of this in the following way + if (rho[i] < 1.e-20) { + rho[i ] = 1.e-20; + vel[i ] = 0.0; + vel[i+ npoints] = 0.0; + vel[i+2*npoints] = 0.0; + eps[i ] = K * pow(rho[i], bin_ns.gamma_poly1-1.) / (bin_ns.gamma_poly1-1.); + press[i ] = K * pow(rho[i], bin_ns.gamma_poly1); + } + } + } // for i - - CCTK_INFO ("Calculating time derivatives of lapse and shift"); + { // Angular velocity CCTK_REAL const omega = bin_ns.omega * cactusT; - + // These initial data assume a helical Killing vector field - - if (CCTK_EQUALS (initial_dtlapse, "ID_Bin_NS")) { - set_dt_from_domega (CCTK_PASS_CTOC, alp, dtalp, omega); - } else if (CCTK_EQUALS (initial_dtlapse, "none")) { - // do nothing - } else { - CCTK_WARN (CCTK_WARN_ABORT, "internal error"); + + if (CCTK_EQUALS(initial_lapse, "Meudon_Bin_NS")) { + if (CCTK_EQUALS (initial_dtlapse, "Meudon_Bin_NS")) { + CCTK_INFO ("Calculating time derivatives of lapse"); + set_dt_from_domega (CCTK_PASS_CTOC, alp, dtalp, omega); + } else if (CCTK_EQUALS (initial_dtlapse, "none")) { + // do nothing + } else { + CCTK_WARN (CCTK_WARN_ABORT, "internal error"); + } } - - if (CCTK_EQUALS (initial_dtshift, "ID_Bin_NS")) { - set_dt_from_domega (CCTK_PASS_CTOC, betax, dtbetax, omega); - set_dt_from_domega (CCTK_PASS_CTOC, betay, dtbetay, omega); - set_dt_from_domega (CCTK_PASS_CTOC, betaz, dtbetaz, omega); - } else if (CCTK_EQUALS (initial_dtshift, "none")) { - // do nothing - } else { - CCTK_WARN (CCTK_WARN_ABORT, "internal error"); + + if (CCTK_EQUALS(initial_shift, "Meudon_Bin_NS")) { + if (CCTK_EQUALS (initial_dtshift, "Meudon_Bin_NS")) { + CCTK_INFO ("Calculating time derivatives of shift"); + set_dt_from_domega (CCTK_PASS_CTOC, betax, dtbetax, omega); + set_dt_from_domega (CCTK_PASS_CTOC, betay, dtbetay, omega); + set_dt_from_domega (CCTK_PASS_CTOC, betaz, dtbetaz, omega); + } else if (CCTK_EQUALS (initial_dtshift, "none")) { + // do nothing + } else { + CCTK_WARN (CCTK_WARN_ABORT, "internal error"); + } } } - - - + CCTK_INFO ("Done."); } + File [removed]: check_parameters.cc Delta lines: +0 -24 =================================================================== --- trunk/src/check_parameters.cc 2010-07-30 03:19:48 UTC (rev 8) +++ trunk/src/check_parameters.cc 2010-08-05 03:34:36 UTC (rev 9) @@ -1,24 +0,0 @@ -#include <cctk.h> -#include <cctk_Arguments.h> -#include <cctk_Parameters.h> - - - -extern "C" -void ID_Bin_NS_check_parameters (CCTK_ARGUMENTS) -{ - DECLARE_CCTK_ARGUMENTS; - DECLARE_CCTK_PARAMETERS; - - if (not CCTK_EQUALS (initial_data, "ID_Bin_NS") or - not CCTK_EQUALS (initial_lapse, "ID_Bin_NS") or - not CCTK_EQUALS (initial_shift, "ID_Bin_NS") or - not (CCTK_EQUALS (initial_dtlapse, "ID_Bin_NS") or - CCTK_EQUALS (initial_dtlapse, "none")) or - not (CCTK_EQUALS (initial_dtshift, "ID_Bin_NS") or - CCTK_EQUALS (initial_dtshift, "none")) or - not CCTK_EQUALS (initial_hydro, "ID_Bin_NS")) - { - CCTK_PARAMWARN ("The parameters ADMBase::initial_data, ADMBase::initial_lapse, ADMBase::initial_shift, ADMBase::initial_dtlapse, ADMBase::initial_dtshift, and HydroBase::initial_hydro must all be set to the value \"ID_Bin_NS\" or \"none\""); - } -} File [modified]: make.code.defn Delta lines: +2 -2 =================================================================== --- trunk/src/make.code.defn 2010-07-30 03:19:48 UTC (rev 8) +++ trunk/src/make.code.defn 2010-08-05 03:34:36 UTC (rev 9) @@ -1,7 +1,7 @@ -# Main make.code.defn file for thorn ID_Bin_NS +# Main make.code.defn file for thorn Meudon_Bin_NS # Source files in this directory -SRCS = Bin_NS.cc check_parameters.cc +SRCS = Bin_NS.cc # Subdirectories containing source files SUBDIRS = Directory: /trunk/ ================== File [modified]: README Delta lines: +6 -5 =================================================================== --- trunk/README 2010-07-30 03:19:48 UTC (rev 8) +++ trunk/README 2010-08-05 03:34:36 UTC (rev 9) @@ -1,6 +1,7 @@ -Cactus Code Thorn ID_Bin_NS -Author(s) : Erik Schnetter <schnetter(a)cct.lsu.edu> -Maintainer(s): Erik Schnetter <schnetter(a)cct.lsu.edu> +Cactus Code Thorn Meudon_Bin_NS +Author(s) : Erik Schnetter + Frank LÃ¶ffler +Maintainer(s): Einstein Toolkit Maintainers Licence : GPL -------------------------------------------------------------------------- @@ -8,5 +9,5 @@ Import LORENE Bin_NS binary neutron star initial data. -This thorn is one of three closely related thorns ID_Bin_BH, -ID_Bin_NS, and ID_Mag_NS which all import LORENE initial data. +This thorn is one of three closely related thorns Meudon_Bin_BH, +Meudon_Bin_NS, and Meudon_Mag_NS which all import LORENE initial data. File [modified]: configuration.ccl Delta lines: +1 -1 =================================================================== --- trunk/configuration.ccl 2010-07-30 03:19:48 UTC (rev 8) +++ trunk/configuration.ccl 2010-08-05 03:34:36 UTC (rev 9) @@ -1,3 +1,3 @@ -# Configuration definition for thorn ID_Bin_NS +# Configuration definition for thorn Meudon_Bin_NS REQUIRES LORENE File [modified]: interface.ccl Delta lines: +2 -2 =================================================================== --- trunk/interface.ccl 2010-07-30 03:19:48 UTC (rev 8) +++ trunk/interface.ccl 2010-08-05 03:34:36 UTC (rev 9) @@ -1,6 +1,6 @@ -# Interface definition for thorn ID_Bin_NS +# Interface definition for thorn Meudon_Bin_NS -IMPLEMENTS: ID_Bin_NS +IMPLEMENTS: Meudon_Bin_NS INHERITS: grid SummationByParts ADMBase HydroBase File [modified]: param.ccl Delta lines: +7 -7 =================================================================== --- trunk/param.ccl 2010-07-30 03:19:48 UTC (rev 8) +++ trunk/param.ccl 2010-08-05 03:34:36 UTC (rev 9) @@ -1,30 +1,30 @@ -# Parameter definitions for thorn ID_Bin_NS +# Parameter definitions for thorn Meudon_Bin_NS SHARES: ADMBase EXTENDS KEYWORD initial_data { - "ID_Bin_NS" :: "" + "Meudon_Bin_NS" :: "" } EXTENDS KEYWORD initial_lapse { - "ID_Bin_NS" :: "" + "Meudon_Bin_NS" :: "" } EXTENDS KEYWORD initial_shift { - "ID_Bin_NS" :: "" + "Meudon_Bin_NS" :: "" } EXTENDS KEYWORD initial_dtlapse { - "ID_Bin_NS" :: "" + "Meudon_Bin_NS" :: "" } EXTENDS KEYWORD initial_dtshift { - "ID_Bin_NS" :: "" + "Meudon_Bin_NS" :: "" } @@ -33,7 +33,7 @@ EXTENDS KEYWORD initial_hydro { - "ID_Bin_NS" :: "" + "Meudon_Bin_NS" :: "" } File [modified]: schedule.ccl Delta lines: +8 -13 =================================================================== --- trunk/schedule.ccl 2010-07-30 03:19:48 UTC (rev 8) +++ trunk/schedule.ccl 2010-08-05 03:34:36 UTC (rev 9) @@ -1,19 +1,14 @@ -# Schedule definitions for thorn ID_Bin_NS +# Schedule definitions for thorn Meudon_Bin_NS -if (CCTK_EQUALS (initial_data, "ID_Bin_NS") || - CCTK_EQUALS (initial_lapse, "ID_Bin_NS") || - CCTK_EQUALS (initial_shift, "ID_Bin_NS") || - CCTK_EQUALS (initial_dtlapse, "ID_Bin_NS") || - CCTK_EQUALS (initial_dtshift, "ID_Bin_NS") || - CCTK_EQUALS (initial_hydro, "ID_Bin_NS")) +if (CCTK_EQUALS (initial_data, "Meudon_Bin_NS") || + CCTK_EQUALS (initial_lapse, "Meudon_Bin_NS") || + CCTK_EQUALS (initial_shift, "Meudon_Bin_NS") || + CCTK_EQUALS (initial_dtlapse, "Meudon_Bin_NS") || + CCTK_EQUALS (initial_dtshift, "Meudon_Bin_NS") || + CCTK_EQUALS (initial_hydro, "Meudon_Bin_NS")) { - SCHEDULE ID_Bin_NS_check_parameters AT paramcheck + SCHEDULE Meudon_Bin_NS_initialise IN HydroBase_Initial { LANG: C - } "Check parameters" - - SCHEDULE ID_Bin_NS_initialise IN HydroBase_Initial - { - LANG: C } "Set up binary neutron star initial data" }

1 0

[svn:einsteintoolkit] www/info/documentation/ (Rev. 321)
by cjordan＠cct.lsu.edu 04 Aug '10

04 Aug '10

User: cjordan Date: 2010/08/04 04:49 PM Modified: /info/documentation/ send-account.php Log: removed redundant space and debugging print File Changes: Directory: /info/documentation/ =============================== File [modified]: send-account.php Delta lines: +1 -3 =================================================================== --- info/documentation/send-account.php 2010-08-04 21:33:02 UTC (rev 320) +++ info/documentation/send-account.php 2010-08-04 21:49:13 UTC (rev 321) @@ -32,10 +32,8 @@ $institution = 'at '.$institution.', '; } -$message = "Einstein Toolkit maintainers: \n\n".$name.", ".$position." ".$department.$institution."has submitted a request for a test account for the Einstein Toolkit. His or her email address is ".$email.". ".$mentionadvisor." \n\n Thanks,\n Einstein Toolkit Request Bot\n"; +$message = "Einstein Toolkit maintainers: \n\n".$name.", ".$position.$department.$institution."has submitted a request for a test account for the Einstein Toolkit. His or her email address is ".$email.". ".$mentionadvisor." \n\n Thanks,\n Einstein Toolkit Request Bot\n"; -echo $message; - /* PHP form validation: the script checks that the Email field contains a valid email address and the Subject field isn't empty. preg_match performs a regular expression match. It's a very powerful PHP function to validate form fields and other strings - see PHP manual for details. */ if (empty($name)) { echo '<h4>Please fill in your name.</h4>';

1 0

[svn:einsteintoolkit] www/ (Rev. 320)
by cjordan＠cct.lsu.edu 04 Aug '10

04 Aug '10

User: cjordan Date: 2010/08/04 04:33 PM Modified: /about/members/ send-registration.php /info/documentation/ request.php, send-account.php Log: fixed the scripts to work with php5, corrected grammar logic File Changes: Directory: /info/documentation/ =============================== File [modified]: request.php Delta lines: +5 -5 =================================================================== --- info/documentation/request.php 2010-07-26 18:20:13 UTC (rev 319) +++ info/documentation/request.php 2010-08-04 21:33:02 UTC (rev 320) @@ -23,11 +23,11 @@ </tr> <tr> <td>Position</td> -<td><input type="radio" name="position" value="an undergraduate in" checked /> undergraduate -<input type="radio" name="position" value="a graduate student in" /> graduate student<br> -<input type="radio" name="position" value="a postdoc in" /> postdoc -<input type="radio" name="position" value="a researcher in" /> researcher -<input type="radio" name="position" value="faculty of" /> faculty +<td><input type="radio" name="position" value="an undergraduate " checked /> undergraduate +<input type="radio" name="position" value="a graduate student " /> graduate student<br> +<input type="radio" name="position" value="a postdoc " /> postdoc +<input type="radio" name="position" value="a researcher " /> researcher +<input type="radio" name="position" value="faculty " /> faculty </td> </tr> <tr> File [modified]: send-account.php Delta lines: +27 -10 =================================================================== --- info/documentation/send-account.php 2010-07-26 18:20:13 UTC (rev 319) +++ info/documentation/send-account.php 2010-08-04 21:33:02 UTC (rev 320) @@ -5,22 +5,39 @@ <?php /* All form fields are automatically passed to the PHP script through the array $HTTP_POST_VARS. */ -$name = $HTTP_POST_VARS['name']; -$email = $HTTP_POST_VARS['email']; -$department = $HTTP_POST_VARS['department']; -$institution = $HTTP_POST_VARS['institution']; -$position = $HTTP_POST_VARS['position']; -$advisor = $HTTP_POST_VARS['advisor']; +$name = $_POST['name']; +$email = $_POST['email']; +$department = $_POST['department']; +$institution = $_POST['institution']; +$position = $_POST['position']; +$advisor = $_POST['advisor']; if ($position=='undergraduate' || $position=='graduate') { $mentionadvisor = 'This student\'s advisor is '.$advisor.'.'; } +if (! empty($department)){ +if ($position=='faculty ') { +$position = $position.'of '; +} +else { +$position = $position.'in '; +}} -$message = "Einstein Toolkit maintainers: \n\n".$name.", ".$position." the ".$department." Department at ".$institution.", has submitted a request for a test account for the Einstein Toolkit. His or her email address is ".$email.". ".$mentionadvisor." \n\n Thanks,\n Einstein Toolkit Request Bot\n"; +if (! empty($department)) { +$department = 'the '.$department.' Department '; +} +if (! empty($institution)) { +$institution = 'at '.$institution.', '; +} + +$message = "Einstein Toolkit maintainers: \n\n".$name.", ".$position." ".$department.$institution."has submitted a request for a test account for the Einstein Toolkit. His or her email address is ".$email.". ".$mentionadvisor." \n\n Thanks,\n Einstein Toolkit Request Bot\n"; + +echo $message; + /* PHP form validation: the script checks that the Email field contains a valid email address and the Subject field isn't empty. preg_match performs a regular expression match. It's a very powerful PHP function to validate form fields and other strings - see PHP manual for details. */ -if ($name == '') { +if (empty($name)) { echo '<h4>Please fill in your name.</h4>'; echo '<br /><a href="javascript:history.back(1);">Try again</a>'; } @@ -31,11 +48,11 @@ /* Sends the mail and outputs the "Thank you" string if the mail is successfully sent, or the error string otherwise. */ elseif (mail('maintainers(a)einsteintoolkit.org','New Einstein Toolkit test account request received',$message,'From: RegistrationBot(a)einsteintoolkit.org')) { - echo '<h4>Your request for a test account has been successfully submitted. You will hear from us soon.</h4>'; + echo '<h4>Your request for a test account has been successfully submitted. You will hear from us soon!</h4>'; echo '<br /><a href="/">Home</a>'; } else { echo '<h4>Unfortunately, there was a problem requesting an account.</h4>'; - echo '<a href="javascript:history.back(1);">Go back to try again?</a>'; + echo 'Go back to <a href="javascript:history.back(1);">try again</a>?'; } ?> Directory: /about/members/ ========================== File [modified]: send-registration.php Delta lines: +12 -8 =================================================================== --- about/members/send-registration.php 2010-07-26 18:20:13 UTC (rev 319) +++ about/members/send-registration.php 2010-08-04 21:33:02 UTC (rev 320) @@ -5,11 +5,15 @@ <?php /* All form fields are automatically passed to the PHP script through the array $HTTP_POST_VARS. */ -$name = $HTTP_POST_VARS['name']; -$email = $HTTP_POST_VARS['email']; -$institution = $HTTP_POST_VARS['institution']; -$list = $HTTP_POST_VARS['list']; +$name = $_POST['name']; +$email = $_POST['email']; +$institution = $_POST['institution']; +$list = $_POST['list']; +if (! empty($institution)){ +$institution = ' from '.$institution; +} + if ($list=='yes') { $addtolist = "Please add this person to the ET users mailing list.\n".$name." <".$email.">"; } @@ -17,16 +21,16 @@ $addtolist = "This person's email address is ".$email."; however, this person does not wish to be added to the ET users mailing list."; } -$message = "Einstein Toolkit maintainers: \n\n".$name." from ".$institution." has submitted a request to register with the Einstein Toolkit. ".$addtolist."\n\n Thanks,\n Einstein Toolkit Registration Bot\n"; +$message = "Einstein Toolkit maintainers: \n\n".$name.$institution." has submitted a request to register with the Einstein Toolkit. ".$addtolist."\n\n Thanks,\n Einstein Toolkit Registration Bot\n"; /* PHP form validation: the script checks that the Email field contains a valid email address and the Subject field isn't empty. preg_match performs a regular expression match. It's a very powerful PHP function to validate form fields and other strings - see PHP manual for details. */ -if ($name == '') { +if (empty($name)) { echo '<h4>Please fill in your name.</h4>'; echo '<br /><a href="javascript:history.back(1);">Try again</a>'; } elseif (!preg_match("/\w+([-+.]\w+)*(a)\w+([-.]\w+)*\.\w+([-.]\w+)*/", $email)) { echo '<h4>Please provide a valid email address.</h4>'; - echo '<br /><a href="javascript:history.back(1);">Try again</a>'; + echo '<br />Please <a href="javascript:history.back(1);">try again</a>'; } /* Sends the mail and outputs the "Thank you" string if the mail is successfully sent, or the error string otherwise. */ @@ -35,7 +39,7 @@ echo '<br /><a href="/">Home</a>'; } else { echo '<h4>Unfortunately, there was a problem registering.</h4>'; - echo '<a href="javascript:history.back(1);">Go back to try again?</a>'; + echo 'Go back to <a href="javascript:history.back(1);">try again</a>?'; } ?>

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits August 2010