Removing stand alone mascaret now within telemac

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index 40510843b4b800bbf9c1e4d2b564c989619a25b8..489d80f1eff9df8780208732fc20c7ecefa52f0f 100644 (file)
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -21,8 +21,6 @@
 
 # These files are data, module or lib files
 SET(_adm_data
-  FindMascaret.cmake
-  FindSalomeMascaret.cmake
   FindTelemac.cmake
   FindSalomeTelemac.cmake
 )

diff --git a/adm_local/cmake_files/FindMascaret.cmake b/adm_local/cmake_files/FindMascaret.cmake
deleted file mode 100644 (file)
index 1602e88..0000000
--- a/adm_local/cmake_files/FindMascaret.cmake
+++ /dev/null
@@ -1,23 +0,0 @@
-#  Copyright (C) 2012-2013 EDF
-#
-#  This file is part of SALOME HYDRO module.
-#
-#  SALOME HYDRO module is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  SALOME HYDRO module is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with SALOME HYDRO module.  If not, see <http://www.gnu.org/licenses/>.
-
-FIND_LIBRARY(MASCARET_LIBRARIES mascaret)
-FIND_PATH(MASCARET_INCLUDE_DIR apimascaret.h)
-
-# Handle the standard arguments of the find_package() command:
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(Mascaret REQUIRED_VARS MASCARET_LIBRARIES MASCARET_INCLUDE_DIR)

diff --git a/adm_local/cmake_files/FindSalomeMascaret.cmake b/adm_local/cmake_files/FindSalomeMascaret.cmake
deleted file mode 100644 (file)
index fa7c5ce..0000000
--- a/adm_local/cmake_files/FindSalomeMascaret.cmake
+++ /dev/null
@@ -1,28 +0,0 @@
-#  Copyright (C) 2012-2013 EDF
-#
-#  This file is part of SALOME HYDRO module.
-#
-#  SALOME HYDRO module is free software: you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation, either version 3 of the License, or
-#  (at your option) any later version.
-#
-#  SALOME HYDRO module is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with SALOME HYDRO module.  If not, see <http://www.gnu.org/licenses/>.
-
-# Mascaret detection for Salome
-#
-#  !! Please read the generic detection procedure in SalomeMacros.cmake !!
-#
-SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(Mascaret MASCARET_ROOT_DIR 0)
-MARK_AS_ADVANCED(MASCARET_LIBRARIES MASCARET_INCLUDE_DIR)
-
-IF(Mascaret_FOUND OR MASCARET_FOUND)
-  SALOME_ACCUMULATE_HEADERS(MASCARET_INCLUDE_DIR)
-  SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${MASCARET_LIBRARIES})
-ENDIF()

diff --git a/adm_local/cmake_files/FindTelemac.cmake b/adm_local/cmake_files/FindTelemac.cmake
index 6be9348af1ff54c776641300c464564c8c9dffd7..4920ae315c15f8b46d86fd2d1165324011819912 100644 (file)
--- a/adm_local/cmake_files/FindTelemac.cmake
+++ b/adm_local/cmake_files/FindTelemac.cmake
@@ -15,30 +15,32 @@
 #  You should have received a copy of the GNU General Public License
 #  along with SALOME HYDRO module.  If not, see <http://www.gnu.org/licenses/>.
 
+FIND_LIBRARY(TELEMAC_LIBRARY_mascaret mascaret
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_api api
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_bief bief
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_damocles damocles
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_parallel parallel
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_sisyphe sisyphe
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_special special
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_telemac2d telemac2d
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_tomawac tomawac
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_gretel gretel
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_partel partel
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_LIBRARY(TELEMAC_LIBRARY_hermes hermes
-             PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/lib)
+             PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/lib)
 FIND_PATH(TELEMAC_INCLUDE_DIR interface_telemac2d.mod
-          PATHS ${TELEMAC_ROOT_DIR}/builds/salome/wrap_api/include)
+          PATHS ${TELEMAC_ROOT_DIR}/builds/salomeHPC/wrap_api/include)
 
 # Handle the standard arguments of the find_package() command:
 INCLUDE(FindPackageHandleStandardArgs)
@@ -49,6 +51,7 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(Telemac REQUIRED_VARS TELEMAC_LIBRARY_api
                                                         TELEMAC_LIBRARY_sisyphe
                                                         TELEMAC_LIBRARY_special
                                                         TELEMAC_LIBRARY_telemac2d
+                                                        TELEMAC_LIBRARY_mascaret
                                                         TELEMAC_LIBRARY_tomawac
                                                         TELEMAC_LIBRARY_gretel
                                                         TELEMAC_LIBRARY_partel

diff --git a/src/salome_hydro/pytel/eficas/pytel_cata.py b/src/salome_hydro/pytel/eficas/pytel_cata.py
index db77f20b493e4a6fde07d954569386d640376420..50f0c43c25654949fa57f7c1c0a69a98e3743e97 100644 (file)
--- a/src/salome_hydro/pytel/eficas/pytel_cata.py
+++ b/src/salome_hydro/pytel/eficas/pytel_cata.py
@@ -19,7 +19,7 @@
 
 from Accas import *
 
-codelist = ("artemis", "estel3d", "postel3d", "sisyphe", "stbtel", "telemac2d", "telemac3d", "tomawac")
+codelist = ("artemis", "estel3d", "postel3d", "sisyphe", "stbtel", "telemac2d", "telemac3d", "tomawac", "mascaret")
 
 JdC = JDC_CATA(regles = (UN_PARMI('PYTEL',)),
                         )