Update black (AMReX-Combustion#495)

SreejithNREL · May 1, 2024 · 13bdc93 · 13bdc93
1 parent fffc8ea
commit 13bdc93
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 54 deletions.
diff --git a/Support/ceptr/ceptr/ck.py b/Support/ceptr/ceptr/ck.py
@@ -875,8 +875,7 @@ def ckpx(fstream, mechanism, species_info):
         fstream,
         "P = rho *"
         f" {(cc.R * cc.ureg.kelvin * cc.ureg.mole / cc.ureg.erg).m:1.14e} * T"
-        " / XW; "
-        + cw.comment("P = rho*R*T/W"),
+        " / XW; " + cw.comment("P = rho*R*T/W"),
     )
 
     cw.writer(fstream)
@@ -915,8 +914,7 @@ def ckpy(fstream, mechanism, species_info):
         fstream,
         "P = rho *"
         f" {(cc.R * cc.ureg.kelvin * cc.ureg.mole / cc.ureg.erg).m:1.14e} * T"
-        " * YOW; "
-        + cw.comment("P = rho*R*T/W"),
+        " * YOW; " + cw.comment("P = rho*R*T/W"),
     )
 
     cw.writer(fstream)
@@ -963,8 +961,7 @@ def ckpc(fstream, mechanism, species_info):
         fstream,
         "P = rho *"
         f" {(cc.R * cc.ureg.kelvin * cc.ureg.mole / cc.ureg.erg).m:1.14e} * T"
-        " * sumC / W; "
-        + cw.comment("P = rho*R*T/W"),
+        " * sumC / W; " + cw.comment("P = rho*R*T/W"),
     )
 
     cw.writer(fstream)
@@ -1003,8 +1000,7 @@ def ckrhox(fstream, mechanism, species_info):
         fstream,
         "rho = P * XW /"
         f" ({(cc.R * cc.ureg.kelvin * cc.ureg.mole / cc.ureg.erg).m:1.14e} *"
-        " T); "
-        + cw.comment("rho = P*W/(R*T)"),
+        " T); " + cw.comment("rho = P*W/(R*T)"),
     )
 
     cw.writer(fstream)
@@ -1036,8 +1032,7 @@ def ckrhoy(fstream, mechanism, species_info):
         fstream,
         "rho = P /"
         f" ({(cc.R * cc.ureg.mole * cc.ureg.kelvin / cc.ureg.erg).m:1.14e} * T"
-        " * YOW);"
-        + cw.comment("rho = P*W/(R*T)"),
+        " * YOW);" + cw.comment("rho = P*W/(R*T)"),
     )
 
     cw.writer(fstream, "}")
@@ -1419,8 +1414,7 @@ def ckxtcp(fstream, mechanism, species_info):
         fstream,
         "amrex::Real PORT ="
         f" P/({(cc.R * cc.ureg.kelvin * cc.ureg.mole / cc.ureg.erg).m:1.14e} *"
-        " T); "
-        + cw.comment("P/RT"),
+        " T); " + cw.comment("P/RT"),
     )
     # now compute conversion
     cw.writer(fstream)
@@ -2130,8 +2124,7 @@ def ckwxp(fstream, mechanism, species_info):
         fstream,
         "amrex::Real PORT = 1e6 *"
         f" P/({(cc.R * cc.ureg.kelvin * cc.ureg.mole / cc.ureg.erg).m:1.14e} *"
-        " T); "
-        + cw.comment("1e6 * P/RT so c goes to SI units"),
+        " T); " + cw.comment("1e6 * P/RT so c goes to SI units"),
     )
 
     # now compute conversion
@@ -2568,8 +2561,7 @@ def ckkfkr(fstream, mechanism, species_info):
         fstream,
         "amrex::Real PORT = 1e6 *"
         f" P/({(cc.R * cc.ureg.kelvin * cc.ureg.mole / cc.ureg.erg).m:1.14e} *"
-        " T); "
-        + cw.comment("1e6 * P/RT so c goes to SI units"),
+        " T); " + cw.comment("1e6 * P/RT so c goes to SI units"),
     )
 
     # now compute conversion

diff --git a/Support/ceptr/ceptr/species_info.py b/Support/ceptr/ceptr/species_info.py
@@ -197,12 +197,14 @@ def make_scqss_dataframe(self):
             lev_list.append(0)
 
         # Initialize the dataframe
