From: Gérald NICOLAS Date: Tue, 24 Nov 2015 08:50:29 +0000 (+0100) Subject: Prise en compte des différents modes de non conformité X-Git-Tag: V8_0_0a1~7^2 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=71a545b248f9594795cc2b215a0a6d9d89eff420;p=modules%2Fhomard.git 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 4d7c6441..9d2a5fe5 100644 --- 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 af627343..7b88b385 100644 --- 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 7f329922..6b33b572 100644 --- 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 29f387be..239d9e8d 100644 --- 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 636cbe75..8bba6822 100755 --- 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 a202ccb5..2a1d1897 100755 --- 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 1ef96f58..00f8770d 100755 --- 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 c161e030..97a2aa81 100755 --- 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 4c0af365..0d074ce2 100755 --- 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 78a9aa12..2d9a91c8 100755 --- 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 3ce77611..c7039115 100644 --- 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 6ab5b8c6..da64c66c 100755 --- 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 83b5d1b8..c2c2c97f 100755 --- 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 c09a7cbe..358a17fd 100755 --- 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 a34ef117..99585010 100755 --- 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 46bdb450..e5723983 100755 --- 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