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

10
src/Mod/Fem/femexamples/boxanalysis_frequency.py
View File

@@ -35,7 +35,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": [],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["frequency"]
}
@@ -70,12 +70,10 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = doc.Analysis
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.AnalysisType = "frequency"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = False

10
src/Mod/Fem/femexamples/boxanalysis_static.py
View File

@@ -37,7 +37,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "force", "pressure"],
"solvers": ["calculix", "ccxtools", "elmer"],
"solvers": ["ccxtools", "elmer"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -73,10 +73,8 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = doc.Analysis
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
elif solvertype == "elmer":
solver_obj = ObjectsFem.makeSolverElmer(doc, "SolverElmer")
@@ -86,7 +84,7 @@ def setup(doc=None, solvertype="ccxtools"):
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/buckling_lateraltorsionalbuckling.py
View File

@@ -37,7 +37,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Tria6",
"constraints": ["displacement", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["buckling"]
}
@@ -106,17 +106,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "buckling"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/buckling_platebuckling.py
View File

@@ -37,7 +37,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Tria6",
"constraints": ["displacement", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["buckling"]
}
@@ -80,17 +80,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "buckling"
solver_obj.BucklingFactors = 10

10
src/Mod/Fem/femexamples/ccx_buckling_flexuralbuckling.py
View File

@@ -38,7 +38,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Hexa8",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["buckling"]
}
@@ -85,17 +85,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver,
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "buckling"
solver_obj.BucklingFactors = 10

8
src/Mod/Fem/femexamples/ccx_cantilever_base_edge.py
View File

