Prise en compte des différents modes de non conformité

diff --git a/src/HOMARD/HOMARD_Cas.cxx b/src/HOMARD/HOMARD_Cas.cxx
index 4d7c644196b7003b9646d674c4705ca4178fcd30..9d2a5fe5e4befa7e8d6a4d4216cff8b611ec9a38 100644 (file)
--- a/src/HOMARD/HOMARD_Cas.cxx
+++ b/src/HOMARD/HOMARD_Cas.cxx
@@ -50,7 +50,7 @@
  */
 //=============================================================================
 HOMARD_Cas::HOMARD_Cas():
-  _Name(""), _NomDir("/tmp"), _ConfType(1)
+  _Name(""), _NomDir("/tmp"), _ConfType(0)
 {
   MESSAGE("HOMARD_Cas");
 }
@@ -145,7 +145,7 @@ int HOMARD_Cas::GetNumberofIter()
 //=============================================================================
 void HOMARD_Cas::SetConfType( int Conftype )
 {
-//   VERIFICATION( (Conftype>=1) && (Conftype<=4) );
+//   VERIFICATION( (Conftype>=-2) && (Conftype<=3) );
   _ConfType = Conftype;
 }
 //=============================================================================

diff --git a/src/HOMARD/HomardDriver.cxx b/src/HOMARD/HomardDriver.cxx
index af62734341ea37944bfcab077d99592a817315ed..7b88b385762e7fe7fbb97d62eca90845ffebaeba 100644 (file)
--- a/src/HOMARD/HomardDriver.cxx
+++ b/src/HOMARD/HomardDriver.cxx
@@ -151,29 +151,34 @@ void HomardDriver::TexteConfRaffDera( int ConfType, int TypeAdap, int TypeRaff,
   std::string saux ;
   switch (ConfType)
   {
+    case -2: //
+    {
+      saux = "NON_CONFORME_1_ARETE" ;
+      break;
+    }
     case -1: //
     {
-      saux = "conforme_boites" ;
+      saux = "CONFORME_BOITES" ;
       break;
     }
-    case 1: //
+    case 0: //
     {
-      saux = "conforme" ;
+      saux = "CONFORME" ;
       break;
     }
-    case 2: //
+    case 1: //
     {
-      saux = "non_conforme_1_noeud" ;
+      saux = "NON_CONFORME" ;
       break;
     }
-    case 3: //
+    case 2: //
     {
-      saux = "non_conforme_1_arete" ;
+      saux = "NON_CONFORME_1_NOEUD" ;
       break;
     }
-    case 4: //
+    case 3: //
     {
-      saux = "non_conforme_indicateur" ;
+      saux = "NON_CONFORME_INDICATEUR" ;
       break;
     }
   }

diff --git a/src/HOMARDGUI/MonCreateCase.cxx b/src/HOMARDGUI/MonCreateCase.cxx
index 7f3299224655177d412fdaa27f1178af21e82d01..6b33b57243dad95e212573b32c3a2c404ba2c649 100644 (file)
--- a/src/HOMARDGUI/MonCreateCase.cxx
+++ b/src/HOMARDGUI/MonCreateCase.cxx
@@ -363,7 +363,7 @@ void MonCreateCase::SetConforme()
 {
   GBTypeNoConf->setVisible(0);
 //
-  _ConfType=1;
+  _ConfType=0;
 //
   adjustSize();
 }
@@ -374,7 +374,7 @@ void MonCreateCase::SetNonConforme()
   GBTypeNoConf->setVisible(1);
   RB1NpM->setChecked(true);
 //
-  _ConfType=2;
+  _ConfType=1;
 //
   adjustSize();
 }
@@ -388,13 +388,13 @@ void MonCreateCase::Set1NpM()
 void MonCreateCase::Set1NpA()
 // ------------------------------------------------------------------------
 {
-  _ConfType=3;
+  _ConfType=1;
 }
 // ------------------------------------------------------------------------
 void MonCreateCase::SetQuelconque()
 // ------------------------------------------------------------------------
 {
-  _ConfType=4;
+  _ConfType=3;
 }
 // ------------------------------------------------------------------------
 void MonCreateCase::SetBoundaryD()

