Commits April 2010

commits@lists.einsteintoolkit.org

5 participants
59 discussions

[svn:einsteintoolkit] www/toolkit/ (Rev. 156)
by knarf＠cct.lsu.edu 15 Apr '10

15 Apr '10

User: knarf Date: 2010/04/15 03:39 AM Modified: /toolkit/ index.php Log: clarify about Cactus move File Changes: Directory: /toolkit/ ==================== File [modified]: index.php Delta lines: +1 -1 =================================================================== --- toolkit/index.php 2010-04-15 08:25:17 UTC (rev 155) +++ toolkit/index.php 2010-04-15 08:39:51 UTC (rev 156) @@ -42,7 +42,7 @@ </table> <h2>Thorns moving</h2> -<p>A lot of components either already moved from one place to another or will move soon. The following table gives an overview of the components which already moved or when they will be moved.</p> +<p>A lot of components either already moved from one place to another or will move soon. The following table gives an overview of the components which already moved or when they will be moved. Please note that here only components are mentioned which move to the Einstein Toolkit or Cactus. Many other Cactus repositories will move from CVS to Subversion as well, but will stay within Cactus itself, but those are not mentioned here.</p> <h3>Cactus thorns</h3> <table border="0">

1 0

[svn:einsteintoolkit] www/toolkit/ (Rev. 155)
by knarf＠cct.lsu.edu 15 Apr '10

15 Apr '10

User: knarf Date: 2010/04/15 03:25 AM Modified: /toolkit/ index.php Log: fix html File Changes: Directory: /toolkit/ ==================== File [modified]: index.php Delta lines: +8 -8 =================================================================== --- toolkit/index.php 2010-04-15 08:24:19 UTC (rev 154) +++ toolkit/index.php 2010-04-15 08:25:17 UTC (rev 155) @@ -45,8 +45,8 @@ <p>A lot of components either already moved from one place to another or will move soon. The following table gives an overview of the components which already moved or when they will be moved.</p> <h3>Cactus thorns</h3> -<table border="1"> -<tr><th>Old arrangement</th><th>Old thorn name </th>Status<th></th><th>New arrangement </th><th>New name (if changed)</th></tr> +<table border="0"> +<tr><th>Old arrangement</th><th>Old thorn name </th><th>Status</th><th>New arrangement </th><th>New name (if changed)</th></tr> <tr><td>AEIThorns </td><td>AHFinderDirect </td><td>Apr 19</td><td>EinsteinAnalysis </td><td> </td></tr> <tr><td>AEIThorns </td><td>CalcK </td><td>Apr 19</td><td>EinsteinAnalysis </td><td> </td></tr> <tr><td>AEIThorns </td><td>Constants </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> @@ -95,12 +95,12 @@ <tr><td>CactusEOS </td><td>EOS_IdealFluid </td><td>Apr 19</td><td>EinsteinEOS </td><td> </td></tr> <tr><td>CactusEOS </td><td>EOS_Polytrope </td><td>Apr 19</td><td>EinsteinEOS </td><td> </td></tr> <tr><td>CIGR_tmp </td><td>Hydro_Analysis </td><td>moved </td><td>EinsteinAnalysis </td><td> </td></tr> -<tr><td>CIGR_tmp </td><td>Whisky </td><td>moved </td><td>EinsteinEvolve </td></td>GRHydro</td></tr> -<tr><td>CIGR_tmp </td><td>Whisky_Init_Data </td><td>moved </td><td>EinsteinInitialData</td></td>GRHydro_InitData</td></tr> -<tr><td>CIGR_tmp </td><td>Whisky_TOVSolverC </td><td>moved </td><td>EinsteinInitialData</td></td>TOVSolver</td></tr> -<tr><td>LSUThorns </td><td>ID_Bin_BH </td><td>Apr 19</td><td>EinsteinInitialData</td></td>Meudon_Bin_BH</td></tr> -<tr><td>LSUThorns </td><td>ID_Bin_NS </td><td>Apr 19</td><td>EinsteinInitialData</td></td>Meudon_Bin_NS</td></tr> -<tr><td>LSUThorns </td><td>ID_Mag_NS </td><td>Apr 19</td><td>EinsteinInitialData</td></td>Meudon_Mag_NS</td></tr> +<tr><td>CIGR_tmp </td><td>Whisky </td><td>moved </td><td>EinsteinEvolve </td><td>GRHydro</td></tr> +<tr><td>CIGR_tmp </td><td>Whisky_Init_Data </td><td>moved </td><td>EinsteinInitialData</td><td>GRHydro_InitData</td></tr> +<tr><td>CIGR_tmp </td><td>Whisky_TOVSolverC </td><td>moved </td><td>EinsteinInitialData</td><td>TOVSolver</td></tr> +<tr><td>LSUThorns </td><td>ID_Bin_BH </td><td>Apr 19</td><td>EinsteinInitialData</td><td>Meudon_Bin_BH</td></tr> +<tr><td>LSUThorns </td><td>ID_Bin_NS </td><td>Apr 19</td><td>EinsteinInitialData</td><td>Meudon_Bin_NS</td></tr> +<tr><td>LSUThorns </td><td>ID_Mag_NS </td><td>Apr 19</td><td>EinsteinInitialData</td><td>Meudon_Mag_NS</td></tr> <tr><td>LSUThorns </td><td>NewRad </td><td>Apr 19</td><td>EinsteinEvolve </td><td> </td></tr> <tr><td>TAT </td><td>Slab </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> <tr><td>TAT </td><td>SlabTest </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr>

