Permalink
Browse files

New version

  • Loading branch information...
kirill-terekhov committed Nov 23, 2015
1 parent da03410 commit 682f9db19bf9f87db5e1a82817fa13458749d359
Showing with 20,264 additions and 18,837 deletions.
  1. +2 −4 .gitignore
  2. +42 −97 CMakeLists.txt
  3. +15 −0 CTestConfig.cmake
  4. +15 −0 CTestConfig.local.cmake
  5. +28 −0 Debuggers/VisualStudio/autoexp.dat
  6. +0 −10 Documentation/header.html
  7. +10 −0 Source/Autodiff/CMakeLists.txt
  8. +104 −66 { → Source/Autodiff}/autodiff.cpp
  9. +14 −0 Source/CMakeLists.txt
  10. +11 −0 Source/Data/CMakeLists.txt
  11. +54 −0 Source/Data/storage.cpp
  12. +84 −38 { → Source/Data}/tag.cpp
  13. +22 −0 Source/Headers/CMakeLists.txt
  14. +3 −0 { → Source/Headers}/container.hpp
  15. +2 −1 { → Source/Headers}/inmost.h
  16. +18 −4 { → Source/Headers}/inmost_autodiff.h
  17. +6 −0 { → Source/Headers}/inmost_common.h
  18. +634 −0 Source/Headers/inmost_data.h
  19. +987 −0 Source/Headers/inmost_expression.h
  20. +542 −510 { → Source/Headers}/inmost_mesh.h
  21. +32 −0 Source/Headers/inmost_nonlinear.h
  22. +4 −0 { → Source/Headers}/inmost_options_cmake.h
  23. 0 { → Source/Headers}/inmost_partitioner.h
  24. +358 −0 Source/Headers/inmost_solver.h
  25. +448 −0 Source/Headers/inmost_sparse.h
  26. +698 −0 Source/Headers/inmost_variable.h
  27. +19 −0 Source/IO/CMakeLists.txt
  28. 0 { → Source/IO}/io.hpp
  29. +504 −0 Source/IO/mesh_ecl_file.cpp
  30. +158 −0 Source/IO/mesh_file.cpp
  31. +641 −0 Source/IO/mesh_gmsh_file.cpp
  32. +276 −0 Source/IO/mesh_gmv_file.cpp
  33. +273 −0 Source/IO/mesh_mkf_file.cpp
  34. +1,399 −0 Source/IO/mesh_pmf_file.cpp
  35. +145 −0 Source/IO/mesh_pvtk_file.cpp
  36. +1,683 −0 Source/IO/mesh_vtk_file.cpp
  37. +2,224 −0 Source/IO/mesh_xml_file.cpp
  38. +22 −0 Source/Mesh/CMakeLists.txt
  39. +20 −20 { → Source/Mesh}/cell.cpp
  40. 0 { → Source/Mesh}/comparator.cpp
  41. +30 −16 { → Source/Mesh}/earray.cpp
  42. +15 −14 { → Source/Mesh}/edge.cpp
  43. 0 { → Source/Mesh}/element.cpp
  44. +231 −140 { → Source/Mesh}/eset.cpp
  45. 0 { → Source/Mesh}/face.cpp
  46. +31 −11 { → Source/Mesh}/geometry.cpp
  47. 0 { → Source/Mesh}/iterator.cpp
  48. +190 −11 { → Source/Mesh}/mesh.cpp
  49. 0 { → Source/Mesh}/modify.cpp
  50. +13 −13 { → Source/Mesh}/node.cpp
  51. 0 mesh_parallel.cpp → Source/Mesh/parallel.cpp
  52. +10 −0 Source/Misc/CMakeLists.txt
  53. 0 { → Source/Misc}/timer.cpp
  54. +10 −0 Source/NonlinearSolver/CMakeLists.txt
  55. +1 −0 Source/NonlinearSolver/nonlinear.cpp
  56. +10 −0 Source/Partitioner/CMakeLists.txt
  57. 0 { → Source/Partitioner}/partitioner.cpp
  58. +62 −0 Source/Solver/CMakeLists.txt
  59. +297 −670 { → Source/Solver}/solver.cpp
  60. 0 { → Source/Solver}/solver_ani.cpp
  61. 0 { → Source/Solver}/solver_ani.h
  62. +103 −55 { → Source/Solver}/solver_bcgsl.hpp
  63. +37 −37 { → Source/Solver}/solver_ddpqiluc2.cpp
  64. +15 −15 { → Source/Solver}/solver_ddpqiluc2.hpp
  65. +17 −17 { → Source/Solver}/solver_ilu2.hpp
  66. +1,070 −0 Source/Solver/solver_mtilu2.cpp
  67. +59 −0 Source/Solver/solver_mtilu2.hpp
  68. +3,088 −0 Source/Solver/solver_mtiluc2.cpp
  69. +86 −0 Source/Solver/solver_mtiluc2.hpp
  70. +3 −0 { → Source/Solver}/solver_petsc.cpp
  71. 0 { → Source/Solver}/solver_petsc.h
  72. +4 −4 { → Source/Solver}/solver_prototypes.hpp
  73. +652 −0 Source/Solver/sparse.cpp
  74. +0 −167 algorithm.cpp
  75. +55 −0 examples/ADFVDiscr/CMakeLists.txt
  76. +348 −0 examples/ADFVDiscr/main.cpp
  77. +54 −0 examples/ADMFD/CMakeLists.txt
  78. +646 −0 examples/ADMFD/main.cpp
  79. +453 −0 examples/ADMFD/matrix.hpp
  80. +2 −0 examples/CMakeLists.txt
  81. +17 −19 examples/DrawMatrix/main.cpp
  82. +30 −8 examples/FVDiscr/main.cpp
  83. +20 −3 examples/GridGen/main.cpp
  84. +14 −8 examples/MatSolve/main.cpp
  85. +73 −0 examples/OldDrawGrid/fragment.glsl.txt
  86. +949 −50 examples/OldDrawGrid/main.cpp
  87. +20 −0 examples/OldDrawGrid/vertex.glsl.txt
  88. +3 −3 examples/Solver/main.cpp
  89. +1 −1 inmost-config.cmake.in
  90. +0 −757 inmost_solver.h
  91. +0 −9,449 k3d.cpp
  92. +0 −849 k3d.h
  93. +0 −4,852 mesh_file.cpp
  94. +0 −593 solver_k3biilu2.cpp
  95. +0 −40 solver_k3biilu2.h
  96. +0 −242 storage.cpp
  97. +4 −5 tests/pmesh_test000/main.cpp
  98. +1 −1 tests/pmesh_test001/main.cpp
  99. +3 −3 tests/solver_test000/CMakeLists.txt
  100. +3 −3 tests/solver_test000/main.cpp
  101. +5 −5 tests/solver_test001/main.cpp
  102. +22 −19 tests/solver_test002/CMakeLists.txt
  103. +10 −7 tests/solver_test002/main.cpp