diff --git a/src/HOMARDGUI/MonEditCase.cxx b/src/HOMARDGUI/MonEditCase.cxx
index 29f387be219db42a1f38fc9b98017aa60bc90c9c..239d9e8d1fbaf6c56f146185fa3004978035433d 100644 (file)
--- a/src/HOMARDGUI/MonEditCase.cxx
+++ b/src/HOMARDGUI/MonEditCase.cxx
@@ -68,7 +68,7 @@ void MonEditCase::InitValEdit()
   PushFichier->setVisible(0);
 
   int ConfType=aCase->GetConfType();
-  if(ConfType==1)
+  if(ConfType==0)
   {
     RBConforme->setChecked(true);
     GBTypeNoConf->setVisible(0);
@@ -78,8 +78,8 @@ void MonEditCase::InitValEdit()
     RBNonConforme->setChecked(true);
     GBTypeNoConf->setVisible(1);
     if (ConfType==2) { RB1NpM->setChecked(true);};
-    if (ConfType==3) { RB1NpA->setChecked(true);};
-    if (ConfType==4) { RBQuelconque->setChecked(true);};
+    if (ConfType==1) { RB1NpA->setChecked(true);};
+    if (ConfType==3) { RBQuelconque->setChecked(true);};
     RB1NpM->setEnabled(false);
     RB1NpA->setEnabled(false);
     RBQuelconque->setEnabled(false);

diff --git a/src/HOMARD_I/HOMARD_Cas_i.cxx b/src/HOMARD_I/HOMARD_Cas_i.cxx
index 636cbe750dc70d02ec0c8b481a19c0bb7c7121ba..8bba6822dfe5be417b240fea9439dc9521427bd4 100755 (executable)
--- a/src/HOMARD_I/HOMARD_Cas_i.cxx
+++ b/src/HOMARD_I/HOMARD_Cas_i.cxx
@@ -237,7 +237,7 @@ CORBA::Long HOMARD_Cas_i::GetNumberofIter()
 void HOMARD_Cas_i::SetConfType( CORBA::Long ConfType )
 {
   ASSERT( myHomardCas );
-//   VERIFICATION( (ConfType>=1) && (ConfType<=4) );
+//   VERIFICATION( (ConfType>=-2) && (ConfType<=3) );
   myHomardCas->SetConfType( ConfType );
 }
 //=============================================================================

diff --git a/tests/test_1.py b/tests/test_1.py
index a202ccb5ed1aaa9c3cbe0f30b936d006dc1dddba..2a1d1897663976b7fb00961abbb5186b2cd699b7 100755 (executable)
--- a/tests/test_1.py
+++ b/tests/test_1.py
@@ -19,13 +19,13 @@
 #
 """
 Python script for HOMARD
-Copyright EDF-R&D 2010, 2015
 Test test_1
 """
-__revision__ = "V2.5"
+__revision__ = "V2.6"
 
 #========================================================================
 Test_Name = "test_1"
+debug=False
 n_iter_test_file = 3
 #========================================================================
 import os
@@ -40,9 +40,16 @@ pathHomard = os.getenv('HOMARD_ROOT_DIR')
 Rep_Test = os.path.join(pathHomard, "share", "salome", "resources", "homard")
 Rep_Test = os.path.normpath(Rep_Test)
 sys.path.append(Rep_Test)
+from test_util import remove_dir
 from test_util import test_results
 # Repertoire des resultats
-dircase = tempfile.mkdtemp()
+if debug :
+  dircase = os.path.join("/tmp", Test_Name)
+  if ( os.path.isdir(dircase) ) :
+    remove_dir(dircase)
+  os.mkdir(dircase)
+else :
+  dircase = tempfile.mkdtemp()
 # ==================================
 
 salome.salome_init()
@@ -115,7 +122,6 @@ Python script for HOMARD
     MeshFile = os.path.join(Rep_Test, Test_Name + '.00.med')
     Case_test_1 = homard.CreateCase(CaseName, 'MAILL', MeshFile)
     Case_test_1.SetDirName(dircase)
-    Case_test_1.SetConfType(1)
   #
   # Creation of the iterations
   # ==========================
@@ -203,7 +209,8 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file)
+destroy_dir = not debug
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir)
 #
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)