1 0

[svn:einsteintoolkit] www/toolkit/ (Rev. 154)
by knarf＠cct.lsu.edu 15 Apr '10

15 Apr '10

User: knarf Date: 2010/04/15 03:24 AM Modified: /toolkit/ index.php Log: move list and plan File Changes: Directory: /toolkit/ ==================== File [modified]: index.php Delta lines: +68 -1 =================================================================== --- toolkit/index.php 2010-04-15 05:01:00 UTC (rev 153) +++ toolkit/index.php 2010-04-15 08:24:19 UTC (rev 154) @@ -41,8 +41,75 @@ </tr> </table> +<h2>Thorns moving</h2> +<p>A lot of components either already moved from one place to another or will move soon. The following table gives an overview of the components which already moved or when they will be moved.</p> +<h3>Cactus thorns</h3> +<table border="1"> +<tr><th>Old arrangement</th><th>Old thorn name </th>Status<th></th><th>New arrangement </th><th>New name (if changed)</th></tr> +<tr><td>AEIThorns </td><td>AHFinderDirect </td><td>Apr 19</td><td>EinsteinAnalysis </td><td> </td></tr> +<tr><td>AEIThorns </td><td>CalcK </td><td>Apr 19</td><td>EinsteinAnalysis </td><td> </td></tr> +<tr><td>AEIThorns </td><td>Constants </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> +<tr><td>AEIThorns </td><td>Dissipation </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> +<tr><td>AEIThorns </td><td>EHFinder </td><td>Apr 19</td><td>EinsteinAnalysis </td><td> </td></tr> +<tr><td>AEIThorns </td><td>Exact </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>AEIThorns </td><td>Formaline </td><td>Apr 19</td><td>CactusUtils </td><td> </td></tr> +<tr><td>AEIThorns </td><td>Fortran </td><td>Apr 19</td><td>CactusBase </td><td> </td></tr> +<tr><td>AEIThorns </td><td>IDConstraintViolate</td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>AEIThorns </td><td>IDFileADM </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>AEIThorns </td><td>Nice </td><td>Apr 19</td><td>CactusUtils </td><td> </td></tr> +<tr><td>AEIThorns </td><td>NoExcision </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>AEIThorns </td><td>Noise </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> +<tr><td>AEIThorns </td><td>ReflectionSymmetry </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> +<tr><td>AEIThorns </td><td>RotatingSymmetry180</td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> +<tr><td>AEIThorns </td><td>RotatingSymmetry90 </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> +<tr><td>AEIThorns </td><td>SphericalSurface </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> +<tr><td>AEIThorns </td><td>TwoPunctures </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>Excision </td><td>LEGOExcision </td><td>Apr 19</td><td>EinsteinEvolve </td><td> </td></tr> +<tr><td>PerturbedBH </td><td>DistortedBHIVP </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>PerturbedBH </td><td>IDAxiOddBrillBH </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>PerturbedBH </td><td>RotatingDBHIVP </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>BetaThorns </td><td>Cartoon2D </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> +<tr><td>CactusBase </td><td>MoL </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>ADMAnalysis </td><td>Apr 19</td><td>EinsteinAnalysis </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>ADMBase </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>ADMConstraints </td><td>Apr 19</td><td>EinsteinAnalysis </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>ADMCoupling </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>ADMMacros </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>AHFinder </td><td>Apr 19</td><td>EinsteinAnalysis </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>CoordGauge </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>Extract </td><td>Apr 19</td><td>EinsteinAnalysis </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>HydroBase </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>IDAnalyticBH </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>CactusEinstein </td><td>IDAxiBrillBH </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>CactusEinstein </td><td>IDBrillData </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>CactusEinstein </td><td>IDLinearWaves </td><td>Apr 19</td><td>EinsteinInitialData</td><td> </td></tr> +<tr><td>CactusEinstein </td><td>StaticConformal </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> +<tr><td>CactusEinstein </td><td>TmunuBase </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> +<tr><td>CactusEOS </td><td>EOS_Base </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> +<tr><td>CactusEOS </td><td>EOSG_Base </td><td>Apr 19</td><td>EinsteinBase </td><td> </td></tr> +<tr><td>CactusEOS </td><td>EOSG_Hybrid </td><td>Apr 19</td><td>EinsteinEOS </td><td> </td></tr> +<tr><td>CactusEOS </td><td>EOSG_IdealFluid </td><td>Apr 19</td><td>EinsteinEOS </td><td> </td></tr> +<tr><td>CactusEOS </td><td>EOSG_Polytrope </td><td>Apr 19</td><td>EinsteinEOS </td><td> </td></tr> +<tr><td>CactusEOS </td><td>EOS_Hybrid </td><td>Apr 19</td><td>EinsteinEOS </td><td> </td></tr> +<tr><td>CactusEOS </td><td>EOS_IdealFluid </td><td>Apr 19</td><td>EinsteinEOS </td><td> </td></tr> +<tr><td>CactusEOS </td><td>EOS_Polytrope </td><td>Apr 19</td><td>EinsteinEOS </td><td> </td></tr> +<tr><td>CIGR_tmp </td><td>Hydro_Analysis </td><td>moved </td><td>EinsteinAnalysis </td><td> </td></tr> +<tr><td>CIGR_tmp </td><td>Whisky </td><td>moved </td><td>EinsteinEvolve </td></td>GRHydro</td></tr> +<tr><td>CIGR_tmp </td><td>Whisky_Init_Data </td><td>moved </td><td>EinsteinInitialData</td></td>GRHydro_InitData</td></tr> +<tr><td>CIGR_tmp </td><td>Whisky_TOVSolverC </td><td>moved </td><td>EinsteinInitialData</td></td>TOVSolver</td></tr> +<tr><td>LSUThorns </td><td>ID_Bin_BH </td><td>Apr 19</td><td>EinsteinInitialData</td></td>Meudon_Bin_BH</td></tr> +<tr><td>LSUThorns </td><td>ID_Bin_NS </td><td>Apr 19</td><td>EinsteinInitialData</td></td>Meudon_Bin_NS</td></tr> +<tr><td>LSUThorns </td><td>ID_Mag_NS </td><td>Apr 19</td><td>EinsteinInitialData</td></td>Meudon_Mag_NS</td></tr> +<tr><td>LSUThorns </td><td>NewRad </td><td>Apr 19</td><td>EinsteinEvolve </td><td> </td></tr> +<tr><td>TAT </td><td>Slab </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> +<tr><td>TAT </td><td>SlabTest </td><td>Apr 19</td><td>CactusNumerical </td><td> </td></tr> +<tr><td>Waves </td><td>Multipole </td><td>moved </td><td>EinsteinAnalysis </td><td> </td></tr> +<tr><td>Waves </td><td>WeylScal4 </td><td>moved </td><td>EinsteinAnalysis </td><td> </td></tr> +</table> +<p>New arrangements within the EinteinToolkit will have URLs of the form +<pre>https://svn.einsteintoolkit.org/cactus/ARRANGEMENT/THORN</pre> and thorns within Cactus can be found using +<pre>https://svn.cactuscode.org/arrangements/ARRANGEMENT/THORN</pre>.</p> - <?php include_once($_SERVER['DOCUMENT_ROOT'].'/global/footer.php');?>

