From 0e8d33ef44c4a4c9a5aad4f2756e8eabb4f9327f Mon Sep 17 00:00:00 2001 From: famiuer Date: Thu, 4 Apr 2019 10:28:54 +0800 Subject: [PATCH 1/3] StartDateTime change --- dhitools/dfsu.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/dhitools/dfsu.py b/dhitools/dfsu.py index 3fd1acf..91ea5e1 100644 --- a/dhitools/dfsu.py +++ b/dhitools/dfsu.py @@ -96,8 +96,13 @@ def read_dfsu(self, filename): # Time attributes self.start_datetime_str = dfsu_object.StartDateTime.Date.ToString() - self.start_datetime = dt.datetime.strptime(self.start_datetime_str, - '%d/%m/%Y %H:%M:%S %p') + dt_start_obj = dfsu_object.StartDateTime + self.start_datetime = dt.datetime(year=dt_start_obj.Year, + month=dt_start_obj.Month, + day=dt_start_obj.Day, + hour=dt_start_obj.Hour, + minute=dt_start_obj.Minute, + second=dt_start_obj.Second) self.timestep = dfsu_object.TimeStepInSeconds self.number_tstep = dfsu_object.NumberOfTimeSteps - 1 self.end_datetime = self.start_datetime + \ From 4fbf186fcefc17efaa5d3918c6b8a3a0ce9fe2f7 Mon Sep 17 00:00:00 2001 From: famiuer Date: Thu, 4 Apr 2019 16:33:11 +0800 Subject: [PATCH 2/3] change date and time format --- dhitools/dfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dhitools/dfs.py b/dhitools/dfs.py index 96d515b..6e69949 100644 --- a/dhitools/dfs.py +++ b/dhitools/dfs.py @@ -78,7 +78,7 @@ def summary(self): """ print("Input file: {}".format(self.filename)) print("Time start = {}".format(dt.datetime.strftime(self.start_datetime, - "%d/%m/%Y %H:%M:%S"))) + "%Y/%m/%d %H:%M:%S"))) print("Number of timesteps = {}".format(self.number_tstep)) print("Timestep = {}".format(self.timestep)) print("Number of items = {}".format(self.num_items)) From 5cd3f036244d3234fb90adf47bb41adc0fd3f1c8 Mon Sep 17 00:00:00 2001 From: famiuer Date: Thu, 18 Apr 2019 13:41:29 +0800 Subject: [PATCH 3/3] Add dfs2 angle to north property --- dhitools/dfs.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dhitools/dfs.py b/dhitools/dfs.py index 0c9332c..f014f90 100644 --- a/dhitools/dfs.py +++ b/dhitools/dfs.py @@ -97,6 +97,7 @@ def summary(self): print("(del_X, del_Y) = ({}, {})".format(self.del_x, self.del_y)) print("(X_min, Y_min) = ({}, {})".format(self.x_min, self.y_min)) print("(X_max, Y_max) = ({}, {})".format(self.x_max, self.y_max)) + print("Angle to North = {} ".format(self.orientation)) print("") print("Items:") @@ -333,6 +334,7 @@ def _read_dfs2(self, dfs2_object, close=True): self.del_y = sa.Dy self.y_count = sa.YCount self.y_max = self.y_min + (self.del_y * self.y_count) + self.orientation = fi.Projection.Orientation self.gridshape = (self.y_count, self.x_count) self.X, self.Y = np.meshgrid(np.arange(self.x_min, self.x_max, self.del_x),