diff --git a/tests/test_11.py b/tests/test_11.py
index 1ef96f589bfb6cc728f607d515c4b305c773f440..00f8770d1ba9bd687911a2e44c4a8d2525f9be8d 100755 (executable)
--- a/tests/test_11.py
+++ b/tests/test_11.py
@@ -19,13 +19,13 @@
 #
 """
 Python script for HOMARD
-Copyright EDF-R&D 2010, 2014
 Test test_11 associe au tutorial 1
 """
-__revision__ = "V2.2"
+__revision__ = "V2.3"
 
 #========================================================================
 Test_Name = "test_11"
+debug=False
 n_iter_test_file = 3
 #========================================================================
 import os
@@ -40,9 +40,16 @@ pathHomard = os.getenv('HOMARD_ROOT_DIR')
 Rep_Test = os.path.join(pathHomard, "share", "salome", "resources", "homard")
 Rep_Test = os.path.normpath(Rep_Test)
 sys.path.append(Rep_Test)
+from test_util import remove_dir
 from test_util import test_results
 # Repertoire des resultats
-dircase = tempfile.mkdtemp()
+if debug :
+  dircase = os.path.join("/tmp", Test_Name)
+  if ( os.path.isdir(dircase) ) :
+    remove_dir(dircase)
+  os.mkdir(dircase)
+else :
+  dircase = tempfile.mkdtemp()
 # Repertoire des donnees du tutorial
 data_dir = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "fr", "_downloads")
 data_dir = os.path.normpath(data_dir)
@@ -75,7 +82,6 @@ Python script for HOMARD
   # ===
   Case_1 = homard.CreateCase('Case_1', 'MAILL', data_dir+'/tutorial_1.00.med')
   Case_1.SetDirName(dircase)
-  Case_1.SetConfType(1)
   #
   # Iterations
   # ==========
@@ -120,7 +126,8 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file)
+destroy_dir = not debug
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir)
 #
 # ==================================
 gzip_gunzip(data_dir, 1, 1)

diff --git a/tests/test_12.py b/tests/test_12.py
index c161e030731a2a1467e58589e69ba2bf69164d9c..97a2aa81605eb525b6f2c9377dfaf130175bf9c7 100755 (executable)
--- a/tests/test_12.py
+++ b/tests/test_12.py
@@ -19,13 +19,13 @@
 #
 """
 Python script for HOMARD
-Copyright EDF-R&D 2010, 2014
 Test test_11 associe au tutorial 2
 """
-__revision__ = "V2.2"
+__revision__ = "V2.3"
 
 #========================================================================
 Test_Name = "test_12"
+debug=False
 n_iter_test_file = 2
 #========================================================================
 import os
@@ -40,9 +40,16 @@ pathHomard = os.getenv('HOMARD_ROOT_DIR')
 Rep_Test = os.path.join(pathHomard, "share", "salome", "resources", "homard")
 Rep_Test = os.path.normpath(Rep_Test)
 sys.path.append(Rep_Test)
+from test_util import remove_dir
 from test_util import test_results
 # Repertoire des resultats
-dircase = tempfile.mkdtemp()
+if debug :
+  dircase = os.path.join("/tmp", Test_Name)
+  if ( os.path.isdir(dircase) ) :
+    remove_dir(dircase)
+  os.mkdir(dircase)
+else :
+  dircase = tempfile.mkdtemp()
 # Repertoire des donnees du tutorial
 data_dir = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "fr", "_downloads")
 data_dir = os.path.normpath(data_dir)
@@ -130,7 +137,8 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file)
+destroy_dir = not debug
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir)
 #
 # ==================================
 gzip_gunzip(data_dir, 2, 1)

diff --git a/tests/test_13.py b/tests/test_13.py
index 4c0af365310bfd6dbca71e50884791760b9bb91f..0d074ce23bbc7efcf7662dca533c726bd67424b7 100755 (executable)
--- a/tests/test_13.py
+++ b/tests/test_13.py
@@ -19,13 +19,13 @@
 #
 """
 Python script for HOMARD
-Copyright EDF-R&D 2010, 2014
 Test test_11 associe au tutorial 3
 """
-__revision__ = "V2.2"
+__revision__ = "V2.3"
 
 #========================================================================
 Test_Name = "test_13"
+debug=False
 n_iter_test_file = 2
 #========================================================================
 import os
