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

Jump to bottom

Bug Fix: Diagnostics and Second Radial Derivatives when Using Finite-Difference Mode #566

Merged
merged 4 commits into from
Jul 16, 2024
Merged

Bug Fix: Diagnostics and Second Radial Derivatives when Using Finite-Difference Mode #566

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
cc6a643
Added finite-difference-aware logic to Diagnostics_Second_Derivatives…
feathern Jun 26, 2024
b0728b7
updated dependencies
feathern Jun 26, 2024
e46716a
Updated changelog.
feathern Jun 26, 2024
300c043
Moved changelog addition to end of fixes (was at beginning).
feathern Jun 26, 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: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm

- Running the configure command now requires the correct combination of library locations to be specified; \[Brandon Lazard; 6-21-2024] [#535](https://github.com/geodynamics/Rayleigh/pull/535)

- Fixed a bug that was causing Rayleigh to crash during output if finite-difference mode was active and second-order derivatives in radius were required for output. \[Nick Featherstone; 6-26-2024; [#566](https://github.com/geodynamics/Rayleigh/pull/566) \]


## [1.2.0] - 5-29-2024

Expand Down
26 changes: 19 additions & 7 deletions src/Diagnostics/Diagnostics_Second_Derivatives.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ Module Diagnostics_Second_Derivatives
Use Diagnostics_Base
Use Structures
Use Spectral_Derivatives
Use Finite_Difference, Only : d_by_dx3d3
Implicit None


Expand Down Expand Up @@ -378,20 +379,31 @@ Subroutine Compute_Second_Derivatives(inbuffer)
!Move to p1b configuration
Call d2buffer%reform()
Call d2buffer%construct('p1a')
Call gridcp%To_Spectral(d2buffer%p1b,d2buffer%p1a)
Call gridcp%dealias_buffer(d2buffer%p1a)
If (chebyshev) Then
Call gridcp%To_Spectral(d2buffer%p1b,d2buffer%p1a)
Call gridcp%dealias_buffer(d2buffer%p1a)
Else
d2buffer%p1a = d2buffer%p1b
Endif
d2buffer%p1b = 0.0
d2buffer%config='p1a'

!Write(6,*)'Steps 4 complete.'

!////////////////////////////////////////////////////////////
! Steps 5-6: Load d2_by_dr2 and d2_by_drdt into the buffer
Do i = 1, nddfields*2
j = i+nddfields*2
Call gridcp%d_by_dr_cp(i,j,d2buffer%p1a,1)
Enddo
Call gridcp%From_Spectral(d2buffer%p1a,d2buffer%p1b)
If (chebyshev) Then
Do i = 1, nddfields*2
j = i+nddfields*2
Call gridcp%d_by_dr_cp(i,j,d2buffer%p1a,1)
Enddo
Call gridcp%From_Spectral(d2buffer%p1a,d2buffer%p1b)
Else
Do i = 1, nddfields*2
j = i+nddfields*2
Call d_by_dx3d3(i,j,d2buffer%p1a,1)
Enddo
Endif
d2buffer%p1a=d2buffer%p1b
Call d2buffer%deconstruct('p1b')

Expand Down
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 @@ -25,7 +25,7 @@ Diagnostics_Mean_Correction.o : Diagnostics_Mean_Correction.F90 indices.F Diagno
Diagnostics_Miscellaneous.o : Diagnostics_Miscellaneous.F90 indices.F Diagnostics_Base.o
Diagnostics_Poynting_Flux.o : Diagnostics_Poynting_Flux.F90 indices.F Diagnostics_Base.o
Diagnostics_Scalars.o : Diagnostics_Scalars.F90 indices.F Controls.o Diagnostics_Base.o
Diagnostics_Second_Derivatives.o : Diagnostics_Second_Derivatives.F90 indices.F Spectral_Derivatives.o Structures.o Diagnostics_Base.o
Diagnostics_Second_Derivatives.o : Diagnostics_Second_Derivatives.F90 indices.F Finite_Difference.o Spectral_Derivatives.o Structures.o Diagnostics_Base.o
Diagnostics_Thermal_Energies.o : Diagnostics_Thermal_Energies.F90 indices.F Diagnostics_ADotGradB.o Diagnostics_Base.o
Diagnostics_Thermal_Equation.o : Diagnostics_Thermal_Equation.F90 indices.F Diagnostics_ADotGradB.o Diagnostics_Base.o
Diagnostics_Thermodynamic_Gradients.o : Diagnostics_Thermodynamic_Gradients.F90 indices.F Diagnostics_Base.o
Expand Down