diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index f4f76cbbe4..b1032cfea5 100644 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -1420,7 +1420,7 @@ void FemMesh::writeABAQUS(const std::string &Filename, int elemParam, bool group default: anABAQUS_Output << "** Problem on writing" << std::endl; anABAQUS_Output.close(); - throw std::runtime_error("Not known ABAQUS element choice parameter, [0|1|2] are allowed."); + throw std::runtime_error("Unknown ABAQUS element choice parameter, [0|1|2] are allowed."); } // write nodes diff --git a/src/Mod/Fem/App/FemVTKTools.cpp b/src/Mod/Fem/App/FemVTKTools.cpp index 14fecd6fea..6fb984f778 100644 --- a/src/Mod/Fem/App/FemVTKTools.cpp +++ b/src/Mod/Fem/App/FemVTKTools.cpp @@ -844,7 +844,7 @@ void FemVTKTools::importFluidicResult(vtkSmartPointer dataset, App:: 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 + std::map cfd_scalers; // variable name defined in openfoam -> property defined in CfdResult.py cfd_scalers["Pressure"] = "p"; cfd_scalers["Temperature"] = "T"; cfd_scalers["TurbulenceEnergy"] = "k"; @@ -877,7 +877,7 @@ void FemVTKTools::exportFluidicResult(const App::DocumentObject* res, vtkSmartPo 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 + static std::map cfd_scalers; // variable name defined in openfoam -> property defined in CfdResult.py cfd_scalers["Pressure"] = "p"; cfd_scalers["Temperature"] = "T"; cfd_scalers["TurbulenceEnergy"] = "k"; diff --git a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h index a7e71f4c2b..2a0c2bf859 100644 --- a/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h +++ b/src/Mod/Fem/Gui/TaskFemConstraintFluidBoundary.h @@ -98,7 +98,7 @@ private: private: Ui_TaskFemConstraintFluidBoundary* ui; - int dimension; // -1: unknow, 2 for 2D and 3 for 3D + int dimension; // -1: unknown, 2 for 2D and 3 for 3D Fem::FemSolverObject* pcSolver; App::PropertyBool* pHeatTransfering; App::PropertyEnumeration* pTurbulenceModel; diff --git a/src/Mod/Fem/Gui/ViewProviderFemMesh.h b/src/Mod/Fem/Gui/ViewProviderFemMesh.h index f83c7c114f..5b56af15a3 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMesh.h +++ b/src/Mod/Fem/Gui/ViewProviderFemMesh.h @@ -93,7 +93,7 @@ public: /// return a hit element to the selection path or 0 virtual std::string getElement(const SoDetail*) const; virtual SoDetail* getDetail(const char*) const; - /// return the higlight lines for a given element or the whole shape + /// return the highlight lines for a given element or the whole shape virtual std::vector getSelectionShape(const char* Element) const; //@} diff --git a/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml b/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml index 866ebb85ba..a9312ee113 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml +++ b/src/Mod/Fem/Gui/ViewProviderFemMeshPy.xml @@ -32,31 +32,31 @@ - Postprocessing color of the nodes. The faces between the nodes gets interpolated. + Postprocessing color of the nodes. The faces between the nodes get interpolated. - Postprocessing color of the elements. All faces of the element get the same color. + Postprocessing color of the elements. All faces of the element get the same color. - Postprocessing color of the the nodes. The faces between the nodes gets interpolated. + Postprocessing color of the nodes. The faces between the nodes get interpolated. - List of nodes which gets highlighted + List of nodes which get highlighted. - A List of elements and faces which are actually shown. This are all surface faces of the mesh + List of elements and faces which are actually shown. These are all surface faces of the mesh. diff --git a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h index 4575faa6d8..35d80d894c 100644 --- a/src/Mod/Fem/Gui/ViewProviderFemPostObject.h +++ b/src/Mod/Fem/Gui/ViewProviderFemPostObject.h @@ -112,7 +112,7 @@ public: // /// return a hit element to the selection path or 0 // virtual std::string getElement(const SoDetail*) const; // virtual SoDetail* getDetail(const char*) const; -// /// return the higlight lines for a given element or the whole shape +// /// return the highlight lines for a given element or the whole shape // virtual std::vector getSelectionShape(const char* Element) const; // //@} diff --git a/src/Mod/Fem/PyGui/_ViewProviderFemSolverCalculix.py b/src/Mod/Fem/PyGui/_ViewProviderFemSolverCalculix.py index cf71db20f2..da40ba40da 100644 --- a/src/Mod/Fem/PyGui/_ViewProviderFemSolverCalculix.py +++ b/src/Mod/Fem/PyGui/_ViewProviderFemSolverCalculix.py @@ -281,7 +281,7 @@ class _TaskPanelFemSolverCalculix: fea.update_objects() message = fea.check_prerequisites() if message != "": - QtGui.QMessageBox.critical(None, "Missing prerequisit(s)", message) + QtGui.QMessageBox.critical(None, "Missing prerequisite(s)", message) return False return True diff --git a/src/Mod/Fem/feminout/convert2TetGen.py b/src/Mod/Fem/feminout/convert2TetGen.py index 57176d6c5c..2fcd343b45 100755 --- a/src/Mod/Fem/feminout/convert2TetGen.py +++ b/src/Mod/Fem/feminout/convert2TetGen.py @@ -147,7 +147,7 @@ def createMesh(): beVerbose = 1 if beVerbose == 1: FreeCAD.Console.PrintMessage("\n\n\n\n\n\n\n\nScript starts...") - ## Geometry defenition + ## Geometry definition # Define objects names PyDocumentName = "pnJunction" PSideBoxName = "PSide" diff --git a/src/Mod/Fem/feminout/importZ88Mesh.py b/src/Mod/Fem/feminout/importZ88Mesh.py index 34b189c677..a594ea8995 100644 --- a/src/Mod/Fem/feminout/importZ88Mesh.py +++ b/src/Mod/Fem/feminout/importZ88Mesh.py @@ -290,9 +290,9 @@ def read_z88_mesh(z88_mesh_input): nd11, nd12, nd13, nd14, nd15, nd16, nd17, nd18, nd19, nd20) input_continues = False - # not known elements, some example have -1 for some teaching reasons to show some other stuff + # unknown elements, some examples have -1 for some teaching reasons to show some other stuff else: - FreeCAD.Console.PrintError("Not known element\n") + FreeCAD.Console.PrintError("Unknown element\n") return {} if Debug: diff --git a/src/Mod/Fem/femmesh/meshtools.py b/src/Mod/Fem/femmesh/meshtools.py index 7bc74a4dcb..a98420d246 100644 --- a/src/Mod/Fem/femmesh/meshtools.py +++ b/src/Mod/Fem/femmesh/meshtools.py @@ -324,7 +324,7 @@ def get_femvolumeelements_by_femfacenodes(femelement_table, node_list): if nodecount == 6 or nodecount == 8: e.append(elementID) else: - FreeCAD.Console.PrintError('Error in get_femvolumeelements_by_femfacenodes(): not known volume element: ' + el_nd_ct + '\n') + FreeCAD.Console.PrintError('Error in get_femvolumeelements_by_femfacenodes(): unknown volume element: ' + el_nd_ct + '\n') # print(sorted(e)) return e diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py index 845613ca0c..fb08884ff1 100644 --- a/src/Mod/Fem/femsolver/calculix/writer.py +++ b/src/Mod/Fem/femsolver/calculix/writer.py @@ -1001,7 +1001,7 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter): for line in lines: b = line.split(',') if int(b[0]) == n and b[3] == 'PIPE INLET\n': - f.write(b[1] + ',1,1,' + str(fluidsection_obj.InletFlowRate * 0.001) + '\n') # degree of freedom 1 is for defining flow rate, factor applied to convet unit from kg/s to t/s + f.write(b[1] + ',1,1,' + str(fluidsection_obj.InletFlowRate * 0.001) + '\n') # degree of freedom 1 is for defining flow rate, factor applied to convert unit from kg/s to t/s elif fluidsection_obj.LiquidSectionType == 'PIPE OUTLET': f.write('**Fluid Section Outlet \n') if fluidsection_obj.OutletPressureActive is True: @@ -1017,7 +1017,7 @@ class FemInputWriterCcx(FemInputWriter.FemInputWriter): for line in lines: b = line.split(',') if int(b[0]) == n and b[3] == 'PIPE OUTLET\n': - f.write(b[1] + ',1,1,' + str(fluidsection_obj.OutletFlowRate * 0.001) + '\n') # degree of freedom 1 is for defining flow rate, factor applied to convet unit from kg/s to t/s + f.write(b[1] + ',1,1,' + str(fluidsection_obj.OutletFlowRate * 0.001) + '\n') # degree of freedom 1 is for defining flow rate, factor applied to convert unit from kg/s to t/s def write_outputs_types(self, f): f.write('\n***********************************************************\n') diff --git a/src/Mod/Fem/femtest/testfemcommon.py b/src/Mod/Fem/femtest/testfemcommon.py index 129374d2c9..3908cd4f3d 100644 --- a/src/Mod/Fem/femtest/testfemcommon.py +++ b/src/Mod/Fem/femtest/testfemcommon.py @@ -1310,7 +1310,7 @@ update the results of FEM unit tests: import TestFem TestFem.create_test_results() -copy result files from your_temp_directory/FEM_unittests/ test directories into the src dirctory +copy result files from your_temp_directory/FEM_unittests/ test directories into the src directory compare the results with git difftool run make start FreeCAD and run FEM unit test