hacked .mk.sh so can build both fortran and bumba files and told travis to test them both

Author: harpolea

.travis.yml

@@ -3,6 +3,11 @@ language: python
 python:
   - "3.6"
 
+matrix:
+    include:
+    - env: MK_ARGS=""
+    - env: MK_ARGS=fortran
+
 before_install:
   - export PATH=$(echo $PATH | tr ':' "\n" | sed '/\/opt\/python/d' | tr "\n" ":" | sed "s|::|:|g")
 
@@ -19,7 +24,7 @@ install:
 before_script:
   - export PYTHONPATH=$PYTHONPATH:$(pwd)
   - export PYRO_HOME=$(pwd)
-  - ./mk.sh
+  - ./mk.sh $MK_ARGS
 
 script:
   - flake8 --ignore=W504,F403,E226,E126,E127,E128,E129,E241,E741 .

advection_fv4/fluxes.py

@@ -1,4 +1,4 @@
-import advection_fv4.interface_states as interface_f
+import advection_fv4.interface as interface_f
 import mesh.array_indexer as ai
 
 

advection_fv4/interface_states.py advection_fv4/interface.pyadvection_fv4/interface_states.py renamed to advection_fv4/interface.py

@@ -2,7 +2,7 @@
 
 import numpy as np
 
-import advection_fv4.interface_states as interface_f
+import advection_fv4.interface as interface_f
 import compressible as comp
 import compressible.interface as cf
 import mesh.reconstruction as reconstruction

advection_fv4/interface_states.f90 advection_fv4/interface_f.f90advection_fv4/interface_states.f90 renamed to advection_fv4/interface_f.f90

@@ -14,14 +14,26 @@
 
 if [ "$1" == "clean" ]; then
 
-    rm -rf mesh/*.so
-    rm -rf incompressible/*.so
+    rm -rf advection_fv4/*.so
     rm -rf compressible/*.so
+    rm -rf incompressible/*.so
     rm -rf lm_atm/*.so
+    rm -rf mesh/*.so
+    rm -rf swe/*.so
     find . -name "*.pyc" -exec rm -f {} \;
     find . -type d -name "__pycache__" -exec rm -rf {} \;
     find . -type d -name "build" -exec rm -rf {} \;
 
+    # move numba interface files back
+    regex="([a-z0-9A-Z_/]*/)_([a-z0-9A-Z_]*interface.py)"
+    for f in $(find . -name "*interface.py")
+    do
+        if [[ $f =~ $regex ]]
+        then
+            mv ".${BASH_REMATCH[1]}_${BASH_REMATCH[2]}" ".${BASH_REMATCH[1]}${BASH_REMATCH[2]}"
+        fi
+    done
+
 elif [ "$1" == "fortran" ]; then
 
     if [ "$1" == "debug" ]; then
@@ -30,6 +42,16 @@ elif [ "$1" == "fortran" ]; then
 	FFLAGS="-C"
     fi
 
+    # move numba interface files out of the way
+    regex="([a-z0-9A-Z_/]*/)([a-z0-9A-Z_]*interface.py)"
+    for f in $(find . -name "*interface.py")
+    do
+        if [[ $f =~ $regex ]]
+        then
+            mv ".${BASH_REMATCH[1]}${BASH_REMATCH[2]}" ".${BASH_REMATCH[1]}_${BASH_REMATCH[2]}"
+        fi
+    done
+
     ${PYTHON} setup_fortran.py config_fc --f90flags "${FFLAGS}" build_ext
 
 else

compressible_fv4/fluxes.py

@@ -6,10 +6,8 @@
 
 from numpy.distutils.core import setup, Extension
 
-ext_modules = [Extension("compressible.interface_f", ["compressible/interface_f.f90"]),
-               Extension("advection_fv4.interface_f", ["advection_fv4/interface_states.f90"]),
-               Extension("lm_atm.LM_atm_interface_f", ["lm_atm/LM_atm_interface_f.f90"]),
-               Extension("incompressible.incomp_interface_f", ["incompressible/incomp_interface_f.f90"]),
-               Extension("swe.interface_f", ["swe/interface_f.f90"])]
+f_modules = ["compressible.interface", "advection_fv4.interface", "lm_atm.LM_atm_interface", "incompressible.incomp_interface", "swe.interface"]
+
+ext_modules = [Extension(module, [module.replace('.', '/')+'_f.f90']) for module in f_modules]
 
 setup(ext_modules=ext_modules)