[Getfem-commits] [getfem-commits] branch master updated: minor modifications for 5.4.2 release

[Yves Renard]

This is an automated email from the git hooks/post-receive script.

renard pushed a commit to branch master
in repository getfem.

The following commit(s) were added to refs/heads/master by this push:
     new 52929dd8 minor modifications for 5.4.2 release
52929dd8 is described below

commit 52929dd826e7027c85e7a2de2a9162f0f381eb34
Author: Renard Yves <yves.renard@insa-lyon.fr>
AuthorDate: Wed Jun 29 15:14:57 2022 +0200

    minor modifications for 5.4.2 release
---
 contrib/continuum_mechanics/Makefile.am            | 12 +++++---
 ...icity_fin_strain_lin_hardening_axisymmetric.py} |  0
 ...icity_fin_strain_lin_hardening_plane_strain.py} | 36 +++++++++++++++-------
 interface/src/python/Makefile.am                   |  2 +-
 tests/Makefile.am                                  |  6 ++--
 5 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/contrib/continuum_mechanics/Makefile.am 
b/contrib/continuum_mechanics/Makefile.am
index fddd257c..dc5d9fc1 100644
--- a/contrib/continuum_mechanics/Makefile.am
+++ b/contrib/continuum_mechanics/Makefile.am
@@ -15,12 +15,17 @@
 #  along  with  this program;  if not, write to the Free Software Foundation,
 #  Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301, USA.
 
+EXTRA_DIST = \
+       plasticity_fin_strain_lin_hardening_axisymmetric.py     \
+       plasticity_finite_strain_linear_hardening_tension_3D.py \
+       plasticity_fin_strain_lin_hardening_plane_strain.py
+
 check_PROGRAMS = 
 
 CLEANFILES = 
 
 if BUILDPYTHON
-TESTS = plasticity_finite_strain_linear_hardening_tension_plane_strain.py
+TESTS = plasticity_fin_strain_lin_hardening_plane_strain.py
 
 AM_TESTS_ENVIRONMENT = \
        export PYTHONPATH=$(top_builddir)/interface/src/python; \
@@ -28,7 +33,4 @@ AM_TESTS_ENVIRONMENT = \
 LOG_COMPILER = $(PYTHON)
 endif
 
