Skip to content
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

Added finite-difference support to the log_deriv subroutine. #572

Merged
merged 4 commits into from
Aug 28, 2024
Merged

Added finite-difference support to the log_deriv subroutine. #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
36523dd
Added finite-difference support to the log_deriv subroutine.
feathern Aug 15, 2024
7bca94b
Updated fdeps file.
feathern Aug 15, 2024
bd74570
do not deallocate unallocated arrays in FD mode
tukss Aug 27, 2024
e90d28d
Moved deallocate statement into main Chebyshev "if" block
feathern Aug 27, 2024
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
2 changes: 1 addition & 1 deletion src/Makefile.fdeps
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ Main.o : Main.F90 Run_Parameters.o Benchmarking.o Fourier_Transform.o Timers.o S
MakeDir.o : MakeDir.F90
Math_Constants.o : Math_Constants.F90 Ra_Precision.o
Math_Utility.o : Math_Utility.F90
PDE_Coefficients.o : PDE_Coefficients.F90 General_MPI.o Math_Utility.o Math_Constants.o Controls.o ProblemSize.o
PDE_Coefficients.o : PDE_Coefficients.F90 Finite_Difference.o General_MPI.o Math_Utility.o Math_Constants.o Controls.o ProblemSize.o
Parallel_Framework.o : Parallel_Framework.F90 BufferedOutput.o Structures.o Load_Balance.o General_MPI.o MPI_LAYER.o
Parallel_IO.o : Parallel_IO.F90 General_MPI.o Spherical_Buffer.o Legendre_Transforms.o Fourier_Transform.o MPI_LAYER.o ISendReceive.o Structures.o Parallel_Framework.o Ra_MPI_Base.o
ProblemSize.o : ProblemSize.F90 Ra_MPI_Base.o Timers.o BufferedOutput.o Math_Constants.o Finite_Difference.o Chebyshev_Polynomials.o Controls.o Spectral_Derivatives.o Legendre_Polynomials.o Parallel_Framework.o
Expand Down
41 changes: 25 additions & 16 deletions src/Physics/PDE_Coefficients.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ Module PDE_Coefficients
Use Math_Constants
Use Math_Utility
Use General_MPI, Only : BCAST2D
Use Finite_Difference, Only : d_by_dx
Implicit None

!///////////////////////////////////////////////////////////
Expand Down Expand Up @@ -1584,32 +1585,40 @@ Subroutine Log_Deriv(arr1,arr2, no_log)
! Arr1 is assumed to be in physical space.
! Set no_log = .true. to take normal derivative.

Allocate(dtemp(1:n_r,1,1,2))
Allocate(dtemp2(1:n_r,1,1,2))
If (chebyshev) Then

Allocate(dtemp(1:n_r,1,1,2))
Allocate(dtemp2(1:n_r,1,1,2))

dtemp(:,:,:,:) = 0.0d0
dtemp2(:,:,:,:) = 0.0d0
dtemp(1:n_r,1,1,1) = arr1(1:n_r)
dtemp(:,:,:,:) = 0.0d0
dtemp2(:,:,:,:) = 0.0d0
dtemp(1:n_r,1,1,1) = arr1(1:n_r)

! Transform to spectral space & de-alias
Call gridcp%to_Spectral(dtemp,dtemp2)
dtemp2((n_r*2)/3:n_r,1,1,1) = 0.0d0
! Transform to spectral space & de-alias
Call gridcp%to_Spectral(dtemp,dtemp2)
dtemp2((n_r*2)/3:n_r,1,1,1) = 0.0d0

! Take the derivative & de-alias
Call gridcp%d_by_dr_cp(1,2,dtemp2,1)
dtemp2((n_r*2)/3:n_r,1,1,2) = 0.0d0
! Take the derivative & de-alias
Call gridcp%d_by_dr_cp(1,2,dtemp2,1)
dtemp2((n_r*2)/3:n_r,1,1,2) = 0.0d0

!Transform back to physical space.
Call gridcp%From_Spectral(dtemp2,dtemp)
arr2(:) = dtemp(:,1,1,2)
!Transform back to physical space.
Call gridcp%From_Spectral(dtemp2,dtemp)
arr2(:) = dtemp(:,1,1,2)

DeAllocate(dtemp,dtemp2)

Else

Call d_by_dx(arr1,arr2,1)

Endif

! If desired, convert to logarithmic derivative (default)
If (.not. present(no_log)) Then
arr2(:) = arr2(:)/arr1(:)
Endif

DeAllocate(dtemp,dtemp2)

End Subroutine log_deriv

Subroutine Restore_Reference_Defaults
Expand Down