1 0

[svn:einsteintoolkit] www/info/documentation/ (Rev. 153)
by gallen＠cct.lsu.edu 14 Apr '10

14 Apr '10

User: gallen Date: 2010/04/15 12:01 AM Modified: /info/documentation/ index.php Log: Correct link to wiki File Changes: Directory: /info/documentation/ =============================== File [modified]: index.php Delta lines: +1 -1 =================================================================== --- info/documentation/index.php 2010-04-15 05:00:43 UTC (rev 152) +++ info/documentation/index.php 2010-04-15 05:01:00 UTC (rev 153) @@ -1,7 +1,7 @@ <?php $title='Documentation'; include_once($_SERVER['DOCUMENT_ROOT'].'/global/header.php');?> -<p>Please see the <a href="docs.einsteintoolkit.org>Einstein Toolkit wiki</a> for more documentation:</p> +<p>Please see the <a href="docs.einsteintoolkit.org">Einstein Toolkit wiki</a> for more documentation:</p> <ul>

1 0

[svn:einsteintoolkit] www/info/documentation/ (Rev. 152)
by gallen＠cct.lsu.edu 14 Apr '10

14 Apr '10

User: gallen Date: 2010/04/15 12:00 AM Modified: /info/documentation/ index.php Log: Add link to wiki File Changes: Directory: /info/documentation/ =============================== File [modified]: index.php Delta lines: +1 -1 =================================================================== --- info/documentation/index.php 2010-04-12 12:48:30 UTC (rev 151) +++ info/documentation/index.php 2010-04-15 05:00:43 UTC (rev 152) @@ -1,7 +1,7 @@ <?php $title='Documentation'; include_once($_SERVER['DOCUMENT_ROOT'].'/global/header.php');?> -<p>More documentation will arrive soon, but for now we have:</p> +<p>Please see the <a href="docs.einsteintoolkit.org>Einstein Toolkit wiki</a> for more documentation:</p> <ul>

