augmented error capabilities and fixed related bugs

CovingtonResearchGroup · Sep 10, 2020 · cb62dd9 · cb62dd9
1 parent 3239dd1
commit cb62dd9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/olm/calcite.py b/olm/calcite.py
@@ -1431,14 +1431,14 @@ def err_est(Ca,PCO2,T_C,Ca_err,PCO2_err):
         Ca = mgL_to_molL(Ca, 'Ca')
     is_series = (type(Ca)==pandas.core.series.Series)
     if (type(Ca)==np.ndarray) or is_series:
-        rate_arr = np.empty(np.size(Ca), dtype=object)
+        rate_arr = np.empty(np.size(Ca), dtype=float)
         if error:
             if return_samples:
-                err_arr = np.empty((np.size(Ca),error_num), dtype=object)
+                err_arr = np.empty((np.size(Ca),error_num), dtype=float)
             elif confidence == 0:
-                err_arr = np.empty(np.size(Ca), dtype=object)
+                err_arr = np.empty(np.size(Ca), dtype=float)
             else:
-                err_arr = np.empty((np.size(Ca),2), dtype=object)
+                err_arr = np.empty((np.size(Ca),2), dtype=float)
         for i, this_Ca in enumerate(Ca):
             if (i % 100)==0:
                 print( "Solution number "+str(i))