Merge branch 'develop' of NCAR/wrf-python into cmake-build

Author: DWesl

.github/workflows/pypi.yaml

@@ -46,7 +46,7 @@ jobs:
         run: |
           python -m twine check dist/*
       - name: Publish package to PyPI
-        uses: pypa/[email protected].1
+        uses: pypa/[email protected].3
         with:
           user: __token__
           password: ${{ secrets.PYPI_WRF_PYTHON }}

MANIFEST.in

@@ -1,6 +1,5 @@
 include README.md
 include LICENSE
-include requirements.txt
 
 include fortran/*.f90
 include fortran/*.pyf

build_scripts/gnu_omp.sh

@@ -11,6 +11,7 @@ $FC -E ompgen.F90 -fopenmp -cpp -o omp.f90
 cd ..
 
 python setup.py clean --all
+export LDFLAGS=" -fopenmp "
 python setup.py config_fc --f90flags="-mtune=generic -fopenmp" build_ext --libraries="gomp" build
 pip install .
 

fortran/omp.f90

@@ -7,6 +7,9 @@ MODULE omp_constants
     INTEGER(KIND=fomp_sched_kind), PARAMETER :: fomp_sched_dynamic = 2
     INTEGER(KIND=fomp_sched_kind), PARAMETER :: fomp_sched_guided = 3
     INTEGER(KIND=fomp_sched_kind), PARAMETER :: fomp_sched_auto = 4
+contains
+  subroutine have_omp_constants()
+  end subroutine have_omp_constants
 END MODULE omp_constants
 
 

fortran/ompgen.F90

@@ -20,6 +20,10 @@ MODULE omp_constants
     INTEGER(KIND=4), PARAMETER :: fomp_sched_auto = 4
 #endif
 
+contains
+  subroutine have_omp_constants()
+  end subroutine have_omp_constants
+
 END MODULE omp_constants
 
 

fortran/ompgen.F90.template

@@ -20,10 +20,10 @@ MODULE omp_constants
     INTEGER(KIND=4), PARAMETER :: fomp_sched_auto = 4
 #endif
 
-    contains
-    logical function have_omp_constants()
-        have_omp_constants = .true.
-    end function have_omp_constants
+contains
+  subroutine have_omp_constants()
+  end subroutine have_omp_constants
+
 END MODULE omp_constants
 
 

fortran/wrf_constants.f90

@@ -69,10 +69,9 @@ MODULE wrf_constants
     REAL(KIND=8), PARAMETER :: EXPON =  RD*USSALR/G
     REAL(KIND=8), PARAMETER :: EXPONI =  1./EXPON
 
-    contains
-    subroutine have_wrf_constants(a)
-        logical, intent(out) :: a
-        a = .true.
+  contains
+    subroutine have_wrf_constants()
     end subroutine have_wrf_constants
+
 END MODULE wrf_constants