1 0

[svn:einsteintoolkit] manifest/ (Rev. 13)
by knarf＠cct.lsu.edu 14 Apr '10

14 Apr '10

User: knarf Date: 2010/04/14 03:57 PM Modified: / einsteintoolkit.th Log: reflect move of Whisky/GRHydro File Changes: Directory: / ============ File [modified]: einsteintoolkit.th Delta lines: +10 -13 =================================================================== --- einsteintoolkit.th 2010-04-14 13:03:54 UTC (rev 12) +++ einsteintoolkit.th 2010-04-14 20:57:15 UTC (rev 13) @@ -121,9 +121,18 @@ !CHECKOUT = EinsteinAnalysis/Multipole EinsteinAnalysis/WeylScal4 +EinsteinAnalysis/Hydro_Analysis +EinsteinEvolve/GRHydro +EinsteinInitialData/GRHydro_InitData +EinsteinInitialData/Hydro_InitExcision +EinsteinInitialData/TOVSolver +EinsteinUtils/SetMask_SphericalSurface + + + # Additional Cactus thorns !TARGET = $ARR !TYPE = cvs @@ -225,22 +234,10 @@ McLachlan/ML_BSSN_O2 McLachlan/ML_BSSN_O2_Helper McLachlan/ML_ADMConstraints +McLachlan/ML_ADMQuantities -# Whisky, the GRHydro code -!TARGET = $ARR -!TYPE = svn -!URL = https://svn.cct.lsu.edu/repos/users/knarf/CIGR_tmp/trunk/$2 -!CHECKOUT = -CIGR/Whisky -CIGR/Whisky_Init_Data -CIGR/Whisky_TOVSolverC -CIGR/Hydro_Analysis -CIGR/SetMask_SphericalSurface - - - # Carpet, the AMR driver !TARGET = $ARR !TYPE = git

