Upper key word
This commit is contained in:
@@ -135,7 +135,7 @@ def inp_in_curve(section: list[str]) -> ChangeSet:
|
||||
next = i + 1
|
||||
if next < count and section[next].startswith(';') == False:
|
||||
next_tokens = section[next].split()
|
||||
types[next_tokens[0]] = type_plus_desc_tokens[0].strip()
|
||||
types[next_tokens[0]] = type_plus_desc_tokens[0].strip().upper()
|
||||
if len(type_plus_desc_tokens) > 1:
|
||||
descs[next_tokens[0]] = type_plus_desc_tokens[1].strip()
|
||||
continue
|
||||
|
||||
@@ -109,7 +109,7 @@ class InpSource:
|
||||
num_without_desc = (num - 1) if has_desc else num
|
||||
|
||||
self.node = str(tokens[0])
|
||||
self.s_type = str(tokens[1])
|
||||
self.s_type = str(tokens[1].upper())
|
||||
self.strength = float(tokens[2])
|
||||
self.pattern = str(tokens[3]) if num_without_desc >= 4 else None
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ class InpMixing:
|
||||
num_without_desc = (num - 1) if has_desc else num
|
||||
|
||||
self.tank = str(tokens[0])
|
||||
self.model = str(tokens[1])
|
||||
self.model = str(tokens[1].upper())
|
||||
self.value = float(tokens[3]) if num_without_desc >= 4 else None
|
||||
|
||||
|
||||
|
||||
@@ -160,7 +160,7 @@ class InpTank:
|
||||
self.diameter = float(tokens[5])
|
||||
self.min_vol = float(tokens[6])
|
||||
self.vol_curve = str(tokens[7]) if num_without_desc >= 8 else None
|
||||
self.overflow = str(tokens[8]) if num_without_desc >= 9 else None
|
||||
self.overflow = str(tokens[8].upper()) if num_without_desc >= 9 else None
|
||||
self.desc = str(tokens[-1]) if has_desc else None
|
||||
|
||||
|
||||
|
||||
@@ -139,7 +139,7 @@ class InpPipe:
|
||||
self.roughness = float(tokens[5])
|
||||
self.minor_loss = float(tokens[6])
|
||||
# status is must-have, here fix input
|
||||
self.status = str(tokens[7]) if num_without_desc >= 8 else PIPE_STATUS_OPEN
|
||||
self.status = str(tokens[7].upper()) if num_without_desc >= 8 else PIPE_STATUS_OPEN
|
||||
self.desc = str(tokens[-1]) if has_desc else None
|
||||
|
||||
|
||||
|
||||
@@ -134,7 +134,7 @@ class InpValve:
|
||||
self.node1 = str(tokens[1])
|
||||
self.node2 = str(tokens[2])
|
||||
self.diameter = float(tokens[3])
|
||||
self.v_type = str(tokens[4])
|
||||
self.v_type = str(tokens[4].upper())
|
||||
self.setting = float(tokens[5])
|
||||
self.minor_loss = float(tokens[6])
|
||||
self.desc = str(tokens[-1]) if has_desc else None
|
||||
|
||||
@@ -87,7 +87,7 @@ class InpTag:
|
||||
has_desc = tokens[-1].startswith(';')
|
||||
num_without_desc = (num - 1) if has_desc else num
|
||||
|
||||
self.t_type = str(tokens[0])
|
||||
self.t_type = str(tokens[0].upper())
|
||||
self.id = str(tokens[1])
|
||||
self.tag = str(tokens[2])
|
||||
|
||||
|
||||
Reference in New Issue
Block a user