From: Gerald NICOLAS <D68518@dsp0677846.(none)>
Date: Wed, 13 Jan 2016 14:52:52 +0000 (+0100)
Subject: coquilles
X-Git-Tag: V7_8_0a1~5
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a8186c505301bc0d1e9c881d6c5244102a1f366c;p=modules%2Fhomard.git

coquilles
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de79735f..28003189 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -185,7 +185,7 @@ SET(SALOME_INSTALL_RES "${SALOME_INSTALL_RES}" CACHE PATH "Install path: SALOME
 SET(SALOME_INSTALL_DOC "${SALOME_INSTALL_DOC}" CACHE PATH "Install path: SALOME documentation")
 
 # Specific to HOMARD:
-SET(SALOME_HOMARD_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/homard" CACHE PATH 
+SET(SALOME_HOMARD_INSTALL_RES_DATA "${SALOME_INSTALL_RES}/homard" CACHE PATH
   "Install path: SALOME HOMARD specific data")
 SET(SALOME_HOMARD_INSTALL_SAMPLES share/salome/homardsamples CACHE PATH
   "Install path: SALOME HOMARD samples")
@@ -199,6 +199,7 @@ MARK_AS_ADVANCED(SALOME_INSTALL_SCRIPT_SCRIPTS SALOME_INSTALL_SCRIPT_DATA SALOME
 MARK_AS_ADVANCED(SALOME_INSTALL_APPLISKEL_SCRIPTS  SALOME_INSTALL_APPLISKEL_PYTHON SALOME_INSTALL_CMAKE_LOCAL SALOME_INSTALL_RES)
 MARK_AS_ADVANCED(SALOME_INSTALL_PYTHON SALOME_INSTALL_PYTHON_SHARED)
 MARK_AS_ADVANCED(SALOME_INSTALL_AMCONFIG_LOCAL SALOME_INSTALL_DOC)
+MARK_AS_ADVANCED(SALOME_HOMARD_INSTALL_TEST)
 MARK_AS_ADVANCED(SALOME_HOMARD_INSTALL_RES_DATA)
 
 # Accumulate environment variables for HOMARD module
diff --git a/src/tests/Test/test_1.py b/src/tests/Test/test_1.py
index 0d7746c1..79d100f2 100755
--- a/src/tests/Test/test_1.py
+++ b/src/tests/Test/test_1.py
@@ -120,10 +120,9 @@ Python script for HOMARD
   # Creation of the cases
   # =====================
     # Creation of the case
-    casename = "Case_" + TEST_NAME
-    print "-------- Creation of the case", casename
+    print "-------- Creation of the case", TEST_NAME
     mesh_file = os.path.join(REP_DATA, TEST_NAME + '.00.med')
-    case_test_1 = HOMARD.CreateCase(casename, 'MAILL', mesh_file)
+    case_test_1 = HOMARD.CreateCase(TEST_NAME, 'MAILL', mesh_file)
     case_test_1.SetDirName(DIRCASE)
   #
   # Creation of the iterations
diff --git a/src/tests/Test/test_2.py b/src/tests/Test/test_2.py
index e4120362..2d121d40 100755
--- a/src/tests/Test/test_2.py
+++ b/src/tests/Test/test_2.py
@@ -107,9 +107,8 @@ Python script for HOMARD
   # Creation of the cases
   # =====================
     # Creation of the case
-    casename = "case_" + TEST_NAME
     mesh_file = os.path.join(REP_DATA, TEST_NAME + '.00.med')
-    case_test_2 = HOMARD.CreateCase(casename, 'PLAQUE_0', mesh_file)
+    case_test_2 = HOMARD.CreateCase(TEST_NAME, 'PLAQUE_0', mesh_file)
     case_test_2.SetDirName(DIRCASE)
     case_test_2.AddBoundaryGroup('internal_boundary', '')
   #
diff --git a/src/tests/Test/test_3.py b/src/tests/Test/test_3.py
index cf133325..1c4527f5 100755
--- a/src/tests/Test/test_3.py
+++ b/src/tests/Test/test_3.py
@@ -108,10 +108,9 @@ Python script for HOMARD
   # Creation of the case case_test_3
   # ===========================
       if ( num <= 1 ) :
-        casename = "case_" + TEST_NAME
-        print "-------- Creation of the case", casename
+        print "-------- Creation of the case", TEST_NAME
         mesh_file = os.path.join(REP_DATA, TEST_NAME + '.00.med')
-        case_test_3 = HOMARD.CreateCase(casename, 'MOYEU', mesh_file)
+        case_test_3 = HOMARD.CreateCase(TEST_NAME, 'MOYEU', mesh_file)
         case_test_3.SetDirName(DIRCASE)
         case_test_3.AddBoundaryGroup('courbes', '')
         case_test_3.AddBoundaryGroup('cyl_ext', 'EXT')
diff --git a/src/tests/Test/test_4.py b/src/tests/Test/test_4.py
index c2ec0752..335c5d4b 100755
--- a/src/tests/Test/test_4.py
+++ b/src/tests/Test/test_4.py
@@ -256,10 +256,9 @@ Python script for HOMARD
   # Creation of the cases
   # =====================
     # Creation of the case
-    casename = "case_" + TEST_NAME
-    print "-------- Creation of the case", casename
+    print "-------- Creation of the case", TEST_NAME
     mesh_file = os.path.join(DIRCASE, 'maill.00.med')
-    case_test_4 = HOMARD.CreateCase(casename, 'MESH', mesh_file)
+    case_test_4 = HOMARD.CreateCase(TEST_NAME, 'MESH', mesh_file)
     case_test_4.SetDirName(DIRCASE)
   #
   # Creation of the iterations