Updated python script

diff --git a/CDMATH/tests/ressources/scripts/convert_gmsh_to_med.py b/CDMATH/tests/ressources/scripts/convert_gmsh_to_med.py
index 82aa133be3896f16a905ebfc6836a48972d82c41..ef8ec13bde9c6c15fbc1dfa514d7ae6e0b600e71 100755 (executable)
--- a/CDMATH/tests/ressources/scripts/convert_gmsh_to_med.py
+++ b/CDMATH/tests/ressources/scripts/convert_gmsh_to_med.py
@@ -3,19 +3,19 @@
 
 import sys
 
-import MEDCoupling as MC
+import medcoupling as MC
 import MEDLoader as ML
 
 #filename = "locrafgrid_1_new.msh"
 #filename = "checkerboard_2x2x2_new.msh"
 
 if len(sys.argv) != 2:
-  print "USAGE: convert_gmsh_to_med.py file.msh"
+  print( "USAGE: convert_gmsh_to_med.py file.msh")
   sys.exit(-1)
 
 filename = sys.argv[1]
 
-print "Converting ", filename
+print( "Converting ", filename)
 
 # type de maille en fonction du nombre de noeuds.
 # cf INTERP_KERNEL/CellModel.cxx
@@ -168,4 +168,4 @@ meshMEDFile.addGroup(-1, arr_front)
 med_filename = filename.replace(".msh", ".med")
 meshMEDFile.write(med_filename,2) # 2 stands for write from scratch
 
-print "...done"
+print( "...done")

diff --git a/CDMATH/tests/ressources/scripts/convert_typ_to_med.py b/CDMATH/tests/ressources/scripts/convert_typ_to_med.py
index c84cbed4ab02c85d370bb91c81b4e9ce5683ea0b..90482a84a1b3f179eb27509c132680508a946132 100644 (file)
--- a/CDMATH/tests/ressources/scripts/convert_typ_to_med.py
+++ b/CDMATH/tests/ressources/scripts/convert_typ_to_med.py
@@ -1,5 +1,5 @@
 import MEDLoader as ml\r
-import os\r
+import os, sys\r
 \r
 def read_typ2(fichier, nom_med):\r
     with open(fichier, "r") as fic: lines = fic.readlines()\r
@@ -112,18 +112,37 @@ def read_typ3(fichier, nom_med):
 \r
     mm.write("{}/mesh.med".format(nom_med), 2)\r
 \r
-# maillages 3D\r
-meshes = (("meshAA-random",      "RandMesh",     ("4", "8", "16", "32")),\r
-          #("meshBB_well",        "WellMesh_",     ("1", "2", "3", "4", "5", "6", "7")),\r
-          #("meshB_tetra",        "tet.",          ("00", "0", "1", "2", "3", "4", "5", "6")),\r
-          ("meshC_voro",         "vmesh_",        ("1", "2", "3", "4", "5")),\r
-          ("meshD_kershaw",      "dkershaw",      ("08", "16", "32", "64")),\r
-          ("meshF_dbls",         "dbls_",         ("10", "20", "30", "40")))\r
-          # ("meshH_locrafgrid",   "locrafgrid_",   ("1", "2", "3", "4", "5")),\r
-          # ("meshI_checkerboard", "checkerboard_", ("2x2x2", "4x4x4", "8x8x8", "16x16x16", "32x32x32")))\r
-for t, m, d in meshes:\r
-    for n in d:\r
-        print t, n\r
-        folder = "{}/jdd_{}".format(t, n)\r
-        os.system("mkdir -p {}".format(folder))\r
-        read_typ3("Meshes_3D/{}/{}{}.msh".format(t, m, n), folder)\r
+# maillages 3D du benchmark FVCA6\r
+# meshes = (("meshAA-random",      "RandMesh",     ("4", "8", "16", "32")),\r
+          # #("meshBB_well",        "WellMesh_",     ("1", "2", "3", "4", "5", "6", "7")),\r
+          # #("meshB_tetra",        "tet.",          ("00", "0", "1", "2", "3", "4", "5", "6")),\r
+          # ("meshC_voro",         "vmesh_",        ("1", "2", "3", "4", "5")),\r
+          # ("meshD_kershaw",      "dkershaw",      ("08", "16", "32", "64")),\r
+          # ("meshF_dbls",         "dbls_",         ("10", "20", "30", "40")))\r
+          # # ("meshH_locrafgrid",   "locrafgrid_",   ("1", "2", "3", "4", "5")),\r
+          # # ("meshI_checkerboard", "checkerboard_", ("2x2x2", "4x4x4", "8x8x8", "16x16x16", "32x32x32")))\r
+# for t, m, d in meshes:\r
+    # for n in d:\r
+        # print( t, n)\r
+        # folder = "{}/jdd_{}".format(t, n)\r
+        # os.system("mkdir -p {}".format(folder))\r
+        # read_typ3("Meshes_3D/{}/{}{}.msh".format(t, m, n), folder)\r
+\r
+if __name__ == "__main__":\r
+\r
+       if len(sys.argv) != 2:\r
+         print("USAGE: convert_gmsh_to_med.py file.typ")\r
+         sys.exit(-1)\r
+       \r
+       filename = sys.argv[1]\r
+       print("Converting ", filename)\r
+\r
+       l=len(filename)\r
+       name=filename[:l-5]\r
+       extension=filename[l-5:]\r
+       if extension==".typ2":\r
+               read_typ2(filename, name+".med")\r
+       elif extension==".typ3":\r
+               read_typ3(filename, name+".med")\r
+       else :\r
+               raise ValueError("File "+filename+" has unknown file extension "+extension)\r