@@ -67,10 +67,8 @@ def setup_cantilever_base_edge(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
elif solvertype == "mystran":
solver_obj = ObjectsFem.makeSolverMystran(doc, "SolverMystran")
@@ -79,7 +77,7 @@ def setup_cantilever_base_edge(doc=None, solvertype="ccxtools"):
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = False

8
src/Mod/Fem/femexamples/ccx_cantilever_base_face.py
View File

@@ -56,10 +56,8 @@ def setup_cantilever_base_face(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
elif solvertype == "mystran":
solver_obj = ObjectsFem.makeSolverMystran(doc, "SolverMystran")
@@ -70,7 +68,7 @@ def setup_cantilever_base_face(doc=None, solvertype="ccxtools"):
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = False

8
src/Mod/Fem/femexamples/ccx_cantilever_base_solid.py
View File

@@ -52,10 +52,8 @@ def setup_cantilever_base_solid(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
elif solvertype == "elmer":
solver_obj = ObjectsFem.makeSolverElmer(doc, "SolverElmer")
@@ -69,7 +67,7 @@ def setup_cantilever_base_solid(doc=None, solvertype="ccxtools"):
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

2
src/Mod/Fem/femexamples/ccx_cantilever_beam_circle.py
View File

@@ -34,7 +34,7 @@ def get_information():
"meshtype": "edge",
"meshelement": "Seg3",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_beam_pipe.py
View File

@@ -34,7 +34,7 @@ def get_information():
"meshtype": "edge",
"meshelement": "Seg3",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_beam_rect.py
View File

@@ -34,7 +34,7 @@ def get_information():
"meshtype": "edge",
"meshelement": "Seg3",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_ele_hexa20.py
View File

@@ -38,7 +38,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Hexa20",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools", "elmer", "z88"],
"solvers": ["ccxtools", "elmer", "z88"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_ele_quad4.py
View File

@@ -37,7 +37,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Quad4",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools", "mystran"],
"solvers": ["ccxtools", "mystran"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_ele_quad8.py
View File

@@ -37,7 +37,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Quad8",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_ele_seg2.py
View File

@@ -37,7 +37,7 @@ def get_information():
"meshtype": "edge",
"meshelement": "Seg2",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools", "mystran"],
"solvers": ["ccxtools", "mystran"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_ele_seg3.py
View File

@@ -32,7 +32,7 @@ def get_information():
"meshtype": "edge",
"meshelement": "Seg3",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_ele_tetra4.py
View File

@@ -36,7 +36,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tetra4",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools", "elmer", "mystran", "z88"],
"solvers": ["ccxtools", "elmer", "mystran", "z88"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_ele_tria3.py
View File

@@ -37,7 +37,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Tria3",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools", "mystran"],
"solvers": ["ccxtools", "mystran"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_ele_tria6.py
View File

@@ -32,7 +32,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Tria6",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools", "z88"],
"solvers": ["ccxtools", "z88"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_faceload.py
View File

@@ -35,7 +35,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools", "elmer", "mystran", "z88"],
"solvers": ["ccxtools", "elmer", "mystran", "z88"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_nodeload.py
View File

@@ -35,7 +35,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools", "elmer", "mystran", "z88"],
"solvers": ["ccxtools", "elmer", "mystran", "z88"],
"material": "solid",
"equations": ["mechanical"]
}

2
src/Mod/Fem/femexamples/ccx_cantilever_prescribeddisplacement.py
View File

@@ -35,7 +35,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "displacement"],
"solvers": ["calculix", "ccxtools", "elmer"],
"solvers": ["ccxtools", "elmer"],
"material": "solid",
"equations": ["mechanical"]
}

10
src/Mod/Fem/femexamples/constraint_centrif.py
View File

@@ -42,7 +42,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["centrif", "fixed"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "multimaterial",
"equations": ["mechanical"]
}
@@ -127,17 +127,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = False

10
src/Mod/Fem/femexamples/constraint_contact_shell_shell.py
View File

@@ -41,7 +41,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Tria3",
"constraints": ["fixed", "force", "contact"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -136,17 +136,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.AnalysisType = "static"
solver_obj.BeamShellResultOutput3D = True
solver_obj.GeometricalNonlinearity = "linear" # really?

10
src/Mod/Fem/femexamples/constraint_contact_solid_solid.py
View File

@@ -42,7 +42,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "pressure", "contact"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -116,17 +116,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = False

10
src/Mod/Fem/femexamples/constraint_section_print.py
View File

@@ -48,7 +48,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["section_print", "fixed", "pressure"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -221,17 +221,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/constraint_selfweight_cantilever.py
View File

@@ -37,7 +37,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "self weight"],
"solvers": ["calculix", "ccxtools", "elmer"],
"solvers": ["ccxtools", "elmer"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -84,10 +84,8 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
elif solvertype == "elmer":
solver_obj = ObjectsFem.makeSolverElmer(doc, "SolverElmer")
@@ -98,7 +96,7 @@ def setup(doc=None, solvertype="ccxtools"):
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/constraint_tie.py
View File

@@ -42,7 +42,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "force", "tie"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -106,17 +106,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = False

10
src/Mod/Fem/femexamples/constraint_transform_beam_hinged.py
View File

@@ -42,7 +42,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["pressure", "displacement", "transform"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -116,17 +116,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/constraint_transform_torque.py
View File

@@ -50,7 +50,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "force", "transform"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -113,17 +113,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = False

10
src/Mod/Fem/femexamples/elmer_nonguitutorial01_eigenvalue_of_elastic_beam.py
View File

@@ -37,7 +37,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": [],
"solvers": ["calculix", "ccxtools", "elmer"],
"solvers": ["ccxtools", "elmer"],
"material": "solid",
"equations": ["elasticity"] # "frequency", but list not allowed here
}
@@ -81,10 +81,8 @@ def setup(doc=None, solvertype="elmer"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
elif solvertype == "elmer":
solver_obj = ObjectsFem.makeSolverElmer(doc, "SolverElmer")
@@ -97,7 +95,7 @@ def setup(doc=None, solvertype="elmer"):
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.AnalysisType = "frequency"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = False

10
src/Mod/Fem/femexamples/frequency_beamsimple.py
View File

@@ -37,7 +37,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["frequency"]
}
@@ -83,17 +83,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "frequency"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/material_multiple_bendingbeam_fiveboxes.py
View File

@@ -40,7 +40,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "multimaterial",
"equations": ["mechanical"]
}
@@ -122,17 +122,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/material_multiple_bendingbeam_fivefaces.py
View File

@@ -38,7 +38,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Tria6",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "multimaterial",
"equations": ["mechanical"]
}
@@ -111,17 +111,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/material_multiple_tensionrod_twoboxes.py
View File

@@ -41,7 +41,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "pressure"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "multimaterial",
"equations": ["mechanical"]
}
@@ -107,17 +107,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/material_nl_platewithhole.py
View File

@@ -49,7 +49,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "nonlinear",
"equations": ["mechanical"]
}
@@ -116,17 +116,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/mystran_plate.py
View File

