Merge pull request #151 from laristra/recent-updates

(+-*) a few recent updates

.clang-format

@@ -0,0 +1,122 @@
+---
+#Language:        Cpp
+# BasedOnStyle:  LLVM
+AccessModifierOffset: -2
+AlignAfterOpenBracket: DontAlign
+#AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Right
+AlignOperands:   true
+AlignTrailingComments: false
+#AllowAllArgumentsOnNextLine: false
+#AllowAllConstructorInitializersOnNextLine: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+#AllowShortLambdasOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: TopLevelDefinitions
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: true
+BinPackArguments: true
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      true
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   false
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  AfterStruct:     false
+  AfterUnion:      true
+  AfterExternBlock: false
+  BeforeCatch:     true
+  BeforeElse:      true
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: true
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+ConstructorInitializerIndentWidth: 2
+ContinuationIndentWidth: 2
+Cpp11BracedListStyle: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Preserve
+IncludeCategories:
+  - Regex:           '^"(llvm|llvm-c|clang|clang-c)/'
+    Priority:        2
+  - Regex:           '^(<|"(gtest|gmock|isl|json)/)'
+    Priority:        3
+  - Regex:           '.*'
+    Priority:        1
+IncludeIsMainRegex: '(Test)?$'
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: true
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerAlignment: Middle
+ReflowComments:  true
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+#SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: false
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: Never
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+Standard:        Cpp11
+TabWidth:        2
+UseTab:          Never
+...

.gitignore

@@ -1,4 +1,4 @@
-tools/bns_generator/*.h5part
+tools/*/*.h5part
 build*
 bld
 *.o
@@ -11,3 +11,4 @@ bld
 .DS_Store
 *.h5
 __pycache__
+.vscode*

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "cinch"]
-  path = cinch
-  url = ../cinch.git

CMakeLists.txt

@@ -1,41 +1,59 @@
 #------------------------------------------------------------------------------#
-# Copyright (c) 2014 Triad National Security, LLC
+# Copyright (c) 2020 Triad National Security, LLC
 # All rights reserved.
 #------------------------------------------------------------------------------#
 
-################################################################################
-# Please Do Not Edit This File Unless You Know What You Are Doing!!!
-#
-# Project-specific configuration rules should be added in the 'config'
-# subdirectory of the top-level of this project in the appropriate file,
-# e.g., package configuration options should go in 'config/packages.cmake'.
-#
-# For more documentation on the design philosophy of this build system
-# and the recognized configuration files that can be added to the 'config'
-# subdirectory, please look in 'cinch/README.md' and 'cinch/INSTALL.md'
-# from the top-level of this project.
-#
-# Any changes to the basic build template should be discussed with the
-# project maintainers.
-################################################################################
-
 #------------------------------------------------------------------------------#
-# Require some version of cmake
+# The project name
 #------------------------------------------------------------------------------#
+project(flecsph)
+cmake_minimum_required(VERSION 3.15)
+
+#------------------------------------------------
+# kick the tires
+#------------------------------------------------
+
+enable_language(CXX)
+include(CMakeDetermineCXXCompiler)
+include(CheckCXXCompilerFlag)
+
+#------------------------------------------------
+# global interface targets
+#------------------------------------------------
+
+# interface libraries
+# see: cmake/SetupDeps.cmake, cmake/SetupFlags.cmake
+#add_library(flecsph::include_sources INTERFACE IMPORTED)
+#add_library(flecsph::compile_flags INTERFACE IMPORTED)
+#add_library(flecsph::library_flags INTERFACE IMPORTED)
+add_library(flecsph::flags INTERFACE IMPORTED)
 
-cmake_minimum_required(VERSION 2.8)
+#------------------------------------------------
+# construct configuration state
+#------------------------------------------------
 
+LIST(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)
+
+# make sure order is correct when adding modules
+include(ProcessOptions)
+include(SetupDeps)
+include(SetupFlags)
+include(SetupTesting)
+
+#add_subdirectory("include")
 #------------------------------------------------------------------------------#
-# Include project-level CMake configuration file
+# Add mpisph tests
 #------------------------------------------------------------------------------#
+add_subdirectory("include")
+add_subdirectory("mpisph/")
+add_subdirectory("include/physics/test")
+add_subdirectory("include/tree_topology/test")
 
-if(NOT "$ENV{CINCH_SOURCE_DIR}" STREQUAL "")
-    set(CINCH_SOURCE_DIR $ENV{CINCH_SOURCE_DIR})
-elseif(EXISTS ${CMAKE_SOURCE_DIR}/cinch)
-    set(CINCH_SOURCE_DIR ${CMAKE_SOURCE_DIR}/cinch)
-endif()
-
-include(${CINCH_SOURCE_DIR}/cmake/ProjectLists.txt)
+#------------------------------------------------------------------------------#
+# Add application targets
+#------------------------------------------------------------------------------#
+add_subdirectory("app/id_generators")
+add_subdirectory("app/drivers")
 
 #------------------------------------------------------------------------------#
 # Formatting options for emacs and vim.