kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

FEM: Fix cxx typo and remove calculix from solvers tab in examples (#12876)

Browse Source 
* FEM: remove calculix from solvers

* FEM: remove calculix from joint with ccxtools if branches

* FEM: remove calculix from its if

* FEM: fix cxx typo in translations

* FEM: fix cxx typo in classes name

* FEM: fix ccx typo in shortcuts

* FEM: convert FEM_*CcxTools to CamelCase

* FEM: remove tests related to calculix

* FEM: remove test_solver_calculix.py from Fem/CMakeLists.txt

* FEM: convert all 'CalculiXccxTools' to 'CalculiXCcxTools'

* FEM: revert changes in all *_*.ts files

* FEM: convert 'SolverCcxtools' to 'SolverCcxTools'

* FEM: convert remaining 'Ccxtools' to 'CcxTools'
This commit is contained in:
lyphrowny
2024-04-01 15:51:23 +00:00
committed by GitHub
parent 01b0ae5d81
commit e99ee08514
53 changed files with 145 additions and 588 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Fem/femtest/app/test_ccxtools.py
View File

@@ -22,7 +22,7 @@
# * *
# ***************************************************************************
__title__ = "Ccxtools FEM unit tests"
__title__ = "CcxTools FEM unit tests"
__author__ = "Bernd Hahnebach"
__url__ = "https://www.freecad.org"
@@ -153,7 +153,7 @@ class TestCcxTools(unittest.TestCase):
if analysis_dir is None:
analysis_dir = testtools.get_fem_test_tmp_dir(self.pre_dir_name + base_name)
analysis = self.document.Analysis
solver_object = self.document.CalculiXccxTools
solver_object = self.document.CalculiXCcxTools
fea = ccxtools.FemToolsCcx(analysis, solver_object, test_mode=True)
fea.update_objects()

10
src/Mod/Fem/femtest/app/test_object.py
View File

@@ -328,7 +328,7 @@ class TestObjectType(unittest.TestCase):
solverelmer = ObjectsFem.makeSolverElmer(doc)
self.assertEqual(
"Fem::SolverCcxTools",
type_of_obj(ObjectsFem.makeSolverCalculixCcxTools(doc))
type_of_obj(ObjectsFem.makeSolverCalculiXCcxTools(doc))
)
self.assertEqual(
"Fem::SolverCalculix",
@@ -574,7 +574,7 @@ class TestObjectType(unittest.TestCase):
))
solverelmer = ObjectsFem.makeSolverElmer(doc)
self.assertTrue(is_of_type(
ObjectsFem.makeSolverCalculixCcxTools(doc),
ObjectsFem.makeSolverCalculiXCcxTools(doc),
"Fem::SolverCcxTools"
))
self.assertTrue(is_of_type(
@@ -1285,7 +1285,7 @@ class TestObjectType(unittest.TestCase):
))
# SolverCcxTools
solver_ccxtools = ObjectsFem.makeSolverCalculixCcxTools(doc)
solver_ccxtools = ObjectsFem.makeSolverCalculiXCcxTools(doc)
self.assertTrue(is_derived_from(
solver_ccxtools,
"App::DocumentObject"
@@ -1745,7 +1745,7 @@ class TestObjectType(unittest.TestCase):
)
solverelmer = ObjectsFem.makeSolverElmer(doc)
self.assertTrue(
ObjectsFem.makeSolverCalculixCcxTools(
ObjectsFem.makeSolverCalculiXCcxTools(
doc
).isDerivedFrom("Fem::FemSolverObjectPython")
)
@@ -1891,7 +1891,7 @@ def create_all_fem_objects_doc(
ObjectsFem.makePostVtkFilterCutFunction(doc, vres)
ObjectsFem.makePostVtkFilterWarp(doc, vres)
analysis.addObject(ObjectsFem.makeSolverCalculixCcxTools(doc))
analysis.addObject(ObjectsFem.makeSolverCalculiXCcxTools(doc))
analysis.addObject(ObjectsFem.makeSolverCalculix(doc))
sol = analysis.addObject(ObjectsFem.makeSolverElmer(doc))[0]
analysis.addObject(ObjectsFem.makeSolverMystran(doc))

384
src/Mod/Fem/femtest/app/test_solver_calculix.py
View File

@@ -1,384 +0,0 @@
# ***************************************************************************
# * Copyright (c) 2018 Bernd Hahnebach <bernd@bimstatik.org> *
# * *
# * This file is part of the FreeCAD CAx development system. *
# * *
# * This program is free software; you can redistribute it and/or modify *
# * it under the terms of the GNU Lesser General Public License (LGPL) *
# * as published by the Free Software Foundation; either version 2 of *
# * the License, or (at your option) any later version. *
# * for detail see the LICENCE text file. *
# * *
# * This program is distributed in the hope that it will be useful, *
# * but WITHOUT ANY WARRANTY; without even the implied warranty of *
# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the *
# * GNU Library General Public License for more details. *
# * *
# * You should have received a copy of the GNU Library General Public *
# * License along with this program; if not, write to the Free Software *
# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 *
# * USA *
# * *
# ***************************************************************************
__title__ = "Solver calculix FEM unit tests"
__author__ = "Bernd Hahnebach"
__url__ = "https://www.freecad.org"
import unittest
from os.path import join
import FreeCAD
import femsolver.run
from . import support_utils as testtools
from .support_utils import fcc_print
from .support_utils import get_namefromdef
class TestSolverCalculix(unittest.TestCase):
fcc_print("import TestSolverCalculix")
# ********************************************************************************************
def setUp(
self
):
# setUp is executed before every test
# new document
self.document = FreeCAD.newDocument(self.__class__.__name__)
# more inits
self.pre_dir_name = "solver_calculix_"
self.ending = ".inp"
self.infilename = "Mesh"
self.test_file_dir = join(
testtools.get_fem_test_home_dir(),
"calculix"
)
# ********************************************************************************************
def tearDown(
self
):
# tearDown is executed after every test
FreeCAD.closeDocument(self.document.Name)
# ********************************************************************************************
def test_00print(
self
):
# since method name starts with 00 this will be run first
# this test just prints a line with stars
fcc_print("\n{0}\n{1} run FEM TestSolverCalculix tests {2}\n{0}".format(
100 * "*",
10 * "*",
55 * "*"
))
# ********************************************************************************************
def test_box_frequency(
self
):
fcc_print("")
from femexamples.boxanalysis_frequency import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_box_static(
self
):
fcc_print("")
from femexamples.boxanalysis_static import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_buckling_flexuralbuckling(
self
):
from femexamples.ccx_buckling_flexuralbuckling import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_beam_circle(
self
):
from femexamples.ccx_cantilever_beam_circle import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_beam_pipe(
self
):
from femexamples.ccx_cantilever_beam_pipe import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_beam_rect(
self
):
from femexamples.ccx_cantilever_beam_rect import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_ele_hexa20(
self
):
from femexamples.ccx_cantilever_ele_hexa20 import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_ele_quad4(
self
):
from femexamples.ccx_cantilever_ele_quad4 import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_ele_quad8(
self
):
from femexamples.ccx_cantilever_ele_quad8 import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_ele_seg2(
self
):
from femexamples.ccx_cantilever_ele_seg2 import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_ele_seg3(
self
):
from femexamples.ccx_cantilever_ele_seg3 import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_ele_tria3(
self
):
from femexamples.ccx_cantilever_ele_tria3 import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_ele_tria6(
self
):
from femexamples.ccx_cantilever_ele_tria6 import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_faceload(
self
):
from femexamples.ccx_cantilever_faceload import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_nodeload(
self
):
from femexamples.ccx_cantilever_nodeload import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_ccx_cantilever_prescribeddisplacement(
self
):
from femexamples.ccx_cantilever_prescribeddisplacement import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_constraint_centrif(
self
):
# TODO does pass on my local machine, but not on ci
return
from femexamples.constraint_centrif import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_constraint_contact_shell_shell(
self
):
from femexamples.constraint_contact_shell_shell import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_constraint_contact_solid_solid(
self
):
# TODO does pass on my local machine, but not on ci
return
from femexamples.constraint_contact_solid_solid import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_constraint_sectionprint(
self
):
from femexamples.constraint_section_print import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_constraint_selfweight_cantilever(
self
):
from femexamples.constraint_selfweight_cantilever import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_constraint_tie(
self
):
from femexamples.constraint_tie import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_constraint_transform_beam_hinged(
self
):
from femexamples.constraint_transform_beam_hinged import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_constraint_transform_torque(
self
):
from femexamples.constraint_transform_torque import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_frequency_beamsimple(
self
):
from femexamples.frequency_beamsimple import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_material_multiple_bendingbeam_fiveboxes(
self
):
from femexamples.material_multiple_bendingbeam_fiveboxes import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_material_multiple_bendingbeam_fivefaces(
self
):
from femexamples.material_multiple_bendingbeam_fivefaces import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_material_multiple_tensionrod_twoboxes(
self
):
from femexamples.material_multiple_tensionrod_twoboxes import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_material_nonlinear(
self
):
from femexamples.material_nl_platewithhole import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_square_pipe_end_twisted_edgeforces(
self
):
from femexamples.square_pipe_end_twisted_edgeforces import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_square_pipe_end_twisted_nodeforces(
self
):
from femexamples.square_pipe_end_twisted_nodeforces import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def test_thermomech_bimetall(
self
):
from femexamples.thermomech_bimetall import setup
setup(self.document, "calculix")
self.input_file_writing_test(get_namefromdef("test_"))
# ********************************************************************************************
def input_file_writing_test(
self,
base_name
):
self.document.recompute()
# get analysis working directory and save FreeCAD file
working_dir = testtools.get_fem_test_tmp_dir(self.pre_dir_name + base_name)
save_fc_file = join(working_dir, base_name + ".FCStd")
# fcc_print("Save FreeCAD file to {} ...".format(save_fc_file))
self.document.saveAs(save_fc_file)
# write input file
machine = self.document.SolverCalculiX.Proxy.createMachine(
self.document.SolverCalculiX,
working_dir,
True # set testmode to True
)
machine.target = femsolver.run.PREPARE
machine.start()
machine.join() # wait for the machine to finish
# compare input file with the given one
inpfile_given = join(
self.test_file_dir,
base_name + self.ending
)
inpfile_totest = join(
working_dir,
self.infilename + self.ending
)
# fcc_print("Comparing {} to {}".format(inpfile_given, inpfile_totest))
ret = testtools.compare_inp_files(
inpfile_given,
inpfile_totest
)
self.assertFalse(
ret,
"CalculiX write_inp_file for {0} test failed.\n{1}".format(base_name, ret)
)