Skip to content

Commit

Permalink
(#55) more .F90->.f90 and minor cleanups
Browse files Browse the repository at this point in the history
  • Loading branch information
danieljprice committed Apr 9, 2024
1 parent b5d18c7 commit bc0f007
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
10 changes: 5 additions & 5 deletions build/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ SRCPOTS= extern_gr.F90 \
extern_spiral.f90 \
extern_lensethirring.f90 \
extern_gnewton.f90 \
lumin_nsdisc.F90 extern_prdrag.f90 \
lumin_nsdisc.f90 extern_prdrag.f90 \
extern_Bfield.f90 \
extern_densprofile.f90 \
extern_staticsine.f90 \
Expand Down Expand Up @@ -508,9 +508,9 @@ SRCMESA= eos_mesa_microphysics.f90 eos_mesa.f90
SRCEOS = eos_barotropic.f90 eos_stratified.f90 eos_piecewise.f90 ${SRCMESA} eos_shen.f90 eos_helmholtz.f90 eos_idealplusrad.f90 ionization.F90 eos_gasradrec.f90 eos.f90

ifeq ($(HDF5), yes)
SRCREADWRITE_DUMPS= utils_hdf5.f90 utils_dumpfiles_hdf5.f90 readwrite_dumps_common.F90 readwrite_dumps_fortran.F90 readwrite_dumps_hdf5.F90 readwrite_dumps.F90
SRCREADWRITE_DUMPS= utils_hdf5.f90 utils_dumpfiles_hdf5.f90 readwrite_dumps_common.f90 readwrite_dumps_fortran.F90 readwrite_dumps_hdf5.F90 readwrite_dumps.F90
else
SRCREADWRITE_DUMPS= readwrite_dumps_common.F90 readwrite_dumps_fortran.F90 readwrite_dumps.F90
SRCREADWRITE_DUMPS= readwrite_dumps_common.f90 readwrite_dumps_fortran.F90 readwrite_dumps.F90
endif

ifeq ($(KROME), krome)
Expand All @@ -534,7 +534,7 @@ SOURCES= physcon.f90 ${CONFIG} ${SRCKERNEL} io.F90 units.f90 \
partinject.F90 utils_inject.f90 dust_formation.f90 ptmass_radiation.f90 ptmass_heating.f90 \
utils_deriv.f90 utils_implicit.f90 radiation_implicit.f90 ${SRCTURB} \
${SRCINJECT_DEPS} wind_equations.f90 wind.F90 ${SRCINJECT} \
${SRCKROME} memory.F90 ${SRCREADWRITE_DUMPS} \
${SRCKROME} memory.f90 ${SRCREADWRITE_DUMPS} \
quitdump.f90 ptmass.F90 \
readwrite_infile.F90 dens.F90 force.F90 deriv.F90 energies.F90 sort_particles.f90 \
utils_shuffleparticles.F90 evwrite.f90 step_leapfrog.F90 writeheader.F90 ${SRCAN} step_supertimestep.F90 \
Expand Down Expand Up @@ -616,7 +616,7 @@ SRCDUMP= physcon.f90 ${CONFIG} ${SRCKERNEL} utils_omp.F90 io.F90 units.f90 \
centreofmass.f90 \
timestep.f90 ${SRCEOS} cullendehnen.f90 dust_formation.f90 \
${SRCGR} ${SRCPOT} \
memory.F90 \
memory.f90 \
utils_sphNG.f90 \
setup_params.f90 ${SRCFASTMATH} checkoptions.F90 \
viscosity.f90 damping.f90 options.f90 checkconserved.f90 prompting.f90 ${SRCDUST} \
Expand Down
File renamed without changes.
9 changes: 6 additions & 3 deletions src/main/interp_metric.F90 → src/main/interp_metric.f90
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,27 @@
!--------------------------------------------------------------------------!
module metric_interp
!
! metric_interp
! Interpolate a tabulated metric onto the particle positions
!
! :References: None
! :References:
! Magnall, Price, Lasky & Macpherson (2023), Phys. Rev D. 108, 103534
!
! :Owner: Spencer Magnall
!
! :Runtime parameters: None
!
! :Dependencies: einsteintk_utils
!
implicit none

interface trilinear_interp
module procedure interp_g, interp_sqrtg, interp_gderiv
end interface trilinear_interp

contains

subroutine interp_g()

end subroutine interp_g

subroutine interp_sqrtg()
Expand Down Expand Up @@ -54,7 +58,6 @@ pure subroutine get_grid_neighbours(position,dx,xlower,ylower,zlower)
ylower = ylower + 1
zlower = zlower + 1


end subroutine get_grid_neighbours

end module metric_interp
File renamed without changes.
2 changes: 1 addition & 1 deletion src/main/memory.F90 → src/main/memory.f90
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
!--------------------------------------------------------------------------!
module memory
!
! None
! Wrapper routines for memory allocation
!
! :References: None
!
Expand Down
File renamed without changes.

0 comments on commit bc0f007

Please sign in to comment.