From 6010246101dce0e9d67596cbbfcc0d1f73f429dc Mon Sep 17 00:00:00 2001 From: knarf Date: Fri, 6 Dec 2013 22:59:27 +0000 Subject: revert last commit to see why this made the testsuite fail in jenkins but not my workstation git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinInitialData/GRHydro_InitData/trunk@221 ac85fae7-cede-4708-beff-ae01c7fa1c26 --- param.ccl | 5 ----- src/GRHydro_PoloidalMagFieldM.F90 | 23 +++++++---------------- 2 files changed, 7 insertions(+), 21 deletions(-) diff --git a/param.ccl b/param.ccl index d4a1116..3ce9530 100644 --- a/param.ccl +++ b/param.ccl @@ -462,11 +462,6 @@ CCTK_REAL poloidal_P_cut "Pressure used to confine the B field inside a star" (0:* :: "Anything positive." } 1.0e-8 -CCTK_INT poloidal_P_p "Index of pressure factor" -{ - (0:* :: "Any non-negative integer" -} 1 - CCTK_REAL poloidal_rho_max "Maximum initial density" { (0:* :: "Anything positive." diff --git a/src/GRHydro_PoloidalMagFieldM.F90 b/src/GRHydro_PoloidalMagFieldM.F90 index d8c454c..c809001 100644 --- a/src/GRHydro_PoloidalMagFieldM.F90 +++ b/src/GRHydro_PoloidalMagFieldM.F90 @@ -88,10 +88,6 @@ subroutine GRHydro_PoloidalMagFieldM(CCTK_ARGUMENTS) ! Initialize to zero Bvec = 0.0d0 - Aphi_dx = 0.0 - Aphi_dy = 0.0 - Aphi_dz = 0.0 - do i=2,nx-1 do j=2,ny-1 do k=2,nz-1 @@ -99,7 +95,7 @@ subroutine GRHydro_PoloidalMagFieldM(CCTK_ARGUMENTS) rhofac = 1.0d0-rho(i,j,k)/poloidal_rho_max delPcut = press(i,j,k)-poloidal_P_cut maxP_Pcut = max(delPcut,0.0d0) - AphiL = poloidal_A_b*rhofac**poloidal_n_p*maxP_Pcut**poloidal_P_p + AphiL = poloidal_A_b*rhofac**poloidal_n_p*maxP_Pcut Ax = -y(i,j,k)*AphiL Ay = x(i,j,k)*AphiL Az = 0.0 @@ -119,17 +115,12 @@ subroutine GRHydro_PoloidalMagFieldM(CCTK_ARGUMENTS) press_dy = 0.5d0*(press(i,j+1,k)-press(i,j-1,k))/dy press_dz = 0.5d0*(press(i,j,k+1)-press(i,j,k-1))/dz - if (maxP_Pcut > 0.0) then - Aphi_dx = poloidal_A_b*( & - -poloidal_n_p*rho_dx/poloidal_rho_max*maxP_Pcut**poloidal_P_p & - +rhofac**poloidal_n_p*press_dx*poloidal_P_p*maxP_Pcut**(poloidal_P_p-1)) - Aphi_dy = poloidal_A_b*( & - -poloidal_n_p*rho_dy/poloidal_rho_max*maxP_Pcut**poloidal_P_p & - +rhofac**poloidal_n_p*press_dy*poloidal_P_p*maxP_Pcut**(poloidal_P_p-1)) - Aphi_dz = poloidal_A_b*( & - -poloidal_n_p*rho_dz/poloidal_rho_max*maxP_Pcut**poloidal_P_p & - +rhofac**poloidal_n_p*press_dz*poloidal_P_p*maxP_Pcut**(poloidal_P_p-1)) - endif + Aphi_dx = poloidal_A_b*rhofac**(poloidal_n_p-1)*maxP_Pcut* & + ( rhofac*press_dx/delPcut - poloidal_n_p*rho_dx/poloidal_rho_max ) + Aphi_dy = poloidal_A_b*rhofac**(poloidal_n_p-1)*maxP_Pcut* & + ( rhofac*press_dy/delPcut - poloidal_n_p*rho_dy/poloidal_rho_max ) + Aphi_dz = poloidal_A_b*rhofac**(poloidal_n_p-1)*maxP_Pcut* & + ( rhofac*press_dz/delPcut - poloidal_n_p*rho_dz/poloidal_rho_max ) Ax_dy = -AphiL - y(i,j,k)*Aphi_dy Ax_dz = -y(i,j,k)*Aphi_dz -- cgit v1.2.3