From e8587cf0b4f5e1e44a79ff6385a5b7a219fae83c Mon Sep 17 00:00:00 2001 From: luzpaz Date: Thu, 23 Nov 2017 12:09:28 -0500 Subject: [PATCH] Misc. typo fixes Remove double whitespaces between source comments --- src/Mod/Fem/App/FemResultObject.h | 2 +- src/Mod/Fem/App/FemVTKTools.cpp | 12 ++++++------ src/Mod/Fem/FemGmshTools.py | 4 ++-- src/Mod/Fem/FemMeshTools.py | 2 +- src/Mod/Fem/FemTools.py | 2 +- src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp | 2 +- src/Mod/Fem/Gui/ViewProviderResult.cpp | 2 +- src/Mod/Fem/PyObjects/_FemMeshBoundaryLayer.py | 2 +- src/Mod/Fem/PyObjects/_FemMeshGmsh.py | 2 +- src/Mod/Fem/PyObjects/_FemResultMechanical.py | 2 +- src/Mod/Fem/convert2TetGen.py | 2 +- src/Mod/Fem/importToolsFem.py | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/Mod/Fem/App/FemResultObject.h b/src/Mod/Fem/App/FemResultObject.h index 998b1ffc18..29e50f4dbe 100644 --- a/src/Mod/Fem/App/FemResultObject.h +++ b/src/Mod/Fem/App/FemResultObject.h @@ -43,7 +43,7 @@ public: virtual ~FemResultObject(); App::PropertyIntegerList NodeNumbers; - /// Link to the corresponding mesh + /// Link to the corresponding mesh App::PropertyLink Mesh; /// Stats of analysis App::PropertyFloat Time; diff --git a/src/Mod/Fem/App/FemVTKTools.cpp b/src/Mod/Fem/App/FemVTKTools.cpp index df5b52cfc0..14fecd6fea 100644 --- a/src/Mod/Fem/App/FemVTKTools.cpp +++ b/src/Mod/Fem/App/FemVTKTools.cpp @@ -813,7 +813,7 @@ void _exportResult(const App::DocumentObject* result, vtkSmartPointerGetPointData()->AddArray(data); - Base::Console().Message("Info: PropertyVectorList %s exported as vtk array name '%s'\n", kv.first.c_str(), kv.second.c_str()); + Base::Console().Message("Info: PropertyVectorList %s exported as vtk array name '%s'\n", kv.first.c_str(), kv.second.c_str()); } else Base::Console().Error("field = static_cast failed or empty for field: %s", kv.first.c_str()); @@ -833,7 +833,7 @@ void _exportResult(const App::DocumentObject* result, vtkSmartPointerSetValue(i, vec[i]); grid->GetPointData()->AddArray(data); - Base::Console().Message("Info: PropertyFloatList %s exported as vtk array name '%s'\n", kv.first.c_str(), kv.second.c_str()); + Base::Console().Message("Info: PropertyFloatList %s exported as vtk array name '%s'\n", kv.first.c_str(), kv.second.c_str()); } } @@ -841,7 +841,7 @@ void _exportResult(const App::DocumentObject* result, vtkSmartPointer dataset, App::DocumentObject* res) { // velocity and pressure are essential, Temperature is optional, so are turbulence related variables - std::map cfd_vectors; // vector field defined in openfoam -> property defined in CfdResult.py + std::map cfd_vectors; // vector field defined in openfoam -> property defined in CfdResult.py cfd_vectors["Velocity"] = "U"; std::map cfd_scalers; // varable name defined in openfoam -> property defined in CfdResult.py @@ -853,7 +853,7 @@ void FemVTKTools::importFluidicResult(vtkSmartPointer dataset, App:: cfd_scalers["TurbulenceSpecificDissipation"] = "omega"; cfd_scalers["TurbulenceThermalDiffusivity"] = "alphat"; - std::map cfd_varids; // must agree with definition in Stat calc Cfd/_TaskPanelCfdResult.py + std::map cfd_varids; // must agree with definition in Stat calc Cfd/_TaskPanelCfdResult.py cfd_varids["Ux"] = 0; cfd_varids["Uy"] = 1; cfd_varids["Uz"] = 2; @@ -874,7 +874,7 @@ void FemVTKTools::importFluidicResult(vtkSmartPointer dataset, App:: void FemVTKTools::exportFluidicResult(const App::DocumentObject* res, vtkSmartPointer grid) { // velocity and pressure are essential, Temperature is optional, so are turbulence related variables - static std::map cfd_vectors; // vector field defined in openfoam -> property defined in CfdResult.py + static std::map cfd_vectors; // vector field defined in openfoam -> property defined in CfdResult.py cfd_vectors["Velocity"] = "U"; static std::map cfd_scalers; // varable name defined in openfoam -> property defined in CfdResult.py @@ -917,7 +917,7 @@ void FemVTKTools::importMechanicalResult(vtkSmartPointer dataset, Ap //scalers["DisplacementLengths"] = ""; // not yet exported in exportMechanicalResult() std::map varids; - // id sequence must agree with definition in get_result_stats() of Fem/_TaskPanelResultShow.py + // id sequence must agree with definition in get_result_stats() of Fem/_TaskPanelResultShow.py varids["U1"] = 0; // U1, displacement x axis varids["U2"] = 1; varids["U3"] = 2; diff --git a/src/Mod/Fem/FemGmshTools.py b/src/Mod/Fem/FemGmshTools.py index 7d2c50c1fc..d470bf0976 100644 --- a/src/Mod/Fem/FemGmshTools.py +++ b/src/Mod/Fem/FemGmshTools.py @@ -360,14 +360,14 @@ class FemGmshTools(): if found_element: # also elems = found_element else: - FreeCAD.Console.PrintError("One element of the mesh boudary layer " + mr_obj.Name + " could not be found in the Part to mesh. It will be ignored.\n") + FreeCAD.Console.PrintError("One element of the mesh boundary layer " + mr_obj.Name + " could not be found in the Part to mesh. It will be ignored.\n") # print(elems) # element if elems not in self.bl_boundary_list: # fetch settings in DocumentObject, fan setting is not implemented belem_list.append(elems) self.bl_boundary_list.append(elems) else: - FreeCAD.Console.PrintError("The element " + elems + " of the mesh boundary layer " + mr_obj.Name + " has been added to another mesh boudary layer.\n") + FreeCAD.Console.PrintError("The element " + elems + " of the mesh boundary layer " + mr_obj.Name + " has been added to another mesh boundary layer.\n") setting = {} setting['hwall_n'] = Units.Quantity(mr_obj.MinimumThickness).Value setting['ratio'] = mr_obj.GrowthRate diff --git a/src/Mod/Fem/FemMeshTools.py b/src/Mod/Fem/FemMeshTools.py index 71293addeb..f70b495166 100644 --- a/src/Mod/Fem/FemMeshTools.py +++ b/src/Mod/Fem/FemMeshTools.py @@ -146,7 +146,7 @@ def get_bit_pattern_dict(femelement_table, femnodes_ele_table, node_set): http://forum.freecadweb.org/viewtopic.php?f=18&p=141133&sid=013c93f496a63872951d2ce521702ffa#p141108 The bit_pattern_dict holds later an integer (bit array) for each element, which gives us the information we are searching for: - Is this element part of the node list (searching for elements) or has this element a face we are searching for? + Is this element part of the node list (searching for elements) or has this element a face we are searching for? The number in the ele_dict is organized as a bit array. The corresponding bit is set, if the node of the node_set is contained in the element. ''' diff --git a/src/Mod/Fem/FemTools.py b/src/Mod/Fem/FemTools.py index fa4dd09a0c..abf69b4d38 100644 --- a/src/Mod/Fem/FemTools.py +++ b/src/Mod/Fem/FemTools.py @@ -450,7 +450,7 @@ class FemTools(QtCore.QRunnable, QtCore.QObject): ## Sets base_name # @param self The python object self - # @param base_name base name of .inp/.frd file (without extension). It is used to construct .inp file path that is passed to CalculiX ccx + # @param base_name base name of .inp/.frd file (without extension). It is used to construct .inp file path that is passed to CalculiX ccx def set_base_name(self, base_name=None): if base_name is None: self.base_name = "" diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp index 71896167d2..c9964403b4 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp +++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.cpp @@ -231,7 +231,7 @@ TaskFemConstraintFluidBoundary::TaskFemConstraintFluidBoundary(ViewProviderFemCo pHeatTransfering = NULL; pTurbulenceModel = NULL; if (pcSolver != NULL) { - //if only it is CFD solver, otherwise exit by SIGSEGV error, detect getPropertyByName() != NULL + //if only it is CFD solver, otherwise exit by SIGSEGV error, detect getPropertyByName() != NULL if (pcSolver->getPropertyByName("HeatTransfering")) { pHeatTransfering = static_cast(pcSolver->getPropertyByName("HeatTransfering")); if (pHeatTransfering->getValue()) { diff --git a/src/Mod/Fem/Gui/ViewProviderResult.cpp b/src/Mod/Fem/Gui/ViewProviderResult.cpp index d221282ab5..3a8674dd51 100644 --- a/src/Mod/Fem/Gui/ViewProviderResult.cpp +++ b/src/Mod/Fem/Gui/ViewProviderResult.cpp @@ -45,7 +45,7 @@ ViewProviderResult::~ViewProviderResult() } -/* not needed since _ViewProviderFemResult.py is made +/* not needed since _ViewProviderFemResult.py is made bool ViewProviderResult::doubleClicked(void) { Gui::Command::runCommand(Gui::Command::Gui, "Gui.runCommand('Fem_ResultShow')"); diff --git a/src/Mod/Fem/PyObjects/_FemMeshBoundaryLayer.py b/src/Mod/Fem/PyObjects/_FemMeshBoundaryLayer.py index 051b6dc7db..17d759a33d 100644 --- a/src/Mod/Fem/PyObjects/_FemMeshBoundaryLayer.py +++ b/src/Mod/Fem/PyObjects/_FemMeshBoundaryLayer.py @@ -33,7 +33,7 @@ class _FemMeshBoundaryLayer: def __init__(self, obj): self.Type = "FemMeshBoundaryLayer" self.Object = obj # keep a ref to the DocObj for nonGui usage - obj.Proxy = self # link between App::DocumentObject to this object + obj.Proxy = self # link between App::DocumentObject to this object obj.addProperty("App::PropertyInteger", "NumberOfLayers", "MeshBoundaryLayerProperties", "set number of inflation layers for this boundary") diff --git a/src/Mod/Fem/PyObjects/_FemMeshGmsh.py b/src/Mod/Fem/PyObjects/_FemMeshGmsh.py index 5c773e4e3e..d1ed847dd1 100644 --- a/src/Mod/Fem/PyObjects/_FemMeshGmsh.py +++ b/src/Mod/Fem/PyObjects/_FemMeshGmsh.py @@ -41,7 +41,7 @@ class _FemMeshGmsh(): def __init__(self, obj): self.Type = "FemMeshGmsh" self.Object = obj # keep a ref to the DocObj for nonGui usage - obj.Proxy = self # link between App::DocumentObject to this object + obj.Proxy = self # link between App::DocumentObject to this object obj.addProperty("App::PropertyLinkList", "MeshBoundaryLayerList", "Base", "Mesh boundaries need inflation layers") obj.MeshBoundaryLayerList = [] diff --git a/src/Mod/Fem/PyObjects/_FemResultMechanical.py b/src/Mod/Fem/PyObjects/_FemResultMechanical.py index 806e7067bb..45f7cf9e44 100644 --- a/src/Mod/Fem/PyObjects/_FemResultMechanical.py +++ b/src/Mod/Fem/PyObjects/_FemResultMechanical.py @@ -35,7 +35,7 @@ class _FemResultMechanical(): def __init__(self, obj): self.Type = "FemResultMechanical" self.Object = obj # keep a ref to the DocObj for nonGui usage - obj.Proxy = self # link between App::DocumentObject to this object + obj.Proxy = self # link between App::DocumentObject to this object obj.addProperty("App::PropertyString", "ResultType", "Base", "Type of the result", 1) # the 1 set the property to ReadOnly obj.ResultType = str(self.Type) diff --git a/src/Mod/Fem/convert2TetGen.py b/src/Mod/Fem/convert2TetGen.py index f25ad7a225..57176d6c5c 100755 --- a/src/Mod/Fem/convert2TetGen.py +++ b/src/Mod/Fem/convert2TetGen.py @@ -9,7 +9,7 @@ Gui = FreeCADGui # shortcut # @{ def exportMeshToTetGenPoly(meshToExport,filePath,beVerbose=1): - """Export mesh to TetGen *.poly file format""" + """Export mesh to TetGen *.poly file format""" ## Part 1 - write node list to output file if beVerbose == 1: FreeCAD.Console.PrintMessage("\nExport of mesh to TetGen file ...") diff --git a/src/Mod/Fem/importToolsFem.py b/src/Mod/Fem/importToolsFem.py index 1820b229da..1682a9a5c7 100644 --- a/src/Mod/Fem/importToolsFem.py +++ b/src/Mod/Fem/importToolsFem.py @@ -208,7 +208,7 @@ def make_femmesh(mesh_data): def fill_femresult_mechanical(results, result_set, span): - ''' fills an FreeCAD FEM mechanical result object with result data + ''' fills a FreeCAD FEM mechanical result object with result data ''' no_of_values = None