Merge remote-tracking branch 'origin/master'

2ec34630 · JOSSOUD Olivier · 630cf4b4 · bc3e5ac9 · 2ec34630
Commit 2ec34630 authored Feb 03, 2022 by JOSSOUD Olivier
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cfatools/processor/flow.py cfatools/processor/flow.py +1 -1

No files found.
--- a/cfatools/processor/flow.py
+++ b/cfatools/processor/flow.py
@@ -494,7 +494,7 @@ def get_conduct_by_melt_time(arrival_df: pd.DataFrame, conduct_df: pd.DataFrame,
        conduct_rescaled_path = os.path.join(export_in_dataset.dataset_path,
                                             export_in_dataset.dataset_name + "_CONDUCTI-R_periodic.log")
        conduct_rescaled_df.index.name = 'datetime'
-        conduct_rescaled_df.to_csv(conduct_rescaled_path, date_format="%Y-%m-%dT%H:%M:%S.fZ", sep="\t")
+        conduct_rescaled_df.to_csv(conduct_rescaled_path, date_format="%Y-%m-%dT%H:%M:%S.%fZ", sep="\t")

    return conduct_rescaled_df