-EXTRA_DIST = \
-       plasticity_finite_strain_linear_hardening_tension_3D.py \
-       plasticity_finite_strain_linear_hardening_tension_axisymmetric.py \
-       plasticity_finite_strain_linear_hardening_tension_plane_strain.py
+CLEANFILES = *.vtk results/* __pycache__/*
diff --git 
a/contrib/continuum_mechanics/plasticity_finite_strain_linear_hardening_tension_axisymmetric.py
 
b/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_axisymmetric.py
similarity index 100%
rename from 
contrib/continuum_mechanics/plasticity_finite_strain_linear_hardening_tension_axisymmetric.py
rename to 
contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_axisymmetric.py
diff --git 
a/contrib/continuum_mechanics/plasticity_finite_strain_linear_hardening_tension_plane_strain.py
 
b/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_plane_strain.py
similarity index 91%
rename from 
contrib/continuum_mechanics/plasticity_finite_strain_linear_hardening_tension_plane_strain.py
rename to 
contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_plane_strain.py
index a80d3257..3b3644c2 100644
--- 
a/contrib/continuum_mechanics/plasticity_finite_strain_linear_hardening_tension_plane_strain.py
+++ 
b/contrib/continuum_mechanics/plasticity_fin_strain_lin_hardening_plane_strain.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# -*- coding: UTF8 -*-
+# -*- coding: utf-8 -*-
 # Python GetFEM interface
 #
 # Copyright (C) 2020-2020 Konstantinos Poulios.
@@ -62,9 +62,11 @@ mult_fem_order = 2  # dirichlet multipliers finite element 
order
 #integration_degree = 3 # 4 gauss points per quad
 integration_degree = 5 # 9 gauss points per quad
 
+export_results = False;
+
 #------------------------------------
 resultspath = "./results"
-if not os.path.exists(resultspath):
+if (export_results and not os.path.exists(resultspath)):
    os.makedirs(resultspath)
 
 tee = subprocess.Popen(["tee", "%s/tension_plane_strain.log" % resultspath],
@@ -117,8 +119,9 @@ if dH > 0:
       pts[0,i] = x
       pts[1,i] -= (y*dH)/(2*H) * (1 + np.cos(2.*np.pi*x/L))
    mesh.set_pts(pts)
-
-mesh.export_to_vtu("%s/mesh.vtu" % resultspath)
+   
+if (export_results):
+   mesh.export_to_vtu("%s/mesh.vtu" % resultspath)
 
 # FEM
 mfN = gf.MeshFem(mesh, N)
@@ -192,9 +195,15 @@ print("Model dofs: %i" % md.nbdof())
 print("Displacement fem dofs: %i" % mfu.nbdof())
 print("Dirichlet mult dofs: %i" % md.mesh_fem_of_variable("dirmult").nbdof())
 
-shutil.copyfile(os.path.abspath(sys.argv[0]),resultspath+"/"+sys.argv[0])
+if (export_results):
+   shutil.copyfile(os.path.abspath(sys.argv[0]),resultspath+"/"+sys.argv[0])
+
 starttime_overall = time.process_time()
-with open("%s/tension_plane_strain.dat" % resultspath, "w") as f1:
+
+if (export_results):
+   f1 = open("%s/tension_plane_strain.dat" % resultspath, "w")
+
+try:
    for step in range(steps_t+1):
       md.set_variable("disp", disp*step/float(steps_t))
       print('STEP %i: Solving with disp = %g' % (step, md.variable("disp")))
@@ -211,11 +220,12 @@ with open("%s/tension_plane_strain.dat" % resultspath, 
"w") as f1:
       V = gf.asm_generic(mim, 0, "1", -1, md)
       sigma11 = gf.asm_generic(mim, 0, "sigma(1,1)", -1, md)/V
       gamma = gf.asm_generic(mim, 0, "gamma", -1, md)/V
-      f1.write("%.10g %.10g %.10g %.10g %10g %10g\n"
-               % (md.variable("disp"), F, A, F/A, sigma11, gamma))
-      f1.flush()
+      if (export_results):
+         f1.write("%.10g %.10g %.10g %.10g %10g %10g\n"
+                  % (md.variable("disp"), F, A, F/A, sigma11, gamma))
+         f1.flush()
 
-      output = (mfout1, md.local_projection(mim, "sqrt(1.5)*Norm(sigmaD)", 
mfout1), "Von Mises Stress",
+         output = (mfout1, md.local_projection(mim, "sqrt(1.5)*Norm(sigmaD)", 
mfout1), "Von Mises Stress",
                 mfout1, md.local_projection(mim, "J", mfout1), "J",
                 mfout1, md.local_projection(mim, "sigma(1,1)", mfout1), 
"Cauchy stress 11",
                 mfout1, md.local_projection(mim, "sigma(2,2)", mfout1), 
"Cauchy stress 22",
@@ -224,13 +234,17 @@ with open("%s/tension_plane_strain.dat" % resultspath, 
"w") as f1:
                 mfu, md.variable("u"), "Displacements",
                 mfout2, md.interpolation("dirmult", mfout2, XP_RG), "Nominal 
reaction traction",
                 mfout2, md.local_projection(mim, "gamma", mfout2), "plastic 
strain")
-      mfout2.export_to_vtu("%s/tension_plane_strain_%i.vtu" % (resultspath, 
step), *output)
+         
+         mfout2.export_to_vtu("%s/tension_plane_strain_%i.vtu" % (resultspath, 
step), *output)
 
       md.set_variable("gamma0", md.interpolation("gamma", mimd1, -1))
       md.set_variable("invCp0vec",
                       md.interpolation("[[[1,0,0,0]  
,[0,0,0,0.5],[0,0,0,0]],"+\
                                        " [[0,0,0,0.5],[0,1,0,0]  
,[0,0,0,0]],"+\
                                        " [[0,0,0,0]  ,[0,0,0,0]  
,[0,0,1,0]]]:invCp", mimd4, -1))
+finally:
+   if (export_results) :
+      f1.close()
 
 print('OVERALL SOLUTION TIME IS %f SEC' % 
(time.process_time()-starttime_overall))
 
diff --git a/interface/src/python/Makefile.am b/interface/src/python/Makefile.am
index 9da0359a..9d6b7f02 100644
--- a/interface/src/python/Makefile.am
+++ b/interface/src/python/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST = getfem_python.c
 
 # $(warning PSEUDO_FUNCTIONS= $(PSEUDO_FUNCTIONS))
 
-CLEANFILES = getfem.py _getfem*.so *.o getfem_python_c.o getfem_python_c.c 
getfem.pyc
+CLEANFILES = getfem.py _getfem*.so *.o getfem_python_c.o getfem_python_c.c 
getfem.pyc __pycache__/*
 
 if BUILDPYTHONPAR
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 761201a0..2bfe16bf 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -68,12 +68,12 @@ check_PROGRAMS =                   \
 CLEANFILES = \
        laplacian.res laplacian.mesh laplacian.dataelt                      \
        elasto_static.mesh test_mesh.mesh toto.mat test_mat_elem.mesh       \
-       helmholtz.vtk plate.mesh plate.vtk nonlinear_elastostatic.mesh      \
+       helmholtz.vtk helmholtz.vtu plate.mesh plate.vtk                    \
+       nonlinear_elastostatic.mesh                                         \
        nonlinear_elastostatic.mf nonlinear_elastostatic.mfd                \
        nonlinear_elastostatic.dx plasticity.mesh plasticity.U              \
         plasticity.sigmabar plasticity.meshfem plasticity.coef              \
-       ii_files/* auto_gmm* dyn*.txt                                       \
-       *.sl time FN0 *.vtk             \
+       ii_files/* auto_gmm* dyn*.txt *.sl time FN0 *.vtk                   \
        nonlinear_elastostatic.U crack.mesh cut.mesh nonlinear_membrane.mfd \
        nonlinear_membrane.mesh test_range_basis.mesh nonlinear_membrane.mf \
        Q2_incomplete.pos Q2_incomplete.msh