diff options
| -rw-r--r-- | src/GRHydro_UpdateMask.F90 | 7 | ||||
| -rw-r--r-- | src/GRHydro_UpdateMaskM.F90 | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/GRHydro_UpdateMask.F90 b/src/GRHydro_UpdateMask.F90 index b8c3208..b5a84a5 100644 --- a/src/GRHydro_UpdateMask.F90 +++ b/src/GRHydro_UpdateMask.F90 @@ -201,6 +201,7 @@ subroutine GRHydro_InitAtmosMask(CCTK_ARGUMENTS) CCTK_INT :: i,j,k + !$OMP PARALLEL DO PRIVATE(i,j,k) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) @@ -211,6 +212,7 @@ subroutine GRHydro_InitAtmosMask(CCTK_ARGUMENTS) end do end do end do + !$OMP END PARALLEL DO call CCTK_INFO("Setting up the atmosphere mask: points with rho<rho_min are set to be atmosphere") @@ -445,6 +447,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS) rho_min = rho_min * initial_atmosphere_factor endif +!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) @@ -477,6 +480,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS) temperature(i,j,k),y_e(i,j,k)) y_e_con(i,j,k) = dens(i,j,k) * y_e(i,j,k) else + keytemp = 0 call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& @@ -518,6 +522,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS) temperature_p(i,j,k),y_e_p(i,j,k)) y_e_con_p(i,j,k) = dens_p(i,j,k) * y_e_p(i,j,k) else + keytemp = 0 call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& rho_p(i,j,k),eps_p(i,j,k),xtemp,xye,press_p(i,j,k),keyerr,anyerr) call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& @@ -559,6 +564,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS) temperature_p_p(i,j,k),y_e_p_p(i,j,k)) y_e_con_p_p(i,j,k) = dens_p_p(i,j,k) * y_e_p_p(i,j,k) else + keytemp = 0 call EOS_Omni_press(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& rho_p_p(i,j,k),eps_p_p(i,j,k),xtemp,xye,press_p_p(i,j,k),keyerr,anyerr) call EOS_Omni_EpsFromPress(GRHydro_polytrope_handle,keytemp,GRHydro_eos_rf_prec,n,& @@ -576,6 +582,7 @@ subroutine GRHydro_InitialAtmosphereReset(CCTK_ARGUMENTS) end do end do end do +!$OMP END PARALLEL DO end subroutine GRHydro_InitialAtmosphereReset diff --git a/src/GRHydro_UpdateMaskM.F90 b/src/GRHydro_UpdateMaskM.F90 index 8bf4117..3419864 100644 --- a/src/GRHydro_UpdateMaskM.F90 +++ b/src/GRHydro_UpdateMaskM.F90 @@ -161,6 +161,7 @@ subroutine GRHydro_AtmosphereResetM(CCTK_ARGUMENTS) end do end do end do +!$OMP END PARALLEL DO !!$ call GRHydro_BoundariesM(CCTK_PASS_FTOF) #undef faulty_gxx @@ -316,6 +317,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS) rho_min = rho_min * initial_atmosphere_factor endif +!$OMP PARALLEL DO PRIVATE(det,keytemp,i,j,k,anyerr,keyerr) do k = 1, cctk_lsh(3) do j = 1, cctk_lsh(2) do i = 1, cctk_lsh(1) @@ -350,6 +352,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS) else + keytemp = 0 call EOS_Omni_press(eos_handle,keytemp,GRHydro_eos_rf_prec,n,& rho(i,j,k),eps(i,j,k),xtemp,xye,press(i,j,k),keyerr,anyerr) call EOS_Omni_EpsFromPress(eos_handle,keytemp,GRHydro_eos_rf_prec,n,& @@ -396,6 +399,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS) else + keytemp = 0 call EOS_Omni_press(eos_handle,keytemp,GRHydro_eos_rf_prec,n,& rho_p(i,j,k),eps_p(i,j,k),xtemp,xye,press_p(i,j,k),keyerr,anyerr) call EOS_Omni_EpsFromPress(eos_handle,keytemp,GRHydro_eos_rf_prec,n,& @@ -444,6 +448,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS) else + keytemp = 0 call EOS_Omni_press(eos_handle,keytemp,GRHydro_eos_rf_prec,n,& rho_p_p(i,j,k),eps_p_p(i,j,k),xtemp,xye,press_p_p(i,j,k),keyerr,anyerr) call EOS_Omni_EpsFromPress(eos_handle,keytemp,GRHydro_eos_rf_prec,n,& @@ -464,6 +469,7 @@ subroutine GRHydro_InitialAtmosphereResetM(CCTK_ARGUMENTS) end do end do end do +!$OMP END PARALLEL DO write(*,*) " GRHydro_InitialAtmosphereReset" !!$ call GRHydro_BoundariesM(CCTK_PASS_FTOF) |