Commits August 2011

commits@lists.einsteintoolkit.org

9 participants
99 discussions

[svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicReconASCII/ (Rev. 51)
by knarf＠cct.lsu.edu 04 Aug '11

04 Aug '11

User: knarf Date: 2011/08/04 09:02 PM Modified: /PITTNullCode/SphericalHarmonicReconASCII/ interface.ccl, schedule.ccl /PITTNullCode/SphericalHarmonicReconASCII/src/ get.cc, read.cc, startup.cc Log: rename some functions to avoid symbol collision with functions of the same name in SphericalHarmonicRecon File Changes: Directory: /PITTNullCode/SphericalHarmonicReconASCII/ ===================================================== File [modified]: interface.ccl Delta lines: +2 -2 =================================================================== --- PITTNullCode/SphericalHarmonicReconASCII/interface.ccl 2011-08-05 01:55:38 UTC (rev 50) +++ PITTNullCode/SphericalHarmonicReconASCII/interface.ccl 2011-08-05 02:02:37 UTC (rev 51) @@ -21,7 +21,7 @@ CCTK_REAL OUT ARRAY reCt,\ CCTK_REAL OUT ARRAY imCt ) PROVIDES FUNCTION GetCurrentExtractionCoefs WITH \ - SphericalHarmonicRecon_GetCurrentCoefs LANGUAGE C + SphericalHarmonicReconASCII_GetCurrentCoefs LANGUAGE C CCTK_INT \ @@ -30,4 +30,4 @@ CCTK_REAL OUT r_inner,\ CCTK_REAL OUT r_outer) PROVIDES FUNCTION GetExtractionParameters WITH \ - SphericalHarmonicRecon_GetParameters LANGUAGE C + SphericalHarmonicReconASCII_GetParameters LANGUAGE C File [modified]: schedule.ccl Delta lines: +8 -8 =================================================================== --- PITTNullCode/SphericalHarmonicReconASCII/schedule.ccl 2011-08-05 01:55:38 UTC (rev 50) +++ PITTNullCode/SphericalHarmonicReconASCII/schedule.ccl 2011-08-05 02:02:37 UTC (rev 51) @@ -7,8 +7,8 @@ # calls GetCurrentExtractionCoefs should be scheduled in this group SCHEDULE GROUP MetricReconstruction IN \ SphericalHarmonicReconRead \ - AFTER SphericalHarmonicRecon_ReadData \ - BEFORE SphericalHarmonicRecon_PostStep + AFTER SphericalHarmonicReconASCII_ReadData \ + BEFORE SphericalHarmonicReconASCII_PostStep { } "Group for use by external thorns to use the metric" @@ -20,26 +20,26 @@ #{ #} "Schedule group for reconstructing world-tube data" -SCHEDULE SphericalHarmonicRecon_ReadData IN SphericalHarmonicReconRead +SCHEDULE SphericalHarmonicReconASCII_ReadData IN SphericalHarmonicReconRead { LANG: C } "Read the world tube data and set the data flag to read" -SCHEDULE SphericalHarmonicRecon_PostStep \ +SCHEDULE SphericalHarmonicReconASCII_PostStep \ IN SphericalHarmonicReconRead AFTER \ - SphericalHarmonicRecon_ReadData + SphericalHarmonicReconASCII_ReadData { LANG: C OPTIONS: GLOBAL } "set data flag to unread" -SCHEDULE SphericalHarmonicRecon_Startup at CCTK_INITIAL +SCHEDULE SphericalHarmonicReconASCII_Startup at CCTK_INITIAL { LANG: C OPTIONS: GLOBAL } "startup" -SCHEDULE SphericalHarmonicRecon_Startup at CCTK_POST_RECOVER_VARIABLES +SCHEDULE SphericalHarmonicReconASCII_Startup at CCTK_POST_RECOVER_VARIABLES { LANG: C OPTIONS: GLOBAL @@ -47,7 +47,7 @@ -SCHEDULE SphericalHarmonicRecon_Shutdown at CCTK_TERMINATE +SCHEDULE SphericalHarmonicReconASCII_Shutdown at CCTK_TERMINATE { LANG: C OPTIONS: GLOBAL Directory: /PITTNullCode/SphericalHarmonicReconASCII/src/ ========================================================= File [modified]: get.cc Delta lines: +2 -2 =================================================================== --- PITTNullCode/SphericalHarmonicReconASCII/src/get.cc 2011-08-05 01:55:38 UTC (rev 50) +++ PITTNullCode/SphericalHarmonicReconASCII/src/get.cc 2011-08-05 02:02:37 UTC (rev 51) @@ -28,7 +28,7 @@ /* Cactus Aliased Functions */ - int SphericalHarmonicRecon_GetParameters (CCTK_INT *lmax, + int SphericalHarmonicReconASCII_GetParameters (CCTK_INT *lmax, CCTK_REAL *r_inner, CCTK_REAL *r_outer) { @@ -39,7 +39,7 @@ - int SphericalHarmonicRecon_GetCurrentCoefs( + int SphericalHarmonicReconASCII_GetCurrentCoefs( CCTK_INT l, /* the ell mode */ CCTK_INT m, /* the m mode */ CCTK_REAL reC[], /* real part of (l,m) coefficient File [modified]: read.cc Delta lines: +4 -4 =================================================================== --- PITTNullCode/SphericalHarmonicReconASCII/src/read.cc 2011-08-05 01:55:38 UTC (rev 50) +++ PITTNullCode/SphericalHarmonicReconASCII/src/read.cc 2011-08-05 02:02:37 UTC (rev 51) @@ -92,7 +92,7 @@ } - void SphericalHarmonicRecon_ReadData(CCTK_ARGUMENTS) + void SphericalHarmonicReconASCII_ReadData(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -100,8 +100,8 @@ if (! SHR::initialized) { CCTK_WARN(CCTK_WARN_ABORT, "Schedule mismatch. \n" - " SphericalHarmonicRecon_ReadData must be called after\n" - " SphericalHarmonicRecon_Startup"); + " SphericalHarmonicReconASCII_ReadData must be called after\n" + " SphericalHarmonicReconASCII_Startup"); } //if (CCTK_MyProc(cctkGH) == 0) @@ -265,7 +265,7 @@ - void SphericalHarmonicRecon_PostStep(CCTK_ARGUMENTS) + void SphericalHarmonicReconASCII_PostStep(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; SHR::read_data = 0; File [modified]: startup.cc Delta lines: +2 -2 =================================================================== --- PITTNullCode/SphericalHarmonicReconASCII/src/startup.cc 2011-08-05 01:55:38 UTC (rev 50) +++ PITTNullCode/SphericalHarmonicReconASCII/src/startup.cc 2011-08-05 02:02:37 UTC (rev 51) @@ -23,7 +23,7 @@ using namespace std; -extern "C" void SphericalHarmonicRecon_Startup(CCTK_ARGUMENTS) +extern "C" void SphericalHarmonicReconASCII_Startup(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; @@ -314,7 +314,7 @@ -extern "C" void SphericalHarmonicRecon_Shutdown(CCTK_ARGUMENTS) +extern "C" void SphericalHarmonicReconASCII_Shutdown(CCTK_ARGUMENTS) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS;

