From 9505bc08e59d147a7441dfbc449d53ff19034707 Mon Sep 17 00:00:00 2001 From: rhaas Date: Mon, 17 Sep 2012 16:27:32 +0000 Subject: Get rid of (some) tab characters * There are still a lot of committed tab characters in the code. I will try to slowly clean that up. Meanwhile, please teach your text editor to transform tab characters into equivalent blank spaces before saving file to disk. This avoids code looking unformatted to other users due to different personal or default text editor settings for tab characters.. From: Bruno Coutinho Mundim git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/GRHydro_InitData/trunk@168 ac85fae7-cede-4708-beff-ae01c7fa1c26 --- src/GRHydro_AdvectedLoopM.F90 | 20 ++++++++++---------- src/GRHydro_AlfvenWaveM.F90 | 16 ++++++++-------- src/GRHydro_Bondi.c | 38 +++++++++++++++++++------------------- src/GRHydro_Bondi_new.F90 | 0 4 files changed, 37 insertions(+), 37 deletions(-) mode change 100755 => 100644 src/GRHydro_Bondi_new.F90 (limited to 'src') diff --git a/src/GRHydro_AdvectedLoopM.F90 b/src/GRHydro_AdvectedLoopM.F90 index 922e7f5..21acdb1 100644 --- a/src/GRHydro_AdvectedLoopM.F90 +++ b/src/GRHydro_AdvectedLoopM.F90 @@ -83,7 +83,7 @@ subroutine GRHydro_AdvectedLoopM(CCTK_ARGUMENTS) rhoval = 1.0d0 pressval = 3.0d0 - if (CCTK_EQUALS(advectedloop_type,"2D")) then + if (CCTK_EQUALS(advectedloop_type,"2D")) then !!$ Vx, Vy and Vz values: @@ -105,7 +105,7 @@ subroutine GRHydro_AdvectedLoopM(CCTK_ARGUMENTS) call CCTK_WARN(0,"V^z component case not recognized!") end if - else if (CCTK_EQUALS(advectedloop_type,"3D")) then + else if (CCTK_EQUALS(advectedloop_type,"3D")) then vxval=0.2d0*sqrt(2.0d0) vyval=0.2d0 @@ -149,7 +149,7 @@ subroutine GRHydro_AdvectedLoopM(CCTK_ARGUMENTS) do i=1,nx do j=1,ny do k=1,nz - + rho(i,j,k)=rhoval press(i,j,k)=pressval eps(i,j,k)=press(i,j,k)/(gam-1.0d0)/rho(i,j,k) @@ -210,16 +210,16 @@ subroutine GRHydro_AdvectedLoopM(CCTK_ARGUMENTS) !!$ need to make x_d periodic! - if(x_d.gt.1.5*diaglength) then - x_d=x_d-2.0*diaglength + if(x_d.gt.1.5*diaglength) then + x_d=x_d-2.0*diaglength else if (x_d.gt.0.5*diaglength .and. x_d.lt.1.5*diaglength) then - x_d=x_d-diaglength - else if(x_d.lt.-1.5*diaglength) then - x_d=x_d+2.0*diaglength + x_d=x_d-diaglength + else if(x_d.lt.-1.5*diaglength) then + x_d=x_d+2.0*diaglength else if (x_d.lt.(-0.5*diaglength) .and. x_d.gt.(-1.5*diaglength)) then - x_d=x_d+diaglength + x_d=x_d+diaglength endif - + radius = sqrt(x_d**2+y_d**2) if (CCTK_EQUALS(advectedloop_delA,"Exact")) then diff --git a/src/GRHydro_AlfvenWaveM.F90 b/src/GRHydro_AlfvenWaveM.F90 index 23deb2a..53eb7b0 100644 --- a/src/GRHydro_AlfvenWaveM.F90 +++ b/src/GRHydro_AlfvenWaveM.F90 @@ -125,13 +125,13 @@ subroutine GRHydro_AlfvenWaveM(CCTK_ARGUMENTS) do j=1,ny do k=1,nz - rho(i,j,k)=rhoval + rho(i,j,k)=rhoval press(i,j,k)=pressval eps(i,j,k)=epsval if (CCTK_EQUALS(alfvenwave_type,"1D")) then - wnbr = 2.0d0*pi/range_x + wnbr = 2.0d0*pi/range_x velx(i,j,k)=vxval vely(i,j,k)=-valf*AA*cos(wnbr*x(i,j,k)) @@ -142,22 +142,22 @@ subroutine GRHydro_AlfvenWaveM(CCTK_ARGUMENTS) else if (CCTK_EQUALS(alfvenwave_type,"2D")) then - diaglength=range_x*range_y/range_d + diaglength=range_x*range_y/range_d range_d = sqrt(range_x**2+range_y**2) cos_theta = range_y/range_d sin_theta = range_x/range_d wnbr = 2.0d0*pi/diaglength - xnew = cos_theta*x(i,j,k)+sin_theta*y(i,j,k) + xnew = cos_theta*x(i,j,k)+sin_theta*y(i,j,k) - vparallel=vxval - vperp=-valf*AA*cos(wnbr*xnew) - velx(i,j,k)=vparallel*cos_theta-vperp*sin_theta + vparallel=vxval + vperp=-valf*AA*cos(wnbr*xnew) + velx(i,j,k)=vparallel*cos_theta-vperp*sin_theta vely(i,j,k)=vparallel*sin_theta+vperp*cos_theta velz(i,j,k)=-valf*AA*sin(wnbr*xnew) Bparallel=Bxval Bperp=AA*Bxval*cos(wnbr*xnew) - Bvecx(i,j,k)=Bparallel*cos_theta-Bperp*sin_theta + Bvecx(i,j,k)=Bparallel*cos_theta-Bperp*sin_theta Bvecy(i,j,k)=Bparallel*sin_theta+Bperp*cos_theta Bvecz(i,j,k)=AA*Bxval*sin(wnbr*xnew) diff --git a/src/GRHydro_Bondi.c b/src/GRHydro_Bondi.c index c657eec..e1b3d4c 100644 --- a/src/GRHydro_Bondi.c +++ b/src/GRHydro_Bondi.c @@ -350,7 +350,7 @@ static void setutcon(CCTK_REAL *vcon, CCTK_REAL gcov[][NDIM]) + gcov[2][2] * vcon[2] * vcon[2] + gcov[3][3] * vcon[3] * vcon[3] + 2.*( gcov[1][2] * vcon[1] * vcon[2] - + gcov[1][3] * vcon[1] * vcon[3] + + gcov[1][3] * vcon[1] * vcon[3] + gcov[2][3] * vcon[2] * vcon[3] ); c += 1. ; /* vector is timelike */ @@ -385,7 +385,7 @@ static void bl_gcov_func( CCTK_REAL *x, CCTK_REAL gcov[NDIM][NDIM]) r2 = r*r ; DD = 1. - 2.*M/r + asq/r2 ; mu = 1. + asq*cth*cth/r2 ; - + gcov[TT][TT] = -(1. - 2.*M/(r*mu)) ; gcov[TT][3] = -2.*M*a*s2/(r*mu) ; gcov[3][TT] = gcov[TT][3] ; @@ -456,17 +456,17 @@ static void set_bondi_parameters( CCTK_REAL M_in, CCTK_REAL Mdot_in, CCTK_REAL #if( LTRACE ) CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"\n#######################################################\n"); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"Bondi Solution Parameters1: \n"); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"------------------------- \n\n"); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"M = %28.20e Mdot = %28.20e rs = %28.20e \n",M,Mdot,rs); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"vs = %28.20e cs = %28.20e rhos = %28.20e \n",vs,cs,rhos); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"hs = %28.20e K = %28.20e Qdot = %28.20e \n",hs,K,Qdot); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"gam= %28.20e r_sol= %28.20e \n",gamma_eos, r_sol); - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"rs = : %28.20e \n", rs) ; - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"urs = : %28.20e \n", vs) ; - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"rhos = : %28.20e \n", rhos) ; - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"K = : %28.20e \n", K) ; - CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"#######################################################\n\n"); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"Bondi Solution Parameters1: \n"); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"------------------------- \n\n"); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"M = %28.20e Mdot = %28.20e rs = %28.20e \n",M,Mdot,rs); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"vs = %28.20e cs = %28.20e rhos = %28.20e \n",vs,cs,rhos); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"hs = %28.20e K = %28.20e Qdot = %28.20e \n",hs,K,Qdot); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"gam= %28.20e r_sol= %28.20e \n",gamma_eos, r_sol); + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"rs = : %28.20e \n", rs) ; + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"urs = : %28.20e \n", vs) ; + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"rhos = : %28.20e \n", rhos) ; + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"K = : %28.20e \n", K) ; + CCTK_VWarn(CCTK_WARN_DEBUG, __LINE__, __FILE__, CCTK_THORNSTRING,"#######################################################\n\n"); #endif return; @@ -495,9 +495,9 @@ static void set_bondi_parameters( CCTK_REAL M_in, CCTK_REAL Mdot_in, CCTK_REAL *****************************************************************/ static int gnr_bondi( CCTK_REAL x[], int n, - void (*funcd) (CCTK_REAL [], CCTK_REAL [], CCTK_REAL [], - CCTK_REAL [][NEWT_DIM_B], CCTK_REAL *, - CCTK_REAL *, int) ) + void (*funcd) (CCTK_REAL [], CCTK_REAL [], CCTK_REAL [], + CCTK_REAL [][NEWT_DIM_B], CCTK_REAL *, + CCTK_REAL *, int) ) { CCTK_REAL f, df, dx[NEWT_DIM_B], x_old[NEWT_DIM_B], resid[NEWT_DIM_B], jac[NEWT_DIM_B][NEWT_DIM_B]; @@ -560,7 +560,7 @@ static int gnr_bondi( CCTK_REAL x[], int n, if( doing_extra == 1 ) i_extra++ ; if( ((fabs(errx) <= NEWT_TOL_B)&&(doing_extra == 0)) || - (i_extra > EXTRA_NEWT_ITER_B) || (n_iter >= (MAX_NEWT_ITER_B-1)) ) { + (i_extra > EXTRA_NEWT_ITER_B) || (n_iter >= (MAX_NEWT_ITER_B-1)) ) { keep_iterating = 0; } @@ -704,8 +704,8 @@ static int find_bondi_solution( CCTK_REAL r, CCTK_REAL *rho, CCTK_REAL *u, CCTK_ retval = gnr_bondi( rho, NEWT_DIM_B, bondi_resid); if( retval ) { - CCTK_VWarn(CCTK_WARN_ALERT, __LINE__, __FILE__, CCTK_THORNSTRING,"find_bondi_solution: Incr. guess failed, decrease dfactor, retval = %d, r = %g, itry = %d \n", retval, r, itry); - return(10); + CCTK_VWarn(CCTK_WARN_ALERT, __LINE__, __FILE__, CCTK_THORNSTRING,"find_bondi_solution: Incr. guess failed, decrease dfactor, retval = %d, r = %g, itry = %d \n", retval, r, itry); + return(10); } } diff --git a/src/GRHydro_Bondi_new.F90 b/src/GRHydro_Bondi_new.F90 old mode 100755 new mode 100644 -- cgit v1.2.3