Merge branch 'bugfix/issue86' into develop

.circleci/conda_env.yml

@@ -2,7 +2,8 @@ name: wrf-python
 channels:
   - conda-forge
 dependencies:
-  - gcc
+  - gcc_linux-64
+  - gfortran_linux-64
   - setuptools
   - python
   - numpy

.circleci/config.yml

@@ -46,11 +46,14 @@ jobs:
           name: build wrf-python
           command: |
             source ~/miniconda3/bin/activate wrf-python
+            unset FFLAGS
+            unset LDFLAGS
+            unset CFLAGS
             cd fortran/build_help
-            gfortran -o sizes -fopenmp omp_sizes.f90
+            $FC -o sizes -fopenmp omp_sizes.f90
             LD_LIBRARY_PATH=~/miniconda3/envs/wrf-python/lib python sub_sizes.py
             cd ..
-            gfortran -E ompgen.F90 -fopenmp -cpp -o omp.f90
+            $FC -E ompgen.F90 -fopenmp -cpp -o omp.f90
             cd ..
             python setup.py config_fc --f90flags="-mtune=generic -fopenmp" build_ext --libraries="gomp" build
             python setup.py install --single-version-externally-managed --record=record.txt

build_scripts/gnu_no_omp.sh

@@ -1,8 +1,11 @@
 #!/bin/bash
 
+unset LDFLAGS
+unset FFLAGS
+unset CFLAGS
+
 cd ../fortran
-gfortran -E ompgen.F90 -cpp -o omp.f90
+$FC -E ompgen.F90 -cpp -o omp.f90
-#f2py *.f90 -m _wrffortran -h wrffortran.pyf --overwrite-signature
 cd ..
 
 python setup.py clean --all

build_scripts/gnu_omp.sh

@@ -1,12 +1,15 @@
 #!/bin/bash
 
+unset LDFLAGS
+unset FFLAGS
+unset CFLAGS
+
 cd ../fortran/build_help
-gfortran -o sizes -fopenmp omp_sizes.f90
+$FC -o sizes -fopenmp omp_sizes.f90
 python sub_sizes.py
 
 cd ..
-gfortran -E ompgen.F90 -fopenmp -cpp -o omp.f90
+$FC -E ompgen.F90 -fopenmp -cpp -o omp.f90
-#f2py *.f90 -m _wrffortran -h wrffortran.pyf --overwrite-signature
 cd ..
 
 python setup.py clean --all

build_scripts/win_msvc_mingw_no_omp.bat

@@ -1,7 +1,5 @@
 cd ../fortran
 CALL gfortran -E ompgen.F90 -cpp -o omp.f90
-REM Wildcards not working on Windows for some reason
-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

build_scripts/win_msvc_mingw_omp.bat

@@ -4,8 +4,6 @@ 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
-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

fortran/rip_cape.f90

@@ -316,7 +316,9 @@ SUBROUTINE DCAPECALC3D(prs,tmk,qvp,ght,ter,sfp,cape,cin,&
     REAL(KIND=8) :: facden, qvplift, tmklift, tvenv, tvlift, ghtlift
     REAL(KIND=8) :: eslift, tmkenv, qvpenv, tonpsadiabat
     REAL(KIND=8) :: benamin, dz
-    REAL(KIND=8), DIMENSION(150) :: buoy, zrel, benaccum
+    ! Set a safety factor of 2*mkzh + 1 instead of previously chosen
+    ! 150 levels
+    REAL(KIND=8), DIMENSION(2*mkzh + 1) :: buoy, zrel, benaccum
     REAL(KIND=8), DIMENSION(150) :: psadithte, psadiprs
     REAL(KIND=8), DIMENSION(150,150) :: psaditmk
     LOGICAL :: elfound
@@ -646,7 +648,9 @@ SUBROUTINE DCAPECALC2D(prs,tmk,qvp,ght,ter,sfp,cape,cin,&
     REAL(KIND=8) :: facden, qvplift, tmklift, tvenv, tvlift, ghtlift
     REAL(KIND=8) :: eslift, tmkenv, qvpenv, tonpsadiabat
     REAL(KIND=8) :: benamin, dz, pup, pdn
-    REAL(KIND=8), DIMENSION(150) :: buoy, zrel, benaccum
+    ! Set a safety factor of 2*mkzh + 1 instead of previously chosen
+    ! 150 levels
+    REAL(KIND=8), DIMENSION(2*mkzh + 1) :: buoy, zrel, benaccum
     REAL(KIND=8), DIMENSION(150) :: psadithte, psadiprs
     REAL(KIND=8), DIMENSION(150,150) :: psaditmk
     LOGICAL :: elfound

test/utests.py

@@ -13,8 +13,8 @@ from wrf import (getvar, interplevel, interpline, vertcross, vinterp,
                  extract_global_attrs, viewitems, CoordPair, ll_points)
 from wrf.util import is_multi_file
 
-NCL_EXE = "/Users/ladwig/miniconda2/envs/ncl_build/bin/ncl"
+NCL_EXE = "/Users/ladwig/miniconda3/envs/ncl_build/bin/ncl"
-NCARG_ROOT = "/Users/ladwig/miniconda2/envs/ncl_build"
+NCARG_ROOT = "/Users/ladwig/miniconda3/envs/ncl_build"
 DIRS = ["/Users/ladwig/Documents/wrf_files/wrf_vortex_multi/moving_nest",
         "/Users/ladwig/Documents/wrf_files/wrf_vortex_multi/static_nest"]
 PATTERN = "wrfout_d02_*"