From 64a92f7c84e886d04c3b250f029a7a007af8fe0f Mon Sep 17 00:00:00 2001
From: David Robert Verelst <dave@dtu.dk>
Date: Wed, 15 Aug 2018 13:55:14 +0200
Subject: [PATCH] prepost.hawcstab2: rename duplicate columns in .pwr files
with gradients
---
wetb/prepost/hawcstab2.py | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/wetb/prepost/hawcstab2.py b/wetb/prepost/hawcstab2.py
index 39106a49..5d630e92 100644
--- a/wetb/prepost/hawcstab2.py
+++ b/wetb/prepost/hawcstab2.py
@@ -75,9 +75,18 @@ def ReadFileHAWCStab2Header(fname):
line_header, line_data = get_lines(fname)
colwidths = get_col_widths(line_data)
- # FIXME: gradients have duplicate columns: set for with wake updated
- # and another with frozen wake assumption
columns = get_col_names(line_header, colwidths)
+ # gradients have duplicate columns: set for with wake updated
+ # and another with frozen wake assumption, append _fw to the columns
+ # used to indicate frozen wake gradients
+ if 'dQ/dt [kNm/deg]' in columns:
+ i1 = columns.index('dQ/dt [kNm/deg]')
+ if i1 > -1:
+ i2 = columns.index('dQ/dt [kNm/deg]', i1+1)
+ if i2 > i1:
+ for i in range(i2, len(columns)):
+ columns[i] = columns[i].replace(' [', '_fw [')
+
df = pd.read_fwf(fname, widths=colwidths, comment='#', header=None,
names=columns)
units = regex_units.findall(''.join(columns))
--
GitLab