Commits July 2012

commits@lists.einsteintoolkit.org

7 participants
70 discussions

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 389)
by rhaas＠tapir.caltech.edu 04 Jul '12

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/src/ GRHydro_UpdateMaskM.F90 Log: GRHydro: clear atmosphere_mask_real in MHD AtmosphereReset File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_UpdateMaskM.F90 Delta lines: +1 -0 =================================================================== --- trunk/src/GRHydro_UpdateMaskM.F90 2012-07-05 05:36:53 UTC (rev 388) +++ trunk/src/GRHydro_UpdateMaskM.F90 2012-07-05 05:36:55 UTC (rev 389) @@ -66,6 +66,7 @@ Bvec(i,j,k,1),Bvec(i,j,k,2),Bvec(i,j,k,3),w_lorentz(i,j,k)) if (wk_atmosphere .eq. 0) then atmosphere_mask(i, j, k) = 0 + atmosphere_mask_real(i, j, k) = 0 end if end if

2 1

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 388)
by rhaas＠tapir.caltech.edu 04 Jul '12

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/src/ GRHydro_UpdateMask.F90 Log: GRHydro: remove SAVE attribtute from _p and _pp vars this was harmless since the pointers to grid functions affected were OMP shared anyway File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_UpdateMask.F90 Delta lines: +6 -8 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2012-07-05 05:36:52 UTC (rev 387) +++ trunk/src/GRHydro_UpdateMask.F90 2012-07-05 05:36:53 UTC (rev 388) @@ -363,14 +363,12 @@ CCTK_INT :: GRHydro_UseGeneralCoordinates CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11, g12, g13, g22, g23, g33 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup - CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11_p => Null(), g12_p => Null(), & - g13_p => Null(), g22_p => Null(), & - g23_p => Null(), g33_p => Null() - CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup_p => Null() - CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11_p_p => Null(), g12_p_p => Null(), & - g13_p_p => Null(), g22_p_p => Null(), & - g23_p_p => Null(), g33_p_p => Null() - CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup_p_p => Null() + CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11_p, g12_p, g13_p, g22_p, & + g23_p, g33_p + CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup_p + CCTK_REAL, DIMENSION(:,:,:), POINTER :: g11_p_p, g12_p_p, g13_p_p, g22_p_p, & + g23_p_p, g33_p_p + CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup_p_p ! begin EOS Omni vars integer :: n,keytemp,anyerr,keyerr(1)

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 387)
by rhaas＠tapir.caltech.edu 04 Jul '12

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Removed: /trunk/src/ GRHydro_CarpetWeights.cc, GRHydro_SlopeLimiter.F90, GRHydro_Weights.c Log: GRHydro: remove unused files File Changes: Directory: /trunk/src/ ====================== File [removed]: GRHydro_CarpetWeights.cc Delta lines: +0 -66 =================================================================== --- trunk/src/GRHydro_CarpetWeights.cc 2012-07-05 05:36:50 UTC (rev 386) +++ trunk/src/GRHydro_CarpetWeights.cc 2012-07-05 05:36:52 UTC (rev 387) @@ -1,66 +0,0 @@ - /*@@ - @file GRHydro_CarpetWeights.cc - @date Wed Aug 20 23:08:28 2008 - @author Luca Baiotti - @desc - Copy the variable CarpetReduce::weight in a GRHydro variable. - Written with the help of Thomas. - @enddesc - @@*/ - -#include "cctk.h" -#include "cctk_Parameters.h" -#include "cctk_Arguments.h" - -#include "SpaceMask.h" - -#include <stdio.h> -#include <stdlib.h> - - -#ifdef __cplusplus - extern "C" { -#endif - - /* Scheduled functions */ - void GRHydro_CarpetWeights(CCTK_ARGUMENTS); - -#ifdef __cplusplus - } /* extern "C" */ -#endif - - -void GRHydro_CarpetWeights(CCTK_ARGUMENTS) -{ - - DECLARE_CCTK_ARGUMENTS; - DECLARE_CCTK_PARAMETERS; - - int i; - - // Define the variable we will use in Con2Prim (F90) as a pointer to itself - GRHydro_CarpetWeights = (CCTK_REAL *)(CCTK_VarDataPtr(cctkGH,0,"GRHydro::GRHydro_CarpetWeights")); - - - if (CCTK_IsThornActive("CarpetReduce")!=0){ - // If we use Carpet then obtain a pointer to rhe carpet variable. This will be CarpetWeights - const CCTK_REAL *CarpetWeights = (CCTK_REAL *)(CCTK_VarDataPtr(cctkGH,0,"CarpetReduce::weight")); - // Then assign the values of the carpet variable to the GRHydro variable - for (i=0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) - { - GRHydro_CarpetWeights[i] = CarpetWeights[i]; - //printf("%13.12e\n",GRHydro_CarpetWeights[i]); - } - } - else{ - // Then assign the values of the carpet variable to the GRHydro variable - CCTK_INFO("We are not using Carpet, so I set GRHydro_CarpetWeights equal to 1"); - for (i=0; i < cctk_lsh[0]*cctk_lsh[1]*cctk_lsh[2]; i++) - { - GRHydro_CarpetWeights[i] = 1; //if we do not use Carpet then we set this variable to be equal to 1 - //printf("%13.12e\n",GRHydro_CarpetWeights[i]); - } - } - - return; -} File [removed]: GRHydro_SlopeLimiter.F90 Delta lines: +0 -105 =================================================================== --- trunk/src/GRHydro_SlopeLimiter.F90 2012-07-05 05:36:50 UTC (rev 386) +++ trunk/src/GRHydro_SlopeLimiter.F90 2012-07-05 05:36:52 UTC (rev 387) @@ -1,105 +0,0 @@ - /*@@ - @file GRHydro_SlopeLimiter.F90 - @date Sat Jan 26 02:00:32 2002 - @author - @desc - The routine for the more complex slope limiters. - See Toros book for most of these. - @enddesc - @@*/ - -#include "cctk.h" -#include "cctk_Arguments.h" -#include "cctk_Parameters.h" -#include "cctk_Functions.h" - - /*@@ - @routine slopelimiter - @date Sat Jan 26 02:01:15 2002 - @author Luca Baiotti, Ian Hawke - @desc - Given the slope delta and the ratio of the two local slopes, - limit the slope so the reconstruction is TVD. - @enddesc - @calls - @calledby - @history - Original minmod from GR3D, author Mark Miller. Other limiters from - codes of Hawke, Nikiforakis and Toro. - @endhistory - -@@*/ - -subroutine slopelimiter(r, delta) - - USE GRHydro_Scalars - - implicit none - - DECLARE_CCTK_FUNCTIONS - - CCTK_REAL :: phi, r, denor, phir, delta - - denor = 1.d0 + r - phir = 2.d0/denor - - if (MC1) then - - if (r > 0.d0) then - phi = min( 2.d0*r/(1.d0+r), phir ) - else - phi = 0.d0 - end if - -!!$ else if (MC2) then -!!$ -!!$ if (r > 3.d0) then -!!$ phi = 2*phir -!!$ else if (r > 1.d0/3.d0) then -!!$ phi = 1 -!!$ else if (r > 0) then -!!$ phi = 2*r*phir -!!$ else -!!$ phi = 0.d0 -!!$ end if - - else if (MINMOD2) then - - if (r > 1.d0) then - phi = min(1.d0, phir ) - else if (r > 0.d0) then - phi = r - else - phi = 0.d0 - end if - - else if (MINMOD3) then - - if (r > 0.d0) then - phi = min(1.d0, 4.d0/(1.d0+r) ) - else - phi = 0.d0 - end if - - else if (SUPERBEE) then - - if (r > 1.d0) then - phi = min(2.d0, r, 2.d0 / (1.d0 + r)) - else if (r > 0.5d0) then - phi = 1.d0 - else if (r > 0.d0) then - phi = 2.d0 * r - else - phi = 0.d0 - end if - - else - - call CCTK_WARN(0, "Type of limiter not recognized") - - end if - - delta = delta * phi - -end subroutine slopelimiter - File [removed]: GRHydro_Weights.c Delta lines: +0 -286 =================================================================== --- trunk/src/GRHydro_Weights.c 2012-07-05 05:36:50 UTC (rev 386) +++ trunk/src/GRHydro_Weights.c 2012-07-05 05:36:52 UTC (rev 387) @@ -1,286 +0,0 @@ - /*@@ - @file GRHydro_Weights.F90 - @date Sat Jan 26 01:40:14 2002 - @author Ian Hawke - @desc - This routine calculates the "weights" of the cells and cell boundaries. - This is only required if using FishEye. - - There is also a routine that calculates the "physical" velocity. - - @enddesc - @@*/ - -#include "cctk.h" -#include "cctk_Parameters.h" -#include "cctk_Arguments.h" - -#include "FishEye.h" - - /*@@ - @routine GRHydro_Weights - @date Sat Jan 26 01:41:02 2002 - @author Ian Hawke - @desc - Calculates the weights from FishEye. - @enddesc - @calls - @calledby - @history - - @endhistory - -@@*/ - -void GRHydro_Weights(CCTK_ARGUMENTS) -{ - - DECLARE_CCTK_ARGUMENTS; - DECLARE_CCTK_PARAMETERS; - - CCTK_REAL dx, dy, dz, xbound, ybound, zbound; - CCTK_REAL jdet[27], jacobian[9], cell_centre_slice, cell_surface_l; - CCTK_INT i, j, k, nx, ny, nz, l, m, n, index, totalsize; - - dx = cctk_delta_space[0] / cctk_levfac[0]; - dy = cctk_delta_space[1] / cctk_levfac[1]; - dz = cctk_delta_space[2] / cctk_levfac[2]; - nx = cctk_lsh[0]; - ny = cctk_lsh[1]; - nz = cctk_lsh[2]; - totalsize = nx*ny*nz; - - if (use_weighted_fluxes) - { - - for (k = 0; k < nz; k++) - { - for (j = 0; j < ny; j++) - { - for (i = 0; i < nx; i++) - { - - /* - Calculate the jacobian of the transformation at the - 27 points; 3 points in every direction - */ - - index = CCTK_GFINDEX3D(cctkGH, i, j, k); - - for (n = 0; n < 3; n++) - { - for (m = 0; m < 3; m++) - { - for (l = 0; l < 3; l++) - { - - xbound = x[index] + 0.5 * (l-2) * dx; - ybound = y[index] + 0.5 * (m-2) * dy; - zbound = z[index] + 0.5 * (n-2) * dz; - -#ifdef FISHEYE_ACTIVE - activejacobian(xbound,ybound,zbound, - &jacobian[0],&jacobian[1],&jacobian[2], - &jacobian[3],&jacobian[4],&jacobian[5], - &jacobian[6],&jacobian[7],&jacobian[8]); -#else - CCTK_WARN(0,"You must compile with FishEye for this to work!"); -#endif - jdet[l+3*m+9*n] = - -jacobian[2]*jacobian[4]*jacobian[6] + - jacobian[1]*jacobian[5]*jacobian[6] + - jacobian[2]*jacobian[3]*jacobian[7] - - jacobian[0]*jacobian[5]*jacobian[7] - - jacobian[1]*jacobian[3]*jacobian[8] + - jacobian[0]*jacobian[4]*jacobian[8]; - - } - } - } - - cell_jdet[index] = jdet[0]; - - /* - Integrate by Simpsons rule over both directions - */ - - /* - x - */ - - cell_surface[index] = - 1.0 / 36.0 * ( (jdet[2] + 4.0 * jdet[5] + jdet[8])+ - 4.0 *(jdet[11] + 4.0 * jdet[14] + jdet[17])+ - (jdet[20] + 4.0 * jdet[23] + jdet[26]) ); - - /* - y - */ - - cell_surface[index + totalsize] = - 1.0 / 36.0 * ( (jdet[6] + 4.0 * jdet[7] + jdet[8])+ - 4.0 *(jdet[15] + 4.0 * jdet[16] + jdet[17])+ - (jdet[24] + 4.0 * jdet[25] + jdet[26]) ); - - /* - z - */ - - cell_surface[index + 2 * totalsize] = - 1.0 / 36.0 * ( (jdet[18] + 4.0 * jdet[19] + jdet[20])+ - 4.0 *(jdet[21] + 4.0 * jdet[22] + jdet[23])+ - (jdet[24] + 4.0 * jdet[25] + jdet[26]) ); - - /* - scalar for the x direction at the left, needed for - the volume calculations - */ - - cell_surface_l = - 1.0 / 36.0 * ( (jdet[0] + 4.0 * jdet[3] + jdet[6])+ - 4.0 *(jdet[9] + 4.0 * jdet[12] + jdet[15])+ - (jdet[18] + 4.0 * jdet[21] + jdet[24])); - - /* - The slice through the centre holding x fixed. - */ - - cell_centre_slice = - 1.0 / 36.0 * ( (jdet[1] + 4.0 * jdet[4] + jdet[7])+ - 4.0 *(jdet[10] + 4.0 * jdet[13] + jdet[16])+ - (jdet[19] + 4.0 * jdet[22] + jdet[25]) ); - - /* - The cell volume. - Again using Simpsons rule, only in the x direction. - */ - - cell_volume[index] = - 1.0 / 6.0 * ( cell_surface_l + 4.0 * cell_centre_slice + - cell_surface[index] ); - - - } - } - } - - } - else - { - - for (k = 0; k < nz; k++) - { - for (j = 0; j < ny; j++) - { - for (i = 0; i < nx; i++) - { - - index = CCTK_GFINDEX3D(cctkGH, i, j, k); - - cell_volume[index] = 1.0; - cell_surface[index] = 1.0; - cell_surface[index + totalsize] = 1.0; - cell_surface[index + 2 * totalsize] = 1.0; - - } - } - } - - } - - return; -} - - - - /*@@ - @routine GRHydro_Fisheye_Analysis - @date - @author Christian Ott, Ian Hawke - @desc - Prepare output of GRHydro variables in physical coordinates - @enddesc - @calls - @calledby - @history - - @endhistory - -@@*/ - -int GRHydro_Fisheye_Analysis(CCTK_ARGUMENTS) -{ - - DECLARE_CCTK_ARGUMENTS - DECLARE_CCTK_PARAMETERS - - double jacobian[9]; - - int i,j,k, index; - - /* let's first do the scalars: simple copying */ - - for(i=0; - i<cctkGH->cctk_lsh[0]*cctkGH->cctk_lsh[1]*cctkGH->cctk_lsh[2]; - i++) - { - - frho[i] = rho[i]; - fpress[i] = press[i]; - feps[i] = eps[i]; - - } - - /* now the vectors: more complicated... first we need to (numerically) - calculate the jacobian */ - - - for(i=0;i<cctkGH->cctk_lsh[0];i++) - { - for(j=0;j<cctkGH->cctk_lsh[1];j++) - { - for(k=0;k<cctkGH->cctk_lsh[2];k++) - { - - index = CCTK_GFINDEX3D(cctkGH,i,j,k); - -#ifdef FISHEYE_ACTIVE - activejacobian(x[index], y[index], z[index], - &jacobian[0],&jacobian[1],&jacobian[2], - &jacobian[3],&jacobian[4],&jacobian[5], - &jacobian[6],&jacobian[7],&jacobian[8]); -#else - CCTK_WARN(1,"The output of \"FishEye\" velocities is only meaningful if FishEye is active!"); - jacobian[0]=1.0; - jacobian[1]=0.0; - jacobian[2]=0.0; - jacobian[3]=0.0; - jacobian[4]=1.0; - jacobian[5]=0.0; - jacobian[6]=0.0; - jacobian[7]=0.0; - jacobian[8]=1.0; -#endif - - fvelx[index] = - jacobian[0] * velx[index] + - jacobian[1] * vely[index] + - jacobian[2] * velz[index]; - - fvely[index] = - jacobian[3] * velx[index] + - jacobian[4] * vely[index] + - jacobian[5] * velz[index]; - - fvelz[index] = - jacobian[6] * velx[index] + - jacobian[7] * vely[index] + - jacobian[8] * velz[index]; - - } - } - } - - return; - -}

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 386)
by rhaas＠tapir.caltech.edu 04 Jul '12

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/src/ GRHydro_Con2PrimM.F90, GRHydro_Source.F90 Log: GRHydro: remove unused variables File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Con2PrimM.F90 2012-07-05 05:36:48 UTC (rev 385) +++ trunk/src/GRHydro_Con2PrimM.F90 2012-07-05 05:36:50 UTC (rev 386) @@ -549,7 +549,7 @@ CCTK_INT :: epsnegative - CCTK_REAL :: local_min_tracer, local_gam, local_pgam,local_K, sc + CCTK_REAL :: local_min_tracer, local_pgam,local_K, sc ! character(len=400) :: warnline ! begin EOS Omni vars @@ -672,7 +672,7 @@ CCTK_REAL :: b2minus, b2plus CCTK_INT :: epsnegative - CCTK_REAL :: local_gam, local_pgam,local_K,scplus,scminus + CCTK_REAL :: local_pgam,local_K,scplus,scminus ! begin EOS Omni vars integer :: n,keytemp,anyerr,keyerr(1) File [modified]: GRHydro_Source.F90 Delta lines: +0 -5 =================================================================== --- trunk/src/GRHydro_Source.F90 2012-07-05 05:36:48 UTC (rev 385) +++ trunk/src/GRHydro_Source.F90 2012-07-05 05:36:50 UTC (rev 386) @@ -93,11 +93,6 @@ CCTK_REAL, DIMENSION(:,:,:), POINTER :: beta1, beta2, beta3 CCTK_REAL, DIMENSION(:,:,:,:), POINTER :: vup - ! poison hack - CCTK_INT, SAVE :: reflevel = -1 - CCTK_INT, SAVE :: last_iteration_seen = -1 - CCTK_INT, SAVE :: mol_substep = -1 - if (GRHydro_UseGeneralCoordinates(cctkGH).ne.0) then g11 => gaa g12 => gab

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 385)
by rhaas＠tapir.caltech.edu 04 Jul '12

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/src/ GRHydro_UpdateMask.F90 Log: GRHydro: remove superflous code, unused variables File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_UpdateMask.F90 Delta lines: +2 -18 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2012-07-05 05:36:47 UTC (rev 384) +++ trunk/src/GRHydro_UpdateMask.F90 2012-07-05 05:36:48 UTC (rev 385) @@ -169,22 +169,6 @@ DECLARE_CCTK_ARGUMENTS DECLARE_CCTK_PARAMETERS - ! Initialize all rhs variables and the mask. - ! The former vars need to be initialized since there is - ! no rhs computation in CCTK_INITIAL or POSTINITIAL. - - densrhs = 0.0d0 - taurhs = 0.0d0 - srhs = 0.0d0 - - if (evolve_tracer .ne. 0) then - cons_tracerrhs = 0.0d0 - endif - - if (evolve_y_e .ne. 0) then - y_e_con_rhs = 0.0d0 - endif - atmosphere_mask = 0 atmosphere_mask_real = 0 @@ -259,7 +243,7 @@ DECLARE_CCTK_PARAMETERS CCTK_INT :: i, j, k - CCTK_REAL :: det, psi4pt + CCTK_REAL :: det ! save memory when MP is not used @@ -369,7 +353,7 @@ DECLARE_CCTK_PARAMETERS CCTK_INT :: i, j, k - CCTK_REAL :: det, psi4pt + CCTK_REAL :: det CCTK_REAL :: rho_min CCTK_INT :: eos_handle

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 384)
by rhaas＠tapir.caltech.edu 04 Jul '12

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/ schedule.ccl Log: GRHydro: fix apparent typos in scheduling of GRHydro_InitAtmosMask this only matters if wk_atmosphere is used and is based on the argument that it makes no sense to do this in postrestrictinitial (at least when vertex centering is used) but makes sense in postregridinitial File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +2 -2 =================================================================== --- trunk/schedule.ccl 2012-07-05 05:36:45 UTC (rev 383) +++ trunk/schedule.ccl 2012-07-05 05:36:47 UTC (rev 384) @@ -498,7 +498,7 @@ LANG: Fortran } "Initialize the atmosphere mask" -schedule GRHydro_SetupMask AT POSTRESTRICTINITIAL BEFORE HydroBase_PostStep AFTER (MaskOne,MaskZero) +schedule GRHydro_SetupMask AT POSTREGRIDINITIAL BEFORE HydroBase_PostStep AFTER (MaskOne,MaskZero) { LANG: Fortran } "Initialize the atmosphere mask" @@ -515,7 +515,7 @@ LANG: Fortran } "Set the atmosphere mask" - schedule GRHydro_InitAtmosMask AT POSTRESTRICTINITIAL AFTER GRHydro_SetupMask BEFORE HydroBase_PostStep + schedule GRHydro_InitAtmosMask AT POSTREGRIDINITIAL AFTER GRHydro_SetupMask BEFORE HydroBase_PostStep { LANG: Fortran } "Set the atmosphere mask"

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 383)
by rhaas＠tapir.caltech.edu 04 Jul '12

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/ schedule.ccl /trunk/src/ GRHydro_UpdateMask.F90 Log: GRHydro: copy integer atmosphere mask in Post_Recover_Variables this is required since the real valued atmosphere mask is not checkpointed. It is valid since atmosphere_mask_real is non-zero wherever atmosphere_mask is non-zero due to GRHydroUpdateAtmosphereMask and atmosphere_mask is non-zero wherever atmosphere_mask_real is non-zero because of GRHydroPostSyncAtmosphereMask, ie. the two masks are non-zero/zero at the same points. File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_UpdateMask.F90 Delta lines: +40 -0 =================================================================== --- trunk/src/GRHydro_UpdateMask.F90 2012-07-05 05:36:43 UTC (rev 382) +++ trunk/src/GRHydro_UpdateMask.F90 2012-07-05 05:36:45 UTC (rev 383) @@ -109,6 +109,45 @@ /*@@ + @routine GRHydroCopyIntegerMask + @date Wed Jul 4 15:40:16 PDT 2012 + @author Roland Haas + @desc + Initializes real valued mask with integer valued one. + @enddesc + @calls + @calledby + @history + + @endhistory + +@@*/ + +subroutine GRHydroCopyIntegerMask(CCTK_ARGUMENTS) + + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + + CCTK_INT :: i,j,k + +!! This sets the real atmo mask based on the integer-valued atmo mask + + !$OMP PARALLEL DO PRIVATE(k,j,i) + do k = 1, cctk_lsh(3) + do j = 1, cctk_lsh(2) + do i = 1, cctk_lsh(1) + atmosphere_mask_real(i,j,k) = atmosphere_mask(i,j,k) + end do + end do + end do + !$OMP END PARALLEL DO + +end subroutine GRHydroCopyIntegerMask + + + /*@@ @routine GRHydro_SetupMask @date Thu Jun 20 13:27:28 2002 @author Ian Hawke @@ -181,6 +220,7 @@ do i = 1, cctk_lsh(1) if (rho(i,j,k) .le. GRHydro_rho_min) then atmosphere_mask(i,j,k) = 1 + atmosphere_mask_real(i,j,k) = 1 end if end do end do Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +7 -0 =================================================================== --- trunk/schedule.ccl 2012-07-05 05:36:43 UTC (rev 382) +++ trunk/schedule.ccl 2012-07-05 05:36:45 UTC (rev 383) @@ -485,6 +485,13 @@ LANG: Fortran } "Initialize the atmosphere mask" +# alternatively drop support for wk_atmosphere and schedule GRHydro_SetupMask +# only in CCTK_BaseGrid +schedule GRHydroCopyIntegerMask AT CCTK_POST_RECOVER_VARIABLES BEFORE HydroBase_PostStep +{ + LANG: Fortran +} "Initialize the real valued atmosphere mask after checkpoint recovery" + # If using mesh refinement schedule GRHydro_SetupMask AT POSTREGRID BEFORE MoL_PostStep AFTER (MaskOne,MaskZero) {

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 382)
by rhaas＠tapir.caltech.edu 04 Jul '12

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/src/ GRHydro_Con2Prim.F90 Log: * improve error message formatting in hot con2prim File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +11 -11 =================================================================== --- trunk/src/GRHydro_Con2Prim.F90 2012-07-05 05:36:42 UTC (rev 381) +++ trunk/src/GRHydro_Con2Prim.F90 2012-07-05 05:36:43 UTC (rev 382) @@ -697,23 +697,23 @@ enddo write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf call CCTK_WARN(failinfomode,warnline) - write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z + write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) if(nf.gt.nfudgemax) then if(GRHydro_c2p_reset_eps_tau_hot_eos.ne.1) then call CCTK_WARN(failinfomode,"EOS error in c2p 0: injected heat too many times") - write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z + write(warnline,"(i8.4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye call CCTK_WARN(failinfomode,warnline) write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A10,i5,i5)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration + write(warnline,"(A10,i5,i8)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") else call CCTK_WARN(failinfomode,"EOS error in c2p 0: LAST RESORT -- reset eps and tau based on old temp") - write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z + write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye call CCTK_WARN(failinfomode,warnline) @@ -790,23 +790,23 @@ enddo write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf call CCTK_WARN(failinfomode,warnline) - write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z + write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) if(nf.gt.nfudgemax) then if(GRHydro_c2p_reset_eps_tau_hot_eos.ne.1) then call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times") - write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z + write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye call CCTK_WARN(failinfomode,warnline) write(warnline,"(A7,i8)") "code: ",keyerr(1) call CCTK_WARN(failinfomode,warnline) - write(warnline,"(A10,i5,i5)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration + write(warnline,"(A10,i5,i8)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration call CCTK_WARN(failinfomode,warnline) call CCTK_WARN(failwarnmode,"Aborting!!!") else call CCTK_WARN(failinfomode,"EOS error in c2p 1: LAST RESORT -- reset eps and tau based on old temp") - write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z + write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye call CCTK_WARN(failinfomode,warnline) @@ -938,12 +938,12 @@ enddo write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf call CCTK_WARN(failinfomode,warnline) - write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z + write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) if(nf.gt.nfudgemax) then if(GRHydro_c2p_reset_eps_tau_hot_eos.ne.1) then call CCTK_WARN(failinfomode,"EOS error in c2p 2: injected heat too many times") - write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z + write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye call CCTK_WARN(failinfomode,warnline) @@ -954,7 +954,7 @@ call CCTK_WARN(failwarnmode,"Aborting!!!") else call CCTK_WARN(failinfomode,"EOS error in c2p 2: LAST RESORT -- reset eps and tau based on old temp") - write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z + write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z call CCTK_WARN(failinfomode,warnline) write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye call CCTK_WARN(failinfomode,warnline)

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 381)
by rhaas＠tapir.caltech.edu 04 Jul '12

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/ schedule.ccl Log: GRHydro: text-only typos in schedule description File Changes: Directory: /trunk/ ================== File [modified]: schedule.ccl Delta lines: +3 -3 =================================================================== --- trunk/schedule.ccl 2012-07-05 05:36:40 UTC (rev 380) +++ trunk/schedule.ccl 2012-07-05 05:36:42 UTC (rev 381) @@ -1011,7 +1011,7 @@ LANG: Fortran OPTIONS: LEVEL SYNC: GRHydro_atmosphere_mask_real -} "Select primitive variables for boudary conditions" +} "Select atmosphere mask for boundary conditions" schedule group ApplyBCs AS GRHydro_ApplyAtmosphereMaskBCs in GRHydro_AtmosphereMaskBoundaries AFTER GRHydro_SelectAtmosphereMaskBoundaries { @@ -1118,7 +1118,7 @@ SYNC: hydrobase::temperature SYNC: lvel SYNC: lBvec - } "Select primitive variables for boudary conditions" + } "Select primitive variables for boundary conditions" } else { @@ -1158,7 +1158,7 @@ SYNC: HydroBase::vel SYNC: HydroBase::Bvec SYNC: hydrobase::temperature - } "Select primitive variables for boudary conditions" + } "Select primitive variables for boundary conditions" }

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 380)
by rhaas＠tapir.caltech.edu 04 Jul '12

04 Jul '12

User: rhaas Date: 2012/07/05 12:36 AM Modified: /trunk/src/ GRHydro_CalcUpdate.F90 Log: * change comparison of double with integer to double with double File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_CalcUpdate.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_CalcUpdate.F90 2012-07-05 05:36:38 UTC (rev 379) +++ trunk/src/GRHydro_CalcUpdate.F90 2012-07-05 05:36:40 UTC (rev 380) @@ -358,8 +358,8 @@ ! Eliminate non-radial fluid velocities to obtain pseudo 1D scheme rnorm = (x(i,j,k)**2 + y(i,j,k)**2 + z(i,j,k)**2) - if (rnorm.eq.0) then - rnormI = 0 + if (rnorm.lt.1.0d-10) then + rnormI = 0.0d0 else rnormI = 1.0d0/rnorm endif

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits July 2012