1 0

[svn:einsteintoolkit] incoming/PITTNullCode/SphericalHarmonicDecomp/src/ (Rev. 50)
by knarf＠cct.lsu.edu 04 Aug '11

04 Aug '11

User: knarf Date: 2011/08/04 08:55 PM Modified: /PITTNullCode/SphericalHarmonicDecomp/src/ ExtractMetric.cc, alias.cc Log: make sure abs(int) is defined. Otherwise compilers might error out because they cannot decide whether to use abs(float) or abs(double) or abs(anotherdatatype) instead File Changes: Directory: /PITTNullCode/SphericalHarmonicDecomp/src/ ===================================================== File [modified]: ExtractMetric.cc Delta lines: +1 -0 =================================================================== --- PITTNullCode/SphericalHarmonicDecomp/src/ExtractMetric.cc 2011-06-30 21:31:41 UTC (rev 49) +++ PITTNullCode/SphericalHarmonicDecomp/src/ExtractMetric.cc 2011-08-05 01:55:38 UTC (rev 50) @@ -5,6 +5,7 @@ #include "util_ErrorCodes.h" #include "SphericalHarmonicDecomp.h" #include <stdio.h> +#include <stdlib.h> #include "myassert.h" #include <iostream> File [modified]: alias.cc Delta lines: +1 -0 =================================================================== --- PITTNullCode/SphericalHarmonicDecomp/src/alias.cc 2011-06-30 21:31:41 UTC (rev 49) +++ PITTNullCode/SphericalHarmonicDecomp/src/alias.cc 2011-08-05 01:55:38 UTC (rev 50) @@ -5,6 +5,7 @@ #include "util_ErrorCodes.h" #include "SphericalHarmonicDecomp.h" #include <stdio.h> +#include <stdlib.h> #include "myassert.h" #include <iostream>

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 263)
by bcmsma＠astro.rit.edu 04 Aug '11

04 Aug '11

