Commit d2837a0d authored by Gilles MARCKMANN's avatar Gilles MARCKMANN

rename libs/directories:

        Xcrack                            ->   xCrack
        Xcut                              ->   xCut
           |_XdoubleCut                           |_xDoubleCut
           |_XlegacySimpleCut                     |_xLegacySimpleCut

        Xdomaindecomp                     ->   xDomainDecomp
        Xexport                           ->   xExport
        Xext                              ->   xExt
        Xfem                              ->   xFEM
        FastMarching                      ->   xFastMarching
        Geom                              ->   xGeom

        Xinterfaces                       ->   xInterfaces
              |_XAOMDInterface                       |_xAOMDInterface
              |_GraphInterface                       |_xGraphInterface
              |_XoctreeInterface                     |_xOctreeInterface
              |_xSplitMeshInterface                  |_xTemplateRefineMeshInterface
              |
              |                           ->  xLinearAlgebra
              |_SolverInterfaces                     |
                               |_SuperLu             |_xInterfaceSuperLu
                               |_Taucs               |_xInterfaceTaucs
                               |_...                 |_xInterface...

        MeshMachine                       ->   xMeshTools
                  |_DistMesh                            |_xDistMesh
                  |_SplitMesh                           |_xTemplateRefineMesh
                  |                                     |_attic
                  |_FastMarching                              |_FastMarching
                  |_LinearAlgebra                             |_LinearAlgebra
                  |_Stlmesh                                   |_Stlmesh

        Octree                            ->   xOctree
        Physics                           ->   xPhysics
        Xtensor                           ->   xTensor

        Util
           |_eXlibris_tools               ->   xTools

        Util                              ->   xUtil
           |_cmakeUtile                            |_cmakeUtile
           |                                       |_attic
           |_FloUtil                               |_FloUtil
           |_Split                                         |_Split
           |_doxygen_tools                                 |_doxygen_tools
           |_tags_tools                                    |_tags_tools

        Xtest
            |_solverinterfaces            ->   xlinearalgebra-test
            |_physics-seq-test            ->   xphysics-seq-test
            |_xsplitmeshinterface-test    ->   templaterefinemesh-test

cmake variables rules for module Xfiles/xFoe (no more Xfiles/Xfoe) :

      Xfiles/xFoe  => find_package(xFoe)  => xFoe_INCLUDE_DIR  / xFoe_LIBRARIES

