Browse Source

Fix doc printing of fill values. Update recipe based on Travis CI failures with sizes executable.

lon0
Bill Ladwig 7 years ago
parent
commit
219041246d
  1. 10
      conda_recipe/build.sh
  2. 2
      src/wrf/constants.py

10
conda_recipe/build.sh

@ -1,12 +1,16 @@ @@ -1,12 +1,16 @@
#!/bin/bash
cd fortran/build_help
gfortran -o sizes -fopenmp omp_sizes.f90
if [ `uname` == Darwin ]; then
gfortran -o sizes -fopenmp omp_sizes.f90 -Wl,-rpath,${CONDA_PREFIX}/lib
else
gfortran -o sizes -fopenmp omp_sizes.f90
fi
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 ..
if [ `uname` == Darwin ]; then
@ -16,5 +20,3 @@ fi @@ -16,5 +20,3 @@ fi
$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

2
src/wrf/constants.py

@ -76,7 +76,7 @@ else: @@ -76,7 +76,7 @@ else:
# Add the integers based on python 2.x or 3.x
def default_fill(dtype=None):
dt = np.dtype(dtype) if dtype is not None else None
return _DEFAULT_FILL_MAP.get(dt, 0)
return _DEFAULT_FILL_MAP.get(dt, Constants.DEFAULT_FILL)

Loading…
Cancel
Save