User: bmundim Date: 2011/08/04 12:05 PM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_SourceM.F90 Log: RIT GRMHD dev: Change legacy divergence cleaning parameters ch_dc and cp_dc, introduced for the special relativistic case, to kap_dc, the one introduced in the covariant formulation (Liebling et al.). File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_SourceM.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_SourceM.F90 2011-08-03 18:00:47 UTC (rev 262) +++ trunk/src/GRHydro_SourceM.F90 2011-08-04 17:05:23 UTC (rev 263) @@ -422,7 +422,7 @@ taurhs(i,j,k) = alp(i,j,k)*sqrtdet*tau_source if(clean_divergence.ne.0) then - psidcrhs(i,j,k) = -1.d0 * ( ch_dc*ch_dc/cp_dc/cp_dc*alp(i,j,k) + & + psidcrhs(i,j,k) = -1.d0 * (kap_dc*alp(i,j,k) + & dx_betax + dy_betay + dz_betaz ) * psidc(i,j,k) + & Bconsx(i,j,k) * ( dx_alp - half*alp(i,j,k) * & ( uxx*dx_gxx + uyy*dx_gyy + uzz*dx_gzz + 2.d0*uxy*dx_gxy + & Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +2 -7 =================================================================== --- trunk/param.ccl 2011-08-03 18:00:47 UTC (rev 262) +++ trunk/param.ccl 2011-08-04 17:05:23 UTC (rev 263) @@ -506,16 +506,11 @@ { } "no" -CCTK_REAL ch_dc "The c_h parameter for divergence cleaning" +CCTK_REAL kap_dc "The kap parameter for divergence cleaning" { - 0:* :: "Any value, but one is preferred" + 0:* :: "Any non-negative value, but 1/144 to 1 seems preferred" } 1.0 -CCTK_REAL cp_dc "The c_p parameter for divergence cleaning" -{ - 0:* :: "Any value, but one to 12 is preferred" -} 1.0 - KEYWORD psidcspeed "Which speed to set for psidc" { "char speed" :: "Based on the characteristic speeds"

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 262)
by cott＠tapir.caltech.edu 03 Aug '11

03 Aug '11

User: cott Date: 2011/08/03 01:00 PM Modified: /trunk/src/ GRHydro_Boundaries.F90 Log: * change a PARAMWARN to WARN File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2011-08-03 17:56:27 UTC (rev 261) +++ trunk/src/GRHydro_Boundaries.F90 2011-08-03 18:00:47 UTC (rev 262) @@ -125,7 +125,7 @@ ! check that storage for shift is active if(shift_state.eq.0) then - call CCTK_PARAMWARN("shift_state = 0 (no shift storage) no longer supported!"); + call CCTK_WARN(0,"shift_state = 0 (no shift storage) no longer supported!"); endif

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 261)
by cott＠tapir.caltech.edu 03 Aug '11

03 Aug '11

User: cott Date: 2011/08/03 12:56 PM Modified: /trunk/ schedule.ccl /trunk/src/ GRHydro_Boundaries.F90, GRHydro_ParamCheck.F90 Log: * move check of shift_state .ne. 0 to a routine that is scheduled in BASEGRID after ADMBase sets the shift state. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Boundaries.F90 Delta lines: +6 -0 =================================================================== --- trunk/src/GRHydro_Boundaries.F90 2011-08-03 00:17:00 UTC (rev 260) +++ trunk/src/GRHydro_Boundaries.F90 2011-08-03 17:56:27 UTC (rev 261) @@ -122,6 +122,12 @@ call SetCartSymVN(ierr, cctkGH, sym, "HydroBase::Bvec[2]") call SetCartSymVN(ierr, cctkGH, sym, "GRHydro::Bcons[2]") endif + +! check that storage for shift is active + if(shift_state.eq.0) then + call CCTK_PARAMWARN("shift_state = 0 (no shift storage) no longer supported!"); + endif + end subroutine GRHydro_InitSymBound File [modified]: GRHydro_ParamCheck.F90 Delta lines: +0 -4 =================================================================== --- trunk/src/GRHydro_ParamCheck.F90 2011-08-03 00:17:00 UTC (rev 260) +++ trunk/src/GRHydro_ParamCheck.F90 2011-08-03 17:56:27 UTC (rev 261) @@ -92,10 +92,6 @@ evolve_MHD = 0 endif - if(shift_state.eq.0) then - call CCTK_PARAMWARN("shift_state = 0 (no shift storage) no longer supported!d"); - endif - if (CCTK_EQUALS(Y_e_evolution_method,"GRHydro")) then evolve_Y_e = 1 else Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +2 -2 =================================================================== --- trunk/schedule.ccl 2011-08-03 00:17:00 UTC (rev 260) +++ trunk/schedule.ccl 2011-08-03 17:56:27 UTC (rev 261) @@ -218,10 +218,10 @@ ### Standard symmetry registration ### ###################################### -schedule GRHydro_InitSymBound AT BASEGRID +schedule GRHydro_InitSymBound AT BASEGRID AFTER (ADMBase_SetShiftStateOn,ADMBase_SetShiftStateOff) { LANG: Fortran -} "Schedule symmetries" +} "Schedule symmetries and check shift state" ########################################################## ### Schedule the flux weighting calculation at initial ###

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 260)
by schnetter＠cct.lsu.edu 02 Aug '11

02 Aug '11

User: eschnett Date: 2011/08/02 07:17 PM Modified: /trunk/ schedule.ccl Log: Correct schedule Do not schedule group SetTmunu from GRHydro; group SetTmunu is now scheduled by thorn TmunuBase. Correct scheduling of GRHydro_AtmosphereReset, and GRHydro_AtmosphereResetM, and the associated HydroBase_Boundaries. File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +3 -12 =================================================================== --- trunk/schedule.ccl 2011-08-02 21:32:00 UTC (rev 259) +++ trunk/schedule.ccl 2011-08-03 00:17:00 UTC (rev 260) @@ -973,18 +973,18 @@ if (CCTK_Equals(Bvec_evolution_method,"GRHydro")) { - schedule GRHydro_AtmosphereResetM IN MoL_Evolution AFTER MoL_Step BEFORE HydroBase_Boundaries AFTER MoL_RestoreSandR + schedule GRHydro_AtmosphereResetM AT EVOL AFTER MoL_Evolution { LANG: Fortran } "Reset the atmosphere - MHD version" } else { - schedule GRHydro_AtmosphereReset IN MoL_Evolution AFTER MoL_Step BEFORE HydroBase_Boundaries AFTER MoL_RestoreSandR + schedule GRHydro_AtmosphereReset AT EVOL AFTER MoL_Evolution { LANG: Fortran } "Reset the atmosphere" } -schedule group HydroBase_Boundaries IN MoL_Evolution AFTER MoL_Step +schedule group HydroBase_Boundaries AT EVOL AFTER MoL_Evolution AFTER (GRHydro_AtmosphereRese GRHydro_AtmosphereResetM) { } "HydroBase Boundary conditions group" @@ -1064,12 +1064,3 @@ schedule GROUP SetTmunu AT POSTPOSTINITIAL AFTER Con2Prim BEFORE ADMConstraintsGroup { } "Calculate the stress-energy tensor" - -schedule GROUP SetTmunu AT POST_RECOVER_VARIABLES -{ -} "Calculate the stress-energy tensor" - -schedule GROUP SetTmunu IN MoL_Evolution AFTER HydroBase_Boundaries -{ -} "Calculate the stress-energy tensor" -

1 0

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

02 Aug '11

User: eschnett Date: 2011/08/02 07:13 PM Modified: /trunk/ schedule.ccl Log: Correct scheduling of group SetTmunu Schedule group SetTmunu after ADMBase_SetADMVars. Do not explicitly schedule group SetTmunu after MoL_Evolution, since MoL_PostStep is already scheduled there, and this contains SetTmunu. File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +2 -5 =================================================================== --- trunk/schedule.ccl 2011-04-21 04:46:34 UTC (rev 9) +++ trunk/schedule.ccl 2011-08-03 00:13:46 UTC (rev 10) @@ -61,7 +61,7 @@ # if (stress_energy_at_RHS) # { - # SCHEDULE GROUP SetTmunu IN MoL_PostStep AFTER Whisky_PostStep + # SCHEDULE GROUP SetTmunu IN MoL_PostStep AFTER (ADMBase_SetADMVars Whisky_PostStep) # { # } "Calculate the stress-energy tensor" # } else { @@ -71,13 +71,10 @@ # } if (stress_energy_at_RHS) { - SCHEDULE GROUP SetTmunu IN MoL_PostStep + SCHEDULE GROUP SetTmunu IN MoL_PostStep AFTER ADMBase_SetADMVars { } "Group for calculating the stress-energy tensor" } - SCHEDULE GROUP SetTmunu AT evol AFTER MoL_Evolution - { - } "Group for calculating the stress-energy tensor"

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 259)
by cott＠tapir.caltech.edu 02 Aug '11

02 Aug '11

