From 07d1dccebb7decc78e004c9952fbb5f8fa122294 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Tue, 28 Feb 2017 11:50:58 +0100 Subject: [PATCH] FEM: code formating, flake8 --- src/Mod/Fem/FemInputWriterCcx.py | 2 +- src/Mod/Fem/FemMeshTools.py | 1 - src/Mod/Fem/PyGui/_TaskPanelFemFluidSection.py | 4 ++-- src/Mod/Fem/PyObjects/_FemFluidSection.py | 2 +- src/Mod/Fem/importCcxFrdResults.py | 4 ++-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Mod/Fem/FemInputWriterCcx.py b/src/Mod/Fem/FemInputWriterCcx.py index b52f64906..6dc5fe9a5 100644 --- a/src/Mod/Fem/FemInputWriterCcx.py +++ b/src/Mod/Fem/FemInputWriterCcx.py @@ -1346,7 +1346,7 @@ def liquid_section_def(obj, section_type): bend_radius_diameter = str(obj.BendRadiusDiameter) bend_angle = str(obj.BendAngle) bend_loss_coefficient = str(obj.BendLossCoefficient) - section_geo = bend_pipe_area + ',' + bend_radius_diameter + ',' + bend_angle +',' + bend_loss_coefficient + '\n' + section_geo = bend_pipe_area + ',' + bend_radius_diameter + ',' + bend_angle + ',' + bend_loss_coefficient + '\n' return section_geo elif section_type == 'PIPE GATE VALVE': gatevalve_pipe_area = str(obj.GateValvePipeArea.getValueAs('mm^2').Value) diff --git a/src/Mod/Fem/FemMeshTools.py b/src/Mod/Fem/FemMeshTools.py index 27b42f46b..3c87e1dda 100644 --- a/src/Mod/Fem/FemMeshTools.py +++ b/src/Mod/Fem/FemMeshTools.py @@ -1453,7 +1453,6 @@ def use_correct_fluidinout_ele_def(FluidInletoutlet_ele, fileName): line = f.readline() cnt = cnt + 1 - # obtain element line numbers for inlet and outlet while (len(line) > 1): ind = line.find(',') diff --git a/src/Mod/Fem/PyGui/_TaskPanelFemFluidSection.py b/src/Mod/Fem/PyGui/_TaskPanelFemFluidSection.py index 2ab671f4a..27db3265a 100644 --- a/src/Mod/Fem/PyGui/_TaskPanelFemFluidSection.py +++ b/src/Mod/Fem/PyGui/_TaskPanelFemFluidSection.py @@ -214,8 +214,8 @@ class _TaskPanelFemFluidSection: self.form.if_colebrooke_grain_diameter.setText(self.ColebrookeGrainDiameter.UserString) self.form.sb_colebrooke_form_factor.setValue(self.ColebrookeFormFactor) for i in range(len(self.PumpFlowRate)): - self.form.tw_pump_characteristics.setItem(i,0,QtGui.QTableWidgetItem(str(self.PumpFlowRate[i]))) - self.form.tw_pump_characteristics.setItem(i,1,QtGui.QTableWidgetItem(str(self.PumpHeadLoss[i]))) + self.form.tw_pump_characteristics.setItem(i, 0, QtGui.QTableWidgetItem(str(self.PumpFlowRate[i]))) + self.form.tw_pump_characteristics.setItem(i, 1, QtGui.QTableWidgetItem(str(self.PumpHeadLoss[i]))) self.rebuild_list_References() def sectiontype_changed(self, index): diff --git a/src/Mod/Fem/PyObjects/_FemFluidSection.py b/src/Mod/Fem/PyObjects/_FemFluidSection.py index 45432e41a..0b95164c5 100644 --- a/src/Mod/Fem/PyObjects/_FemFluidSection.py +++ b/src/Mod/Fem/PyObjects/_FemFluidSection.py @@ -86,7 +86,7 @@ class _FemFluidSection: obj.ChannelSectionType = 'NONE' obj.ManningArea = 10.0 obj.ManningRadius = 1.0 - obj.ManningCoefficient = 0.0015 # has units of s/mm^(1/3) + obj.ManningCoefficient = 0.0015 # has units of s/mm^(1/3) obj.EnlargeArea1 = 10.0 obj.EnlargeArea2 = 20.0 obj.ContractArea1 = 20.0 diff --git a/src/Mod/Fem/importCcxFrdResults.py b/src/Mod/Fem/importCcxFrdResults.py index 216c8f246..ea29e941f 100644 --- a/src/Mod/Fem/importCcxFrdResults.py +++ b/src/Mod/Fem/importCcxFrdResults.py @@ -595,12 +595,12 @@ def readResult(frd_input): if mode_massflow_found and (line[1:3] == "-1"): elem = int(line[4:13]) massflow = float(line[13:25]) - mode_massflow[elem] = (massflow * 1000) # convert units to kg/s from t/s + mode_massflow[elem] = (massflow * 1000) # convert units to kg/s from t/s if inout_nodes_exist: for i in range(len(inout_nodes)): if elem == int(inout_nodes[i][1]): node = int(inout_nodes[i][2]) - mode_massflow[node] = (massflow * 1000) # convert units to kg/s from t/s + mode_massflow[node] = (massflow * 1000) # convert units to kg/s from t/s if line[5:11] == "STPRES": mode_networkpressure_found = True # we found a network pressure line in the frd file