fixed error in discretization

bin/run_tests.py

@@ -23,8 +23,7 @@ def run(test_outputs, testDir, tests=None):
         # Generate a list of tests from the directories in ref_outputs
         ref_outputs = osp.join(dirDict["suite"],"ref_outputs")
         _, directories, _ = next(walk(osp.join(ref_outputs)))
-        tests = directories
-        tests.sort()
+        tests = sorted(directories)
 
         runInfoAnalyt = {
             "testAnalytCylDifn": (defs.testAnalytCylDifn, defs.analytCylDifn),
@@ -57,7 +56,7 @@ def main():
 
     run(args.output_dir,args.test_dir, args.tests)
 
-    return(args)
+    return (args)
 
 
 if __name__ == "__main__":

mpet/electrolyte/Doyle96_EC_DMC_1_2.py

@@ -20,7 +20,7 @@ def sigma(c, T):
         r4 = 1.3605e-3
         r5 = 1.1724e-4
         k0 = r1 + r2*c - r3*c**2 + r4*c**3 - r5*c**4  # S/cm
-        return(100*k0)
+        return (100*k0)
 
     Dref = D(constants.c_ref, 1)
 

mpet/electrolyte/Doyle96_EC_DMC_2_1.py

@@ -20,7 +20,7 @@ def sigma(c, T):
         r4 = 1.5094e-3
         r5 = 1.6018e-4
         k0 = r1 + r2*c - r3*c**2 + r4*c**3 - r5*c**4  # S/cm
-        return(100*k0)
+        return (100*k0)
 
     Dref = D(constants.c_ref, 1)
 

mpet/geometry.py

@@ -87,7 +87,7 @@ def get_elyte_disc(Nvol, L, poros, BruggExp, k_h):
     dxtmp = np.hstack((out["dxvec"][0], out["dxvec"], out["dxvec"][-1]))
     out["dx"] = dxtmp
     out["dxd1"] = utils.mean_linear(dxtmp)
-    out["dxd2"] = utils.mean_linear(out["dxd1"])  # for thermal finite differences
+    out["dxd2"] = dxtmp[1:-1]  # for thermal finite differences
 
     # The porosity vector
     out["porosvec"] = utils.get_asc_vec(poros, Nvol)

mpet/utils.py

@@ -25,7 +25,7 @@ def mean_harmonic(a):
 
 
 def weighted_harmonic_mean(a, wt):
-    return((wt[1:]+wt[:-1])/(wt[1:]/a[1:]+wt[:-1]/a[:-1]))
+    return ((wt[1:]+wt[:-1])/(wt[1:]/a[1:]+wt[:-1]/a[:-1]))
 
 
 def get_cell_Ntot(Nvol):