in C++ source files, namespace are in lower cases: xfoe
parent 9e3ac656
......@@ -16,7 +16,7 @@ option(TLSELEMENTBASED_TEST_DYN "include test dyn"
option(TLSELEMENTBASED_TEST_PLAST "include test plast" OFF)
option(TLSELEMENTBASED_TEST_ANIMESH_DAM "include test animesh dam" OFF)
option(TLSELEMENTBASED_TEST_INFINITE_DAM "include test infinite dam" OFF)
option(FASTMARCHINGINTERFACE "include FastMarchingInterface" ON )
option(FASTMARCHINGINTERFACE "include FastMarchingInterface" ON )
# END
......@@ -31,18 +31,18 @@ define_archos_suffixe(ARCHOS)
find_package(xTools REQUIRED)
find_package(XAOMDInterfaceGeneral REQUIRED)
find_package(DISTMESH REQUIRED )
find_package(xAOMDInterfaceGeneral REQUIRED)
find_package(xDistMesh REQUIRED )
find_package(Trellis REQUIRED )
find_package(SolverBase REQUIRED )
find_package(InterfaceLapack REQUIRED )
find_package(InterfaceSuperLu REQUIRED )
find_package(InterfaceTaucs REQUIRED )
find_package(Xfem REQUIRED )
find_package(Xext REQUIRED )
find_package(Geom REQUIRED )
find_package(xSolverBase REQUIRED )
find_package(xInterfaceLapack REQUIRED )
find_package(xInterfaceSuperLu REQUIRED )
find_package(xInterfaceTaucs REQUIRED )
find_package(xFEM REQUIRED )
find_package(xExt REQUIRED )
find_package(xGeom REQUIRED )
find_package(xTLS REQUIRED )
find_package(XdoubleCut REQUIRED )
find_package(xDoubleCut REQUIRED )
find_package(ANN REQUIRED )
find_package(CGAL REQUIRED )
find_package(BLAS2 REQUIRED )
......@@ -53,18 +53,17 @@ find_package(METIS REQUIRED )
file(GLOB SOURCES src/*)
list(APPEND EXTERNAL_INCLUDES
${EXLIBRISTYPES_INCLUDE_DIR}
${xTools_INCLUDE_DIR}
${XAOMDInterfaceGeneral_INCLUDE_DIR}
${DISTMESH_INCLUDE_DIR}
${xAOMDInterfaceGeneral_INCLUDE_DIR}
${xDistMesh_INCLUDE_DIR}
${Trellis_INCLUDE_DIR}
${SolverBase_INCLUDE_DIR}
${InterfaceSuperLu_INCLUDE_DIR}
${InterfaceTaucs_INCLUDE_DIR}
${InterfaceLapack_INCLUDE_DIR}
${XFEM_INCLUDE_DIR}
${XEXT_INCLUDE_DIR}
${GEOM_INCLUDE_DIR}
${xSolverBase_INCLUDE_DIR}
${xInterfaceSuperLu_INCLUDE_DIR}
${xInterfaceTaucs_INCLUDE_DIR}
${xInterfaceLapack_INCLUDE_DIR}
${xFEM_INCLUDE_DIR}
${xExt_INCLUDE_DIR}
${xGeom_INCLUDE_DIR}
${xTLS_INCLUDE_DIR}
${PARMETIS_INCLUDE_DIR}
src
......@@ -76,21 +75,21 @@ list(APPEND EXTERNAL_LIBRARIES
${xTLS_LIBRARIES}
${XCUT_LIBRARIES}
${XEXT_LIBRARIES}
${GEOM_LIBRARIES}
${XFEM_LIBRARIES}
${xGeom_LIBRARIES}
${xFEM_LIBRARIES}
${Trellis_LIBRARIES}
${SolverBase_LIBRARIES}
${InterfaceLapack_LIBRARIES}
${xSolverBase_LIBRARIES}
${xInterfaceLapack_LIBRARIES}
${LAPACK_LIBRARIES}
${BLAS_LIBRARIES}
${InterfaceSuperLu_LIBRARIES}
${xInterfaceSuperLu_LIBRARIES}
${SUPERLU_LIBRARIES}
${InterfaceTaucs_LIBRARIES}
${xInterfaceTaucs_LIBRARIES}
${TAUCS_LIBRARIES}
${PARMETIS_LIBRARIES}
${METIS_LIBRARIES}
${ANN_LIBRARIES}
${DISTMESH_LIBRARIES}
${xDistMesh_LIBRARIES}
${xTools_LIBRARIES}
${MPI_CXX_LIBRARIES}
${CGAL_LIBRARIES}
......@@ -98,8 +97,8 @@ list(APPEND EXTERNAL_LIBRARIES
if(FASTMARCHINGINTERFACE)
add_definitions(-DHAVE_FASTMARCHING)
find_package(FastMarching REQUIRED )
list(APPEND EXTERNAL_INCLUDES ${FASTMARCHING_INCLUDE_DIR})
find_package(xFastMarching REQUIRED )
list(APPEND EXTERNAL_INCLUDES ${xFastMarching_INCLUDE_DIR})
set(CXXFLAGS "${CXXFLAGS} -std=c++11")
endif(FASTMARCHINGINTERFACE)
......
cmake_minimum_required(VERSION 2.6)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../Util/cmakeUtil/)
list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../xUtil/cmakeUtil/)
include(common_functions)
include(devel_common_functions)
......
enable_testing()
add_test(dam_gamain ${CMAKE_CURRENT_BINARY_DIR}/dam_gamain ${CMAKE_CURRENT_BINARY_DIR}/data/main.dat)
add_test(ndiff_dam_gamain dam_gamain ${DEVROOT}/Util/cmakeUtil/test_ndiff.sh )
add_test(ndiff_dam_gamain dam_gamain ${DEVROOT}/xUtil/cmakeUtil/test_ndiff.sh )
set_tests_properties(ndiff_dam_gamain PROPERTIES DEPENDS dam_gamain )
enable_testing()
add_test(flounder_eyes_elast ${CMAKE_CURRENT_BINARY_DIR}/flounder_eyes_elast ${CMAKE_CURRENT_BINARY_DIR}/data/main.dat)
add_test(ndiff_flounder_eyes_elast ${DEVROOT}/Util/cmakeUtil/test_ndiff.sh)
add_test(ndiff_flounder_eyes_elast ${DEVROOT}/xUtil/cmakeUtil/test_ndiff.sh)
set_tests_properties(ndiff_flounder_eyes_elast PROPERTIES DEPENDS flounder_eyes_elast)
enable_testing()
add_test(plast_full_beam ${CMAKE_CURRENT_BINARY_DIR}/plast_full_beam ${CMAKE_CURRENT_BINARY_DIR}/data/main.dat)
add_test(ndiff_plast_full_beam ${DEVROOT}/Util/cmakeUtil/test_ndiff.sh)
add_test(ndiff_plast_full_beam ${DEVROOT}/xUtil/cmakeUtil/test_ndiff.sh)
set_tests_properties(ndiff_plast_full_beam PROPERTIES DEPENDS plast_full_beam)
enable_testing()
add_test(quarter_beam_elast ${CMAKE_CURRENT_BINARY_DIR}/quarter_beam_elast ${CMAKE_CURRENT_BINARY_DIR}/data/main.dat)
add_test(ndiff_quarter_beam_elast ${DEVROOT}/Util/cmakeUtil/test_ndiff.sh)
add_test(ndiff_quarter_beam_elast ${DEVROOT}/xUtil/cmakeUtil/test_ndiff.sh)
set_tests_properties(ndiff_quarter_beam_elast PROPERTIES DEPENDS quarter_beam_elast)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment