From a4aa9c82558de05018e620e6ca2c9aa13465f454 Mon Sep 17 00:00:00 2001
From: Pietro Incardona <incardon@mpi-cbg.de>
Date: Wed, 26 Jul 2017 15:15:53 +0200
Subject: [PATCH] Better installation for python-devel
---
CHANGELOG.md | 3 ++-
example/Vector/7_SPH_dlb_opt/main.cpp | 4 +++-
openfpm_pdata.doc | 2 +-
script/pre_req | 5 +++++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 443ecd0d5..b6899bc31 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
# Change Log
All notable changes to this project will be documented in this file.
-## [0.9.0]
+## [development]
### Added
- Introduced getDomainIterator for Cell-list
@@ -17,6 +17,7 @@ All notable changes to this project will be documented in this file.
- getDomainIterator stencil for faster stencil codes iterators see (Grid/gray_scott_3d example)
- Algebraic multigrid solvers interface for linear systems (see Vortex in Cell example)
- Added setPropNames in vector_dist see Vector/0_simple
+- Support for Windows with CYGWIN
### Fixed
- Installation of PETSC in case with MUMPS try without MUMPS
diff --git a/example/Vector/7_SPH_dlb_opt/main.cpp b/example/Vector/7_SPH_dlb_opt/main.cpp
index fa17c7692..3befdbd2d 100644
--- a/example/Vector/7_SPH_dlb_opt/main.cpp
+++ b/example/Vector/7_SPH_dlb_opt/main.cpp
@@ -318,6 +318,8 @@ typedef vector_dist<3,double,aggregate<int, int,double, double, double,
// | at n-1 density at n - 1
// |
// Number of neighborhood
+
+//! Model for Dynamic load balancing
struct ModelCustom
{
template<typename Decomposition, typename vector> inline void addComputation(Decomposition & dec, vector & vd, size_t v, size_t p)
@@ -339,7 +341,7 @@ struct ModelCustom
}
};
-
+//! Second model for dynamic load balancing
struct ModelCustom2
{
template<typename Decomposition, typename vector> inline void addComputation(Decomposition & dec, vector & vd, size_t v, size_t p)
diff --git a/openfpm_pdata.doc b/openfpm_pdata.doc
index ff12e116a..afd54c557 100644
--- a/openfpm_pdata.doc
+++ b/openfpm_pdata.doc
@@ -38,7 +38,7 @@ PROJECT_NAME = "OpenFPM_pdata"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = 0.9.0
+PROJECT_NUMBER = 1.0.0
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/script/pre_req b/script/pre_req
index 48681629e..a1a6e66bb 100755
--- a/script/pre_req
+++ b/script/pre_req
@@ -61,6 +61,11 @@ if [ x"$platform" = x"linux" -a x"$pcman" = x"yum" ]; then
ret1=$?
rpm -V python-devel
ret2=$?
+ if [ $ret2 -ne 0 ]; then
+ echo "Cheking python2-devel"
+ rpm -V python2-devel
+ ret2=$?
+ fi
rpm -V libxml2-devel
ret3=$?
rpm -V libxslt-devel
--
GitLab