@@ -40,9 +40,16 @@ pathHomard = os.getenv('HOMARD_ROOT_DIR')
 Rep_Test = os.path.join(pathHomard, "share", "salome", "resources", "homard")
 Rep_Test = os.path.normpath(Rep_Test)
 sys.path.append(Rep_Test)
+from test_util import remove_dir
 from test_util import test_results
 # Repertoire des resultats
-dircase = tempfile.mkdtemp()
+if debug :
+  dircase = os.path.join("/tmp", Test_Name)
+  if ( os.path.isdir(dircase) ) :
+    remove_dir(dircase)
+  os.mkdir(dircase)
+else :
+  dircase = tempfile.mkdtemp()
 # Repertoire des donnees du tutorial
 data_dir = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "fr", "_downloads")
 data_dir = os.path.normpath(data_dir)
@@ -159,7 +166,8 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = 3
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file)
+destroy_dir = not debug
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir)
 #
 # ==================================
 gzip_gunzip(data_dir, 3, 1)

diff --git a/tests/test_14.py b/tests/test_14.py
index 78a9aa126728cf83a631f168b762ae9a0308e105..2d9a91c8fe00729ced124ef66c236c1066cf6c27 100755 (executable)
--- a/tests/test_14.py
+++ b/tests/test_14.py
@@ -19,13 +19,13 @@
 #
 """
 Python script for HOMARD
-Copyright EDF-R&D 2010, 2014
 Test test_11 associe au tutorial 4
 """
-__revision__ = "V2.2"
+__revision__ = "V2.3"
 
 #========================================================================
 Test_Name = "test_14"
+debug=False
 n_iter_test_file = 3
 #========================================================================
 import os
@@ -40,9 +40,16 @@ pathHomard = os.getenv('HOMARD_ROOT_DIR')
 Rep_Test = os.path.join(pathHomard, "share", "salome", "resources", "homard")
 Rep_Test = os.path.normpath(Rep_Test)
 sys.path.append(Rep_Test)
+from test_util import remove_dir
 from test_util import test_results
 # Repertoire des resultats
-dircase = tempfile.mkdtemp()
+if debug :
+  dircase = os.path.join("/tmp", Test_Name)
+  if ( os.path.isdir(dircase) ) :
+    remove_dir(dircase)
+  os.mkdir(dircase)
+else :
+  dircase = tempfile.mkdtemp()
 # Repertoire des donnees du tutorial
 data_dir = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "fr", "_downloads")
 data_dir = os.path.normpath(data_dir)
@@ -146,7 +153,8 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file)
+destroy_dir = not debug
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir)
 #
 # ==================================
 gzip_gunzip(data_dir, 4, 1)

diff --git a/tests/test_15.apad.02.bilan b/tests/test_15.apad.02.bilan
index 3ce77611fb2d0f4d838a6639bf3340277ea271bb..c7039115d2cbc7a3d1d7726a4989bf9a8450d835 100644 (file)
--- a/tests/test_15.apad.02.bilan
+++ b/tests/test_15.apad.02.bilan
@@ -5,7 +5,7 @@ ANALYSE DU MAILLAGE
 
      Maillage apres adaptation                         
      COEUR_2D                                                                        
-     Date de creation : lundi 2 novembre 2015 a 9 h 11 mn 58 s          
+     Date de creation : mardi 24 novembre 2015 a 9 h 33 mn 8 s          
      Dimension : 2
      Degre : 1
      C'est un maillage obtenu apres      2 adaptations.
@@ -31,10 +31,10 @@ ANALYSE DU MAILLAGE
      ************************************************************
      *                      Segments                            *
      ************************************************************
-     * Nombre total                                *        359 *
+     * Nombre total                                *        418 *
      * . dont aretes isolees                       *          0 *
-     * . dont aretes de bord de regions 2D         *        240 *
-     * . dont aretes internes aux faces/volumes    *        119 *
+     * . dont aretes de bord de regions 2D         *        300 *
+     * . dont aretes internes aux faces/volumes    *        118 *
      ************************************************************
 
      ************************************************************

diff --git a/tests/test_15.py b/tests/test_15.py
index 6ab5b8c628b2099e3fae71774803c3c22e2c5a51..da64c66c02475c340248e546277587b8b50b211b 100755 (executable)
--- a/tests/test_15.py
+++ b/tests/test_15.py
@@ -19,13 +19,13 @@
 #
 """
 Python script for HOMARD
-Copyright EDF-R&D 2010, 2014
 Test test_11 associe au tutorial 5
 """