User: cott Date: 2011/08/02 04:32 PM Modified: /trunk/src/ GRHydro_FluxSplit.F90, GRHydro_HLLE.F90, GRHydro_HLLEM.F90, GRHydro_Marquina.F90, GRHydro_ParamCheck.F90, GRHydro_Reconstruct.F90, GRHydro_ReconstructM.F90, GRHydro_ReconstructPoly.F90, GRHydro_ReconstructPolyM.F90, GRHydro_RoeSolver.F90, GRHydro_Source.F90, GRHydro_SourceM.F90, GRHydro_Tmunu.F90, GRHydro_TmunuM.F90 Log: * Optimize: remove support for shift_state = 0 (except for shock tubes and Cowling calculations of spherically symmetric objects, there is no reason not to have storage for the shift). File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_FluxSplit.F90 Delta lines: +9 -31 =================================================================== --- trunk/src/GRHydro_FluxSplit.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_FluxSplit.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -73,11 +73,7 @@ gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),gyy(i,j,k),& gyz(i,j,k),gzz(i,j,k)) - if (shift_state .eq. 0) then - beta = 0.d0 - else - beta = betax(i,j,k) - end if + beta = betax(i,j,k) call eigenvalues(GRHydro_eos_handle, & rho (i,j,k), & @@ -119,11 +115,7 @@ gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),gyy(i,j,k),& gyz(i,j,k),gzz(i,j,k)) - if (shift_state .eq. 0) then - beta = 0.d0 - else - beta = betay(i,j,k) - end if + beta = betay(i,j,k) call eigenvalues(GRHydro_eos_handle, & rho (i,j,k), & @@ -165,11 +157,7 @@ gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),gyy(i,j,k),& gyz(i,j,k),gzz(i,j,k)) - if (shift_state .eq. 0) then - beta = 0.d0 - else - beta = betaz(i,j,k) - end if + beta = betaz(i,j,k) call eigenvalues(GRHydro_eos_handle, & rho (i,j,k), & @@ -310,11 +298,8 @@ do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 2 do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 2 - if (shift_state .eq. 0) then - dummy = 0.d0 - else - dummy = betax(:,j,k) - end if + dummy = betax(:,j,k) + do i = 1, cctk_lsh(1) det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),\ gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) @@ -347,11 +332,8 @@ do k = GRHydro_stencil, cctk_lsh(3) - GRHydro_stencil + 2 do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 2 - if (shift_state .eq. 0) then - dummy = 0.d0 - else - dummy = betay(i,:,k) - end if + dummy = betay(i,:,k) + do j = 1, cctk_lsh(2) det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),\ gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) @@ -384,12 +366,8 @@ do j = GRHydro_stencil, cctk_lsh(2) - GRHydro_stencil + 2 do i = GRHydro_stencil, cctk_lsh(1) - GRHydro_stencil + 2 - if (shift_state .eq. 0) then - dummy = 0.d0 - else - dummy = betaz(i,j,:) - end if - + dummy = betaz(i,j,:) + do k = 1, cctk_lsh(3) det = SPATIAL_DETERMINANT(gxx(i,j,k),gxy(i,j,k),gxz(i,j,k),\ gyy(i,j,k),gyz(i,j,k),gzz(i,j,k)) File [modified]: GRHydro_HLLE.F90 Delta lines: +21 -29 =================================================================== --- trunk/src/GRHydro_HLLE.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_HLLE.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -103,22 +103,18 @@ !!$ Note also need the average of the lapse at the !!$ left and right points. - if (shift_state .ne. 0) then - if (flux_direction == 1) then - avg_beta = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & - betax(i,j,k)) - else if (flux_direction == 2) then - avg_beta = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & - betay(i,j,k)) - else if (flux_direction == 3) then - avg_beta = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & - betaz(i,j,k)) - else - call CCTK_WARN(0, "Flux direction not x,y,z") - end if + if (flux_direction == 1) then + avg_beta = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & + betax(i,j,k)) + else if (flux_direction == 2) then + avg_beta = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & + betay(i,j,k)) + else if (flux_direction == 3) then + avg_beta = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & + betaz(i,j,k)) else - avg_beta = 0.d0 - end if + call CCTK_WARN(0, "Flux direction not x,y,z") + end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) @@ -470,21 +466,17 @@ !!$ Note also need the average of the lapse at the !!$ left and right points. - if (shift_state .ne. 0) then - if (flux_direction == 1) then - avg_beta = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & - betax(i,j,k)) - else if (flux_direction == 2) then - avg_beta = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & - betay(i,j,k)) - else if (flux_direction == 3) then - avg_beta = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & - betaz(i,j,k)) - else - call CCTK_WARN(0, "Flux direction not x,y,z") - end if + if (flux_direction == 1) then + avg_beta = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & + betax(i,j,k)) + else if (flux_direction == 2) then + avg_beta = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & + betay(i,j,k)) + else if (flux_direction == 3) then + avg_beta = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & + betaz(i,j,k)) else - avg_beta = 0.d0 + call CCTK_WARN(0, "Flux direction not x,y,z") end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) File [modified]: GRHydro_HLLEM.F90 Delta lines: +23 -34 =================================================================== --- trunk/src/GRHydro_HLLEM.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_HLLEM.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -144,27 +144,20 @@ !!$ !!$ In MHD, we need all three shift components regardless of the flux direction - if (shift_state .ne. 0) then - avg_betax = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & - betax(i,j,k)) - avg_betay = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & - betay(i,j,k)) - avg_betaz = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & - betaz(i,j,k)) - if (flux_direction == 1) then - avg_beta=avg_betax - else if (flux_direction == 2) then - avg_beta=avg_betay - else if (flux_direction == 3) then - avg_beta=avg_betaz - else - call CCTK_WARN(0, "Flux direction not x,y,z") - end if + avg_betax = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & + betax(i,j,k)) + avg_betay = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & + betay(i,j,k)) + avg_betaz = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & + betaz(i,j,k)) + if (flux_direction == 1) then + avg_beta=avg_betax + else if (flux_direction == 2) then + avg_beta=avg_betay + else if (flux_direction == 3) then + avg_beta=avg_betaz else - avg_beta = 0.d0 - avg_betax = 0.d0 - avg_betay = 0.d0 - avg_betaz = 0.d0 + call CCTK_WARN(0, "Flux direction not x,y,z") end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) @@ -580,21 +573,17 @@ !!$ Note also need the average of the lapse at the !!$ left and right points. - if (shift_state .ne. 0) then - if (flux_direction == 1) then - avg_beta = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & - betax(i,j,k)) - else if (flux_direction == 2) then - avg_beta = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & - betay(i,j,k)) - else if (flux_direction == 3) then - avg_beta = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & - betaz(i,j,k)) - else - call CCTK_WARN(0, "Flux direction not x,y,z") - end if + if (flux_direction == 1) then + avg_beta = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & + betax(i,j,k)) + else if (flux_direction == 2) then + avg_beta = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & + betay(i,j,k)) + else if (flux_direction == 3) then + avg_beta = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & + betaz(i,j,k)) else - avg_beta = 0.d0 + call CCTK_WARN(0, "Flux direction not x,y,z") end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) File [modified]: GRHydro_Marquina.F90 Delta lines: +8 -12 =================================================================== --- trunk/src/GRHydro_Marquina.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_Marquina.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -111,19 +111,15 @@ !!$ Set metric terms at interface - if (shift_state .ne. 0) then - if (flux_direction == 1) then - avg_beta = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & - betax(i,j,k)) - else if (flux_direction == 2) then - avg_beta = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & - betay(i,j,k)) - else - avg_beta = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & - betaz(i,j,k)) - end if + if (flux_direction == 1) then + avg_beta = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & + betax(i,j,k)) + else if (flux_direction == 2) then + avg_beta = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & + betay(i,j,k)) else - avg_beta = 0.d0 + avg_beta = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & + betaz(i,j,k)) end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) File [modified]: GRHydro_ParamCheck.F90 Delta lines: +4 -0 =================================================================== --- trunk/src/GRHydro_ParamCheck.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_ParamCheck.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -92,6 +92,10 @@ evolve_MHD = 0 endif + if(shift_state.eq.0) then + call CCTK_PARAMWARN("shift_state = 0 (no shift storage) no longer supported!d"); + endif + if (CCTK_EQUALS(Y_e_evolution_method,"GRHydro")) then evolve_Y_e = 1 else File [modified]: GRHydro_Reconstruct.F90 Delta lines: +0 -5 =================================================================== --- trunk/src/GRHydro_Reconstruct.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_Reconstruct.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -41,11 +41,6 @@ CCTK_INT :: i,j,k CCTK_REAL :: local_min_tracer - ! set things up - if (shift_state .eq. 0) then - call CCTK_WARN(0,"This code no longer supports shift_state = 0"); - endif - if (CCTK_EQUALS(recon_method,"tvd")) then ! this handles MHD and non-MHD call GRHydro_TVDReconstruct_drv(CCTK_PASS_FTOF) File [modified]: GRHydro_ReconstructM.F90 Delta lines: +3 -9 =================================================================== --- trunk/src/GRHydro_ReconstructM.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_ReconstructM.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -107,15 +107,9 @@ psi4 = 1.d0 - if (shift_state .ne. 0) then - lbetax = betax - lbetay = betay - lbetaz = betaz - else - lbetax = 0.d0 - lbetay = 0.d0 - lbetaz = 0.d0 - end if + lbetax = betax + lbetay = betay + lbetaz = betaz !!$ Initialize variables that store reconstructed quantities File [modified]: GRHydro_ReconstructPoly.F90 Delta lines: +6 -13 =================================================================== --- trunk/src/GRHydro_ReconstructPoly.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_ReconstructPoly.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -118,20 +118,13 @@ !$OMP WORKSHARE psi4 = 1.0d0 !$OMP END WORKSHARE NOWAIT - if (shift_state .ne. 0) then - !$OMP WORKSHARE - lbetax = betax - lbetay = betay - lbetaz = betaz - !$OMP END WORKSHARE NOWAIT - else - !$OMP WORKSHARE - lbetax = 0.d0 - lbetay = 0.d0 - lbetaz = 0.d0 - !$OMP END WORKSHARE NOWAIT - end if + !$OMP WORKSHARE + lbetax = betax + lbetay = betay + lbetaz = betaz + !$OMP END WORKSHARE NOWAIT + !!$ Initialize variables that store reconstructed quantities !$OMP WORKSHARE File [modified]: GRHydro_ReconstructPolyM.F90 Delta lines: +3 -9 =================================================================== --- trunk/src/GRHydro_ReconstructPolyM.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_ReconstructPolyM.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -107,15 +107,9 @@ psi4 = 1.d0 - if (shift_state .ne. 0) then - lbetax = betax - lbetay = betay - lbetaz = betaz - else - lbetax = 0.d0 - lbetay = 0.d0 - lbetaz = 0.d0 - end if + lbetax = betax + lbetay = betay + lbetaz = betaz !!$ Initialize variables that store reconstructed quantities File [modified]: GRHydro_RoeSolver.F90 Delta lines: +9 -13 =================================================================== --- trunk/src/GRHydro_RoeSolver.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_RoeSolver.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -107,21 +107,17 @@ !!$ Set metric terms at interface - if (shift_state .ne. 0) then - if (flux_direction == 1) then - avg_beta = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & - betax(i,j,k)) - else if (flux_direction == 2) then - avg_beta = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & + if (flux_direction == 1) then + avg_beta = 0.5d0 * (betax(i+xoffset,j+yoffset,k+zoffset) + & + betax(i,j,k)) + else if (flux_direction == 2) then + avg_beta = 0.5d0 * (betay(i+xoffset,j+yoffset,k+zoffset) + & betay(i,j,k)) - else if (flux_direction == 3) then - avg_beta = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & - betaz(i,j,k)) - else - call CCTK_WARN(0, "Flux direction not x,y,z") - end if + else if (flux_direction == 3) then + avg_beta = 0.5d0 * (betaz(i+xoffset,j+yoffset,k+zoffset) + & + betaz(i,j,k)) else - avg_beta = 0.d0 + call CCTK_WARN(0, "Flux direction not x,y,z") end if avg_alp = 0.5 * (alp(i,j,k) + alp(i+xoffset,j+yoffset,k+zoffset)) File [modified]: GRHydro_Source.F90 Delta lines: +30 -52 =================================================================== --- trunk/src/GRHydro_Source.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_Source.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -175,62 +175,40 @@ rhoenthalpyW2 = (rho(i,j,k)*(one + eps(i,j,k)) + press(i,j,k))*& w_lorentz(i,j,k)**2 - if (shift_state .ne. 0) then + shiftx = betax(i,j,k) + shifty = betay(i,j,k) + shiftz = betaz(i,j,k) - shiftx = betax(i,j,k) - shifty = betay(i,j,k) - shiftz = betaz(i,j,k) + if (local_spatial_order .eq. 2) then + + dx_betax = DIFF_X_2(betax) + dx_betay = DIFF_X_2(betay) + dx_betaz = DIFF_X_2(betaz) + + dy_betax = DIFF_Y_2(betax) + dy_betay = DIFF_Y_2(betay) + dy_betaz = DIFF_Y_2(betaz) + + dz_betax = DIFF_Z_2(betax) + dz_betay = DIFF_Z_2(betay) + dz_betaz = DIFF_Z_2(betaz) + + else - if (local_spatial_order .eq. 2) then - - dx_betax = DIFF_X_2(betax) - dx_betay = DIFF_X_2(betay) - dx_betaz = DIFF_X_2(betaz) + dx_betax = DIFF_X_4(betax) + dx_betay = DIFF_X_4(betay) + dx_betaz = DIFF_X_4(betaz) + + dy_betax = DIFF_Y_4(betax) + dy_betay = DIFF_Y_4(betay) + dy_betaz = DIFF_Y_4(betaz) - dy_betax = DIFF_Y_2(betax) - dy_betay = DIFF_Y_2(betay) - dy_betaz = DIFF_Y_2(betaz) - - dz_betax = DIFF_Z_2(betax) - dz_betay = DIFF_Z_2(betay) - dz_betaz = DIFF_Z_2(betaz) - - else - - dx_betax = DIFF_X_4(betax) - dx_betay = DIFF_X_4(betay) - dx_betaz = DIFF_X_4(betaz) - - dy_betax = DIFF_Y_4(betax) - dy_betay = DIFF_Y_4(betay) - dy_betaz = DIFF_Y_4(betaz) - - dz_betax = DIFF_Z_4(betax) - dz_betay = DIFF_Z_4(betay) - dz_betaz = DIFF_Z_4(betaz) - - end if + dz_betax = DIFF_Z_4(betax) + dz_betay = DIFF_Z_4(betay) + dz_betaz = DIFF_Z_4(betaz) + + end if - else - - shiftx = 0.0d0 - shifty = 0.0d0 - shiftz = 0.0d0 - - dx_betax = 0.0d0 - dx_betay = 0.0d0 - dx_betaz = 0.0d0 - - dy_betax = 0.0d0 - dy_betay = 0.0d0 - dy_betaz = 0.0d0 - - dz_betax = 0.0d0 - dz_betay = 0.0d0 - dz_betaz = 0.0d0 - - endif - invalp = 1.0d0 / alp(i,j,k) invalp2 = invalp**2 velxshift = velx(i,j,k) - shiftx*invalp File [modified]: GRHydro_SourceM.F90 Delta lines: +29 -51 =================================================================== --- trunk/src/GRHydro_SourceM.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_SourceM.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -199,62 +199,40 @@ localgxy, localgxz, localgyy, localgyz, localgzz) - if (shift_state .ne. 0) then - - shiftx = betax(i,j,k) - shifty = betay(i,j,k) - shiftz = betaz(i,j,k) - - if (local_spatial_order .eq. 2) then - - dx_betax = DIFF_X_2(betax) - dx_betay = DIFF_X_2(betay) - dx_betaz = DIFF_X_2(betaz) + shiftx = betax(i,j,k) + shifty = betay(i,j,k) + shiftz = betaz(i,j,k) + + if (local_spatial_order .eq. 2) then + + dx_betax = DIFF_X_2(betax) + dx_betay = DIFF_X_2(betay) + dx_betaz = DIFF_X_2(betaz) + + dy_betax = DIFF_Y_2(betax) + dy_betay = DIFF_Y_2(betay) + dy_betaz = DIFF_Y_2(betaz) - dy_betax = DIFF_Y_2(betax) - dy_betay = DIFF_Y_2(betay) - dy_betaz = DIFF_Y_2(betaz) - - dz_betax = DIFF_Z_2(betax) - dz_betay = DIFF_Z_2(betay) - dz_betaz = DIFF_Z_2(betaz) + dz_betax = DIFF_Z_2(betax) + dz_betay = DIFF_Z_2(betay) + dz_betaz = DIFF_Z_2(betaz) - else - - dx_betax = DIFF_X_4(betax) - dx_betay = DIFF_X_4(betay) - dx_betaz = DIFF_X_4(betaz) - - dy_betax = DIFF_Y_4(betax) - dy_betay = DIFF_Y_4(betay) - dy_betaz = DIFF_Y_4(betaz) - - dz_betax = DIFF_Z_4(betax) - dz_betay = DIFF_Z_4(betay) - dz_betaz = DIFF_Z_4(betaz) - - end if - else - shiftx = 0.0d0 - shifty = 0.0d0 - shiftz = 0.0d0 - - dx_betax = 0.0d0 - dx_betay = 0.0d0 - dx_betaz = 0.0d0 + dx_betax = DIFF_X_4(betax) + dx_betay = DIFF_X_4(betay) + dx_betaz = DIFF_X_4(betaz) + + dy_betax = DIFF_Y_4(betax) + dy_betay = DIFF_Y_4(betay) + dy_betaz = DIFF_Y_4(betaz) + + dz_betax = DIFF_Z_4(betax) + dz_betay = DIFF_Z_4(betay) + dz_betaz = DIFF_Z_4(betaz) + + end if - dy_betax = 0.0d0 - dy_betay = 0.0d0 - dy_betaz = 0.0d0 - - dz_betax = 0.0d0 - dz_betay = 0.0d0 - dz_betaz = 0.0d0 - - endif - invalp = 1.0d0 / alp(i,j,k) invalp2 = invalp**2 velxshift = velx(i,j,k) - shiftx*invalp File [modified]: GRHydro_Tmunu.F90 Delta lines: +5 -17 =================================================================== --- trunk/src/GRHydro_Tmunu.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_Tmunu.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -92,24 +92,12 @@ !!$ Calculate lower components and square of shift vector. - if (shift_state .ne. 0) then - - betaxlow = gxx(i,j,k)*betax(i,j,k) + gxy(i,j,k)*betay(i,j,k) + gxz(i,j,k)*betaz(i,j,k) - betaylow = gxy(i,j,k)*betax(i,j,k) + gyy(i,j,k)*betay(i,j,k) + gyz(i,j,k)*betaz(i,j,k) - betazlow = gxz(i,j,k)*betax(i,j,k) + gyz(i,j,k)*betay(i,j,k) + gzz(i,j,k)*betaz(i,j,k) - - beta2 = betax(i,j,k)*betaxlow + betay(i,j,k)*betaylow + betaz(i,j,k)*betazlow + betaxlow = gxx(i,j,k)*betax(i,j,k) + gxy(i,j,k)*betay(i,j,k) + gxz(i,j,k)*betaz(i,j,k) + betaylow = gxy(i,j,k)*betax(i,j,k) + gyy(i,j,k)*betay(i,j,k) + gyz(i,j,k)*betaz(i,j,k) + betazlow = gxz(i,j,k)*betax(i,j,k) + gyz(i,j,k)*betay(i,j,k) + gzz(i,j,k)*betaz(i,j,k) + + beta2 = betax(i,j,k)*betaxlow + betay(i,j,k)*betaylow + betaz(i,j,k)*betazlow - else - - betaxlow = 0.0D0 - betaylow = 0.0D0 - betazlow = 0.0D0 - - beta2 = 0.0D0 - - end if - !!$ Calculate the specific relativistic enthalpy times rho times the !!$ square of the lorentz factor. File [modified]: GRHydro_TmunuM.F90 Delta lines: +12 -27 =================================================================== --- trunk/src/GRHydro_TmunuM.F90 2011-08-02 20:19:41 UTC (rev 258) +++ trunk/src/GRHydro_TmunuM.F90 2011-08-02 21:32:00 UTC (rev 259) @@ -100,36 +100,21 @@ !!$ Calculate lower components and square of shift vector. - if (shift_state .ne. 0) then - - betaxlow = gxx(i,j,k)*betax(i,j,k) + gxy(i,j,k)*betay(i,j,k) + gxz(i,j,k)*betaz(i,j,k) - betaylow = gxy(i,j,k)*betax(i,j,k) + gyy(i,j,k)*betay(i,j,k) + gyz(i,j,k)*betaz(i,j,k) - betazlow = gxz(i,j,k)*betax(i,j,k) + gyz(i,j,k)*betay(i,j,k) + gzz(i,j,k)*betaz(i,j,k) - beta2 = betax(i,j,k)*betaxlow + betay(i,j,k)*betaylow + betaz(i,j,k)*betazlow - - bdotbeta = betaxlow*Bvecx(i,j,k)+betaylow*Bvecy(i,j,k)+betazlow*Bvecz(i,j,k) - vdotbeta = betaxlow*velx(i,j,k)+betaylow*vely(i,j,k)+betazlow*velz(i,j,k) + + betaxlow = gxx(i,j,k)*betax(i,j,k) + gxy(i,j,k)*betay(i,j,k) + gxz(i,j,k)*betaz(i,j,k) + betaylow = gxy(i,j,k)*betax(i,j,k) + gyy(i,j,k)*betay(i,j,k) + gyz(i,j,k)*betaz(i,j,k) + betazlow = gxz(i,j,k)*betax(i,j,k) + gyz(i,j,k)*betay(i,j,k) + gzz(i,j,k)*betaz(i,j,k) + beta2 = betax(i,j,k)*betaxlow + betay(i,j,k)*betaylow + betaz(i,j,k)*betazlow + + bdotbeta = betaxlow*Bvecx(i,j,k)+betaylow*Bvecy(i,j,k)+betazlow*Bvecz(i,j,k) + vdotbeta = betaxlow*velx(i,j,k)+betaylow*vely(i,j,k)+betazlow*velz(i,j,k) !!$ u0 low is missing the w_lorentz factor (see below)!! - utlow = -1.d0*alp(i,j,k) + vdotbeta + utlow = -1.d0*alp(i,j,k) + vdotbeta + + btlow = -1.0d0*w_lorentz(i,j,k)*alp(i,j,k)*bdotv + & + bdotbeta/w_lorentz(i,j,k) + w_lorentz(i,j,k)*bdotv*vdotbeta - btlow = -1.0d0*w_lorentz(i,j,k)*alp(i,j,k)*bdotv + & - bdotbeta/w_lorentz(i,j,k) + w_lorentz(i,j,k)*bdotv*vdotbeta - - - else - - betaxlow = 0.0D0 - betaylow = 0.0D0 - betazlow = 0.0D0 - beta2 = 0.0D0 - -!!$ u0 low is missing the w_lorentz factor (see below)!! - utlow = -1.0*alp(i,j,k) - btlow = utlow*w_lorentz(i,j,k)*bdotv - - end if - !!$ Calculate the specific relativistic enthalpy times rho + the mag. field contribution times the !!$ square of the lorentz factor.