1 0

[svn:einsteintoolkit] manifest/ (Rev. 12)
by schnetter＠cct.lsu.edu 14 Apr '10

14 Apr '10

User: eschnett Date: 2010/04/14 08:03 AM Modified: / einsteintoolkit.th Log: Add IDLinearWaves File Changes: Directory: / ============ File [modified]: einsteintoolkit.th Delta lines: +15 -2 =================================================================== --- einsteintoolkit.th 2010-04-14 10:03:33 UTC (rev 11) +++ einsteintoolkit.th 2010-04-14 13:03:54 UTC (rev 12) @@ -1,4 +1,4 @@ -# Component list for the Einstein Toolkit (http://www.einsteintoolkit.org) +# Component list for the Einstein Toolkit <http://www.einsteintoolkit.org/> # $Revision$ # $Date$ # $HeadURL$ @@ -82,15 +82,18 @@ CactusEinstein/ADMMacros CactusEinstein/CoordGauge CactusEinstein/Extract +CactusEinstein/HydroBase CactusEinstein/IDAnalyticBH CactusEinstein/IDAxiBrillBH +CactusEinstein/IDLinearWaves CactusEinstein/IDSimple -CactusEinstein/HydroBase CactusEinstein/StaticConformal CactusEinstein/SpaceMask CactusEinstein/TmunuBase CactusElliptic/EllBase +#CactusElliptic/EllPETSc +CactusElliptic/EllSOR CactusExternal/jpeg6b @@ -147,6 +150,8 @@ TAT/Periodic TAT/Slab TAT/SlabTest +TAT/TATelliptic +#TAT/TATPETSc TAT/TGRtensor @@ -165,14 +170,22 @@ AEIThorns/Formaline AEIThorns/Fortran AEIThorns/NoExcision +AEIThorns/Noise +AEIThorns/Norms AEIThorns/RotatingSymmetry180 AEIThorns/RotatingSymmetry90 AEIThorns/ReflectionSymmetry AEIThorns/SphericalSurface AEIThorns/TwoPunctures +#Excision/LegoExcision +#PerturbedBH/DistortedBHIVP +#PerturbedBH/IDAxiOddBrillBH +#PerturbedBH/RotatingDBHIVP + + # Various thorns from LSU !TARGET = $ARR !TYPE = cvs

1 0

[svn:einsteintoolkit] manifest/ (Rev. 11)
by schnetter＠cct.lsu.edu 14 Apr '10

14 Apr '10

User: eschnett Date: 2010/04/14 05:03 AM Modified: / einsteintoolkit.th Log: Correct location of BetaThorns File Changes: Directory: / ============ File [modified]: einsteintoolkit.th Delta lines: +2 -2 =================================================================== --- einsteintoolkit.th 2010-04-13 21:43:08 UTC (rev 10) +++ einsteintoolkit.th 2010-04-14 10:03:33 UTC (rev 11) @@ -107,8 +107,10 @@ CactusUtils/TerminationTrigger CactusUtils/TimerReport +BetaThorns/Cartoon2D + # The Einstein Toolkit !TARGET = $ARR !TYPE = svn @@ -127,8 +129,6 @@ !ANON_USER= cvs_anon !ANON_PASS= anon !CHECKOUT = -BetaThorns/Cartoon2D - CactusEOS/EOS_Base CactusEOS/EOS_Hybrid CactusEOS/EOS_Ideal_Fluid

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 106)
by knarf＠cct.lsu.edu 13 Apr '10

13 Apr '10

