Merge branch 'feature/clean_build' into develop

Bill Ladwig · Bill Ladwig · commit 774cd5432aa8 · 2018-10-12T15:48:56.000-06:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/fortran/wrffortran.pyf b/fortran/wrffortran.pyf
diff --git a/setup.py b/setup.py
@@ -40,8 +40,7 @@
                "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: 

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,7 @@`
`40`	`40`	`"fortran/wrf_pw.f90",`
`41`	`41`	`"fortran/wrf_vinterp.f90",`
`42`	`42`	`"fortran/wrf_wind.f90",`
`43`		`- "fortran/omp.f90",`
`44`		`- "fortran/wrffortran.pyf"]`
	`43`	`+ "fortran/omp.f90"]`
`45`	`44`	`)`
`46`	`45`
`47`	`46`	`with open("src/wrf/version.py") as f:`