Merge pull request #72 from NREL/cleanup

Minor cleanup

bird/calibration/param_nn.py

@@ -309,7 +309,8 @@ def prepareLog(self):
         os.makedirs(self.log_loss_folder, exist_ok=True)
         try:
             os.remove(os.path.join(self.log_loss_folder, "log.csv"))
-        except:
+        except FileNotFoundError as err:
+            print(err)
             pass
         # Make log headers
         f = open(os.path.join(self.log_loss_folder, "log.csv"), "a+")

bird/preprocess/inhomogeneousBC/main.py

@@ -167,7 +167,8 @@ def binInfo(phasePropFile):
 
     try:
         shutil.rmtree("IC_inhomo")
-    except FileNotFoundError:
+    except FileNotFoundError as err:
+        print(err)
         pass
     shutil.copytree("IC", "IC_inhomo")
 

bird/utilities/mathtools.py

@@ -4,7 +4,7 @@
 def conditionalAverage(x, y, nbin):
     try:
         assert len(x) == len(y)
-    except:
+    except AssertionError:
         print("conditional average x and y have different dimension")
         print("dim x = ", len(x))
         print("dim y = ", len(y))

bird/utilities/ofio.py

@@ -33,8 +33,9 @@ def readOFScal(file, nCells, nHeader=None):
                 nHeader = iline + 2
                 f.close()
             Array = np.loadtxt(file, skiprows=nHeader, max_rows=nCells)
-    except:
+    except Exception as err:
         print("Issue when reading %s" % file)
+        print(err)
         sys.exit()
     return Array
 
@@ -77,8 +78,9 @@ def readOFVec(file, nCells, nHeader=None):
                 Array[i, 1] = float(Array[i, 1])
                 Array[i, 2] = float(Array[i, 2][:-1])
             Array = np.array(Array).astype(float)
-    except:
+    except Exception as err:
         print("Issue when reading %s" % file)
+        print(err)
         sys.exit()
 
     return Array
@@ -135,6 +137,7 @@ def getCaseTimes(casePath):
         try:
             a = float(entry)
         except ValueError:
+            print(f"{entry} not a time folder, removing")
             a = times_tmp.pop(i)
             # print('removed ', a)
     time_float = [float(entry) for entry in times_tmp]

papers/co2_model/calibration/binBreakup/bcr_nn_list.py

@@ -299,7 +299,8 @@ def prepareLog(self):
         os.makedirs(self.log_loss_folder, exist_ok=True)
         try:
             os.remove(os.path.join(self.log_loss_folder, "log.csv"))
-        except:
+        except FileNotFoundError as err:
+            print(err)
             pass
         # Make log headers
         f = open(os.path.join(self.log_loss_folder, "log.csv"), "a+")

papers/co2_model/calibration/breakup/bcr_nn_list.py

@@ -299,7 +299,8 @@ def prepareLog(self):
         os.makedirs(self.log_loss_folder, exist_ok=True)
         try:
             os.remove(os.path.join(self.log_loss_folder, "log.csv"))
-        except:
+        except FileNotFoundError as err:
+            print(err)
             pass
         # Make log headers
         f = open(os.path.join(self.log_loss_folder, "log.csv"), "a+")

papers/sparger/sparger_single.py

@@ -27,7 +27,8 @@ def setupCaseFolder(
 ):
     try:
         rmtree(target_folder)
-    except:
+    except FileNotFoundError as err:
+        print(err)
         pass
     os.makedirs(target_folder)
 

tutorial_cases/loop_reactor_mixing/presteps.sh

@@ -58,7 +58,7 @@ writeMeshObj
 
 echo PRESTEP 3
 python writeGlobalVars.py
-cp constant/phaseProperties_constantd constant/phaseProperties
+cp constant/phaseProperties_pbe constant/phaseProperties
 
 conda deactivate
 

tutorial_cases/loop_reactor_mixing/run.sh

@@ -55,7 +55,7 @@ writeMeshObj
 
 echo PRESTEP 3
 python writeGlobalVars.py
-cp constant/phaseProperties_constantd constant/phaseProperties
+cp constant/phaseProperties_pbe constant/phaseProperties
 
 #conda deactivate