From 7cb5e4284bf648be9fc7662d9f73398bcc279cef Mon Sep 17 00:00:00 2001 From: Spencer Bryngelson Date: Fri, 7 Jan 2022 16:42:05 -0500 Subject: [PATCH] fix --- Makefile.user | 4 +- src/simulation_code/m_bubbles.f90 | 3 - src/simulation_code/m_cbc.f90 | 3 - src/simulation_code/m_compile_specific.f90 | 3 - src/simulation_code/m_data_output.f90 | 3 - src/simulation_code/m_derived_types.f90 | 3 - src/simulation_code/m_derived_variables.f90 | 3 - src/simulation_code/m_fftw.f90 | 3 - src/simulation_code/m_global_parameters.f90 | 54 +---- src/simulation_code/m_mpi_proxy.f90 | 3 - src/simulation_code/m_qbmm.f90 | 3 - src/simulation_code/m_rhs.f90 | 193 +++++++----------- src/simulation_code/m_riemann_solvers.f90 | 3 - src/simulation_code/m_start_up.f90 | 3 - src/simulation_code/m_time_steppers.f90 | 3 - .../m_variables_conversion.f90 | 3 - src/simulation_code/m_weno.f90 | 3 - src/simulation_code/p_main.f90 | 3 - 18 files changed, 74 insertions(+), 222 deletions(-) diff --git a/Makefile.user b/Makefile.user index 1f43e9d270..5effe4e528 100644 --- a/Makefile.user +++ b/Makefile.user @@ -9,7 +9,7 @@ FC = mpif90 ### Compiler flags [set according to your compiler] ### #Note: Requires -cpp to enable preprocessor -FFLAGS = -cpp -c -w -Ofast +FFLAGS = -cpp -c -w -O3 # FFLAGS = -cpp -c -w -fast -Minfo=accel # FFLAGS = -cpp -c -w -freal-4-real-8 -O3 -fallow-argument-mismatch @@ -41,4 +41,4 @@ silo_lib_dir = $(MFC_DIR)/dependencies/SILO/lib silo_include_dir = $(MFC_DIR)/dependencies/SILO/include #silo_lib_dir = /home/spencer/packages/silo-4.10.2/lib -#silo_include_dir = /home/spencer/packages/silo-4.10.2/include \ No newline at end of file +#silo_include_dir = /home/spencer/packages/silo-4.10.2/include diff --git a/src/simulation_code/m_bubbles.f90 b/src/simulation_code/m_bubbles.f90 index dc01142e4a..04e73ed221 100755 --- a/src/simulation_code/m_bubbles.f90 +++ b/src/simulation_code/m_bubbles.f90 @@ -1,9 +1,6 @@ !> !! @file m_bubbles.f90 !! @brief Contains module m_bubbles -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief This module is used to compute the ensemble-averaged bubble dynamic variables MODULE m_bubbles diff --git a/src/simulation_code/m_cbc.f90 b/src/simulation_code/m_cbc.f90 index 1d85a4f3a3..c011d51ead 100755 --- a/src/simulation_code/m_cbc.f90 +++ b/src/simulation_code/m_cbc.f90 @@ -1,9 +1,6 @@ !> !! @file m_cbc.f90 !! @brief Contains module m_cbc -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief The module features a large database of characteristic boundary !! conditions (CBC) for the Euler system of equations. This system diff --git a/src/simulation_code/m_compile_specific.f90 b/src/simulation_code/m_compile_specific.f90 index b22657e04d..1fb6dd6f0f 100755 --- a/src/simulation_code/m_compile_specific.f90 +++ b/src/simulation_code/m_compile_specific.f90 @@ -1,9 +1,6 @@ !> !! @file m_compile_specific.f90 !! @brief Contains module m_compile_specific -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief This module contains subroutines that are compiler specific MODULE m_compile_specific diff --git a/src/simulation_code/m_data_output.f90 b/src/simulation_code/m_data_output.f90 index 85ae072341..0903b97dc8 100755 --- a/src/simulation_code/m_data_output.f90 +++ b/src/simulation_code/m_data_output.f90 @@ -1,9 +1,6 @@ !> !! @file m_data_output.f90 !! @brief Contains module m_data_output -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief The primary purpose of this module is to output the grid and the !! conservative variables data at the chosen time-step interval. In diff --git a/src/simulation_code/m_derived_types.f90 b/src/simulation_code/m_derived_types.f90 index 962dd8be81..557b42d27f 100755 --- a/src/simulation_code/m_derived_types.f90 +++ b/src/simulation_code/m_derived_types.f90 @@ -1,9 +1,6 @@ !> !! @file m_derived_types.f90 !! @brief Contains module m_derived_types -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief This module features the definitions of all the custom-defined !! derived types that are utilized throughout the simulation code. diff --git a/src/simulation_code/m_derived_variables.f90 b/src/simulation_code/m_derived_variables.f90 index 35ef2ba20a..c92c7b8842 100755 --- a/src/simulation_code/m_derived_variables.f90 +++ b/src/simulation_code/m_derived_variables.f90 @@ -1,9 +1,6 @@ !> !! @file m_derived_variables.f90 !! @brief Contains module m_derived_variables -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief This module features subroutines that allow for the derivation of !! numerous flow variables from the conservative and primitive ones. diff --git a/src/simulation_code/m_fftw.f90 b/src/simulation_code/m_fftw.f90 index 36dc92e9a0..143025a446 100755 --- a/src/simulation_code/m_fftw.f90 +++ b/src/simulation_code/m_fftw.f90 @@ -1,9 +1,6 @@ !> !! @file m_fftw.f90 !! @brief Contains module m_fftw -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief The module contains the subroutines for the FFT routines MODULE m_fftw diff --git a/src/simulation_code/m_global_parameters.f90 b/src/simulation_code/m_global_parameters.f90 index d3f48a8cd4..575a6d60a4 100755 --- a/src/simulation_code/m_global_parameters.f90 +++ b/src/simulation_code/m_global_parameters.f90 @@ -1,9 +1,6 @@ !> !! @file m_global_parameters.f90 !! @brief Contains module m_global_parameters -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief The module contains all of the parameters describing the program !! logistics, the computational domain and the simulation algorithm. @@ -18,8 +15,6 @@ MODULE m_global_parameters USE mpi !< Message passing interface (MPI) module USE m_derived_types !< Definitions of the derived types - - USE m_eigen ! ========================================================================== @@ -1238,53 +1233,8 @@ END SUBROUTINE s_simpson SUBROUTINE s_wheeler - REAL(KIND(0d0)), DIMENSION(2*nb,2*nb) :: sig - REAL(KIND(0d0)), DIMENSION(nb,nb) :: Ja - REAL(KIND(0d0)), DIMENSION(2*nb) :: momRo - REAL(KIND(0d0)), DIMENSION(nb) :: evec, eigs, a, b - REAL(KIND(0d0)) :: muRo - INTEGER :: i,j - - muRo = 1d0 - - a = 0d0; b = 0d0 - sig = 0d0; Ja = 0d0 - - DO i = 0,2*nb-1 - momRo(i+1) = DEXP( i*LOG(muRo) + 0.5d0*(i*poly_sigma)**2d0 ) - END DO - - DO i = 0,2*nb-1 - sig(2,i+1) = momRo(i+1) - END DO - - a(1) = momRo(2)/momRo(1) - DO i = 1,nb-1 - DO j = i,2*nb-i-1 - sig(i+2,j+1) = sig(i+1,j+2) - a(i)*sig(i+1,j+1) - b(i)*sig(i,j+1) - a(i+1) = -1d0*(sig(i+1,i+1)/sig(i+1,i)) + sig(i+2,i+2)/sig(i+2,i+1) - b(i+1) = sig(i+2,i+1)/sig(i+1,i) - END DO - END DO - - DO i = 1,nb - Ja(i,i) = a(i) - END DO - DO i = 1,nb-1 - Ja(i,i+1) = -DSQRT(ABS(b(i+1))) - Ja(i+1,i) = -DSQRT(ABS(b(i+1))) - END DO - - CALL s_eigs(Ja,eigs,evec,nb) - - weight(1:nb) = (evec(nb:1:-1)**2d0)*momRo(1) - R0(1:nb) = eigs(nb:1:-1) - - IF (MINVAL(R0) < 0d0) THEN - PRINT*, 'Minimum R0 is negative. nb might be too large for Wheeler' - PRINT*, 'Aborting...' - STOP - END IF + print*, 's_wheeler no longer supported.' + stop END SUBROUTINE s_wheeler diff --git a/src/simulation_code/m_mpi_proxy.f90 b/src/simulation_code/m_mpi_proxy.f90 index 9c407d7d1d..ca5547c6c5 100755 --- a/src/simulation_code/m_mpi_proxy.f90 +++ b/src/simulation_code/m_mpi_proxy.f90 @@ -1,9 +1,6 @@ !> !! @file m_mpi_proxy.f90 !! @brief Contains module m_mpi_proxy -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief The module serves as a proxy to the parameters and subroutines !! available in the MPI implementation's MPI module. Specifically, diff --git a/src/simulation_code/m_qbmm.f90 b/src/simulation_code/m_qbmm.f90 index 4ff65679fc..ec7e53571a 100755 --- a/src/simulation_code/m_qbmm.f90 +++ b/src/simulation_code/m_qbmm.f90 @@ -1,9 +1,6 @@ !> !! @file m_qbmm.f90 !! @brief Contains module m_qbmm -!! @author S. Bryngelson -!! @version 1.0 -!! @date MAY 28, 2020 !> @brief This module is used to compute moment inversion via qbmm MODULE m_qbmm diff --git a/src/simulation_code/m_rhs.f90 b/src/simulation_code/m_rhs.f90 index 5136852fed..a2d10fe008 100755 --- a/src/simulation_code/m_rhs.f90 +++ b/src/simulation_code/m_rhs.f90 @@ -1,9 +1,6 @@ !> !! @file m_rhs.f90 !! @brief Contains module m_rhs -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief The module contains the subroutines used to calculate the right- !! hand-side (RHS) in the quasi-conservative, shock- and interface- @@ -1605,14 +1602,14 @@ SUBROUTINE s_compute_rhs(q_cons_vf, q_prim_vf, rhs_vf, t_step) ! ------- IF(weno_vars == 1) THEN CALL s_reconstruct_cell_boundary_values( & q_cons_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_cons_ndqp(i,:,:), & - qR_cons_ndqp(i,:,:), & + qL_cons_ndqp(i,0,0), & + qR_cons_ndqp(i,0,0), & weno_vars, i ) ELSE CALL s_reconstruct_cell_boundary_values( & q_prim_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_prim_ndqp(i,:,:), & - qR_prim_ndqp(i,:,:), & + qL_prim_ndqp(i,0,0), & + qR_prim_ndqp(i,0,0), & weno_vars, i ) END IF @@ -1626,8 +1623,8 @@ SUBROUTINE s_compute_rhs(q_cons_vf, q_prim_vf, rhs_vf, t_step) ! ------- CALL s_reconstruct_cell_boundary_values( & q_cons_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_cons_ndqp(i,:,:), & - qR_cons_ndqp(i,:,:), & + qL_cons_ndqp(i,0,0), & + qR_cons_ndqp(i,0,0), & dflt_int, i ) END IF @@ -1641,14 +1638,14 @@ SUBROUTINE s_compute_rhs(q_cons_vf, q_prim_vf, rhs_vf, t_step) ! ------- IF(weno_vars == 1) THEN CALL s_reconstruct_cell_boundary_values( & q_cons_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_cons_ndqp(i,:,:), & - qR_cons_ndqp(i,:,:), & + qL_cons_ndqp(i,0,0), & + qR_cons_ndqp(i,0,0), & dflt_int, i ) ELSE CALL s_reconstruct_cell_boundary_values( & q_prim_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_prim_ndqp(i,:,:), & - qR_prim_ndqp(i,:,:), & + qL_prim_ndqp(i,0,0), & + qR_prim_ndqp(i,0,0), & dflt_int, i ) END IF @@ -1661,14 +1658,14 @@ SUBROUTINE s_compute_rhs(q_cons_vf, q_prim_vf, rhs_vf, t_step) ! ------- IF(weno_vars == 1) THEN CALL s_reconstruct_cell_boundary_values( & q_cons_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_cons_ndqp(i,:,:), & - qR_cons_ndqp(i,:,:), & + qL_cons_ndqp(i,0,0), & + qR_cons_ndqp(i,0,0), & dflt_int, i ) ELSE CALL s_reconstruct_cell_boundary_values( & q_prim_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_prim_ndqp(i,:,:), & - qR_prim_ndqp(i,:,:), & + qL_prim_ndqp(i,0,0), & + qR_prim_ndqp(i,0,0), & dflt_int, i ) END IF ! =============================================================== @@ -1680,8 +1677,8 @@ SUBROUTINE s_compute_rhs(q_cons_vf, q_prim_vf, rhs_vf, t_step) ! ------- CALL s_reconstruct_cell_boundary_values( & q_cons_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_cons_ndqp(i,:,:), & - qR_cons_ndqp(i,:,:), & + qL_cons_ndqp(i,0,0), & + qR_cons_ndqp(i,0,0), & dflt_int, i ) ELSE @@ -1693,8 +1690,8 @@ SUBROUTINE s_compute_rhs(q_cons_vf, q_prim_vf, rhs_vf, t_step) ! ------- CALL s_reconstruct_cell_boundary_values( & q_cons_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_cons_ndqp(i,:,:), & - qR_cons_ndqp(i,:,:), & + qL_cons_ndqp(i,0,0), & + qR_cons_ndqp(i,0,0), & dflt_int, i ) END IF @@ -1756,22 +1753,22 @@ SUBROUTINE s_compute_rhs(q_cons_vf, q_prim_vf, rhs_vf, t_step) ! ------- CALL s_reconstruct_cell_boundary_values( & dq_prim_dx_qp(0,0,0)%vf(iv%beg:iv%end), & - dqL_prim_dx_ndqp(i,:,:), & - dqR_prim_dx_ndqp(i,:,:), & + dqL_prim_dx_ndqp(i,0,0), & + dqR_prim_dx_ndqp(i,0,0), & dflt_int, i ) IF(n > 0) THEN CALL s_reconstruct_cell_boundary_values( & dq_prim_dy_qp(0,0,0)%vf(iv%beg:iv%end), & - dqL_prim_dy_ndqp(i,:,:), & - dqR_prim_dy_ndqp(i,:,:), & + dqL_prim_dy_ndqp(i,0,0), & + dqR_prim_dy_ndqp(i,0,0), & dflt_int, i ) IF(p > 0) THEN CALL s_reconstruct_cell_boundary_values( & dq_prim_dz_qp(0,0,0)%vf(iv%beg:iv%end), & - dqL_prim_dz_ndqp(i,:,:), & - dqR_prim_dz_ndqp(i,:,:), & + dqL_prim_dz_ndqp(i,0,0), & + dqR_prim_dz_ndqp(i,0,0), & dflt_int, i ) END IF @@ -1790,14 +1787,14 @@ SUBROUTINE s_compute_rhs(q_cons_vf, q_prim_vf, rhs_vf, t_step) ! ------- IF (alt_crv .NEQV. .TRUE.) THEN CALL s_reconstruct_cell_boundary_values( & kappa_vf(iv%beg:iv%end), & - kappaL_ndqp(i,:,:), & - kappaR_ndqp(i,:,:), & + kappaL_ndqp(i,0,0), & + kappaR_ndqp(i,0,0), & dflt_int, i ) ELSE CALL s_reconstruct_cell_boundary_values( & alt_kappa_vf(iv%beg:iv%end), & - kappaL_ndqp(i,:,:), & - kappaR_ndqp(i,:,:), & + kappaL_ndqp(i,0,0), & + kappaR_ndqp(i,0,0), & dflt_int, i ) END IF @@ -1895,7 +1892,7 @@ SUBROUTINE s_compute_rhs(q_cons_vf, q_prim_vf, rhs_vf, t_step) ! ------- iv%beg = 1; iv%end = adv_idx%end - CALL s_average_cell_boundary_values(flux_ndqp(i,:,:)) + ! CALL s_average_cell_boundary_values(flux_ndqp(i,:,:)) IF(ANY(Re_size > 0) .OR. We_size > 0 .OR. hypoelasticity) THEN iv%beg = mom_idx%beg @@ -1905,8 +1902,8 @@ SUBROUTINE s_compute_rhs(q_cons_vf, q_prim_vf, rhs_vf, t_step) ! ------- IF(riemann_solver /= 1) iv%end = adv_idx%beg - CALL s_average_cell_boundary_values(flux_src_ndqp(i,:,:)) - CALL s_average_cell_boundary_values(flux_gsrc_ndqp(i,:,:)) + ! CALL s_average_cell_boundary_values(flux_src_ndqp(i,:,:)) + ! CALL s_average_cell_boundary_values(flux_gsrc_ndqp(i,:,:)) ! =============================================================== END IF @@ -4472,7 +4469,7 @@ SUBROUTINE s_get_tvd_flux(q_cons_vf, q_prim_vf, rhs_vf,i) ! ------- iv%beg = 1; iv%end = adv_idx%end - CALL s_average_cell_boundary_values(flux_ndqp(i,:,:)) + ! CALL s_average_cell_boundary_values(flux_ndqp(i,:,:)) IF(ANY(Re_size > 0) .OR. We_size > 0 .OR. hypoelasticity) THEN iv%beg = mom_idx%beg @@ -4482,8 +4479,8 @@ SUBROUTINE s_get_tvd_flux(q_cons_vf, q_prim_vf, rhs_vf,i) ! ------- IF(riemann_solver /= 1) iv%end = adv_idx%beg - CALL s_average_cell_boundary_values(flux_src_ndqp(i,:,:)) - CALL s_average_cell_boundary_values(flux_gsrc_ndqp(i,:,:)) + ! CALL s_average_cell_boundary_values(flux_src_ndqp(i,:,:)) + ! CALL s_average_cell_boundary_values(flux_gsrc_ndqp(i,:,:)) END SUBROUTINE s_get_tvd_flux @@ -4507,8 +4504,8 @@ SUBROUTINE s_get_viscous(q_cons_vf, q_prim_vf, rhs_vf) ! ------- CALL s_reconstruct_cell_boundary_values( & q_cons_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_cons_ndqp(i,:,:), & - qR_cons_ndqp(i,:,:), & + qL_cons_ndqp(i,0,0), & + qR_cons_ndqp(i,0,0), & dflt_int, i ) DO k = ipsi%beg, ipsi%end, 2 @@ -4544,16 +4541,16 @@ SUBROUTINE s_get_viscous(q_cons_vf, q_prim_vf, rhs_vf) ! ------- CALL s_reconstruct_cell_boundary_values( & q_prim_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_prim_ndqp(i,:,:), & - qR_prim_ndqp(i,:,:), & + qL_prim_ndqp(i,0,0), & + qR_prim_ndqp(i,0,0), & dflt_int, i ) END IF iv%beg = mom_idx%beg; iv%end = mom_idx%end - CALL s_average_cell_boundary_values(qL_prim_ndqp(i,:,:)) - CALL s_average_cell_boundary_values(qR_prim_ndqp(i,:,:)) + ! CALL s_average_cell_boundary_values(qL_prim_ndqp(i,:,:)) + ! CALL s_average_cell_boundary_values(qR_prim_ndqp(i,:,:)) END DO IF (weno_Re_flux) THEN @@ -4793,13 +4790,13 @@ SUBROUTINE s_get_crv(q_cons_vf, q_prim_vf, rhs_vf) ! ------- ! Reconstruct the volume fraction at the cell boundaries CALL s_reconstruct_cell_boundary_values( & q_prim_qp(0,0,0)%vf(iv%beg:iv%end), & - qL_prim_ndqp(i,:,:), & - qR_prim_ndqp(i,:,:), & + qL_prim_ndqp(i,0,0), & + qR_prim_ndqp(i,0,0), & dflt_int, i ) ! Average the quadrature points at the cell boundaries to ! obtain higher-order estimate of the volume fraction - CALL s_average_cell_boundary_values(qL_prim_ndqp(i,:,:)) - CALL s_average_cell_boundary_values(qR_prim_ndqp(i,:,:)) + ! CALL s_average_cell_boundary_values(qL_prim_ndqp(i,:,:)) + ! CALL s_average_cell_boundary_values(qR_prim_ndqp(i,:,:)) END DO ! ================================================================== @@ -4865,20 +4862,20 @@ SUBROUTINE s_get_crv(q_cons_vf, q_prim_vf, rhs_vf) ! ------- CALL s_reconstruct_cell_boundary_values( & dq_prim_dx_qp(0,0,0)%vf(iv%beg:iv%end), & - dqL_prim_dx_ndqp(i,:,:), & - dqR_prim_dx_ndqp(i,:,:), & + dqL_prim_dx_ndqp(i,0,0), & + dqR_prim_dx_ndqp(i,0,0), & dflt_int, i ) IF (n > 0) THEN CALL s_reconstruct_cell_boundary_values( & dq_prim_dy_qp(0,0,0)%vf(iv%beg:iv%end), & - dqL_prim_dy_ndqp(i,:,:), & - dqR_prim_dy_ndqp(i,:,:), & + dqL_prim_dy_ndqp(i,0,0), & + dqR_prim_dy_ndqp(i,0,0), & dflt_int, i ) IF (p > 0) THEN CALL s_reconstruct_cell_boundary_values( & dq_prim_dz_qp(0,0,0)%vf(iv%beg:iv%end), & - dqL_prim_dz_ndqp(i,:,:), & - dqR_prim_dz_ndqp(i,:,:), & + dqL_prim_dz_ndqp(i,0,0), & + dqR_prim_dz_ndqp(i,0,0), & dflt_int, i ) END IF END IF @@ -5015,16 +5012,16 @@ SUBROUTINE s_get_crv(q_cons_vf, q_prim_vf, rhs_vf) ! ------- ! Average the quadrature points at the cell boundaries to ! obtain higher-order estimate of the normalized volume fraction ! gradient - CALL s_average_cell_boundary_values(un_alphaL_x_ndqp(1,:,:)) - CALL s_average_cell_boundary_values(un_alphaR_x_ndqp(1,:,:)) - IF (n > 0) THEN - CALL s_average_cell_boundary_values(un_alphaL_y_ndqp(2,:,:)) - CALL s_average_cell_boundary_values(un_alphaR_y_ndqp(2,:,:)) - IF(p > 0) THEN - CALL s_average_cell_boundary_values(un_alphaL_z_ndqp(3,:,:)) - CALL s_average_cell_boundary_values(un_alphaR_z_ndqp(3,:,:)) - END IF - END IF + ! ! CALL s_average_cell_boundary_values(un_alphaL_x_ndqp(1,:,:)) + ! CALL s_average_cell_boundary_values(un_alphaR_x_ndqp(1,:,:)) + ! IF (n > 0) THEN + ! CALL s_average_cell_boundary_values(un_alphaL_y_ndqp(2,:,:)) + ! CALL s_average_cell_boundary_values(un_alphaR_y_ndqp(2,:,:)) + ! IF(p > 0) THEN + ! CALL s_average_cell_boundary_values(un_alphaL_z_ndqp(3,:,:)) + ! CALL s_average_cell_boundary_values(un_alphaR_z_ndqp(3,:,:)) + ! END IF + ! END IF ! ================================================================== IF (lsq_deriv .NEQV. .TRUE.) THEN ! Apply the vector divergence theorem to compute the divergence @@ -5913,10 +5910,12 @@ SUBROUTINE s_reconstruct_cell_boundary_values( v_vf, vL_qp, vR_qp, & ! - TYPE(scalar_field), DIMENSION(iv%beg:iv%end), INTENT(IN) :: v_vf - TYPE(vector_field), & - DIMENSION( ichi%beg:ichi%end, & - ipsi%beg:ipsi%end ), & - INTENT(INOUT) :: vL_qp, vR_qp + ! TYPE(vector_field), & + ! DIMENSION( ichi%beg:ichi%end, & + ! ipsi%beg:ipsi%end ), & + ! INTENT(INOUT) :: vL_qp, vR_qp + + TYPE(vector_field), INTENT(INOUT) :: vL_qp, vR_qp INTEGER, INTENT(IN) :: cd_vars INTEGER, INTENT(IN) :: norm_dir @@ -5940,68 +5939,16 @@ SUBROUTINE s_reconstruct_cell_boundary_values( v_vf, vL_qp, vR_qp, & ! - END IF CALL s_weno( v_vf(iv%beg:iv%end), & - vL_qp( 0, 0)%vf(iv%beg:iv%end), & - vR_qp( 0, 0)%vf(iv%beg:iv%end), & + vL_qp%vf(iv%beg:iv%end), & + vR_qp%vf(iv%beg:iv%end), & cd_vars, norm_dir, weno_dir, 1, & is1,is2,is3 ) ! ================================================================== ! Reconstruction in s2-direction =================================== IF(split_err .NEQV. .TRUE.) RETURN - - IF(norm_dir /= 1) THEN - weno_dir = 1; is1%beg = is1%beg + weno_polyn - is1%end = is1%end - weno_polyn - ELSE - weno_dir = 2; is2%beg = is2%beg + weno_polyn - is2%end = is2%end - weno_polyn - END IF - - CALL s_weno( vL_qp( 0, 0)%vf(iv%beg:iv%end), & - vL_qp(-1, 0)%vf(iv%beg:iv%end), & - vL_qp( 1, 0)%vf(iv%beg:iv%end), & - dflt_int, norm_dir,weno_dir, 2, & - is1,is2,is3 ) - CALL s_weno( vR_qp( 0, 0)%vf(iv%beg:iv%end), & - vR_qp(-1, 0)%vf(iv%beg:iv%end), & - vR_qp( 1, 0)%vf(iv%beg:iv%end), & - dflt_int, norm_dir,weno_dir, 2, & - is1,is2,is3 ) - ! ================================================================== - - - ! Reconstruction in s3-direction =================================== - IF(p == 0) RETURN - - IF(norm_dir /= 3) THEN - weno_dir = 3; is3%beg = is3%beg + weno_polyn - is3%end = is3%end - weno_polyn - ELSE - weno_dir = 2; is2%beg = is2%beg + weno_polyn - is2%end = is2%end - weno_polyn - END IF - - CALL s_weno( vL_qp(-1, 0)%vf(iv%beg:iv%end), & - vL_qp(-1,-1)%vf(iv%beg:iv%end), & - vL_qp(-1, 1)%vf(iv%beg:iv%end), & - dflt_int, norm_dir,weno_dir, 2, & - is1,is2,is3 ) - CALL s_weno( vL_qp( 1, 0)%vf(iv%beg:iv%end), & - vL_qp( 1,-1)%vf(iv%beg:iv%end), & - vL_qp( 1, 1)%vf(iv%beg:iv%end), & - dflt_int, norm_dir,weno_dir, 2, & - is1,is2,is3 ) - CALL s_weno( vR_qp(-1, 0)%vf(iv%beg:iv%end), & - vR_qp(-1,-1)%vf(iv%beg:iv%end), & - vR_qp(-1, 1)%vf(iv%beg:iv%end), & - dflt_int, norm_dir,weno_dir, 2, & - is1,is2,is3 ) - CALL s_weno( vR_qp( 1, 0)%vf(iv%beg:iv%end), & - vR_qp( 1,-1)%vf(iv%beg:iv%end), & - vR_qp( 1, 1)%vf(iv%beg:iv%end), & - dflt_int, norm_dir,weno_dir, 2, & - is1,is2,is3 ) - ! ================================================================== + + call s_mpi_abort() END SUBROUTINE s_reconstruct_cell_boundary_values ! -------------------- diff --git a/src/simulation_code/m_riemann_solvers.f90 b/src/simulation_code/m_riemann_solvers.f90 index 36f35bd724..82b52c6395 100755 --- a/src/simulation_code/m_riemann_solvers.f90 +++ b/src/simulation_code/m_riemann_solvers.f90 @@ -1,9 +1,6 @@ !> !! @file m_riemann_solvers.f90 !! @brief Contains module m_riemann_solvers -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief This module features a database of approximate and exact Riemann !! problem solvers for the Navier-Stokes system of equations, which diff --git a/src/simulation_code/m_start_up.f90 b/src/simulation_code/m_start_up.f90 index d8c25c2b63..e7b6be413b 100755 --- a/src/simulation_code/m_start_up.f90 +++ b/src/simulation_code/m_start_up.f90 @@ -1,9 +1,6 @@ !> !! @file m_start_up.f90 !! @brief Contains module m_start_up -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief The purpose of the module is primarily to read in the files that !! contain the inputs, the initial condition data and the grid data diff --git a/src/simulation_code/m_time_steppers.f90 b/src/simulation_code/m_time_steppers.f90 index 86db261acf..1b7cfcbe6e 100755 --- a/src/simulation_code/m_time_steppers.f90 +++ b/src/simulation_code/m_time_steppers.f90 @@ -1,9 +1,6 @@ !> !! @file m_time_steppers.f90 !! @brief Contains module m_time_steppers -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief The following module features a variety of time-stepping schemes. !! Currently, it includes the following Runge-Kutta (RK) algorithms: diff --git a/src/simulation_code/m_variables_conversion.f90 b/src/simulation_code/m_variables_conversion.f90 index 106b1a0f09..2885e8a414 100755 --- a/src/simulation_code/m_variables_conversion.f90 +++ b/src/simulation_code/m_variables_conversion.f90 @@ -1,9 +1,6 @@ !> !! @file m_variables_conversion.f90 !! @brief Contains module m_variables_conversion -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief This module features a database of subroutines that allow for the !! conversion of state variables from one type into another. At this diff --git a/src/simulation_code/m_weno.f90 b/src/simulation_code/m_weno.f90 index 7019b1921d..6ce3ff03be 100755 --- a/src/simulation_code/m_weno.f90 +++ b/src/simulation_code/m_weno.f90 @@ -1,9 +1,6 @@ !> !! @file m_weno.f90 !! @brief Contains module m_weno -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief Weighted essentially non-oscillatory (WENO) reconstruction scheme !! that is supplemented with monotonicity preserving bounds (MPWENO) diff --git a/src/simulation_code/p_main.f90 b/src/simulation_code/p_main.f90 index 23e8b42823..ee671749a7 100755 --- a/src/simulation_code/p_main.f90 +++ b/src/simulation_code/p_main.f90 @@ -1,9 +1,6 @@ !> !! @file p_main.f90 !! @brief Contains program p_main -!! @author S. Bryngelson, K. Schimdmayer, V. Coralic, J. Meng, K. Maeda, T. Colonius -!! @version 1.0 -!! @date JUNE 06 2019 !> @brief Quasi-conservative, shock- and interface- capturing finite-volume !! scheme for the multicomponent Navier-Stokes equations. The system