@@ -39,7 +39,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Quad4",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools", "elmer", "mystran"],
"solvers": ["ccxtools", "elmer", "mystran"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -115,10 +115,8 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
elif solvertype == "elmer":
solver_obj = ObjectsFem.makeSolverElmer(doc, "SolverElmer")
@@ -133,7 +131,7 @@ def setup(doc=None, solvertype="ccxtools"):
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/rc_wall_2d.py
View File

@@ -42,7 +42,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Tria6",
"constraints": ["fixed", "force", "displacement"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "reinforced",
"equations": ["mechanical"]
}
@@ -102,17 +102,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/square_pipe_end_twisted_edgeforces.py
View File

@@ -41,7 +41,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Tria6",
"constraints": ["force", "fixed"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -91,17 +91,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/square_pipe_end_twisted_nodeforces.py
View File

@@ -41,7 +41,7 @@ def get_information():
"meshtype": "face",
"meshelement": "Tria6",
"constraints": ["force", "fixed"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -201,17 +201,15 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
else:
FreeCAD.Console.PrintWarning(
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"

10
src/Mod/Fem/femexamples/thermomech_bimetall.py
View File

@@ -49,7 +49,7 @@ def get_information():
"meshtype": "solid",
"meshelement": "Tet10",
"constraints": ["fixed", "initial temperature", "temperature"],
"solvers": ["calculix", "ccxtools", "elmer"],
"solvers": ["ccxtools", "elmer"],
"material": "multimaterial",
"equations": ["thermomechanical"]
}
@@ -120,10 +120,8 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
elif solvertype == "elmer":
solver_obj = analysis.addObject(ObjectsFem.makeSolverElmer(doc, "SolverElmer"))[0]
@@ -138,7 +136,7 @@ def setup(doc=None, solvertype="ccxtools"):
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.AnalysisType = "thermomech"
solver_obj.GeometricalNonlinearity = "linear"
solver_obj.ThermoMechSteadyState = True

10
src/Mod/Fem/femexamples/truss_3d_cs_circle_ele_seg3.py
View File

@@ -41,7 +41,7 @@ def get_information():
"meshtype": "edge",
"meshelement": "Seg3",
"constraints": ["fixed", "force"],
"solvers": ["calculix", "ccxtools"],
"solvers": ["ccxtools"],
"material": "solid",
"equations": ["mechanical"]
}
@@ -399,10 +399,8 @@ def setup(doc=None, solvertype="ccxtools"):
analysis = ObjectsFem.makeAnalysis(doc, "Analysis")
# solver
if solvertype == "calculix":
solver_obj = ObjectsFem.makeSolverCalculix(doc, "SolverCalculiX")
elif solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculixCcxTools(doc, "CalculiXccxTools")
if solvertype == "ccxtools":
solver_obj = ObjectsFem.makeSolverCalculiXCcxTools(doc, "CalculiXCcxTools")
solver_obj.WorkingDir = u""
elif solvertype == "z88":
solver_obj = ObjectsFem.makeSolverZ88(doc, "SolverZ88")
@@ -411,7 +409,7 @@ def setup(doc=None, solvertype="ccxtools"):
"Unknown or unsupported solver type: {}. "
"No solver object was created.\n".format(solvertype)
)
if solvertype == "calculix" or solvertype == "ccxtools":
if solvertype == "ccxtools":
solver_obj.SplitInputWriter = False
solver_obj.AnalysisType = "static"
solver_obj.GeometricalNonlinearity = "linear"