From 90cecd0d2c61c19e58cdf0ac01cc3375941665c5 Mon Sep 17 00:00:00 2001 From: Bernd Hahnebach Date: Mon, 12 Jul 2021 21:06:35 +0200 Subject: [PATCH] FEM: calculix writer, rename constraint writing methods --- src/Mod/Fem/CMakeLists.txt | 30 +++++++++---------- ...centrif.py => write_constraint_centrif.py} | 0 ...contact.py => write_constraint_contact.py} | 0 ...nt.py => write_constraint_displacement.py} | 0 ...con_fixed.py => write_constraint_fixed.py} | 0 ...on.py => write_constraint_fluidsection.py} | 0 ...con_force.py => write_constraint_force.py} | 0 ...atflux.py => write_constraint_heatflux.py} | 0 ...=> write_constraint_initialtemperature.py} | 0 ...n.py => write_constraint_planerotation.py} | 0 ...essure.py => write_constraint_pressure.py} | 0 ...nt.py => write_constraint_sectionprint.py} | 0 ...ight.py => write_constraint_selfweight.py} | 0 ...ure.py => write_constraint_temperature.py} | 0 .../{con_tie.py => write_constraint_tie.py} | 0 ...sform.py => write_constraint_transform.py} | 0 src/Mod/Fem/femsolver/calculix/writer.py | 30 +++++++++---------- 17 files changed, 30 insertions(+), 30 deletions(-) rename src/Mod/Fem/femsolver/calculix/{con_centrif.py => write_constraint_centrif.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_contact.py => write_constraint_contact.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_displacement.py => write_constraint_displacement.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_fixed.py => write_constraint_fixed.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_fluidsection.py => write_constraint_fluidsection.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_force.py => write_constraint_force.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_heatflux.py => write_constraint_heatflux.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_initialtemperature.py => write_constraint_initialtemperature.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_planerotation.py => write_constraint_planerotation.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_pressure.py => write_constraint_pressure.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_sectionprint.py => write_constraint_sectionprint.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_selfweight.py => write_constraint_selfweight.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_temperature.py => write_constraint_temperature.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_tie.py => write_constraint_tie.py} (100%) rename src/Mod/Fem/femsolver/calculix/{con_transform.py => write_constraint_transform.py} (100%) diff --git a/src/Mod/Fem/CMakeLists.txt b/src/Mod/Fem/CMakeLists.txt index b7f416540d..1289ee8151 100755 --- a/src/Mod/Fem/CMakeLists.txt +++ b/src/Mod/Fem/CMakeLists.txt @@ -187,22 +187,22 @@ SET(FemSolverCalculix_SRCS femsolver/calculix/__init__.py femsolver/calculix/solver.py femsolver/calculix/tasks.py + femsolver/calculix/write_constraint_centrif.py + femsolver/calculix/write_constraint_contact.py + femsolver/calculix/write_constraint_displacement.py + femsolver/calculix/write_constraint_fixed.py + femsolver/calculix/write_constraint_fluidsection.py + femsolver/calculix/write_constraint_force.py + femsolver/calculix/write_constraint_heatflux.py + femsolver/calculix/write_constraint_initialtemperature.py + femsolver/calculix/write_constraint_planerotation.py + femsolver/calculix/write_constraint_pressure.py + femsolver/calculix/write_constraint_sectionprint.py + femsolver/calculix/write_constraint_selfweight.py + femsolver/calculix/write_constraint_temperature.py + femsolver/calculix/write_constraint_tie.py + femsolver/calculix/write_constraint_transform.py femsolver/calculix/writer.py - femsolver/calculix/con_centrif.py - femsolver/calculix/con_contact.py - femsolver/calculix/con_displacement.py - femsolver/calculix/con_fixed.py - femsolver/calculix/con_fluidsection.py - femsolver/calculix/con_force.py - femsolver/calculix/con_heatflux.py - femsolver/calculix/con_initialtemperature.py - femsolver/calculix/con_planerotation.py - femsolver/calculix/con_pressure.py - femsolver/calculix/con_sectionprint.py - femsolver/calculix/con_selfweight.py - femsolver/calculix/con_temperature.py - femsolver/calculix/con_tie.py - femsolver/calculix/con_transform.py ) SET(FemSolverElmer_SRCS diff --git a/src/Mod/Fem/femsolver/calculix/con_centrif.py b/src/Mod/Fem/femsolver/calculix/write_constraint_centrif.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_centrif.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_centrif.py diff --git a/src/Mod/Fem/femsolver/calculix/con_contact.py b/src/Mod/Fem/femsolver/calculix/write_constraint_contact.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_contact.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_contact.py diff --git a/src/Mod/Fem/femsolver/calculix/con_displacement.py b/src/Mod/Fem/femsolver/calculix/write_constraint_displacement.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_displacement.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_displacement.py diff --git a/src/Mod/Fem/femsolver/calculix/con_fixed.py b/src/Mod/Fem/femsolver/calculix/write_constraint_fixed.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_fixed.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_fixed.py diff --git a/src/Mod/Fem/femsolver/calculix/con_fluidsection.py b/src/Mod/Fem/femsolver/calculix/write_constraint_fluidsection.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_fluidsection.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_fluidsection.py diff --git a/src/Mod/Fem/femsolver/calculix/con_force.py b/src/Mod/Fem/femsolver/calculix/write_constraint_force.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_force.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_force.py diff --git a/src/Mod/Fem/femsolver/calculix/con_heatflux.py b/src/Mod/Fem/femsolver/calculix/write_constraint_heatflux.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_heatflux.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_heatflux.py diff --git a/src/Mod/Fem/femsolver/calculix/con_initialtemperature.py b/src/Mod/Fem/femsolver/calculix/write_constraint_initialtemperature.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_initialtemperature.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_initialtemperature.py diff --git a/src/Mod/Fem/femsolver/calculix/con_planerotation.py b/src/Mod/Fem/femsolver/calculix/write_constraint_planerotation.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_planerotation.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_planerotation.py diff --git a/src/Mod/Fem/femsolver/calculix/con_pressure.py b/src/Mod/Fem/femsolver/calculix/write_constraint_pressure.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_pressure.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_pressure.py diff --git a/src/Mod/Fem/femsolver/calculix/con_sectionprint.py b/src/Mod/Fem/femsolver/calculix/write_constraint_sectionprint.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_sectionprint.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_sectionprint.py diff --git a/src/Mod/Fem/femsolver/calculix/con_selfweight.py b/src/Mod/Fem/femsolver/calculix/write_constraint_selfweight.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_selfweight.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_selfweight.py diff --git a/src/Mod/Fem/femsolver/calculix/con_temperature.py b/src/Mod/Fem/femsolver/calculix/write_constraint_temperature.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_temperature.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_temperature.py diff --git a/src/Mod/Fem/femsolver/calculix/con_tie.py b/src/Mod/Fem/femsolver/calculix/write_constraint_tie.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_tie.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_tie.py diff --git a/src/Mod/Fem/femsolver/calculix/con_transform.py b/src/Mod/Fem/femsolver/calculix/write_constraint_transform.py similarity index 100% rename from src/Mod/Fem/femsolver/calculix/con_transform.py rename to src/Mod/Fem/femsolver/calculix/write_constraint_transform.py diff --git a/src/Mod/Fem/femsolver/calculix/writer.py b/src/Mod/Fem/femsolver/calculix/writer.py index ff80c0c23d..00bc97117d 100644 --- a/src/Mod/Fem/femsolver/calculix/writer.py +++ b/src/Mod/Fem/femsolver/calculix/writer.py @@ -38,21 +38,21 @@ from os.path import join import FreeCAD from FreeCAD import Units -from . import con_centrif -from . import con_contact -from . import con_displacement -from . import con_fixed -from . import con_fluidsection -from . import con_force -from . import con_heatflux -from . import con_initialtemperature as con_initialtemp -from . import con_planerotation -from . import con_pressure -from . import con_sectionprint -from . import con_selfweight -from . import con_temperature -from . import con_tie -from . import con_transform +from . import write_constraint_centrif as con_centrif +from . import write_constraint_contact as con_contact +from . import write_constraint_displacement as con_displacement +from . import write_constraint_fixed as con_fixed +from . import write_constraint_fluidsection as con_fluidsection +from . import write_constraint_force as con_force +from . import write_constraint_heatflux as con_heatflux +from . import write_constraint_initialtemperature as con_initialtemp +from . import write_constraint_planerotation as con_planerotation +from . import write_constraint_pressure as con_pressure +from . import write_constraint_sectionprint as con_sectionprint +from . import write_constraint_selfweight as con_selfweight +from . import write_constraint_temperature as con_temperature +from . import write_constraint_tie as con_tie +from . import write_constraint_transform as con_transform from .. import writerbase from femmesh import meshtools from femtools import constants