Commit 2ec34630 authored by JOSSOUD Olivier's avatar JOSSOUD Olivier
Browse files

Merge remote-tracking branch 'origin/master'

parents 630cf4b4 bc3e5ac9
Pipeline #159954 passed with stages
in 47 seconds
......@@ -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") = '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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment