From 345c517840a8bc50e243df9905cf0399618e56c7 Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 31 Dec 2017 12:21:51 +0100 Subject: [PATCH] FEM: Moar typos --- src/Mod/Fem/App/AppFem.cpp | 2 +- src/Mod/Fem/App/FemPostPipeline.cpp | 4 ++-- src/Mod/Fem/PyObjects/_FemMaterialMechanicalNonlinear.py | 2 +- src/Mod/Fem/PyObjects/_FemSolverCalculix.py | 2 +- src/Mod/Fem/feminout/importZ88Mesh.py | 2 +- src/Mod/Fem/femsolver/calculix/solver.py | 2 +- src/Mod/Fem/femtest/testfemcommon.py | 8 ++++---- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/Mod/Fem/App/AppFem.cpp b/src/Mod/Fem/App/AppFem.cpp index c03c11dad1..e8c7d41139 100644 --- a/src/Mod/Fem/App/AppFem.cpp +++ b/src/Mod/Fem/App/AppFem.cpp @@ -76,7 +76,7 @@ extern PyObject* initModule(); /* Python entry */ PyMOD_INIT_FUNC(Fem) { - // load dependend module + // load dependent module try { Base::Interpreter().loadModule("Part"); //Base::Interpreter().loadModule("Mesh"); diff --git a/src/Mod/Fem/App/FemPostPipeline.cpp b/src/Mod/Fem/App/FemPostPipeline.cpp index 7544efd83c..ab2b3013c7 100644 --- a/src/Mod/Fem/App/FemPostPipeline.cpp +++ b/src/Mod/Fem/App/FemPostPipeline.cpp @@ -180,7 +180,7 @@ void FemPostPipeline::onChanged(const Property* prop) if(filter->Input.getValue() != Input.getValue()) filter->Input.setValue(Input.getValue()); - //all the others need to be connected to the previous filter or the source, dependend on the mode + //all the others need to be connected to the previous filter or the source, dependent on the mode ++it; for(; it != objs.end(); ++it) { FemPostFilter* nextFilter = static_cast(*it); @@ -203,7 +203,7 @@ void FemPostPipeline::onChanged(const Property* prop) if(filter->Input.getValue() != NULL) filter->Input.setValue(NULL); - //all the others need to be connected to the previous filter or grab the data, dependend on mode + //all the others need to be connected to the previous filter or grab the data, dependent on mode ++it; for(; it != objs.end(); ++it) { FemPostFilter* nextFilter = static_cast(*it); diff --git a/src/Mod/Fem/PyObjects/_FemMaterialMechanicalNonlinear.py b/src/Mod/Fem/PyObjects/_FemMaterialMechanicalNonlinear.py index 15d720726f..f818e36a2b 100644 --- a/src/Mod/Fem/PyObjects/_FemMaterialMechanicalNonlinear.py +++ b/src/Mod/Fem/PyObjects/_FemMaterialMechanicalNonlinear.py @@ -34,7 +34,7 @@ class _FemMaterialMechanicalNonlinear: obj.Proxy = self self.Type = "FemMaterialMechanicalNonlinear" - obj.addProperty("App::PropertyLink", "LinearBaseMaterial", "Base", "Set the linear material the nonlinear build uppon.") + obj.addProperty("App::PropertyLink", "LinearBaseMaterial", "Base", "Set the linear material the nonlinear builds upon.") choices_nonlinear_material_models = ["simple hardening"] obj.addProperty("App::PropertyEnumeration", "MaterialModelNonlinearity", "Fem", "Set the type on nonlinear material model") diff --git a/src/Mod/Fem/PyObjects/_FemSolverCalculix.py b/src/Mod/Fem/PyObjects/_FemSolverCalculix.py index 5728db6ecc..2b4242694f 100644 --- a/src/Mod/Fem/PyObjects/_FemSolverCalculix.py +++ b/src/Mod/Fem/PyObjects/_FemSolverCalculix.py @@ -144,7 +144,7 @@ class _FemSolverCalculix(): solver_type = ccx_prefs.GetInt("Solver", 0) obj.MatrixSolverType = known_ccx_solver_types[solver_type] - obj.addProperty("App::PropertyBool", "BeamShellResultOutput3D", "Fem", "Output 3D results for 1D and 2D anlysis ") + obj.addProperty("App::PropertyBool", "BeamShellResultOutput3D", "Fem", "Output 3D results for 1D and 2D analysis ") dimout = ccx_prefs.GetBool("BeamShellOutput", False) obj.BeamShellResultOutput3D = dimout diff --git a/src/Mod/Fem/feminout/importZ88Mesh.py b/src/Mod/Fem/feminout/importZ88Mesh.py index ef8c4ac911..34b189c677 100644 --- a/src/Mod/Fem/feminout/importZ88Mesh.py +++ b/src/Mod/Fem/feminout/importZ88Mesh.py @@ -454,6 +454,6 @@ def get_z88_element_type(femmesh, femelement_table=None): print('Edge femmesh will be exported as 3D truss element nr 4') return 4 else: - print('Neither, edge, face or solid femmesh') + print('Neither edge nor face nor solid femmesh') return 0 return 0 diff --git a/src/Mod/Fem/femsolver/calculix/solver.py b/src/Mod/Fem/femsolver/calculix/solver.py index b7bbb56328..2501795173 100644 --- a/src/Mod/Fem/femsolver/calculix/solver.py +++ b/src/Mod/Fem/femsolver/calculix/solver.py @@ -158,7 +158,7 @@ class Proxy(solverbase.Proxy): solver_type = ccx_prefs.GetInt("Solver", 0) obj.MatrixSolverType = known_ccx_solver_types[solver_type] - obj.addProperty("App::PropertyBool", "BeamShellResultOutput3D", "Fem", "Output 3D results for 1D and 2D anlysis ") + obj.addProperty("App::PropertyBool", "BeamShellResultOutput3D", "Fem", "Output 3D results for 1D and 2D analysis ") dimout = ccx_prefs.GetBool("BeamShellOutput", False) obj.BeamShellResultOutput3D = dimout diff --git a/src/Mod/Fem/femtest/testfemcommon.py b/src/Mod/Fem/femtest/testfemcommon.py index a36a5aa5d9..99d71c4ead 100644 --- a/src/Mod/Fem/femtest/testfemcommon.py +++ b/src/Mod/Fem/femtest/testfemcommon.py @@ -529,7 +529,7 @@ class FemCcxAnalysisTest(unittest.TestCase): fcc_print('Setting analysis type to \'static\"') fea.set_analysis_type("static") - self.assertTrue(True if fea.analysis_type == 'static' else False, "Setting anlysis type to \'static\' failed") + self.assertTrue(True if fea.analysis_type == 'static' else False, "Setting analysis type to \'static\' failed") fcc_print('Writing {}/{}.inp for static analysis'.format(static_analysis_dir, mesh_name)) error = fea.write_inp_file() @@ -570,7 +570,7 @@ class FemCcxAnalysisTest(unittest.TestCase): fea.reset_all() fcc_print('Setting analysis type to \'frequency\"') fea.set_analysis_type("frequency") - self.assertTrue(True if fea.analysis_type == 'frequency' else False, "Setting anlysis type to \'frequency\' failed") + self.assertTrue(True if fea.analysis_type == 'frequency' else False, "Setting analysis type to \'frequency\' failed") fcc_print('Setting up working directory to {} in order to write frequency calculations'.format(frequency_analysis_dir)) fea.setup_working_dir(frequency_analysis_dir) @@ -773,7 +773,7 @@ class FemCcxAnalysisTest(unittest.TestCase): fcc_print('Setting analysis type to \'thermomech\"') fea.set_analysis_type("thermomech") - self.assertTrue(True if fea.analysis_type == 'thermomech' else False, "Setting anlysis type to \'thermomech\' failed") + self.assertTrue(True if fea.analysis_type == 'thermomech' else False, "Setting analysis type to \'thermomech\' failed") fcc_print('Checking FEM inp file prerequisites for thermo-mechanical analysis...') error = fea.check_prerequisites() @@ -1021,7 +1021,7 @@ class FemCcxAnalysisTest(unittest.TestCase): fcc_print('Setting analysis type to \'thermomech\"') fea.set_analysis_type("thermomech") - self.assertTrue(True if fea.analysis_type == 'thermomech' else False, "Setting anlysis type to \'thermomech\' failed") + self.assertTrue(True if fea.analysis_type == 'thermomech' else False, "Setting analysis type to \'thermomech\' failed") fcc_print('Checking FEM inp file prerequisites for thermo-mechanical analysis...') error = fea.check_prerequisites()