From 6469338ff3ed176219e746a5eb6fcbd5a6e9c81c Mon Sep 17 00:00:00 2001 From: Bill Ladwig Date: Fri, 12 Oct 2018 15:46:22 -0600 Subject: [PATCH] Removed the pyf file from setup and build scripts. This file is generated by numpy distutils when it isn't provided. --- build_scripts/chey_intel_mkl_omp.sh | 2 +- build_scripts/gnu_no_omp.sh | 2 +- build_scripts/gnu_omp.sh | 2 +- build_scripts/win_mingw_no_omp.bat | 2 +- build_scripts/win_mingw_omp.bat | 2 +- build_scripts/win_msvc_mingw_no_omp.bat | 2 +- build_scripts/win_msvc_mingw_omp.bat | 2 +- setup.py | 3 +-- 8 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build_scripts/chey_intel_mkl_omp.sh b/build_scripts/chey_intel_mkl_omp.sh index ee40614..c6b014f 100644 --- a/build_scripts/chey_intel_mkl_omp.sh +++ b/build_scripts/chey_intel_mkl_omp.sh @@ -7,7 +7,7 @@ python sub_sizes.py cd .. ifort ompgen.F90 -qopenmp -fpp -save-temps > /dev/null 2>&1 mv ompgen.i90 omp.f90 -f2py *.f90 -m _wrffortran -h wrffortran.pyf --overwrite-signature +#f2py *.f90 -m _wrffortran -h wrffortran.pyf --overwrite-signature cd .. python setup.py clean --all diff --git a/build_scripts/gnu_no_omp.sh b/build_scripts/gnu_no_omp.sh index b87b529..917c2da 100755 --- a/build_scripts/gnu_no_omp.sh +++ b/build_scripts/gnu_no_omp.sh @@ -2,7 +2,7 @@ cd ../fortran gfortran -E ompgen.F90 -cpp -o omp.f90 -f2py *.f90 -m _wrffortran -h wrffortran.pyf --overwrite-signature +#f2py *.f90 -m _wrffortran -h wrffortran.pyf --overwrite-signature cd .. python setup.py clean --all diff --git a/build_scripts/gnu_omp.sh b/build_scripts/gnu_omp.sh index 75310ad..3f97567 100755 --- a/build_scripts/gnu_omp.sh +++ b/build_scripts/gnu_omp.sh @@ -6,7 +6,7 @@ python sub_sizes.py cd .. gfortran -E ompgen.F90 -fopenmp -cpp -o omp.f90 -f2py *.f90 -m _wrffortran -h wrffortran.pyf --overwrite-signature +#f2py *.f90 -m _wrffortran -h wrffortran.pyf --overwrite-signature cd .. python setup.py clean --all diff --git a/build_scripts/win_mingw_no_omp.bat b/build_scripts/win_mingw_no_omp.bat index 9e1223c..f72d8de 100644 --- a/build_scripts/win_mingw_no_omp.bat +++ b/build_scripts/win_mingw_no_omp.bat @@ -1,7 +1,7 @@ cd ../fortran CALL gfortran -E ompgen.F90 -cpp -o omp.f90 REM Wildcards not working on Windows for some reason -CALL f2py -m _wrffortran -h wrffortran.pyf --overwrite-signature wrf_constants.f90 wrf_testfunc.f90 wrf_user.f90 rip_cape.f90 wrf_cloud_fracf.f90 wrf_fctt.f90 wrf_user_dbz.f90 wrf_relhl.f90 calc_uh.f90 wrf_user_latlon_routines.f90 wrf_pvo.f90 eqthecalc.f90 wrf_rip_phys_routines.f90 wrf_pw.f90 wrf_vinterp.f90 wrf_wind.f90 omp.f90 +REM CALL f2py -m _wrffortran -h wrffortran.pyf --overwrite-signature wrf_constants.f90 wrf_testfunc.f90 wrf_user.f90 rip_cape.f90 wrf_cloud_fracf.f90 wrf_fctt.f90 wrf_user_dbz.f90 wrf_relhl.f90 calc_uh.f90 wrf_user_latlon_routines.f90 wrf_pvo.f90 eqthecalc.f90 wrf_rip_phys_routines.f90 wrf_pw.f90 wrf_vinterp.f90 wrf_wind.f90 omp.f90 cd .. CALL python setup.py clean --all diff --git a/build_scripts/win_mingw_omp.bat b/build_scripts/win_mingw_omp.bat index a5fa4c3..84dbdba 100644 --- a/build_scripts/win_mingw_omp.bat +++ b/build_scripts/win_mingw_omp.bat @@ -5,7 +5,7 @@ CALL python sub_sizes.py cd .. CALL gfortran -E ompgen.F90 -cpp -fopenmp -o omp.f90 REM Wildcards not working on Windows for some reason -CALLf2py -m _wrffortran -h wrffortran.pyf --overwrite-signature wrf_constants.f90 wrf_testfunc.f90 wrf_user.f90 rip_cape.f90 wrf_cloud_fracf.f90 wrf_fctt.f90 wrf_user_dbz.f90 wrf_relhl.f90 calc_uh.f90 wrf_user_latlon_routines.f90 wrf_pvo.f90 eqthecalc.f90 wrf_rip_phys_routines.f90 wrf_pw.f90 wrf_vinterp.f90 wrf_wind.f90 omp.f90 +REM CALL f2py -m _wrffortran -h wrffortran.pyf --overwrite-signature wrf_constants.f90 wrf_testfunc.f90 wrf_user.f90 rip_cape.f90 wrf_cloud_fracf.f90 wrf_fctt.f90 wrf_user_dbz.f90 wrf_relhl.f90 calc_uh.f90 wrf_user_latlon_routines.f90 wrf_pvo.f90 eqthecalc.f90 wrf_rip_phys_routines.f90 wrf_pw.f90 wrf_vinterp.f90 wrf_wind.f90 omp.f90 cd .. CALL python setup.py clean --all diff --git a/build_scripts/win_msvc_mingw_no_omp.bat b/build_scripts/win_msvc_mingw_no_omp.bat index 6fa132b..b789008 100644 --- a/build_scripts/win_msvc_mingw_no_omp.bat +++ b/build_scripts/win_msvc_mingw_no_omp.bat @@ -1,7 +1,7 @@ cd ../fortran CALL gfortran -E ompgen.F90 -cpp -o omp.f90 REM Wildcards not working on Windows for some reason -CALL f2py -m _wrffortran -h wrffortran.pyf --overwrite-signature wrf_constants.f90 wrf_testfunc.f90 wrf_user.f90 rip_cape.f90 wrf_cloud_fracf.f90 wrf_fctt.f90 wrf_user_dbz.f90 wrf_relhl.f90 calc_uh.f90 wrf_user_latlon_routines.f90 wrf_pvo.f90 eqthecalc.f90 wrf_rip_phys_routines.f90 wrf_pw.f90 wrf_vinterp.f90 wrf_wind.f90 omp.f90 +REM CALL f2py -m _wrffortran -h wrffortran.pyf --overwrite-signature wrf_constants.f90 wrf_testfunc.f90 wrf_user.f90 rip_cape.f90 wrf_cloud_fracf.f90 wrf_fctt.f90 wrf_user_dbz.f90 wrf_relhl.f90 calc_uh.f90 wrf_user_latlon_routines.f90 wrf_pvo.f90 eqthecalc.f90 wrf_rip_phys_routines.f90 wrf_pw.f90 wrf_vinterp.f90 wrf_wind.f90 omp.f90 cd .. CALL python setup.py clean --all diff --git a/build_scripts/win_msvc_mingw_omp.bat b/build_scripts/win_msvc_mingw_omp.bat index f4d1c5d..2582a22 100644 --- a/build_scripts/win_msvc_mingw_omp.bat +++ b/build_scripts/win_msvc_mingw_omp.bat @@ -5,7 +5,7 @@ CALL python sub_sizes.py cd .. CALL gfortran -E ompgen.F90 -cpp -fopenmp -o omp.f90 REM Wildcards not working on Windows for some reason -CALL f2py -m _wrffortran -h wrffortran.pyf --overwrite-signature wrf_constants.f90 wrf_testfunc.f90 wrf_user.f90 rip_cape.f90 wrf_cloud_fracf.f90 wrf_fctt.f90 wrf_user_dbz.f90 wrf_relhl.f90 calc_uh.f90 wrf_user_latlon_routines.f90 wrf_pvo.f90 eqthecalc.f90 wrf_rip_phys_routines.f90 wrf_pw.f90 wrf_vinterp.f90 wrf_wind.f90 omp.f90 +REM CALL f2py -m _wrffortran -h wrffortran.pyf --overwrite-signature wrf_constants.f90 wrf_testfunc.f90 wrf_user.f90 rip_cape.f90 wrf_cloud_fracf.f90 wrf_fctt.f90 wrf_user_dbz.f90 wrf_relhl.f90 calc_uh.f90 wrf_user_latlon_routines.f90 wrf_pvo.f90 eqthecalc.f90 wrf_rip_phys_routines.f90 wrf_pw.f90 wrf_vinterp.f90 wrf_wind.f90 omp.f90 cd .. CALL python setup.py clean --all diff --git a/setup.py b/setup.py index d93704b..3964f41 100755 --- a/setup.py +++ b/setup.py @@ -40,8 +40,7 @@ ext1 = numpy.distutils.core.Extension( "fortran/wrf_pw.f90", "fortran/wrf_vinterp.f90", "fortran/wrf_wind.f90", - "fortran/omp.f90", - "fortran/wrffortran.pyf"] + "fortran/omp.f90"] ) with open("src/wrf/version.py") as f: