Skip to content

fix N-D problem with newer compilers #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2022
Merged

fix N-D problem with newer compilers #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Makefile.user
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
#silo_include_dir = /home/spencer/packages/silo-4.10.2/include
3 changes: 0 additions & 3 deletions src/simulation_code/m_bubbles.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/simulation_code/m_cbc.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/simulation_code/m_compile_specific.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/simulation_code/m_data_output.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
3 changes: 0 additions & 3 deletions src/simulation_code/m_derived_types.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 0 additions & 3 deletions src/simulation_code/m_derived_variables.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
3 changes: 0 additions & 3 deletions src/simulation_code/m_fftw.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
54 changes: 2 additions & 52 deletions src/simulation_code/m_global_parameters.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.
Expand All @@ -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
! ==========================================================================


Expand Down Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions src/simulation_code/m_mpi_proxy.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
3 changes: 0 additions & 3 deletions src/simulation_code/m_qbmm.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading