Merge branch 'main' of https://github.com/NCAR/music-box into TAMU_LambdaRate

Author: ceeedric

python/acom_music_box/conditions_manager.py

@@ -534,6 +534,22 @@ def _load_from_conditions_section(self, path_to_json: str, conditions_config: di
             for data_block in conditions_config["data"]:
                 self._load_inline_data(data_block)
 
+    def _ensure_numeric_float64(self, df: pd.DataFrame) -> pd.DataFrame:
+        """
+        Convert all numeric columns to float64 to handle integer values (e.g., 0).
+        Uses vectorized operation for performance with wide/large DataFrames.
+
+        Args:
+            df: DataFrame to convert.
+
+        Returns:
+            DataFrame with numeric columns as float64.
+        """
+        numeric_cols = df.select_dtypes(include=['number']).columns
+        if len(numeric_cols) > 0:
+            df[numeric_cols] = df[numeric_cols].astype(np.float64)
+        return df
+
     def _read_csv(self, file_path: str):
         """
         Load conditions from a CSV file.
@@ -542,6 +558,7 @@ def _read_csv(self, file_path: str):
             file_path: Path to the CSV file.
         """
         df = pd.read_csv(file_path, skipinitialspace=True)
+        df = self._ensure_numeric_float64(df)
         self.add_from_dataframe(df)
 
     def _load_inline_data(self, data_block: dict):
@@ -561,6 +578,7 @@ def _load_inline_data(self, data_block: dict):
         rows = data_block["rows"]
 
         df = pd.DataFrame(rows, columns=headers)
+        df = self._ensure_numeric_float64(df)
         self.add_from_dataframe(df)
 
     def get_conditions_at_time(self, time: float) -> dict:

python/tests/unit/test_conditions_manager.py

@@ -313,6 +313,47 @@ def test_surf_rate_parameter_format(self):
         assert "SURF.surface.particle number concentration.# m-3" in conds["rate_parameters"]
         assert conds["rate_parameters"]["SURF.surface.particle number concentration.# m-3"] == 1e12
 
+    def test_integer_values_converted_to_float64(self):
+        """Test that integer values (like 0) are converted to np.float64."""
+        import numpy as np
+
+        manager = ConditionsManager()
+
+        # Test with inline data containing integer 0
+        data_block = {
+            "headers": ["time.s", "ENV.temperature.K", "PHOTO.rate1.s-1"],
+            "rows": [[0, 300.0, 0]]  # Integer 0 values
+        }
+        manager._load_inline_data(data_block)
+
+        # Check that values are stored as float64
+        df = manager._df
+        assert df["time.s"].dtype == np.float64
+        assert df["ENV.temperature.K"].dtype == np.float64
+        assert df["PHOTO.rate1.s-1"].dtype == np.float64
+
+        # Test with CSV-like data
+        with tempfile.TemporaryDirectory() as tmpdir:
+            csv_content = """time.s,ENV.temperature.K,PHOTO.rate2.s-1
+0,298.15,0
+3600,310.0,1e-5
+"""
+            csv_path = os.path.join(tmpdir, "test.csv")
+            with open(csv_path, 'w') as f:
+                f.write(csv_content)
+
+            manager2 = ConditionsManager()
+            manager2._read_csv(csv_path)
+
+            df2 = manager2._df
+            assert df2["time.s"].dtype == np.float64
+            assert df2["ENV.temperature.K"].dtype == np.float64
+            assert df2["PHOTO.rate2.s-1"].dtype == np.float64
+
+            # Verify the values are correct
+            assert df2.loc[0, "time.s"] == 0.0
+            assert df2.loc[0, "PHOTO.rate2.s-1"] == 0.0
+
 
 if __name__ == "__main__":
     pytest.main([__file__, "-v"])