View
@@ -1,5 +1,3 @@
.svn
tests/solver_test001/matrices
solver_mtiluc2.cpp
solver_mtiluc2.hpp
solver_mtilu2.hpp
Tests/solver_test001/matrices
SyncToy*
View
@@ -1,85 +1,15 @@
cmake_minimum_required (VERSION 2.6)
project (INMOST)
set(SOURCE solver.cpp
solver_ani.cpp
solver_petsc.cpp
partitioner.cpp
algorithm.cpp
geometry.cpp
iterator.cpp
storage.cpp
eset.cpp
mesh_file.cpp
timer.cpp
face.cpp
edge.cpp
mesh.cpp
node.cpp
cell.cpp
tag.cpp
element.cpp
mesh_parallel.cpp
modify.cpp
earray.cpp
comparator.cpp
autodiff.cpp
solver_ddpqiluc2.cpp)
set(HEADER inmost.h
inmost_options_cmake.h
inmost_common.h
inmost_mesh.h
inmost_solver.h
inmost_partitioner.h
inmost_autodiff.h
container.hpp
io.hpp
solver_ilu2.hpp
solver_ddpqiluc2.hpp
solver_bcgsl.hpp
solver_prototypes.hpp)
add_subdirectory(Source)
add_definitions(${SOLVER_DEFINITIONS})
include_directories("Source/Headers")
set(INMOST_MAJOR_VERSION 0)
set(INMOST_MINOR_VERSION 1)
set(INMOST_PATCH_VERSION 0)
set(INMOST_VERSION "${INMOST_MAJOR_VERSION}.${INMOST_MINOR_VERSION}.${INMOST_PATCH_VERSION}")
if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/solver_mtiluc2.hpp" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/solver_mtiluc2.cpp" )
add_definitions(-DHAVE_SOLVER_MPTILUC2)
set(HAVE_SOLVER_MPTILUC2 TRUE)
list(APPEND HEADER solver_mtiluc2.hpp)
list(APPEND SOURCE solver_mtiluc2.cpp)
else()
set(HAVE_SOLVER_MPTILUC2 FALSE)
endif()
if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/solver_mtilu2.hpp" )
add_definitions(-DHAVE_SOLVER_MPTILU2)
set(HAVE_SOLVER_MPTILU2 TRUE)
list(APPEND SOURCE solver_mtilu2.hpp)
else()
set(HAVE_SOLVER_MPTILU2 FALSE)
endif()
if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/solver_fcbiilu2.h" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/solver_fcbiilu2.cpp" AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/fcbiilu2.cpp" )
add_definitions(-DHAVE_SOLVER_FCBIILU2)
set(HAVE_SOLVER_FCBIILU2 TRUE)
list(APPEND HEADER solver_fcbiilu2.h)
list(APPEND SOURCE solver_fcbiilu2.cpp fcbiilu2.cpp)
else()
set(HAVE_SOLVER_FCBIILU2 FALSE)
endif()
if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/solver_k3biilu2.h" AND EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/solver_k3biilu2.cpp" AND EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/k3d.h" AND EXISTS
"${CMAKE_CURRENT_SOURCE_DIR}/k3d.cpp" )
add_definitions(-DHAVE_SOLVER_K3BIILU2)
set(HAVE_SOLVER_K3BIILU2 TRUE)
list(APPEND HEADER solver_k3biilu2.h k3d.h)
list(APPEND SOURCE solver_k3biilu2.cpp k3d.cpp)
else()
set(HAVE_SOLVER_K3BIILU2 FALSE)
endif()
add_library(inmost STATIC ${SOURCE} ${HEADER})
@@ -93,9 +23,9 @@ option(USE_MESH "Compile mesh capabilities" ON)
option(USE_SOLVER "Compile solver capabilities" ON)
option(USE_PARTITIONER "Compile partitioner capabilities" ON)
option(USE_AUTODIFF "Compile automatic differentiation capabilities" ON)
option(USE_NONLINEAR "Compile nonlinear solver capabilities" ON)
option(TEST_FORTRAN_ANI3D "Test for fortran availibility to compile ANI3D lib" OFF)
option(COMPILE_EXAMPLES "Compile examples" OFF)
#option(COMPILE_PROJECTS "Compile projects" OFF)
option(COMPILE_TESTS "Compile some tests" OFF)
option(USE_PARTITIONER_PARMETIS "Use ParMetis partitioner" OFF)
@@ -145,8 +75,10 @@ if(USE_OMP)
if (OPENMP_FOUND)
set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}")
message("OpenMP FOUND")
else()
set(USE_OMP OFF)
message("OpenMP NOT FOUND")
endif()
endif()
@@ -285,52 +217,65 @@ if(MSVC)
endif()
endif()
configure_file("inmost_options_cmake.h" "${PROJECT_BINARY_DIR}/inmost_options.h")
configure_file("Source/Headers/inmost_options_cmake.h" "${PROJECT_BINARY_DIR}/inmost_options.h")
include_directories("${PROJECT_BINARY_DIR}")
target_include_directories(inmost PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>)
target_include_directories(inmost PUBLIC $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}>)
target_include_directories(inmost PUBLIC $<INSTALL_INTERFACE:include>)
if(COMPILE_EXAMPLES)
add_subdirectory(examples)
add_subdirectory(Examples)
endif(COMPILE_EXAMPLES)
#if(COMPILE_PROJECTS)
#add_subdirectory(projects)
#endif(COMPILE_PROJECTS)
if(COMPILE_TESTS)
enable_testing()
include(CTest)
add_subdirectory(tests)
add_subdirectory(Tests)
endif(COMPILE_TESTS)
set(INMOST_INSTALL_HEADERS inmost.h
inmost_options_cmake.h
inmost_common.h
inmost_mesh.h
inmost_solver.h
inmost_partitioner.h
inmost_autodiff.h
container.hpp)
set(INMOST_INSTALL_HEADERS Source/Headers/inmost.h
Source/Headers/inmost_autodiff.h
Source/Headers/inmost_common.h
Source/Headers/inmost_data.h
Source/Headers/inmost_expression.h
Source/Headers/inmost_mesh.h
Source/Headers/inmost_nonlinear.h
Source/Headers/inmost_partitioner.h
Source/Headers/inmost_solver.h
Source/Headers/inmost_sparse.h
Source/Headers/inmost_variable.h
Source/Headers/container.hpp)
include(CPack)
export(TARGETS inmost FILE inmost-targets.cmake)
export(PACKAGE inmost)
set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}" "${PROJECT_BINARY_DIR}")
set(CONF_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/Source/Headers" "${PROJECT_BINARY_DIR}")
configure_file(inmost-config.cmake.in "${PROJECT_BINARY_DIR}/inmost-config.cmake" @ONLY)
set(CONF_INCLUDE_DIRS "\${inmost_DIR}/include")
configure_file(inmost-config.cmake.in "${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/inmost-config.cmake" @ONLY)
configure_file(inmost-config-version.cmake.in "${PROJECT_BINARY_DIR}/inmost-config-version.cmake" @ONLY)
set_property(TARGET inmost PROPERTY PUBLIC_HEADER
"${PROJECT_BINARY_DIR}/inmost_options.h"
"${PROJECT_SOURCE_DIR}/inmost.h"
"${PROJECT_SOURCE_DIR}/inmost_common.h"
"${PROJECT_SOURCE_DIR}/inmost_mesh.h"
"${PROJECT_SOURCE_DIR}/inmost_solver.h"
"${PROJECT_SOURCE_DIR}/inmost_partitioner.h"
"${PROJECT_SOURCE_DIR}/inmost_autodiff.h"
"${PROJECT_SOURCE_DIR}/container.hpp")
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_autodiff.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_common.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_data.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_expression.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_mesh.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_nonlinear.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_partitioner.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_solver.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_sparse.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/inmost_variable.h"
"${PROJECT_SOURCE_DIR}/Source/Headers/container.hpp")
install(FILES
"${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/inmost-config.cmake"
View
@@ -0,0 +1,15 @@
## This file should be placed in the root directory of your project.
## Then modify the CMakeLists.txt file in the root directory of your
## project to incorporate the testing dashboard.
##
## # The following are required to submit to the CDash dashboard:
## ENABLE_TESTING()
## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "INMOST")
set(CTEST_NIGHTLY_START_TIME "00:00:00 EST")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "my.cdash.org")
set(CTEST_DROP_LOCATION "/submit.php?project=INMOST")
set(CTEST_DROP_SITE_CDASH TRUE)
View
@@ -0,0 +1,15 @@
## This file should be placed in the root directory of your project.
## Then modify the CMakeLists.txt file in the root directory of your
## project to incorporate the testing dashboard.
##
## # The following are required to submit to the CDash dashboard:
## ENABLE_TESTING()
## INCLUDE(CTest)
set(CTEST_PROJECT_NAME "inmost")
set(CTEST_NIGHTLY_START_TIME "01:00:00 UTC")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "localhost")
set(CTEST_DROP_LOCATION "/cdash/submit.php?project=inmost")
set(CTEST_DROP_SITE_CDASH TRUE)
@@ -85,3 +85,31 @@ INMOST::shell<*>{
)
)
}
;------------------------------------------------------------------------------
; INMOST::array
;------------------------------------------------------------------------------
INMOST::array<*>{
preview (
#(
"[",
$e.m_size,
"](",
#array(
expr: ($e.m_arr)[$i],
size: $e.m_size
),
")"
)
)
children (
#(
#([size] : $e.m_size),
#array(
expr: ($e.m_arr)[$i],
size: $e.m_size
)
)
)
}
View
@@ -3,16 +3,6 @@
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<script>
(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
})(window,document,'script','//www.google-analytics.com/analytics.js','ga');
ga('create', 'UA-59408561-3', 'auto');
ga('send', 'pageview');
</script>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
@@ -0,0 +1,10 @@
set(SOURCE
${SOURCE}
${CMAKE_CURRENT_SOURCE_DIR}/autodiff.cpp
PARENT_SCOPE
)
set(HEADER
${HEADER}
PARENT_SCOPE
)
Oops, something went wrong.

0 comments on commit 682f9db

Please sign in to comment.