1 0

[svn:einsteintoolkit] GRHydro/trunk/test/ (Rev. 258)
by bcmsma＠astro.rit.edu 02 Aug '11

02 Aug '11

User: bmundim Date: 2011/08/02 03:19 PM Modified: /trunk/test/ GRHydro_test_shock.par, GRHydro_test_shock_ppm.par Log: Fix testsuite parameter files to reflect the recent support removal for shift_state = 0. File Changes: Directory: /trunk/test/ ======================= File [modified]: GRHydro_test_shock.par Delta lines: +1 -1 =================================================================== --- trunk/test/GRHydro_test_shock.par 2011-08-02 19:01:56 UTC (rev 257) +++ trunk/test/GRHydro_test_shock.par 2011-08-02 20:19:41 UTC (rev 258) @@ -43,7 +43,7 @@ TmunuBase::prolongation_type = none ADMBase::evolution_method = "none" -ADMBase::initial_shift = "none" +ADMBase::initial_shift = "zero" ADMBase::metric_type = "physical" SpaceMask::use_mask = "yes" File [modified]: GRHydro_test_shock_ppm.par Delta lines: +1 -1 =================================================================== --- trunk/test/GRHydro_test_shock_ppm.par 2011-08-02 19:01:56 UTC (rev 257) +++ trunk/test/GRHydro_test_shock_ppm.par 2011-08-02 20:19:41 UTC (rev 258) @@ -43,7 +43,7 @@ TmunuBase::prolongation_type = none ADMBase::evolution_method = "none" -ADMBase::initial_shift = "none" +ADMBase::initial_shift = "zero" ADMBase::metric_type = "physical" SpaceMask::use_mask = "yes"

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 257)
by cott＠tapir.caltech.edu 02 Aug '11

