fixed confilict

Author: cheginit

.coveragerc

@@ -1,8 +1,9 @@
 [run]
 omit = examples/*
        test.py
-       incompressible/setup.py
-       compressible/setup.py
-       lm_atm/setup.py
-       advection_fv4/setup.py
-       plot.py
+       plot.py
+
+[report]
+omit = examples/*
+       test.py
+       plot.py

.flake8

@@ -1,4 +1,4 @@
 [flake8]
 max-line-length = 120
-ignore = E126, E127, E128, E129, E226, E241, E265, E741, F403
-exclude = docs/,lm_combustion,radhydro
+ignore = E126, E127, E128, E129, E226, E241, E265, E741, F403, W504
+exclude = docs/,lm_combustion,radhydro

.gitignore

@@ -16,3 +16,5 @@ inputs.auto
 !/*/tests/*.h5
 
 .cache
+
+.pytest_cache/

.mailmap

@@ -0,0 +1,8 @@
+Taher Chegini <taher.chegini@gmail.com> Taher Chegini <taher@cfd-lab.attlocal.net>
+Taher Chegini <taher.chegini@gmail.com> taataam <taher.chegini@gmail.com>
+Michael Zingale <michael.zingale@stonybrook.edu> Michael Zingale <mzingale@mail.astro.sunysb.edu>
+Michael Zingale <michael.zingale@stonybrook.edu> Michael Zingale <zingale@bender.astro.sunysb.edu>
+Michael Zingale <michael.zingale@stonybrook.edu> Michael Zingale <zingale@localhost.localdomain>
+Michael Zingale <michael.zingale@stonybrook.edu> Michael Zingale <zingale@nan.astro.sunysb.edu>
+Michael Zingale <michael.zingale@stonybrook.edu> Michael Zingale <zingale@inf.astro.sunysb.edu>
+Michael Zingale <michael.zingale@stonybrook.edu> zingale <zingale>

.pytest_cache/v/cache/lastfailed

@@ -19,7 +19,6 @@ install:
 before_script:
   - export PYTHONPATH=$PYTHONPATH:$(pwd)
   - export PYRO_HOME=$(pwd)
-  - ./mk.sh
 
 script:
   - flake8 .

.pytest_cache/v/cache/nodeids

@@ -60,12 +60,12 @@ def unsplit_fluxes(my_data, rp, dt, scalar_name):
     u = my_data.get_var("x-velocity")
     v = my_data.get_var("y-velocity")
 
-    cx = u*dt/myg.dx
-    cy = v*dt/myg.dy
+    cx = u * dt / myg.dx
+    cy = v * dt / myg.dy
 
-    #--------------------------------------------------------------------------
+    # --------------------------------------------------------------------------
     # monotonized central differences
-    #--------------------------------------------------------------------------
+    # --------------------------------------------------------------------------
 
     limiter = rp.get_param("advection.limiter")
 
@@ -102,8 +102,8 @@ def unsplit_fluxes(my_data, rp, dt, scalar_name):
 
     # compute the transverse flux differences.  The flux is just (u a)
     # HOTF
-    F_xt = u*a_x
-    F_yt = v*a_y
+    F_xt = u * a_x
+    F_yt = v * a_y
 
     F_x = myg.scratch_array()
     F_y = myg.scratch_array()

.travis.yml

@@ -15,4 +15,4 @@ advection\_nonuniform\.problems\.slotted module
 .. automodule:: advection_nonuniform.problems.slotted
     :members:
     :undoc-members:
-    :show-inheritance:
+    :show-inheritance:

advection_nonuniform/advective_fluxes.py

@@ -37,4 +37,3 @@
   +----------------------------------+----------------+----------------------------------------------------+
   | offset                           | ``0.25``       | offset of the slot's center from domain's center   |
   +----------------------------------+----------------+----------------------------------------------------+
-