-
Nicolas CHEVAUGEON authored
commit f5bc3b9d33f2b6f2ec35757b666fbd975fe4158a Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Wed Jun 26 13:52:30 2019 +0200 back to superLU 3 commit 0fd17be223d6879fc6c0ae2f8e5a9263558d8322 Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Wed Jun 26 13:40:53 2019 +0200 cosmetics change after a merge. commit 5be5f7a4e0b225bef44ef89471c929d8b392fa82 Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Wed Jun 26 12:16:46 2019 +0200 Squashed commit of the following: commit dcc41789 Author: Benoit LE <ble@pc-str33.ec-nantes.fr> Date: Wed Jun 26 10:59:32 2019 +0200 Removed uncessary classes and function in xFastMarching/src/Skeleton Removed FMSK_linearalgebra.h and FMSK_meshinterfacexRegion.h. Moved a few details from FMSK_fastmarching.h to FM.h. In particular, the destructor of entitystorage is corrected to clear variables properly. (WARNING : in some cases, probably due to numerical rounding, it may slightly change some results, for instance when doing a TLS computation using FastMarching. However, after a discussion with N. Chevaugeon, it was the proper way to do it). Removed dupplicated function and classes (like entitysotrage, FMUpdaterGeneric, fmeik_intern, etc). commit 45d8e958f302c51b8f4c388c8e1aeaeb2516052b Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Wed Jun 26 12:11:30 2019 +0200 * xCrack/CMakeLists.txt : ANN is now optional for this module * xCrack/src/lCrack.h/cc : Changes to make the submesh and filter correct in parallel setting. - lCrack class is no more derived from the obsolete xExchangeBool. - The support information (stored in xSubMesh in lCrack ) are now build directly in member createSupportInfo(). Helper functions pre_exchange_XXXX post_exchange and members bucket_type map_xx are deleted. - bool supportsCutthruByCrack(AOMD::mEntity* e) const and - bool supportInCylinderAroundFront(double r, AOMD::mEntity *e) const members function of lCrack are now implemented in the cc to make the .h more readable - Gradient of lst and lsn are now computed during initialization (post_init member of lcrack), since it need synchronisation among processors. this avoids dead-lock when agradient is evaluated latter on. * xFEM/src/xAlgorithm.h : added range version of some export algorithm. I have plans to add more range version of the algorithms. (range version : I mean just interface to algorithm where one can pass a range (an object on which one can call begin() and end() ... see xIteratorTools.h ) instead of two iterators.) * XFEM/src/xRegion.h/cc : added members to class xRegion : size_t size() const; size_t size(int what) const; xtool::xRange<xIter> range() const; xtool::xRange<xIter> range(int what ) const; * XFEM/src/xSubmesh.h/cc : - added members to class xSubMesh : xtool::xRange<xIter > range() const xtool::xRange<xIter > range(int what) const - added xUnifySubMeshAccrossProcess class, which is a submesh modifyier By calling this modifiyer, one insure that if an entity exist in a submesh at least on one proc, and is on the partition of the background mesh, this entity will be in the submesh of all the proc that share this entity. * xLinAlg/xSolverBase/src/xDenseMatrix.cc : double xDenseMatrix::maxnorm() const implemeted in the cc file. * xTool/src/xIteratorTools.h added : - make_filter_iter(pred, itb, ite) - make_filter_range(pred, range) - make_filter_range(pred, itb, ite) * xTool/src/xRawDataExchanger.h addeded communication paterns when no key can be easily defined. Used for example in xSubMesh xUnifySubMeshAccrossProcess added test in xTool/test/testsendRecvRawData/ * Trellis/AOMD/AOMD/include/mMesh.h : - added move constructor for mMesh. - member find(mEntity *) is now const. * xInterface/AOMD/general/src/xAttachedDataManagerAOMD.h xAttachedDataManagerAOMD's member funciton deleteData now return a size_t (stl style) to knwon if a data as been effectively delete or not. * xTLS/CMakeLists.txt : bug corrected in CMake line 80 commit 0f3d17e3e7b01c28a5a168e213c6926b2619526f Merge: be8df97f fc91b2b6 Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Wed Jun 26 11:30:04 2019 +0200 Merge remote-tracking branch 'origin/master' into mycurrent_branch commit be8df97fb07b3dc877b299e583833d08526e7fee Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Fri Jun 21 12:11:27 2019 +0200 CMakeList for Xcrack : now ann is optional for xcrack commit 0953a5a729969089666a74dd0fbff760c29baa19 Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Fri Jun 14 13:55:02 2019 +0200 Added new communications pattern in xTool/src/xRawDataExchanger.h, usefull when exchanging data when no key can be defined. Associated test case : xTool/test/testsendRecvRawData/ commit 1f2739fd89dcb9e0e41bb6e33c3c3679e53aa700 Merge: cf61c8b7 e249e06c Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Thu Jun 13 15:58:13 2019 +0200 Merge branch 'refactoring' into mybranch_refactmerge commit e249e06c Author: Salzman Alexis <alexis.salzman@ec-nantes.fr> Date: Thu Jun 13 12:38:12 2019 +0200 xfastmarching namespace usage correction New xfastmarching namespace have been introduced but pack/unPack helping function must remain in :: namescpace (i.e. in no namescpace). This is to let FMupdaterGeneric call ::pack ::unPack in a generic way (no assumption on VECT or TRANSPORTED namespace) commit 4c2c20c2 Author: Salzman Alexis <alexis.salzman@ec-nantes.fr> Date: Wed Jun 12 11:39:05 2019 +0200 xInterface/Graph: little change on how to use try_run in cmake commit 6614834f Author: Salzman Alexis <alexis.salzman@ec-nantes.fr> Date: Tue Jun 11 14:41:49 2019 +0200 SuperLU:Add durty duplication to control version. TODO commit eb383986 Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Tue Jun 11 12:54:11 2019 +0200 Squashed commit of the following: commit 90452f607824ed9ac46c1d3fca8e8160de399f53 Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Tue Jun 11 12:52:08 2019 +0200 Back to superLU 3 as default in xLinearSystemSolverSuperLU.h commit 52420031eb8d5add55039dc5b143000807a32b9d Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Tue Jun 11 12:37:39 2019 +0200 CMakeLists modifyed to fix linking issue: library xExport is now not parts of the XFEM_LIBRARIES defined by find Xfem xExport dependecies where therfore added where needed. Super for SuperLU 5 (experimental ) added in xinterface superlu commit 1e798815a51737d615ee25940cb1e6b796150c7a Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Fri Jun 7 15:03:05 2019 +0200 corrected ../../../xInterface/Graph/ParMetis build process to reflect change in paths. modifiyed xCSRVector.h and cc so that the .h does not include xBlasDef.h since it can produce conflict when including xVector.h in superLU interface Changes to be committed: modified: xFEM/CMakeLists.txt modified: xInterface/Graph/ParMetis/CMakeLists.txt modified: xInterface/Graph/ParMetis/src/setType/test.cc modified: xLinAlg/xInterfaceBasicIterSolver/test/springSolve/main.cc modified: xLinAlg/xInterfaceSuperLu/src/xLinearSystemSolverSuperLU.cc modified: xLinAlg/xInterfaceSuperLu/src/xLinearSystemSolverSuperLU.h modified: xLinAlg/xInterfaceSuperLu/src/xLinearSystemSolverSuperLU_imp.h modified: xLinAlg/xSolverBase/src/xCSRVector.cc modified: xLinAlg/xSolverBase/src/xCSRVector.h modified: xLinAlg/xSolverBase/src/xDenseMatrix.cc modified: xLinAlg/xSolverBase/src/xDenseMatrix.h modified: xUtil/cmakeUtil/FindxFEM.cmake commit cf61c8b74089cd0ffe274c5cc2a45e24285c74c5 Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Fri Jun 7 14:45:28 2019 +0200 changes in CMakelists.txt for ParMetisInterface_types.h to be properly generated commit 286497f1b9ddc3a017561a0494af5a6df3cdf09a Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Fri Jun 7 12:36:23 2019 +0200 small modif in : xInterface/Graph/ParMetis/CMakeLists.txt and xLinAlg/xSolverBase/src/xCSRVector.h in xInterface/Graph/ParMetis/CMakeLists.txt, path for the test.cc file was wrong in xLinAlg/xSolverBase/src/xCSRVector.h : small change to avoid the inclusion of xBlasDef.h, which conflict with some version of superLu that define the same external function from blas, with slightly different signature. commit bf8cbe0851dfd2c7107565dff1f06a25220db25e Merge: 4fcc8541 8c95f4d6 Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Fri Jun 7 10:45:08 2019 +0200 Merge remote-tracking branch 'origin/refactoring' into mybranch_refactmerge commit 4fcc85416046e03da4e53bfd84f8262718cda959 Author: Nicolas Chevaugeon <nicolas.chevaugeon@ec-nantes.fr> Date: Fri Jun 7 09:34:55 2019 +0200 Small changes in aomd : - move constructor for mMesh added - mEntity * mesh::find(mEntity *) now a const member function - void xAttachedDataManagerAOMD::deleteData( AOMD::mEntity &e ) changed to size_t xAttachedDataManagerAOMD::deleteData( AOMD::mEntity &e ) delete data now return un unsigned int telling if a data was actually deleted or not (like in stl style container ): return 0 if nothing was deleted, 1 otherwise commit 8c95f4d6 Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Thu Jun 6 15:11:57 2019 +0200 finalises standard pathes: commit 33bbac5d Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Tue Jun 4 10:51:16 2019 +0200 rename directory and namespaces. Last modifications below: Original directory (Master) -> New directory (refactoring) Namespace (refactoring) =========================== =========================== ======================= Xfiles: ======= Util |_eXlibris_tools xTool xtool:: | | xUtil |_cmakeUtile |_cmakeUtile | |_FloUtil attic |_Split attic |_doxygen_tools attic |_tags_tools attic Xcrack xCrack |_ xCrack |_ src xcrack:: | |_ xCrackFMM attic Xcut xCut |_XdoubleCut |_xDoubleCut xcut:: Xdomaindecomp xDomainDecomp |_DomainManager |_DomainManager xdomaindecomp:: |_Solvers |_Solver xdomaindecomp:: Xext |_AnalyicalSolutions xAnalyticalSolution | |_Elastic2D |_Elastic2D xanalyticalsolution:: | |_Xext xExt |_src |_src xext:: | |_ImageProcessing attic Xfem |_Xfem ___________________________________ xFEM xfem:: \_______ xCut \ |_xLegacySimpleCut xcut:: \ \____ xExport xexport:: \___ xTensor xtensor:: \__ xMapping xmapping \_ xQuadrature xquadrature:: FastMarching xFastMarching |_src |_src xfastmarching:: | |_FMSkeleton | |_Skeleton xfastmarching::skeleton | | |_xDistFM |_xDistFM xfastmarching:: |_xDistFM |_src xfastmarching:: Geom xGeom xgeom:: Xinterfaces xInterface |_XAOMDInterface |_AOMD xinterface::aomd:: | | |_GraphInterface |_Graph | |_ParMetis | |_ParMetis xinterface::parmetis:: | | |_XoctreeInterface |_xOctree xinterface::xoctree:: | | |_xSplitMeshInterface |_xTemplateRefineMesh xinterface::xtempaterefinemesh:: | | |_SolverInterfaces xLinAlg |_SolverBase |_SolverBase xlinalg:: |_SuperLu |_xInterfaceSuperLu xlinalg:: |_Taucs |_xInterfaceTaucs xlinalg:: |_Lapack |_xInterfaceTaucs xlinalg:: |_Mumps |_xInterfaceMumps xlinalg:: |_BasicIterSolver |_xInterfaceBasicIterSolver xlinalg:: |_Pastix |_xInterfacePastix xlinalg:: | |_NonLinearSolver attic |_PetscParallel attic |_PetscSeq attic |_SparsKit attic |_Itl attic |_Mtl attic |_KSPParallel attic MeshMachine xMeshTools |_DistMesh |_xDistMesh xmeshtool:: |_SplitMesh |_xTemplateRefineMesh xmeshtool:: | |_FastMarching attic |_LinearAlgebra attic |_Stlmesh attic Octree xOctree xoctree:: Physics |_Physics xPhysics |_Materials |_Materials xphysics:: |_src |_src xphysics:: xTLS |_trunck |_xTLS xTLS xtls:: ============================================================================================ Xfem splitting: =============== xCut |_src |__ xDoubleCut | |__(unchanged) | |__ xLegacySimpleCut |__ xPhysSurfByTagging.cc |__ xPhysSurfByTagging.h |__ xPhysSurf.cc |__ xPhysSurf.h |__ xPhysSurfParameter.cc |__ xPhysSurfParameter.h |__ xRefCut.cc |__ xRefCut.h |__ xRefCutToAOMD.cc |__ xRefCutToAOMD.h |__ xRefCutToIsoZeroVector.cc |__ xRefCutToIsoZeroVector.h |__ xRefMesh.cc |__ xRefMesh.h xExport |_src |__ xExport.cc |__ xExportEnsight.cc |__ xExportEnsight.h |__ xExportGmsh.cc |__ xExportGmsh.h |__ xExportGmsh_imp.h |__ xExport.h |__ xExportManager.cc |__ xExportManager.h |__ xExportTranslate.cc |__ xExportTranslate.h |__ xPostPro.cc |__ xPostPro.h |__ xPostProMSH.cc |__ xPostProMSH.h |__ xPostProVTU.cc |__ xPostProVTU.h |__ xSensors.cc |__ xSensors.h xTensor |_src |__ xPoint.h |__ xTensor2.cc |__ xTensor2.h |__ xTensor2Sym.cc |__ xTensor2Sym.h |__ xTensor3.h |__ xTensor4.h |__ xTensorOperations.h |__ xVector.cc |__ xVector.h |__ xVectorScalarProd.h commit d76fddf4 Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Fri May 10 12:33:16 2019 +0200 previous retrieval was a mistake commit d2a57bbf Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Fri May 10 12:09:17 2019 +0200 retrieve forgotten files concerning xSplitMesh commit 458beb2b Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Fri May 3 16:15:37 2019 +0200 - added modules in preparation for "V0": Xfiles |_xMapping + namespace xmapping |_xQuadrature - modified namespaces: geom -> xgeom distmesh -> xdistmesh oct -> xoctree oct_xfem_adapt } oct_utilities }-> xoctreeinterface oct_xfem_interf } - namespace xphysics created for module Xfiles/xPhysics commit 230607c4 Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Thu May 2 17:06:15 2019 +0200 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 commit 474db3f3 Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Tue Apr 30 15:04:25 2019 +0200 rename Xfiles/Util/eXlibris_tools in Xfiles/xTools find_package(EXLIBRISTOOLS) becomes find_package(xTools) namespace is now xtools instead of eXlibris_tools move: Util/FloUtil -> Util/attic/FloUtil Util/Split -> Util/attic/Split Util/doxygen_tools -> Util/attic/doxygen_tools Util/tags_tools -> Util/attic/tags_tools Xtensor/src/xGenericOperations.h -> xTools/src/xGenericOperations.h commit 559ab2c1 Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Tue Apr 30 11:49:07 2019 +0200 Finalises XlegacySimpleCut. Still to do: move eventually class xPhysSurfVLS (inside xVectorLevelSet.*) into Xfiles/Xcut/XlegacySimpleCut. commit 8c4dfc76 Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Thu Apr 25 12:11:22 2019 +0200 purge mistakes commit a741772f Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Thu Apr 25 11:46:10 2019 +0200 use XlegacySimpleCut: backup with partial updates commit 3c9d751e Author: Gilles Marckmann <gilles.marckmann@ec-nantes.fr> Date: Wed Apr 17 17:37:15 2019 +0200 takes into account the renaming of Xcut/xDoubleCut/src into Xcut/XdoubleCut/srcff195880
