Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/scalfmm/scalfmm

CMakeLists.txt

@@ -929,10 +929,8 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/CMakeModules/morse/
   set(PACK_PACKAGE_VERSION "${SCALFMM_MAJOR_VERSION}.${SCALFMM_MINOR_VERSION}-${CPACK_PACKAGE_VERSION_PATCH}")
   set(CPACK_SOURCE_GENERATOR "TGZ")
   set(CPACK_SOURCE_PACKAGE_FILE_NAME  "SCALFMM-${SCALFMM_MAJOR_VERSION}.${SCALFMM_MINOR_VERSION}-${CPACK_PACKAGE_VERSION_PATCH}")
-  set(CPACK_SOURCE_IGNORE_FILES "\\\\.git;.DS_Store;.*~;/*.aux;/*.idx;/*.log;/*.out;/*.toc;/*.ilg;scalfmm.pro*;org.eclipse.core.resources.prefs;.cproject;.project;/.settings/,/FmmApi/")
-  list(APPEND CPACK_SOURCE_IGNORE_FILES  "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/Utils/;Notes;Deprecated;/Build*;/noDist/;/Bench/;/Obsolete/;ToRemove;Olivier;Addons/HMat")
-  # Uniform;GroupTree;Adaptive;testUnif*;/*Lagrange*")
-  #list(APPEND CPACK_SOURCE_IGNORE_FILES  "Stages;Uniform;O;testUnif*;*Lagrange*" )
+  set(CPACK_SOURCE_IGNORE_FILES "\\\\.git;.DS_Store;.*~;/*.aux;/*.idx;/*.log;/*.out;/*.toc;/*.ilg;CMakeLists.txt.user;/.settings/")
+  list(APPEND CPACK_SOURCE_IGNORE_FILES  "${CMAKE_CURRENT_BINARY_DIR};${CMAKE_CURRENT_SOURCE_DIR}/Utils/;/Build*;/Obsolete/")
   #
   include(CPack)
   #

Obsolete/makespublic.sh

+#!/bin/bash
+
+# @SCALFMM_PRIVATE
+
+if [ "$#" -ne 1 ]; then
+    echo "Use current directory as source"
+    here="."
+else
+    echo "Use first parameter as source"
+    here=$1
+fi    
+
+echo "Makes the files included in $here and below public"
+
+for ext in "cpp" "hpp" "h" "c" ; do
+    allfiles=`find $here -name \*.$ext -print`
+    for thefile in $allfiles ; do
+        echo "Update : $thefile"
+        grep -v "@SCALFMM_PRIVATE" $thefile > $thefile.$$.tmp
+        mv $thefile.$$.tmp $thefile
+    done
+done    

Obsolete/paraviewscript.py

+from paraview import *
+
+
+reader = GetActiveSource()
+# SVReader(DetectNumericColumns = True, FieldDelimiterCharacters = ",", HaveHeaders = True, FileName = "/home/qkhan/work/scalfmm/Build/20k10z.4.csv")
+
+#classRef = CSVReader()
+
+#if not isinstance(reader, classRef.__class__):
+#    exit(-1)
+
+filename = reader.FileName[0]
+print filename
+nbZones = int(filename.split('.')[0].split('_')[-1][0:-1])
+
+selection = SelectionQuerySource(FieldType = "ROW", QueryString = "zone >= 0")
+extractor = ExtractSelection(Input = reader, Selection = selection)
+points = TableToPoints(Input = extractor, XColumn = "x", YColumn = "y", ZColumn = "z")
+
+repr = GetRepresentation()
+repr.ColorArrayName = 'zone'
+repr.LookupTable = AssignLookupTable(points.PointData['zone'], "Cool to Warm")
+Show()
+
+#for i in range(nbZones):
+