User: knarf Date: 2010/04/13 05:40 PM Modified: /trunk/src/ Whisky_Con2Prim.F90, Whisky_ENOReconstruct.F90, Whisky_PPM.F90, Whisky_TVDReconstruct.F90, Whisky_UpdateMask.F90 Log: correct logical/integer expressions File Changes: Directory: /trunk/src/ ====================== File [modified]: Whisky_Con2Prim.F90 Delta lines: +8 -8 =================================================================== --- trunk/src/Whisky_Con2Prim.F90 2010-04-11 03:32:45 UTC (rev 105) +++ trunk/src/Whisky_Con2Prim.F90 2010-04-13 22:40:33 UTC (rev 106) @@ -604,7 +604,7 @@ !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset)) gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset)) @@ -818,7 +818,7 @@ !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle if (conformal_state .eq. 0) then call SpatialDeterminant(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),& @@ -1146,7 +1146,7 @@ !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle gxxl = 0.5d0 * (gxx(i,j,k) + gxx(i-xoffset,j-yoffset,k-zoffset)) gxyl = 0.5d0 * (gxy(i,j,k) + gxy(i-xoffset,j-yoffset,k-zoffset)) @@ -1629,7 +1629,7 @@ !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision .and. (hydro_excision_mask(i,j,k) .ne. 0)) & + whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) & then press_new(i,j,k) = press(i,j,k) press_old(i,j,k) = press(i,j,k) @@ -1733,7 +1733,7 @@ !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle f = press_new(i,j,k) - press(i,j,k) @@ -1787,7 +1787,7 @@ !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle !!$ Note that in the following we enforce eps > 0 !!$ This makes the later check redundant @@ -2017,7 +2017,7 @@ !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle enthalpy = 1.d0 + eps(i,j,k) + press(i,j,k) / press_new(i,j,k) @@ -2070,7 +2070,7 @@ !do not compute if in atmosphere or in an excised region if (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, type_bits, atmosphere) .or. & - whisky_enable_internal_excision .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle + whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0)) cycle udens = dens(i,j,k) / sqrt(Whisky_det(i,j,k)) File [modified]: Whisky_ENOReconstruct.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/Whisky_ENOReconstruct.F90 2010-04-11 03:32:45 UTC (rev 105) +++ trunk/src/Whisky_ENOReconstruct.F90 2010-04-13 22:40:33 UTC (rev 106) @@ -181,7 +181,7 @@ !!$ Initialize excision do i = 1, nx - if (whisky_enable_internal_excision .and. (hydro_excision_mask(i) .ne. 0)) then + if (whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i) .ne. 0)) then vdiff(1, i) = large * (-1.d0*(1.d0+mod(i,10)))**i trivial_rp(i) = .true. excise(i) = .true. File [modified]: Whisky_PPM.F90 Delta lines: +5 -7 =================================================================== --- trunk/src/Whisky_PPM.F90 2010-04-11 03:32:45 UTC (rev 105) +++ trunk/src/Whisky_PPM.F90 2010-04-13 22:40:33 UTC (rev 106) @@ -430,9 +430,8 @@ end if !!$ excision - if (hydro_excision) then do i = 1, nx - if (whisky_enable_internal_excision .and. & + if (whisky_enable_internal_excision /= 0 .and. & (hydro_excision_mask(i) .ne. 0)) then if (i .gt. 1) then trivial_rp(i-1)=.true. @@ -443,7 +442,7 @@ !!$ have to follow the order of sub-expressions given here and might !!$ access outside the array range cond = i .gt. 1 - if (cond .and. whisky_enable_internal_excision) then + if (cond .and. whisky_enable_internal_excision /= 0) then cond = hydro_excision_mask(i-1) .ne. 0 end if if (cond) then @@ -471,7 +470,7 @@ end if else cond = (i.gt.2) .and. (i.lt.nx) - if (cond .and. whisky_enable_internal_excision) then + if (cond .and. whisky_enable_internal_excision /= 0) then cond = (ppm_mppm .eq. 0) .and. (hydro_excision_mask(i-2) .ne. 0) end if if (cond) then @@ -485,7 +484,7 @@ end if end if cond = i.lt.nx - if (cond .and. whisky_enable_internal_excision) then + if (cond .and. whisky_enable_internal_excision /= 0) then cond = hydro_excision_mask(i+1) .ne. 0 end if if (cond) then @@ -513,7 +512,7 @@ endif else cond = (i.lt.nx-1) .and. (i.gt.1) - if (cond .and. whisky_enable_internal_excision) then + if (cond .and. whisky_enable_internal_excision /= 0) then cond = (ppm_mppm .eq. 0) .and. (hydro_excision_mask(i+2) .ne. 0) end if if (cond) then @@ -528,7 +527,6 @@ end if end if end do - end if return end subroutine SimplePPM_1d File [modified]: Whisky_TVDReconstruct.F90 Delta lines: +3 -3 =================================================================== --- trunk/src/Whisky_TVDReconstruct.F90 2010-04-11 03:32:45 UTC (rev 105) +++ trunk/src/Whisky_TVDReconstruct.F90 2010-04-13 22:40:33 UTC (rev 106) @@ -56,18 +56,18 @@ do k = whisky_stencil, nz-whisky_stencil+1 do j = whisky_stencil, ny-whisky_stencil+1 do i = whisky_stencil, nx-whisky_stencil+1 - if (whisky_enable_internal_excision .and. & + if (whisky_enable_internal_excision /= 0 .and. & (hydro_excision_mask(i,j,k) .ne. 0)) then trivial_rp(i-xoffset, j-yoffset, k-zoffset) = .true. trivial_rp(i, j, k) = .true. bextm(i, j, k) = orig(i, j, k) bextp(i, j, k) = orig(i, j, k) - if (whisky_enable_internal_excision .and. & + if (whisky_enable_internal_excision /= 0 .and. & (hydro_excision_mask(i+xoffset,j+yoffset,k+zoffset) .eq. 0)) then bextm(i, j, k) = orig(i+xoffset, j+yoffset, k+zoffset) bextp(i, j, k) = orig(i+xoffset, j+yoffset, k+zoffset) end if - else if (whisky_enable_internal_excision .and. & + else if (whisky_enable_internal_excision /= 0 .and. & ((hydro_excision_mask(i-xoffset,j-yoffset,k-zoffset) .ne. 0) .or. & (hydro_excision_mask(i+xoffset,j+yoffset,k+zoffset) .ne. 0))) then bextm(i, j, k) = orig(i, j, k) File [modified]: Whisky_UpdateMask.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/Whisky_UpdateMask.F90 2010-04-11 03:32:45 UTC (rev 105) +++ trunk/src/Whisky_UpdateMask.F90 2010-04-13 22:40:33 UTC (rev 106) @@ -38,7 +38,7 @@ do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) - if ( whisky_enable_internal_excision .and. (hydro_excision_mask(i,j,k) .ne. 0) .or. & + if ( whisky_enable_internal_excision /= 0 .and. (hydro_excision_mask(i,j,k) .ne. 0) .or. & (SpaceMask_CheckStateBitsF90(space_mask, i, j, k, \ type_bits, atmosphere)) .or. & (tau(i,j,k) + frac * taurhs(i,j,k) .le. 0.d0) .or. &

1 0

[svn:einsteintoolkit] manifest/ (Rev. 10)
by schnetter＠cct.lsu.edu 13 Apr '10

13 Apr '10

User: eschnett Date: 2010/04/13 04:43 PM Modified: / einsteintoolkit.th Log: Add TerminationTrigger File Changes: Directory: / ============ File [modified]: einsteintoolkit.th Delta lines: +1 -0 =================================================================== --- einsteintoolkit.th 2010-04-13 21:42:07 UTC (rev 9) +++ einsteintoolkit.th 2010-04-13 21:43:08 UTC (rev 10) @@ -104,6 +104,7 @@ CactusPUGHIO/IOHDF5 CactusUtils/NaNChecker +CactusUtils/TerminationTrigger CactusUtils/TimerReport

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits April 2010