Skip to content

fix the build with python3.12 #13

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

Open
Thomas-Ulrich wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix the build with python3.12 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
017d35a
fix the build with python3.12
Thomas-Ulrich Sep 25, 2025
ce2ec9a
now the module can also be loaded
Thomas-Ulrich Oct 1, 2025
d56685b
fix build of convmPy
Thomas-Ulrich Oct 24, 2025
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
3 changes: 2 additions & 1 deletion MOMENT_DISP_F90_OPENMP/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,9 @@ tar:
######################################
# PYTHON
######################################

python: parameter.o dimension1.o fft2cd.o fsource.o dll2km.o axitra2py
f2py -c -m convmPy -DF2PY_REPORT_ON_ARRAY_COPY=1 $(F2PY) convmPy.f90 fft2cd.o fsource.o dll2km.o
f2py -c -m convmPy -DF2PY_REPORT_ON_ARRAY_COPY=1 $(F2PY) parameter.f90 convmPy.F90 fsource.f90 fft2cd.f90 dll2km.f90

axitra2py: dimension1.o dimension2.o parameter.o allocateArray.o initdata.o dll2km.o axitra2py.o
$(FC) $(FFLAGS) -o $@ axitra2py.o dimension1.o dimension2.o allocateArray.o initdata.o dll2km.o parameter.o
0 MOMENT_DISP_F90_OPENMP/src/convmPy.f90 → MOMENT_DISP_F90_OPENMP/src/convmPy.F90
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions MOMENT_DISP_F90_OPENMP/src/dll2km.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ subroutine projlcc(rlat,rlon,xloc,yloc,isens)

implicit real*8 (a-h,o-z)
common /laccproj/ rlon0,radius,p0,fcon,cone,pi4
common /trig/ pi,radpdeg
common /trig/ radpdeg

! CONSTANTS SET IN EARLIER ROUTINE
! cone=alog(cos(radpdeg*stdlat1)/cos(radpdeg*stdlat2))/
Expand Down Expand Up @@ -79,7 +79,7 @@ subroutine init_lcc(rlat0,lon0,stdlat1,stdlat2)
implicit real*8 (a-h,o-z)
real*8 lon0
common /laccproj/ rlon0,radius,p0,fcon,cone,pi4
common /trig/ pi,radpdeg
common /trig/ radpdeg
rlon0=lon0
pi4=atan(1.)
pi=pi4*4.
Expand Down
10 changes: 4 additions & 6 deletions MOMENT_DISP_F90_OPENMP/src/parameter.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,12 @@
! **********************************************************************

module parameter
use iso_fortran_env
implicit none

! size for kind declaration, fs= single precision, fd=double precision
! uses iso_fortran_env, can be replace by any sizeof if your compiler is not Fortran2003 compliant
integer :: fs,fd
parameter(fd=real64, fs=real32)
integer, parameter :: fs = kind(0.0)
integer, parameter :: fd = kind(0d0)

complex(kind=fd) :: ai
parameter(ai=(0., 1.))
Expand Down Expand Up @@ -49,10 +48,9 @@ module parameter

contains
function doubleEquality(x1, x2) result(t)
use ISO_FORTRAN_ENV
implicit none

real(kind=real64) :: x1, x2
integer, parameter :: fd = kind(0d0)
real(kind=fd) :: x1, x2
logical :: t

t = (abs(x1 - x2) <= epsilon(x1))
Expand Down