-        scqss_df = pd.DataFrame({
-            "name": name_list,
-            "number": numb_list,
-            "symbol": symb_list,
-            "level": lev_list,
-        })
+        scqss_df = pd.DataFrame(
+            {
+                "name": name_list,
+                "number": numb_list,
+                "symbol": symb_list,
+                "level": lev_list,
+            }
+        )
 
         # Find the list of qss terms that have been filled
         qss_filled = scqss_df["name"].unique()
@@ -230,12 +232,14 @@ def make_scqss_dataframe(self):
                         symb_list.append(symb)
                         lev_list.append(level)
 
-            scqss_df = pd.DataFrame({
-                "name": name_list,
-                "number": numb_list,
-                "symbol": symb_list,
-                "level": lev_list,
-            })
+            scqss_df = pd.DataFrame(
+                {
+                    "name": name_list,
+                    "number": numb_list,
+                    "symbol": symb_list,
+                    "level": lev_list,
+                }
+            )
             qss_filled = scqss_df["name"].unique()
 
             level += 1
@@ -262,11 +266,13 @@ def make_sc_dataframe(self):
             symb_list.append(self.nonqssa_species_list[idx])
 
         # Initialize the dataframe
-        sc_df = pd.DataFrame({
-            "name": name_list,
-            "number": numb_list,
-            "symbol": symb_list,
-        })
+        sc_df = pd.DataFrame(
+            {
+                "name": name_list,
+                "number": numb_list,
+                "symbol": symb_list,
+            }
+        )
 
         sc_df["scqss_rely"] = ""
         # Loop over the scqss_df and add in scqss dependence upon sc terms
@@ -293,11 +299,13 @@ def make_wdot_dataframe(self):
             symb_list.append(self.nonqssa_species_list[idx])
 
         # Initialize the dataframe
-        wdot_df = pd.DataFrame({
-            "name": name_list,
-            "number": numb_list,
-            "symbol": symb_list,
-        })
+        wdot_df = pd.DataFrame(
+            {
+                "name": name_list,
+                "number": numb_list,
+                "symbol": symb_list,
+            }
+        )
 
         wdot_df["sc_dep"] = ""
         wdot_df["scqss_dep"] = ""

diff --git a/Support/ceptr/ceptr/symbolic_math.py b/Support/ceptr/ceptr/symbolic_math.py
@@ -196,22 +196,30 @@ def convert_to_cpp(self, sym_smp):
 
         if self.remove_pow:
             # Positive exponents
-            user_functions["Pow"].append((
-                lambda b, e: (e.is_Integer or e.is_Float)
-                and (abs(e - 1) < 1e-16 or abs(e - 2) < 1e-16 or abs(e - 3) < 1e-16),
-                lambda b, e: "(" + "*".join(["(" + b + ")"] * int(float(e))) + ")",
-            ))
+            user_functions["Pow"].append(
+                (
+                    lambda b, e: (e.is_Integer or e.is_Float)
+                    and (
+                        abs(e - 1) < 1e-16 or abs(e - 2) < 1e-16 or abs(e - 3) < 1e-16
+                    ),
+                    lambda b, e: "(" + "*".join(["(" + b + ")"] * int(float(e))) + ")",
+                )
+            )
             # Negative exponents
-            user_functions["Pow"].append((
-                lambda b, e: (e.is_Integer or e.is_Float)
-                and (abs(e + 1) < 1e-16 or abs(e + 2) < 1e-16 or abs(e + 3) < 1e-16),
-                lambda b, e: "("
-                + "1.0/"
-                + "("
-                + "*".join(["(" + b + ")"] * int(-float(e)))
-                + ")"
-                + ")",
-            ))
+            user_functions["Pow"].append(
+                (
+                    lambda b, e: (e.is_Integer or e.is_Float)
+                    and (
+                        abs(e + 1) < 1e-16 or abs(e + 2) < 1e-16 or abs(e + 3) < 1e-16
+                    ),
+                    lambda b, e: "("
+                    + "1.0/"
+                    + "("
+                    + "*".join(["(" + b + ")"] * int(-float(e)))
+                    + ")"
+                    + ")",
+                )
+            )
 
         if self.remove_pow10:
             user_functions["Pow"].append(

diff --git a/Support/ceptr/pyproject.toml b/Support/ceptr/pyproject.toml
@@ -21,7 +21,7 @@ pyarrow = "^15.0.0"
 
 [tool.poetry.dev-dependencies]
 pytest = "^7.4.0"
-black = {version = "^23.7.0"}
+black = {version = "^24.3.0"}
 isort = "^5.12.0"
 ipython = "^8.14.0"
 flake8 = "^4.0.1"