-__revision__ = "V2.2"
+__revision__ = "V2.3"
 
 #========================================================================
 Test_Name = "test_15"
+debug=False
 n_iter_test_file = 2
 #========================================================================
 import os
@@ -40,9 +40,17 @@ pathHomard = os.getenv('HOMARD_ROOT_DIR')
 Rep_Test = os.path.join(pathHomard, "share", "salome", "resources", "homard")
 Rep_Test = os.path.normpath(Rep_Test)
 sys.path.append(Rep_Test)
+sys.path.append(Rep_Test)
+from test_util import remove_dir
 from test_util import test_results
 # Repertoire des resultats
-dircase = tempfile.mkdtemp()
+if debug :
+  dircase = os.path.join("/tmp", Test_Name)
+  if ( os.path.isdir(dircase) ) :
+    remove_dir(dircase)
+  os.mkdir(dircase)
+else :
+  dircase = tempfile.mkdtemp()
 # Repertoire des donnees du tutorial
 data_dir = os.path.join(pathHomard, "share", "doc", "salome", "gui", "HOMARD", "fr", "_downloads")
 data_dir = os.path.normpath(data_dir)
@@ -91,7 +99,7 @@ Python script for HOMARD
   # ===
   Case_5 = homard.CreateCase('Case_5', 'COEUR_2D', data_dir+'/tutorial_5.00.med')
   Case_5.SetDirName(dircase)
-  Case_5.SetConfType(3)
+  Case_5.SetConfType(1)
   Case_5.AddBoundaryGroup('Boun_5_1', '')
   #
   # Iteration "Iter_5_1"
@@ -130,7 +138,8 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file)
+destroy_dir = not debug
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir)
 #
 # ==================================
 gzip_gunzip(data_dir, 5, 1)

diff --git a/tests/test_2.py b/tests/test_2.py
index 83b5d1b8ffc080804565d7a1919159c0423c411e..c2c2c97fa9484063ab7fdb36d45f2333701def2b 100755 (executable)
--- a/tests/test_2.py
+++ b/tests/test_2.py
@@ -19,13 +19,13 @@
 #
 """
 Python script for HOMARD
-Copyright EDF-R&D 2010, 2014
 Test test_2
 """
-__revision__ = "V2.4"
+__revision__ = "V2.5"
 
 #========================================================================
 Test_Name = "test_2"
+debug=False
 n_iter_test_file = 3
 #========================================================================
 import os
@@ -40,9 +40,16 @@ pathHomard = os.getenv('HOMARD_ROOT_DIR')
 Rep_Test = os.path.join(pathHomard, "share", "salome", "resources", "homard")
 Rep_Test = os.path.normpath(Rep_Test)
 sys.path.append(Rep_Test)
+from test_util import remove_dir
 from test_util import test_results
 # Repertoire des resultats
-dircase = tempfile.mkdtemp()
+if debug :
+  dircase = os.path.join("/tmp", Test_Name)
+  if ( os.path.isdir(dircase) ) :
+    remove_dir(dircase)
+  os.mkdir(dircase)
+else :
+  dircase = tempfile.mkdtemp()
 # ==================================
 
 salome.salome_init()
@@ -101,7 +108,6 @@ Python script for HOMARD
     MeshFile = os.path.join(Rep_Test, Test_Name + '.00.med')
     Case_test_2 = homard.CreateCase(CaseName, 'PLAQUE_0', MeshFile)
     Case_test_2.SetDirName(dircase)
-    Case_test_2.SetConfType(1)
     Case_test_2.AddBoundaryGroup('internal_boundary', '')
   #
   # Creation of the iterations
@@ -175,7 +181,8 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, True)
+destroy_dir = not debug
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir)
 #
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)

diff --git a/tests/test_3.py b/tests/test_3.py
index c09a7cbeb79ff386e690fad2c7ba34d8707d4301..358a17fd20a3b9636f9057daa7b69b9785b90090 100755 (executable)
--- a/tests/test_3.py
+++ b/tests/test_3.py
@@ -19,13 +19,13 @@
 #
 """
 Python script for HOMARD
-Copyright EDF-R&D 2011, 2013
 Test test_3
 """