02 Aug '11

User: cott Date: 2011/08/02 02:01 PM Modified: /trunk/src/ GRHydro_PPM.F90, GRHydro_PPMM.F90 Log: * remove psi4 (optimize) File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PPM.F90 Delta lines: +8 -8 =================================================================== --- trunk/src/GRHydro_PPM.F90 2011-08-02 18:52:56 UTC (rev 256) +++ trunk/src/GRHydro_PPM.F90 2011-08-02 19:01:56 UTC (rev 257) @@ -55,7 +55,7 @@ nx,dx,rho,velx,vely,velz,eps,press,rhominus,& velxminus,velyminus,velzminus,epsminus,rhoplus,velxplus,velyplus,& velzplus,epsplus,trivial_rp, hydro_excision_mask,& - gxx, gxy, gxz, gyy, gyz, gzz, psi4, beta, alp, w_lorentz, & + gxx, gxy, gxz, gyy, gyz, gzz, beta, alp, w_lorentz, & dir, ni, nj, nrx, nry, nrz, ev_l, ev_r, xw) USE GRHydro_Scalars @@ -88,7 +88,7 @@ CCTK_INT, dimension(nx) :: hydro_excision_mask CCTK_REAL, dimension(nx) :: gxx, gxy, gxz, gyy, gyz, gzz, & - psi4, beta, alp, w_lorentz + beta, alp, w_lorentz CCTK_INT :: dir, ni, nj, nrx, nry, nrz CCTK_REAL, dimension(nrx, nry, nrz) :: ev_l, ev_r, xw @@ -212,12 +212,12 @@ l_ev_r=0.d0 xwind=0.d0 do i=3, nx - 3 - agxx = 0.5d0*( psi4(i)*gxx(i) + psi4(i+1)*gxx(i+1) ) - agxy = 0.5d0*( psi4(i)*gxy(i) + psi4(i+1)*gxy(i+1) ) - agxz = 0.5d0*( psi4(i)*gxz(i) + psi4(i+1)*gxz(i+1) ) - agyy = 0.5d0*( psi4(i)*gyy(i) + psi4(i+1)*gyy(i+1) ) - agyz = 0.5d0*( psi4(i)*gyz(i) + psi4(i+1)*gyz(i+1) ) - agzz = 0.5d0*( psi4(i)*gzz(i) + psi4(i+1)*gzz(i+1) ) + agxx = 0.5d0*( gxx(i) + gxx(i+1) ) + agxy = 0.5d0*( gxy(i) + gxy(i+1) ) + agxz = 0.5d0*( gxz(i) + gxz(i+1) ) + agyy = 0.5d0*( gyy(i) + gyy(i+1) ) + agyz = 0.5d0*( gyz(i) + gyz(i+1) ) + agzz = 0.5d0*( gzz(i) + gzz(i+1) ) det = SPATIAL_DETERMINANT(agxx, agxy, agxz, \ agyy, agyz, agzz) call UpperMetric (uxx, uxy, uxz, uyy, uyz, uzz, & File [modified]: GRHydro_PPMM.F90 Delta lines: +8 -8 =================================================================== --- trunk/src/GRHydro_PPMM.F90 2011-08-02 18:52:56 UTC (rev 256) +++ trunk/src/GRHydro_PPMM.F90 2011-08-02 19:01:56 UTC (rev 257) @@ -39,7 +39,7 @@ rhominus,velxminus,velyminus,velzminus,Bvcxminus,Bvcyminus,Bvczminus,psidcminus,epsminus,& rhoplus,velxplus,velyplus,velzplus,Bvcxplus,Bvcyplus,Bvczplus,psidcplus,epsplus,dc_flag,& trivial_rp, hydro_excision_mask,& - gxx, gxy, gxz, gyy, gyz, gzz, psi4, beta, alp, w_lorentz, & + gxx, gxy, gxz, gyy, gyz, gzz, beta, alp, w_lorentz, & dir, ni, nj, nrx, nry, nrz, ev_l, ev_r, xw) USE GRHydro_Scalars @@ -71,7 +71,7 @@ CCTK_INT, dimension(nx) :: hydro_excision_mask CCTK_REAL, dimension(nx) :: gxx, gxy, gxz, gyy, gyz, gzz, & - psi4, beta, alp, w_lorentz + beta, alp, w_lorentz CCTK_INT :: dir, ni, nj, nrx, nry, nrz CCTK_REAL, dimension(nrx, nry, nrz) :: ev_l, ev_r, xw @@ -222,12 +222,12 @@ l_ev_r=0.d0 xwind=0.d0 do i=3, nx - 3 - agxx = 0.5d0*( psi4(i)*gxx(i) + psi4(i+1)*gxx(i+1) ) - agxy = 0.5d0*( psi4(i)*gxy(i) + psi4(i+1)*gxy(i+1) ) - agxz = 0.5d0*( psi4(i)*gxz(i) + psi4(i+1)*gxz(i+1) ) - agyy = 0.5d0*( psi4(i)*gyy(i) + psi4(i+1)*gyy(i+1) ) - agyz = 0.5d0*( psi4(i)*gyz(i) + psi4(i+1)*gyz(i+1) ) - agzz = 0.5d0*( psi4(i)*gzz(i) + psi4(i+1)*gzz(i+1) ) + agxx = 0.5d0*( gxx(i) + gxx(i+1) ) + agxy = 0.5d0*( gxy(i) + gxy(i+1) ) + agxz = 0.5d0*( gxz(i) + gxz(i+1) ) + agyy = 0.5d0*( gyy(i) + gyy(i+1) ) + agyz = 0.5d0*( gyz(i) + gyz(i+1) ) + agzz = 0.5d0*( gzz(i) + gzz(i+1) ) det = SPATIAL_DETERMINANT(agxx, agxy, agxz, \ agyy, agyz, agzz) call UpperMetric (uxx, uxy, uxz, uyy, uyz, uzz, &

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 August 2011