diff --git a/conda_recipe/meta.yaml b/conda_recipe/meta.yaml index b912d3a..c22a760 100644 --- a/conda_recipe/meta.yaml +++ b/conda_recipe/meta.yaml @@ -1,5 +1,14 @@ {% set version = "1.1.0" %} +package: + name: wrf-python + version: {{ version }} + +source: + fn: wrf-python-{{ version }}.tar.gz + url: https://github.com/NCAR/wrf-python/archive/{{ version }}.tar.gz + sha256: 9ca11366ed9a0d5e83e576ac80ce36be4748ba8a06752dac077277acec5e46d9 + package: name: wrf-python version: {{ version }} @@ -8,7 +17,6 @@ source: git_url: https://github.com/NCAR/wrf-python git_branch: develop - build: number: 0 detect_binary_files_with_prefix: true @@ -17,14 +25,15 @@ requirements: build: - setuptools - python - - numpy 1.11.* # [unix] - - numpy 1.14.* # [win] + - numpy 1.11.* # [unix] + - numpy 1.14.* # [win] - wrapt - m2w64-toolchain # [win] - gcc # [unix] run: - setuptools - - numpy >=1.11 + - numpy >=1.11 # [unix] + - numpy >=1.14 # [win] - python - wrapt - m2w64-gcc-libs # [win] @@ -56,3 +65,4 @@ extra: - marylhaley - david-ian-brown - khallock + \ No newline at end of file diff --git a/conda_recipe/meta.yaml.develop b/conda_recipe/meta.yaml.develop index ee75ff1..9ab332b 100644 --- a/conda_recipe/meta.yaml.develop +++ b/conda_recipe/meta.yaml.develop @@ -8,7 +8,6 @@ source: git_url: https://github.com/NCAR/wrf-python git_branch: develop - build: number: 0 detect_binary_files_with_prefix: true @@ -16,15 +15,16 @@ build: requirements: build: - setuptools - - numpy 1.11.* # [unix] - - numpy 1.14.* # [win] + - python + - numpy 1.11.* # [unix] + - numpy 1.14.* # [win] - wrapt - m2w64-toolchain # [win] - - gcc # [unix] - - python + - gcc # [unix] run: - setuptools - - numpy >=1.11 + - numpy >=1.11 # [unix] + - numpy >=1.14 # [win] - python - wrapt - m2w64-gcc-libs # [win] @@ -55,4 +55,4 @@ extra: - bladwig1 - marylhaley - david-ian-brown - - khallock + - khallock \ No newline at end of file diff --git a/conda_recipe/meta.yaml.release b/conda_recipe/meta.yaml.release index 51c2ee0..f38235e 100644 --- a/conda_recipe/meta.yaml.release +++ b/conda_recipe/meta.yaml.release @@ -7,7 +7,7 @@ package: source: fn: wrf-python-{{ version }}.tar.gz url: https://github.com/NCAR/wrf-python/archive/{{ version }}.tar.gz - sha256: ea2202e1d8237c65b9d77a91f00da0f2e7a37ed6214ddd976872b619b9647b33 + sha256: 9ca11366ed9a0d5e83e576ac80ce36be4748ba8a06752dac077277acec5e46d9 build: number: 0 @@ -16,15 +16,16 @@ build: requirements: build: - setuptools - - numpy 1.11.* # [unix] - - numpy 1.14.* # [win] + - python + - numpy 1.11.* # [unix] + - numpy 1.14.* # [win] - wrapt - m2w64-toolchain # [win] - - gcc # [unix] - - python + - gcc # [unix] run: - setuptools - - numpy >=1.11 + - numpy >=1.11 # [unix] + - numpy >=1.14 # [win] - python - wrapt - m2w64-gcc-libs # [win] @@ -56,3 +57,4 @@ extra: - marylhaley - david-ian-brown - khallock + \ No newline at end of file diff --git a/fortran/ompgen.F90 b/fortran/ompgen.F90 index 6ae48e1..60fb080 100644 --- a/fortran/ompgen.F90 +++ b/fortran/ompgen.F90 @@ -12,11 +12,20 @@ MODULE omp_constants ! are for GNU on 64bit. This may not be entirely correct for non-GNU ! compilers. In particular, it will be the locks that segfault/crash if ! this is wrong. + ! linux on conda-forge uses 4, 4, 8 for some reason #if defined(__GFORTRAN__) #if (__SIZEOF_POINTER__ == 8) +#if defined(__linux__) + ! Will make this better in the future, for now on conda-forge, this + ! is what they're using + INTEGER, PARAMETER :: fomp_sched_kind = 4 + INTEGER, PARAMETER :: fomp_lock_kind = 4 + INTEGER, PARAMETER :: fomp_nest_lock_kind = 8 +#else INTEGER, PARAMETER :: fomp_sched_kind = 4 INTEGER, PARAMETER :: fomp_lock_kind = 8 INTEGER, PARAMETER :: fomp_nest_lock_kind = 8 +#endif #else INTEGER, PARAMETER :: fomp_sched_kind = 4 INTEGER, PARAMETER :: fomp_lock_kind = 4