-__revision__ = "V2.3"
+__revision__ = "V2.4"
 
 #========================================================================
 Test_Name = "test_3"
+debug=False
 n_boucle = 2
 n_iter_test_file = 2
 #========================================================================
@@ -41,9 +41,16 @@ pathHomard = os.getenv('HOMARD_ROOT_DIR')
 Rep_Test = os.path.join(pathHomard, "share", "salome", "resources", "homard")
 Rep_Test = os.path.normpath(Rep_Test)
 sys.path.append(Rep_Test)
+from test_util import remove_dir
 from test_util import test_results
 # Repertoire des resultats
-dircase = tempfile.mkdtemp()
+if debug :
+  dircase = os.path.join("/tmp", Test_Name)
+  if ( os.path.isdir(dircase) ) :
+    remove_dir(dircase)
+  os.mkdir(dircase)
+else :
+  dircase = tempfile.mkdtemp()
 # ==================================
 
 salome.salome_init()
@@ -103,7 +110,6 @@ Python script for HOMARD
         MeshFile = os.path.join(Rep_Test, Test_Name + '.00.med')
         Case_test_3 = homard.CreateCase(CaseName, 'MOYEU', MeshFile)
         Case_test_3.SetDirName(dircase)
-        Case_test_3.SetConfType(1)
         Case_test_3.AddBoundaryGroup('courbes', '')
         Case_test_3.AddBoundaryGroup('cyl_ext', 'EXT')
         Case_test_3.AddBoundaryGroup('cyl_int', 'INT')
@@ -209,7 +215,8 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file*n_boucle
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, True)
+destroy_dir = not debug
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir)
 #
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)

diff --git a/tests/test_4.py b/tests/test_4.py
index a34ef11765101fe6a5a4f83c5c7906af508eb590..995850109708c6479230449034e2cf682031ba41 100755 (executable)
--- a/tests/test_4.py
+++ b/tests/test_4.py
@@ -19,13 +19,13 @@
 #
 """
 Python script for HOMARD
-Copyright EDF-R&D 2010, 2015
 Test test_4
 """
 __revision__ = "V1.0"
 
 #========================================================================
 Test_Name = "test_4"
+debug=False
 n_iter_test_file = 3
 DX = 600.
 DY = 400.
@@ -48,10 +48,16 @@ pathHomard = os.getenv('HOMARD_ROOT_DIR')
 Rep_Test = os.path.join(pathHomard, "share", "salome", "resources", "homard")
 Rep_Test = os.path.normpath(Rep_Test)
 sys.path.append(Rep_Test)
+from test_util import remove_dir
 from test_util import test_results
 # Repertoire des resultats
-dircase = tempfile.mkdtemp()
-#dircase = "/scratch/D68518/Salome/resu"
+if debug :
+  dircase = os.path.join("/tmp", Test_Name)
+  if ( os.path.isdir(dircase) ) :
+    remove_dir(dircase)
+  os.mkdir(dircase)
+else :
+  dircase = tempfile.mkdtemp()
 # ==================================
 
 salome.salome_init()
@@ -252,7 +258,6 @@ Python script for HOMARD
     MeshFile = os.path.join(dircase, 'maill.00.med')
     Case_test_4 = homard.CreateCase(CaseName, 'MESH', MeshFile)
     Case_test_4.SetDirName(dircase)
-    Case_test_4.SetConfType(1)
   #
   # Creation of the iterations
   # ==========================
@@ -333,7 +338,8 @@ except Exception, e:
 # Test of the results
 #
 n_rep_test_file = n_iter_test_file
-test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file)
+destroy_dir = not debug
+test_results(Rep_Test, Test_Name, dircase, n_iter_test_file, n_rep_test_file, destroy_dir)
 #
 if salome.sg.hasDesktop():
   salome.sg.updateObjBrowser(1)

diff --git a/tests/test_util.py b/tests/test_util.py
index 46bdb450e904fee77b0ada72e63bfd6413ecc586..e5723983fc97d2d8f84ed09f97146bcbc9c84dd2 100755 (executable)
--- a/tests/test_util.py
+++ b/tests/test_util.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 # Copyright (C) 2011-2015  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or