Permalink
Browse files

Out of source tests fixed; clion codestyling; less ctest clutter targ…

…ets; indent policy changed from 2 to 4.
  • Loading branch information...
1 parent 10f8509 commit 388a5a1382c691c3efdbb79ca72fb2ab19af086e @mlund committed Nov 25, 2016
Showing with 2,768 additions and 2,223 deletions.
  1. +1 −1 .github/PULL_REQUEST_TEMPLATE.md
  2. +1 −1 .gitignore
  3. +43 −7 .idea/codeStyleSettings.xml
  4. +0 −1 CMakeLists.txt
  5. +2,260 −1,818 include/faunus/energy.h
  6. +454 −392 include/faunus/scatter.h
  7. +1 −1 src/CMakeLists.txt
  8. +2 −1 src/examples/CMakeLists.txt
  9. +6 −1 src/examples/grand.py
@@ -2,5 +2,5 @@ Before sending a pull request, please ensure that:
- all tests pass, i.e. run `make test`
- all compiler warnings have been fixed
-- source files use soft-indendation of two
+- source files use soft-indendation of four
- no temporary files (.o, .pqr, state etc) are included in the commit
View
@@ -48,4 +48,4 @@ ehthumbs.db
Thumbs.db
/.idea/
-!/.idea/codeStyleSettings.xml
+#!/.idea/codeStyleSettings.xml
@@ -3,10 +3,26 @@
<component name="ProjectCodeStyleSettingsManager">
<option name="PER_PROJECT_SETTINGS">
<value>
+ <Objective-C>
+ <option name="INDENT_NAMESPACE_MEMBERS" value="0" />
+ <option name="KEEP_STRUCTURES_IN_ONE_LINE" value="true" />
+ <option name="KEEP_CASE_EXPRESSIONS_IN_ONE_LINE" value="true" />
+ <option name="NAMESPACE_BRACE_PLACEMENT" value="5" />
+ <option name="FUNCTION_BRACE_PLACEMENT" value="5" />
+ <option name="BLOCK_BRACE_PLACEMENT" value="5" />
+ <option name="FUNCTION_NON_TOP_AFTER_RETURN_TYPE_WRAP" value="2" />
+ <option name="FUNCTION_TOP_AFTER_RETURN_TYPE_WRAP" value="2" />
+ <option name="FUNCTION_PARAMETERS_WRAP" value="5" />
+ <option name="FUNCTION_CALL_ARGUMENTS_WRAP" value="5" />
+ <option name="TEMPLATE_DECLARATION_STRUCT_WRAP" value="1" />
+ <option name="TEMPLATE_DECLARATION_FUNCTION_WRAP" value="1" />
+ <option name="TEMPLATE_CALL_ARGUMENTS_WRAP" value="5" />
+ <option name="TEMPLATE_CALL_ARGUMENTS_ALIGN_MULTILINE" value="true" />
+ <option name="CLASS_CONSTRUCTOR_INIT_LIST_WRAP" value="5" />
+ <option name="ALIGN_INIT_LIST_IN_COLUMNS" value="false" />
+ <option name="SPACE_WITHIN_FUNCTION_DECLARATION_PARENTHESES" value="true" />
+ </Objective-C>
<Objective-C-extensions>
- <option name="GENERATE_INSTANCE_VARIABLES_FOR_PROPERTIES" value="ASK" />
- <option name="RELEASE_STYLE" value="IVAR" />
- <option name="TYPE_QUALIFIERS_PLACEMENT" value="BEFORE" />
<file>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
@@ -31,11 +47,31 @@
<pair source="c" header="h" />
</extensions>
</Objective-C-extensions>
- <XML>
- <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
- </XML>
+ <codeStyleSettings language="ObjectiveC">
+ <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" />
+ <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
+ <option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
+ <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" />
+ <option name="BLANK_LINES_BEFORE_IMPORTS" value="0" />
+ <option name="BLANK_LINES_AFTER_IMPORTS" value="0" />
+ <option name="BLANK_LINES_AROUND_CLASS" value="0" />
+ <option name="BLANK_LINES_AROUND_METHOD" value="0" />
+ <option name="BLANK_LINES_AROUND_METHOD_IN_INTERFACE" value="0" />
+ <option name="BRACE_STYLE" value="5" />
+ <option name="CLASS_BRACE_STYLE" value="5" />
+ <option name="ELSE_ON_NEW_LINE" value="true" />
+ <option name="WHILE_ON_NEW_LINE" value="true" />
+ <option name="CATCH_ON_NEW_LINE" value="true" />
+ <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="false" />
+ <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
+ <option name="FOR_STATEMENT_WRAP" value="1" />
+ <option name="ASSIGNMENT_WRAP" value="1" />
+ <indentOptions>
+ <option name="CONTINUATION_INDENT_SIZE" value="4" />
+ </indentOptions>
+ </codeStyleSettings>
</value>
</option>
- <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default (1)" />
+ <option name="USE_PER_PROJECT_SETTINGS" value="true" />
</component>
</project>
View
@@ -9,7 +9,6 @@ endif()
# Locate external packages
# ----------------------------
set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/scripts)
-include(CTest)
include(CheckIncludeFileCXX)
include(CheckCXXSourceCompiles)
enable_testing()
Oops, something went wrong.

0 comments on commit 388a5a1

Please sign in to comment.