suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FEM: nonlinear material object, move make def into make objects FEM module

Browse Source
This commit is contained in:
Bernd Hahnebach 2017-02-20 18:00:19 +01:00 committed by wmayer
parent de9b534366
commit 907a14d73a
5 changed files with 14 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Mod/Fem/App/CMakeLists.txt
View File

@ -125,7 +125,6 @@ SET(FemScripts_SRCS
FemInputWriter.py
FemInputWriterCcx.py
FemInputWriterZ88.py
FemMaterialMechanicalNonlinear.py
FemMesh2Mesh.py
FemMeshGmsh.py
FemMeshGroup.py

1
src/Mod/Fem/CMakeLists.txt
View File

@ -94,7 +94,6 @@ INSTALL(
_TaskPanelFemMaterial.py
TaskPanelFemMaterial.ui
FemMaterialMechanicalNonlinear.py
_FemMaterialMechanicalNonlinear.py
_ViewProviderFemMaterialMechanicalNonlinear.py
_CommandMaterialMechanicalNonlinear.py

45
src/Mod/Fem/FemMaterialMechanicalNonlinear.py
View File

@ -1,45 +0,0 @@
# ***************************************************************************
# * *
# * Copyright (c) 2016 - Bernd Hahnebach <bernd@bimstatik.org> *
# * *
# * 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__ = "FemMaterialMechanicalNonlinear"
__author__ = "Bernd Hahnebach"
__url__ = "http://www.freecadweb.org"
## \addtogroup FEM
# @{
import FreeCAD
import FemGui
import _FemMaterialMechanicalNonlinear
def makeFemMaterialMechanicalNonlinear(base_material, name="MechanicalMaterialNonlinear"):
'''makeFemMaterialMechanicalNonlinear(base_material, [name]): creates an nonlinear material object'''
obj = FemGui.getActiveAnalysis().Document.addObject("Fem::FeaturePython", name)
_FemMaterialMechanicalNonlinear._FemMaterialMechanicalNonlinear(obj)
obj.LinearBaseMaterial = base_material
if FreeCAD.GuiUp:
import _ViewProviderFemMaterialMechanicalNonlinear
_ViewProviderFemMaterialMechanicalNonlinear._ViewProviderFemMaterialMechanicalNonlinear(obj.ViewObject)
return obj
# @}

12
src/Mod/Fem/ObjectsFem.py
View File

@ -122,6 +122,18 @@ def makeMaterialFluid(name):
return obj
def makeMaterialMechanicalNonlinear(base_material, name="MechanicalMaterialNonlinear"):
'''makeMaterialMechanicalNonlinear(base_material, [name]): creates an nonlinear material object'''
obj = FreeCAD.ActiveDocument.addObject("Fem::FeaturePython", name)
import _FemMaterialMechanicalNonlinear
_FemMaterialMechanicalNonlinear._FemMaterialMechanicalNonlinear(obj)
obj.LinearBaseMaterial = base_material
if FreeCAD.GuiUp:
import _ViewProviderFemMaterialMechanicalNonlinear
_ViewProviderFemMaterialMechanicalNonlinear._ViewProviderFemMaterialMechanicalNonlinear(obj.ViewObject)
return obj
########## results ##########
def makeMechanicalResult(name="MechanicalResult"):
'''makeMechanicalResult(name): creates an mechanical object result to hold FEM results'''

4
src/Mod/Fem/_CommandMaterialMechanicalNonlinear.py
View File

@ -57,9 +57,9 @@ class _CommandMaterialMechanicalNonlinear(FemCommands):
break
if allow_nonlinear_material:
string_lin_mat_obj = "App.ActiveDocument.getObject('" + lin_mat_obj.Name + "')"
command_to_run = "FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [FemMaterialMechanicalNonlinear.makeFemMaterialMechanicalNonlinear(" + string_lin_mat_obj + ")]"
command_to_run = "FemGui.getActiveAnalysis().Member = FemGui.getActiveAnalysis().Member + [ObjectsFem.makeMaterialMechanicalNonlinear(" + string_lin_mat_obj + ")]"
FreeCAD.ActiveDocument.openTransaction("Create FemMaterialMechanicalNonlinear")
FreeCADGui.addModule("FemMaterialMechanicalNonlinear")
FreeCADGui.addModule("ObjectsFem")
FreeCADGui.doCommand(command_to_run)
# set the material nonlinear property of the solver to nonlinear if only one solver is available and if this solver is a CalculiX solver
solver_object = None