Merge pull request #15 from jbusecke/xarray_wrapper2

Adding an xarray wrapper with apply_ufunc

Author: jbusecke

.github/workflows/ci.yaml

@@ -50,4 +50,4 @@ jobs:
           conda list
       - name: Run Tests
         run: |
-          pytest test/test.py #Generalize this later?
+          pytest -vv

.gitignore

@@ -7,6 +7,14 @@ _version.py
 .eggs/
 build/
 __pycache__
+dist/
+
+# files built by f2py
+source/fortran/*f2pywrappers*
+source/fortran/*.c
+source/aerobulk/aerobulk/
 mod_aerobulk_wrap.*.so
-source/fortran/mod_aerobulk_wrap-f2pywrappers2.f90
-source/fortran/mod_aerobulk_wrapmodule.c
+
+# should we ignore submodules
+.DS_Store
+.vscode/

setup.cfg

@@ -12,3 +12,5 @@ ignore =
     W503
     E265
     F811
+[tool:pytest]
+testpaths = tests

setup.py

@@ -40,7 +40,7 @@
 # for this API we will only expose a single extension?
 ext_modules = [
     Extension(
-        name="mod_aerobulk_wrap",
+        name="mod_aerobulk_wrap_noskin",
         sources=[
             "./source/fortran/aerobulk/src/mod_const.f90",
             "./source/fortran/aerobulk/src/mod_phymbl.f90",
@@ -55,12 +55,34 @@
             "./source/fortran/aerobulk/src/mod_blk_neutral_10m.f90",
             "./source/fortran/aerobulk/src/mod_aerobulk_compute.f90",
             "./source/fortran/aerobulk/src/mod_aerobulk.f90",
-            "./source/fortran/mod_aerobulk_wrap.f90",
-            "./source/fortran/mod_aerobulk_wrap.pyf",
+            "./source/fortran/mod_aerobulk_wrap_noskin.f90",
+            "./source/fortran/mod_aerobulk_wrap_noskin.pyf",
         ],
         extra_f90_compile_args=f90flags,
         # f2py_options=['--quiet'],
-    )
+    ),
+    Extension(
+        name="mod_aerobulk_wrap_skin",
+        sources=[
+            "./source/fortran/aerobulk/src/mod_const.f90",
+            "./source/fortran/aerobulk/src/mod_phymbl.f90",
+            "./source/fortran/aerobulk/src/mod_skin_coare.f90",
+            "./source/fortran/aerobulk/src/mod_skin_ecmwf.f90",
+            "./source/fortran/aerobulk/src/mod_blk_andreas.f90",
+            "./source/fortran/aerobulk/src/mod_common_coare.f90",
+            "./source/fortran/aerobulk/src/mod_blk_coare3p0.f90",
+            "./source/fortran/aerobulk/src/mod_blk_coare3p6.f90",
+            "./source/fortran/aerobulk/src/mod_blk_ecmwf.f90",
+            "./source/fortran/aerobulk/src/mod_blk_ncar.f90",
+            "./source/fortran/aerobulk/src/mod_blk_neutral_10m.f90",
+            "./source/fortran/aerobulk/src/mod_aerobulk_compute.f90",
+            "./source/fortran/aerobulk/src/mod_aerobulk.f90",
+            "./source/fortran/mod_aerobulk_wrap_skin.f90",
+            "./source/fortran/mod_aerobulk_wrap_skin.pyf",
+        ],
+        extra_f90_compile_args=f90flags,
+        f2py_options=["--quiet"],
+    ),
 ]
 
 setup(

source/aerobulk/__init__.py

@@ -6,4 +6,4 @@
     __version__ = "unknown"
     pass
 
-from .flux import flux_noskin, flux_skin
+from .flux import noskin, skin