diff --git a/HySoP/DoxyConf/parmes.doxyfile.in.bak b/HySoP/DoxyConf/parmes.doxyfile.in.bak
deleted file mode 100644
index 64f0f003cfd2bea031613822432481764670ad86..0000000000000000000000000000000000000000
--- a/HySoP/DoxyConf/parmes.doxyfile.in.bak
+++ /dev/null
@@ -1,1809 +0,0 @@
-# Doxyfile 1.8.2
-
-# This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
-#
-# All text after a hash (#) is considered a comment and will be ignored
-# The format is:
-# TAG = value [value, ...]
-# For lists items can also be appended using:
-# TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
-
-#---------------------------------------------------------------------------
-# Project related configuration options
-#---------------------------------------------------------------------------
-
-# This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
-
-DOXYFILE_ENCODING = UTF-8
-
-# The PROJECT_NAME tag is a single word (or sequence of words) that should
-# identify the project. Note that if you do not use Doxywizard you need
-# to put quotes around the project name if it contains spaces.
-
-PROJECT_NAME = @PROJECT_NAME@
-
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER = @PACKAGE_VERSION@
-
-# 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 quick idea about the purpose of the project. Keep the description short.
-
-PROJECT_BRIEF = "Particle Methods simulation on hybrid architectures"
-
-# With the PROJECT_LOGO tag one can specify an logo or icon that is
-# included in the documentation. The maximum height of the logo should not
-# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-# Doxygen will copy the logo to the output directory.
-
-PROJECT_LOGO =
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
-
-OUTPUT_DIRECTORY = @CMAKE_BINARY_DIR@/DoxygenGeneratedDoc
-
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
-
-CREATE_SUBDIRS = YES
-
-# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-# documentation generated by doxygen is written. Doxygen will use this
-# information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-
-OUTPUT_LANGUAGE = English
-
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
-
-BRIEF_MEMBER_DESC = YES
-
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-# brief descriptions will be completely suppressed.
-
-REPEAT_BRIEF = YES
-
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
-
-ABBREVIATE_BRIEF =
-
-# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
-# description.
-
-ALWAYS_DETAILED_SEC = NO
-
-# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-# inherited members of a class in the documentation of that class as if those
-# members were ordinary class members. Constructors, destructors and assignment
-# operators of the base classes will not be shown.
-
-INLINE_INHERITED_MEMB = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
-
-FULL_PATH_NAMES = NO
-
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip. Note that you specify absolute paths here, but also
-# relative paths, which will be relative from the directory where doxygen is
-# started.
-
-STRIP_FROM_PATH =
-
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
-
-STRIP_FROM_INC_PATH =
-
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful if your file system
-# doesn't support long names like on DOS, Mac, or CD-ROM.
-
-SHORT_NAMES = NO
-
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
-
-JAVADOC_AUTOBRIEF = YES
-
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
-
-QT_AUTOBRIEF = NO
-
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
-
-MULTILINE_CPP_IS_BRIEF = NO
-
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
-
-INHERIT_DOCS = YES
-
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
-
-SEPARATE_MEMBER_PAGES = NO
-
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
-
-TAB_SIZE = 8
-
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
-
-ALIASES =
-
-# This tag can be used to specify a number of word-keyword mappings (TCL only).
-# A mapping has the form "name=value". For example adding
-# "class=itcl::class" will allow you to use the command class in the
-# itcl::class meaning.
-
-TCL_SUBST =
-
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
-
-OPTIMIZE_OUTPUT_FOR_C = NO
-
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
-
-OPTIMIZE_OUTPUT_JAVA = YES
-
-# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
-
-OPTIMIZE_FOR_FORTRAN = NO
-
-# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
-
-OPTIMIZE_OUTPUT_VHDL = NO
-
-# Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given
-# extension. Doxygen has a built-in mapping, but you can override or extend it
-# using this tag. The format is ext=language, where ext is a file extension,
-# and language is one of the parsers supported by doxygen: IDL, Java,
-# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
-# C++. For instance to make doxygen treat .inc files as Fortran files (default
-# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
-# that for custom extensions you also need to set FILE_PATTERNS otherwise the
-# files are not read by doxygen.
-
-EXTENSION_MAPPING =
-
-# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-# comments according to the Markdown format, which allows for more readable
-# documentation. See http://daringfireball.net/projects/markdown/ for details.
-# The output of markdown processing is further processed by doxygen, so you
-# can mix doxygen, HTML, and XML commands with Markdown formatting.
-# Disable only in case of backward compatibilities issues.
-
-MARKDOWN_SUPPORT = NO
-
-# When enabled doxygen tries to link words that correspond to documented classes,
-# or namespaces to their corresponding documentation. Such a link can be
-# prevented in individual cases by by putting a % sign in front of the word or
-# globally by setting AUTOLINK_SUPPORT to NO.
-
-AUTOLINK_SUPPORT = YES
-
-# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also makes the inheritance and collaboration
-# diagrams that involve STL classes more complete and accurate.
-
-BUILTIN_STL_SUPPORT = NO
-
-# If you use Microsoft's C++/CLI language, you should set this option to YES to
-# enable parsing support.
-
-CPP_CLI_SUPPORT = NO
-
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
-
-SIP_SUPPORT = NO
-
-# For Microsoft's IDL there are propget and propput attributes to indicate
-# getter and setter methods for a property. Setting this option to YES (the
-# default) will make doxygen replace the get and set methods by a property in
-# the documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
-
-IDL_PROPERTY_SUPPORT = YES
-
-# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-# tag is set to YES, then doxygen will reuse the documentation of the first
-# member in the group (if any) for the other members of the group. By default
-# all members of a group must be documented explicitly.
-
-DISTRIBUTE_GROUP_DOC = NO
-
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
-
-SUBGROUPING = YES
-
-# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-# unions are shown inside the group in which they are included (e.g. using
-# @ingroup) instead of on a separate page (for HTML and Man pages) or
-# section (for LaTeX and RTF).
-
-INLINE_GROUPED_CLASSES = NO
-
-# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-# unions with only public data fields will be shown inline in the documentation
-# of the scope in which they are defined (i.e. file, namespace, or group
-# documentation), provided this scope is documented. If set to NO (the default),
-# structs, classes, and unions are shown on a separate page (for HTML and Man
-# pages) or section (for LaTeX and RTF).
-
-INLINE_SIMPLE_STRUCTS = NO
-
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
-# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-# with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
-# types are typedef'ed and only the typedef is referenced, never the tag name.
-
-TYPEDEF_HIDES_STRUCT = NO
-
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penalty.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will roughly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-SYMBOL_CACHE_SIZE = 0
-
-# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-# their name and scope. Since this can be an expensive process and often the
-# same symbol appear multiple times in the code, doxygen keeps a cache of
-# pre-resolved symbols. If the cache is too small doxygen will become slower.
-# If the cache is too large, memory is wasted. The cache size is given by this
-# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols.
-
-LOOKUP_CACHE_SIZE = 0
-
-#---------------------------------------------------------------------------
-# Build related configuration options
-#---------------------------------------------------------------------------
-
-# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-
-EXTRACT_ALL = NO
-
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
-
-EXTRACT_PRIVATE = NO
-
-# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-# scope will be included in the documentation.
-
-EXTRACT_PACKAGE = YES
-
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
-
-EXTRACT_STATIC = YES
-
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
-
-EXTRACT_LOCAL_CLASSES = YES
-
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
-
-EXTRACT_LOCAL_METHODS = YES
-
-# If this flag is set to YES, the members of anonymous namespaces will be
-# extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespaces are hidden.
-
-EXTRACT_ANON_NSPACES = NO
-
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_MEMBERS = YES
-
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
-
-HIDE_UNDOC_CLASSES = YES
-
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
-
-HIDE_FRIEND_COMPOUNDS = NO
-
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
-
-HIDE_IN_BODY_DOCS = NO
-
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
-
-INTERNAL_DOCS = NO
-
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
-# allowed. This is useful if you have classes or files whose names only differ
-# in case and if your file system supports case sensitive file names. Windows
-# and Mac users are advised to set this option to NO.
-
-CASE_SENSE_NAMES = NO
-
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
-
-HIDE_SCOPE_NAMES = NO
-
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
-
-SHOW_INCLUDE_FILES = YES
-
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
-
-FORCE_LOCAL_INCLUDES = NO
-
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
-
-INLINE_INFO = YES
-
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
-
-SORT_MEMBER_DOCS = NO
-
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
-
-SORT_BRIEF_DOCS = NO
-
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-
-SORT_MEMBERS_CTORS_1ST = YES
-
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
-
-SORT_GROUP_NAMES = NO
-
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
-# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
-
-SORT_BY_SCOPE_NAME = YES
-
-# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-# do proper type resolution of all parameters of a function it will reject a
-# match between the prototype and the implementation of a member function even
-# if there is only one candidate or it is obvious which candidate to choose
-# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-# will still accept a match between prototype and implementation in such cases.
-
-STRICT_PROTO_MATCHING = NO
-
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
-
-GENERATE_TODOLIST = YES
-
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
-
-GENERATE_TESTLIST = YES
-
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
-
-GENERATE_BUGLIST = YES
-
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
-
-GENERATE_DEPRECATEDLIST= YES
-
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
-
-ENABLED_SECTIONS =
-
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or macro consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and macros in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
-
-MAX_INITIALIZER_LINES = 29
-
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
-
-SHOW_USED_FILES = YES
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
-
-SHOW_FILES = YES
-
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page. This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
-
-SHOW_NAMESPACES = NO
-
-# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-# doxygen should invoke to get the current version for each file (typically from
-# the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
-
-FILE_VERSION_FILTER =
-
-# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-# by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. To create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
-
-LAYOUT_FILE =
-
-# The CITE_BIB_FILES tag can be used to specify one or more bib files
-# containing the references data. This must be a list of .bib files. The
-# .bib extension is automatically appended if omitted. Using this command
-# requires the bibtex tool to be installed. See also
-# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-# feature you need bibtex and perl available in the search path.
-
-CITE_BIB_FILES =
-
-#---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
-#---------------------------------------------------------------------------
-
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
-
-QUIET = NO
-
-# The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
-
-WARNINGS = YES
-
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
-
-WARN_IF_UNDOCUMENTED = YES
-
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
-
-WARN_IF_DOC_ERROR = YES
-
-# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
-
-WARN_NO_PARAMDOC = YES
-
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
-
-WARN_FORMAT = "$file:$line: $text"
-
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
-
-WARN_LOGFILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the input files
-#---------------------------------------------------------------------------
-
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT = @CMAKE_SOURCE_DIR@/parmepy \
- @CMAKE_SOURCE_DIR@/DoxyConf/mainpage.doxygen \
- @CMAKE_SOURCE_DIR@/src/fftw
-
-# This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
-
-INPUT_ENCODING = UTF-8
-
-# If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-# *.f90 *.f *.for *.vhd *.vhdl
-
-FILE_PATTERNS = *.doxygen \
- *.py \
- *.cl \
- *.f90
-
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
-
-RECURSIVE = YES
-
-# The EXCLUDE tag can be used to specify files and/or directories that should be
-# excluded from the INPUT source files. This way you can easily exclude a
-# subdirectory from a directory tree whose root is specified with the INPUT tag.
-# Note that relative paths are relative to the directory from which doxygen is
-# run.
-
-EXCLUDE =
-
-# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-# directories that are symbolic links (a Unix file system feature) are excluded
-# from the input.
-
-EXCLUDE_SYMLINKS = NO
-
-# If the value of the INPUT tag contains directories, you can use the
-# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
-
-EXCLUDE_PATTERNS = */.svn/* \
- */tests/*
-
-# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-# (namespaces, classes, functions, etc.) that should be excluded from the
-# output. The symbol name can be a fully qualified name, a word, or if the
-# wildcard * is used, a substring. Examples: ANamespace, AClass,
-# AClass::ANamespace, ANamespace::*Test
-
-EXCLUDE_SYMBOLS =
-
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
-
-EXAMPLE_PATH =
-
-# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
-
-EXAMPLE_PATTERNS = *
-
-# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
-
-EXAMPLE_RECURSIVE = NO
-
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
-
-IMAGE_PATH =
-
-# The INPUT_FILTER tag can be used to specify a program that doxygen should
-# invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output. If FILTER_PATTERNS is specified, this tag will be
-# ignored.
-
-INPUT_FILTER =
-
-# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis. Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match. The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty or if
-# non of the patterns match the file name, INPUT_FILTER is applied.
-
-FILTER_PATTERNS = *.py=/usr/local/bin/doxypy.py
-
-# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-
-FILTER_SOURCE_FILES = YES
-
-# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-# and it is also possible to disable source filtering for a specific pattern
-# using *.ext= (so without naming a filter). This option only has effect when
-# FILTER_SOURCE_FILES is enabled.
-
-FILTER_SOURCE_PATTERNS =
-
-#---------------------------------------------------------------------------
-# configuration options related to source browsing
-#---------------------------------------------------------------------------
-
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
-
-SOURCE_BROWSER = NO
-
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
-
-INLINE_SOURCES = NO
-
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C, C++ and Fortran comments will always remain visible.
-
-STRIP_CODE_COMMENTS = YES
-
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
-
-REFERENCED_BY_RELATION = NO
-
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
-
-REFERENCES_RELATION = NO
-
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code. Otherwise they will link to the documentation.
-
-REFERENCES_LINK_SOURCE = YES
-
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
-
-USE_HTAGS = NO
-
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
-
-VERBATIM_HEADERS = YES
-
-#---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
-#---------------------------------------------------------------------------
-
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
-
-ALPHABETICAL_INDEX = YES
-
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
-
-COLS_IN_ALPHA_INDEX = 5
-
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
-
-IGNORE_PREFIX =
-
-#---------------------------------------------------------------------------
-# configuration options related to the HTML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
-
-GENERATE_HTML = YES
-
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
-
-HTML_OUTPUT = html
-
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
-
-HTML_FILE_EXTENSION = .html
-
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard header. Note that when using a custom header you are responsible
-# for the proper inclusion of any scripts and style sheets that doxygen
-# needs, which is dependent on the configuration options used.
-# It is advised to generate a default header using "doxygen -w html
-# header.html footer.html stylesheet.css YourConfigFile" and then modify
-# that header. Note that the header is subject to change so you typically
-# have to redo this when upgrading to a newer version of doxygen or when
-# changing the value of configuration settings such as GENERATE_TREEVIEW!
-
-HTML_HEADER =
-
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
-
-HTML_FOOTER =
-
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If left blank doxygen will
-# generate a default style sheet. Note that it is recommended to use
-# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
-# tag will in the future become obsolete.
-
-HTML_STYLESHEET =
-
-# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
-# user-defined cascading style sheet that is included after the standard
-# style sheets created by doxygen. Using this option one can overrule
-# certain style aspects. This is preferred over using HTML_STYLESHEET
-# since it does not replace the standard style sheet and is therefor more
-# robust against future updates. Doxygen will copy the style sheet file to
-# the output directory.
-
-HTML_EXTRA_STYLESHEET =
-
-# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-# other source files which should be copied to the HTML output directory. Note
-# that these files will be copied to the base HTML output directory. Use the
-# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-# the files will be copied as-is; there are no commands or markers available.
-
-HTML_EXTRA_FILES =
-
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the style sheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
-
-HTML_COLORSTYLE_HUE = 115
-
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
-
-HTML_COLORSTYLE_SAT = 115
-
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
-
-HTML_COLORSTYLE_GAMMA = 124
-
-# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
-
-HTML_TIMESTAMP = YES
-
-# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-# documentation will contain sections that can be hidden and shown after the
-# page has loaded.
-
-HTML_DYNAMIC_SECTIONS = NO
-
-# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-# entries shown in the various tree structured indices initially; the user
-# can expand and collapse entries dynamically later on. Doxygen will expand
-# the tree to such a level that at most the specified number of entries are
-# visible (unless a fully collapsed tree already exceeds this amount).
-# So setting the number of entries 1 will produce a full collapsed tree by
-# default. 0 is a special value representing an infinite number of entries
-# and will result in a full expanded tree by default.
-
-HTML_INDEX_NUM_ENTRIES = 100
-
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-# for more information.
-
-GENERATE_DOCSET = NO
-
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
-
-DOCSET_FEEDNAME = "Doxygen generated docs"
-
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
-
-DOCSET_BUNDLE_ID = org.doxygen.Project
-
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
-# identify the documentation publisher. This should be a reverse domain-name
-# style string, e.g. com.mycompany.MyDocSet.documentation.
-
-DOCSET_PUBLISHER_ID = org.doxygen.Publisher
-
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-
-DOCSET_PUBLISHER_NAME = Publisher
-
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
-
-GENERATE_HTMLHELP = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
-# written to the html output directory.
-
-CHM_FILE =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
-
-HHC_LOCATION =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
-
-GENERATE_CHI = NO
-
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
-
-CHM_INDEX_ENCODING =
-
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
-
-BINARY_TOC = NO
-
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
-
-TOC_EXPAND = NO
-
-# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
-
-GENERATE_QHP = NO
-
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
-
-QCH_FILE =
-
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
-
-QHP_NAMESPACE = org.doxygen.Project
-
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-
-QHP_VIRTUAL_FOLDER = doc
-
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
-
-QHP_CUST_FILTER_NAME =
-
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
-
-QHP_CUST_FILTER_ATTRS =
-
-# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
-
-QHP_SECT_FILTER_ATTRS =
-
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
-
-QHG_LOCATION =
-
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-# will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
-
-GENERATE_ECLIPSEHELP = NO
-
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
-
-ECLIPSE_DOC_ID = org.doxygen.Project
-
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-# at top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it. Since the tabs have the same information as the
-# navigation tree you can set this option to NO if you already set
-# GENERATE_TREEVIEW to YES.
-
-DISABLE_INDEX = NO
-
-# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
-# Since the tree basically has the same information as the tab index you
-# could consider to set DISABLE_INDEX to NO when enabling this option.
-
-GENERATE_TREEVIEW = NO
-
-# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-# documentation. Note that a value of 0 will completely suppress the enum
-# values from appearing in the overview section.
-
-ENUM_VALUES_PER_LINE = 4
-
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
-
-TREEVIEW_WIDTH = 250
-
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
-
-EXT_LINKS_IN_WINDOW = NO
-
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
-
-FORMULA_FONTSIZE = 10
-
-# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
-
-FORMULA_TRANSPARENT = YES
-
-# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-# (see http://www.mathjax.org) which uses client side Javascript for the
-# rendering instead of using prerendered bitmaps. Use this if you do not
-# have LaTeX installed or if you want to formulas look prettier in the HTML
-# output. When enabled you may also need to install MathJax separately and
-# configure the path to it using the MATHJAX_RELPATH option.
-
-USE_MATHJAX = YES
-
-# When MathJax is enabled you need to specify the location relative to the
-# HTML output directory using the MATHJAX_RELPATH option. The destination
-# directory should contain the MathJax.js script. For instance, if the mathjax
-# directory is located at the same level as the HTML output directory, then
-# MATHJAX_RELPATH should be ../mathjax. The default value points to
-# the MathJax Content Delivery Network so you can quickly see the result without
-# installing MathJax. However, it is strongly recommended to install a local
-# copy of MathJax from http://www.mathjax.org before deployment.
-
-MATHJAX_RELPATH = http://www.mathjax.org/mathjax
-
-# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-# names that should be enabled during MathJax rendering.
-
-MATHJAX_EXTENSIONS =
-
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-
-SEARCHENGINE = YES
-
-# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvantages are that it is more difficult to setup
-# and does not have live searching capabilities.
-
-SERVER_BASED_SEARCH = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
-
-GENERATE_LATEX = NO
-
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
-
-LATEX_OUTPUT = latex
-
-# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
-
-LATEX_CMD_NAME = latex
-
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
-
-MAKEINDEX_CMD_NAME = makeindex
-
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_LATEX = YES
-
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, letter, legal and
-# executive. If left blank a4wide will be used.
-
-PAPER_TYPE = a4
-
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
-
-EXTRA_PACKAGES =
-
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
-
-LATEX_HEADER =
-
-# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-# the generated latex document. The footer should contain everything after
-# the last chapter. If it is left blank doxygen will generate a
-# standard footer. Notice: only use this tag if you know what you are doing!
-
-LATEX_FOOTER =
-
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
-
-PDF_HYPERLINKS = YES
-
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
-# higher quality PDF documentation.
-
-USE_PDFLATEX = YES
-
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
-
-LATEX_BATCHMODE = NO
-
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
-
-LATEX_HIDE_INDICES = NO
-
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
-
-LATEX_SOURCE_CODE = NO
-
-# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-# http://en.wikipedia.org/wiki/BibTeX for more info.
-
-LATEX_BIB_STYLE = plain
-
-#---------------------------------------------------------------------------
-# configuration options related to the RTF output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
-
-GENERATE_RTF = NO
-
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
-
-RTF_OUTPUT = rtf
-
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
-
-COMPACT_RTF = NO
-
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
-
-RTF_HYPERLINKS = NO
-
-# Load style sheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
-
-RTF_STYLESHEET_FILE =
-
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
-
-RTF_EXTENSIONS_FILE =
-
-#---------------------------------------------------------------------------
-# configuration options related to the man page output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
-
-GENERATE_MAN = NO
-
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
-
-MAN_OUTPUT = man
-
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
-
-MAN_EXTENSION = .3
-
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
-
-MAN_LINKS = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the XML output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
-
-GENERATE_XML = NO
-
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
-
-XML_OUTPUT = xml
-
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_SCHEMA =
-
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
-
-XML_DTD =
-
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
-
-XML_PROGRAMLISTING = YES
-
-#---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
-
-GENERATE_AUTOGEN_DEF = NO
-
-#---------------------------------------------------------------------------
-# configuration options related to the Perl module output
-#---------------------------------------------------------------------------
-
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
-
-GENERATE_PERLMOD = NO
-
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
-
-PERLMOD_LATEX = NO
-
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader. This is useful
-# if you want to understand what is going on. On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
-
-PERLMOD_PRETTY = YES
-
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
-
-PERLMOD_MAKEVAR_PREFIX =
-
-#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
-#---------------------------------------------------------------------------
-
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
-
-ENABLE_PREPROCESSING = YES
-
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
-
-MACRO_EXPANSION = NO
-
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
-
-EXPAND_ONLY_PREDEF = NO
-
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# pointed to by INCLUDE_PATH will be searched when a #include is found.
-
-SEARCH_INCLUDES = YES
-
-# The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
-
-INCLUDE_PATH =
-
-# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-# patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
-
-INCLUDE_FILE_PATTERNS =
-
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
-
-PREDEFINED =
-
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition that
-# overrules the definition found in the source code.
-
-EXPAND_AS_DEFINED =
-
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all references to function-like macros
-# that are alone on a line, have an all uppercase name, and do not end with a
-# semicolon, because these will confuse the parser if not removed.
-
-SKIP_FUNCTION_MACROS = YES
-
-#---------------------------------------------------------------------------
-# Configuration::additions related to external references
-#---------------------------------------------------------------------------
-
-# The TAGFILES option can be used to specify one or more tagfiles. For each
-# tag file the location of the external documentation should be added. The
-# format of a tag file without this location is as follows:
-# TAGFILES = file1 file2 ...
-# Adding location for the tag files is done as follows:
-# TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths
-# or URLs. Note that each tag file must have a unique name (where the name does
-# NOT include the path). If a tag file is not located in the directory in which
-# doxygen is run, you must also specify the path to the tagfile here.
-
-TAGFILES =
-
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
-
-GENERATE_TAGFILE =
-
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
-
-ALLEXTERNALS = NO
-
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
-
-EXTERNAL_GROUPS = YES
-
-# The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
-
-PERL_PATH = /usr/bin/perl
-
-#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
-#---------------------------------------------------------------------------
-
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option also works with HAVE_DOT disabled, but it is recommended to
-# install and use dot, since it yields more powerful graphs.
-
-CLASS_DIAGRAMS = YES
-
-# You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-# the mscgen tool resides. If left empty the tool is assumed to be found in the
-# default search path.
-
-MSCGEN_PATH =
-
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
-
-HIDE_UNDOC_RELATIONS = YES
-
-# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
-
-HAVE_DOT = YES
-
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
-
-DOT_NUM_THREADS = 0
-
-# By default doxygen will use the Helvetica font for all dot files that
-# doxygen generates. When you want a differently looking font you can specify
-# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-# the font, which can be done by putting it in a standard location or by setting
-# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-# directory containing the font.
-
-DOT_FONTNAME = Helvetica
-
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
-
-DOT_FONTSIZE = 10
-
-# By default doxygen will tell dot to use the Helvetica font.
-# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-# set the path where dot can find it.
-
-DOT_FONTPATH =
-
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# CLASS_DIAGRAMS tag to NO.
-
-CLASS_GRAPH = YES
-
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
-
-COLLABORATION_GRAPH = YES
-
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
-
-GROUP_GRAPHS = YES
-
-# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-# collaboration diagrams in a style similar to the OMG's Unified Modeling
-# Language.
-
-UML_LOOK = YES
-
-# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-# the class node. If there are many fields or methods and many nodes the
-# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-# threshold limits the number of items for each type to make the size more
-# managable. Set this to 0 for no limit. Note that the threshold may be
-# exceeded by 50% before the limit is enforced.
-
-UML_LIMIT_NUM_FIELDS = 0
-
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
-
-TEMPLATE_RELATIONS = NO
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
-
-INCLUDE_GRAPH = YES
-
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
-
-INCLUDED_BY_GRAPH = YES
-
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
-
-CALL_GRAPH = YES
-
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
-
-CALLER_GRAPH = YES
-
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will generate a graphical hierarchy of all classes instead of a textual one.
-
-GRAPHICAL_HIERARCHY = YES
-
-# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
-
-DIRECTORY_GRAPH = YES
-
-# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are svg, png, jpg, or gif.
-# If left blank png will be used. If you choose svg you need to set
-# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible in IE 9+ (other browsers do not have this requirement).
-
-DOT_IMAGE_FORMAT = png
-
-# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-# enable generation of interactive SVG images that allow zooming and panning.
-# Note that this requires a modern browser other than Internet Explorer.
-# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-# visible. Older versions of IE do not have SVG support.
-
-INTERACTIVE_SVG = NO
-
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
-# found. If left blank, it is assumed the dot tool can be found in the path.
-
-DOT_PATH = @DOXYGEN_DOT_PATH@
-
-# The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
-
-DOTFILE_DIRS =
-
-# The MSCFILE_DIRS tag can be used to specify one or more directories that
-# contain msc files that are included in the documentation (see the
-# \mscfile command).
-
-MSCFILE_DIRS =
-
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-
-DOT_GRAPH_MAX_NODES = 4
-
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
-# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-
-MAX_DOT_GRAPH_DEPTH = 0
-
-# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
-
-DOT_TRANSPARENT = NO
-
-# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-# files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
-
-DOT_MULTI_TARGETS = NO
-
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
-
-GENERATE_LEGEND = YES
-
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
-
-DOT_CLEANUP = YES
diff --git a/HySoP/ToSinglePrecision.patch b/HySoP/ToSinglePrecision.patch
deleted file mode 100644
index 4632059ed6d2baec7ac3511b54a9c9bf0365602a..0000000000000000000000000000000000000000
--- a/HySoP/ToSinglePrecision.patch
+++ /dev/null
@@ -1,952 +0,0 @@
-diff --git parmepy/constants.py parmepy/constants.py
-index d77a3e9..ee24b47 100644
---- parmepy/constants.py
-+++ parmepy/constants.py
-@@ -10,7 +10,7 @@ from parmepy.mpi import MPI
-
- PI = math.pi
- # Set default type for real and integer numbers
--PARMES_REAL = np.float64
-+PARMES_REAL = np.float32
- SIZEOF_PARMES_REAL = int(PARMES_REAL(1.).nbytes)
- # type for array indices
- PARMES_INDEX = np.uint32
-@@ -19,7 +19,7 @@ PARMES_INTEGER = np.int32
- # integer used for arrays dimensions
- PARMES_DIM = np.int16
- # float type for MPI messages
--PARMES_MPI_REAL = MPI.DOUBLE
-+PARMES_MPI_REAL = MPI.REAL
- # int type for MPI messages
- PARMES_MPI_INTEGER = MPI.INT
- ## default array layout (fortran or C convention)
-diff --git parmepy/f2py/fftw2py.f90 parmepy/f2py/fftw2py.f90
-index c032cd0..113db90 100755
---- parmepy/f2py/fftw2py.f90
-+++ parmepy/f2py/fftw2py.f90
-@@ -5,7 +5,7 @@
- module fftw2py
-
- use client_data
-- use parmesparam
-+ use parmesparam_sp
- !> 2d case
- use fft2d
- !> 3d case
-@@ -81,7 +81,7 @@ contains
- subroutine solve_poisson_2d(omega,velocity_x,velocity_y)
- real(pk),dimension(:,:),intent(in):: omega
- real(pk),dimension(size(omega,1),size(omega,2)),intent(out) :: velocity_x,velocity_y
-- real(pk) :: start
-+ real(8) :: start
- !f2py intent(in,out) :: velocity_x,velocity_y
- start = MPI_WTime()
-
-@@ -117,7 +117,7 @@ contains
- real(pk),dimension(:,:,:),intent(in):: omega_x,omega_y,omega_z
- real(pk),dimension(size(omega_x,1),size(omega_y,2),size(omega_z,3)),intent(out) :: velocity_x,velocity_y,velocity_z
- integer, dimension(3), intent(in) :: ghosts_vort, ghosts_velo
-- real(pk) :: start
-+ real(8) :: start
- !f2py intent(in,out) :: velocity_x,velocity_y,velocity_z
- start = MPI_WTime()
- call r2c_3d(omega_x,omega_y,omega_z, ghosts_vort)
-diff --git parmepy/f2py/scales2py.f90 parmepy/f2py/scales2py.f90
-index 7884535..f901685 100755
---- parmepy/f2py/scales2py.f90
-+++ parmepy/f2py/scales2py.f90
-@@ -6,7 +6,7 @@ use advec, only : advec_init,advec_step,advec_step_Inter_basic,advec_step_Inter_
- use advec_vect, only : advec_step_Vect,advec_step_Inter_basic_Vect
- use interpolation_velo, only : interpol_init
- use mpi
--use parmesparam
-+use parmesparam_sp
-
-
- implicit none
-@@ -93,7 +93,7 @@ contains
- real(pk), dimension(size(vx,1),size(vx,2),size(vx,3)), intent(inout) :: scal
- !f2py real(pk) intent(in,out), depend(size(vx,1)) :: scal
-
-- real(pk) :: t0
-+ real(8) :: t0
-
- t0 = MPI_Wtime()
- call advec_step(dt,vx,vy,vz,scal)
-diff --git setup.py.in setup.py.in
-index dec8ebd..559ad8c 100644
---- setup.py.in
-+++ setup.py.in
-@@ -70,8 +70,8 @@ if enable_fortran is "ON":
- fortran_src.append(fortran_dir+'parameters.f90')
- fortran_src.append(fortran_dir+'fftw2py.f90')
- fftwdir = '@FFTWLIB@'
-- parmeslib.append('fftw3')
-- parmeslib.append('fftw3_mpi')
-+ parmeslib.append('fftw3f')
-+ parmeslib.append('fftw3f_mpi')
- parmes_libdir.append(fftwdir)
- else:
- packages.append('parmepy.fakef2py')
-diff --git src/client_data.f90 src/client_data.f90
-index 46b5268..77178d9 100755
---- src/client_data.f90
-+++ src/client_data.f90
-@@ -1,14 +1,14 @@
- !> Some global parameters and variables
- module client_data
-
-- use MPI, only : MPI_DOUBLE_PRECISION
-+ use MPI, only : MPI_REAL
- use, intrinsic :: iso_c_binding ! required for fftw
- implicit none
-
- !> kind for real variables (simple or double precision)
-- integer, parameter :: mk = kind(1.0d0) ! double precision
-+ integer, parameter :: mk = kind(1.0) ! single precision
- !> kind for real variables in mpi routines
-- integer, parameter :: mpi_mk = MPI_DOUBLE_PRECISION
-+ integer, parameter :: mpi_mk = MPI_REAL
- !> Problem dimension (model, required for ppm to work properly)
- integer, parameter :: dime = 2
- !> Real dimension
-@@ -26,7 +26,7 @@ module client_data
- !> to activate (or not) screen output
- logical,parameter :: verbose = .True.
- !> i (sqrt(-1) ...)
-- complex(C_DOUBLE_COMPLEX), parameter :: Icmplx = cmplx(0._mk,1._mk, kind=mk)
-+ complex(C_FLOAT_COMPLEX), parameter :: Icmplx = cmplx(0._mk,1._mk, kind=mk)
- !> tolerance used to compute error
- real(mk), parameter :: tolerance = 1e-12
-
-diff --git src/fftw/Poisson.f90 src/fftw/Poisson.f90
-index 78b355c..8804e3d 100755
---- src/fftw/Poisson.f90
-+++ src/fftw/Poisson.f90
-@@ -53,7 +53,7 @@ contains
- real(mk),dimension(:,:,:),intent(in) :: omega_x,omega_y,omega_z
- real(mk),dimension(:,:,:),intent(inout) :: velocity_x,velocity_y,velocity_z
- integer, dimension(3), intent(in) :: ghosts_w, ghosts_v
-- real(mk) :: start
-+ real(8) :: start
- !! Compute fftw forward transform
- !! Omega is used to initialize the fftw buffer for input field.
-
-@@ -74,7 +74,7 @@ contains
-
- real(mk),dimension(:,:,:),intent(in) :: omega_x,omega_y,omega_z
- real(mk),dimension(:,:,:),intent(inout) :: velocity_x,velocity_y,velocity_z
-- real(mk) :: start
-+ real(8) :: start
- !! Compute fftw forward transform
- !! Omega is used to initialize the fftw buffer for input field.
-
-diff --git src/fftw/fft2d.f90 src/fftw/fft2d.f90
-index cf2a69a..fd0b337 100755
---- src/fftw/fft2d.f90
-+++ src/fftw/fft2d.f90
-@@ -42,15 +42,15 @@ module fft2d
- type(C_PTR) :: cbuffer2
- !! Note Franck : check if local declarations of datain/out works and improve perfs.
- !> Field (complex values) for fftw input
-- complex(C_DOUBLE_COMPLEX), pointer :: datain1(:,:),datain2(:,:)
-+ complex(C_FLOAT_COMPLEX), pointer :: datain1(:,:),datain2(:,:)
- !> Field (real values) for fftw input
-- real(C_DOUBLE), pointer :: rdatain1(:,:)
-+ real(C_FLOAT), pointer :: rdatain1(:,:)
- !> Field (complex values) for fftw (forward) output
-- complex(C_DOUBLE_COMPLEX), pointer :: dataout1(:,:)
-+ complex(C_FLOAT_COMPLEX), pointer :: dataout1(:,:)
- !> Field (real values) for fftw output
-- real(C_DOUBLE), pointer :: rdatain2(:,:)
-+ real(C_FLOAT), pointer :: rdatain2(:,:)
- !> Field (complex values) for fftw (forward) output
-- complex(C_DOUBLE_COMPLEX), pointer :: dataout2(:,:)
-+ complex(C_FLOAT_COMPLEX), pointer :: dataout2(:,:)
- !> GLOBAL number of points in each direction
- integer(C_INTPTR_T),pointer :: fft_resolution(:)
- !> LOCAL resolution
-@@ -58,13 +58,13 @@ module fft2d
- !> Offset in the direction of distribution
- integer(c_INTPTR_T),dimension(2) :: local_offset
- !> wave numbers for fft in x direction
-- real(C_DOUBLE), pointer :: kx(:)
-+ real(C_FLOAT), pointer :: kx(:)
- !> wave numbers for fft in y direction
-- real(C_DOUBLE), pointer :: ky(:)
-+ real(C_FLOAT), pointer :: ky(:)
- !> log file for fftw
- character(len=20),parameter :: filename ="parmesfftw.log"
- !> normalization factor
-- real(C_DOUBLE) :: normFFT
-+ real(C_FLOAT) :: normFFT
- !> true if all the allocation stuff for global variables has been done.
- logical :: is2DUpToDate = .false.
-
-@@ -88,7 +88,7 @@ contains
- if(is2DUpToDate) return
-
- ! init fftw mpi context
-- call fftw_mpi_init()
-+ call fftwf_mpi_init()
-
- if(rank==0) open(unit=21,file=filename,form="formatted")
-
-@@ -98,13 +98,13 @@ contains
-
- ! compute "optimal" size (according to fftw) for local date
- ! (warning : dimension reversal)
-- alloc_local = fftw_mpi_local_size_2d_transposed(fft_resolution(c_Y), &
-+ alloc_local = fftwf_mpi_local_size_2d_transposed(fft_resolution(c_Y), &
- fft_resolution(c_X),main_comm, local_resolution(c_Y), &
- local_offset(c_Y), local_resolution(c_X),local_offset(c_X));
-
- ! allocate local buffer (used to save datain/dataout1
- ! ==> in-place transform!!)
-- cbuffer1 = fftw_alloc_complex(alloc_local)
-+ cbuffer1 = fftwf_alloc_complex(alloc_local)
- ! link datain and dataout1 to cbuffer, setting the right dimensions
- call c_f_pointer(cbuffer1, datain1, &
- [fft_resolution(c_X),local_resolution(c_Y)])
-@@ -115,17 +115,17 @@ contains
- ! into dataout2 (input for backward transform and filter)
- ! and to save (in-place) the transform of the second component
- ! of the velocity
-- cbuffer2 = fftw_alloc_complex(alloc_local)
-+ cbuffer2 = fftwf_alloc_complex(alloc_local)
- call c_f_pointer(cbuffer2, datain2,&
- [fft_resolution(c_X),local_resolution(c_Y)])
- call c_f_pointer(cbuffer2, dataout2, [fft_resolution(c_Y),local_resolution(c_X)])
-
- ! create MPI plan for in-place forward/backward DFT (note dimension reversal)
-- plan_forward1 = fftw_mpi_plan_dft_2d(fft_resolution(c_Y), fft_resolution(c_X),datain1,dataout1,&
-+ plan_forward1 = fftwf_mpi_plan_dft_2d(fft_resolution(c_Y), fft_resolution(c_X),datain1,dataout1,&
- main_comm,FFTW_FORWARD,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_OUT))
-- plan_backward1 = fftw_mpi_plan_dft_2d(fft_resolution(c_Y),fft_resolution(c_X),dataout1,datain1,&
-+ plan_backward1 = fftwf_mpi_plan_dft_2d(fft_resolution(c_Y),fft_resolution(c_X),dataout1,datain1,&
- main_comm,FFTW_BACKWARD,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-- plan_backward2 = fftw_mpi_plan_dft_2d(fft_resolution(c_Y),fft_resolution(c_X),dataout2,datain2,&
-+ plan_backward2 = fftwf_mpi_plan_dft_2d(fft_resolution(c_Y),fft_resolution(c_X),dataout2,datain2,&
- main_comm,FFTW_BACKWARD,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-
- call computeKxC(lengths(c_X))
-@@ -154,7 +154,7 @@ contains
- end do
-
- ! compute transform (as many times as desired)
-- call fftw_mpi_execute_dft(plan_forward1, datain1, dataout1)
-+ call fftwf_mpi_execute_dft(plan_forward1, datain1, dataout1)
-
- !!$ do i = 1, fft_resolution(c_Y)
- !!$ write(*,'(a,i5,a,16f10.4)') 'out[',rank,'] ', dataout1(i,1:local_resolution(c_X))
-@@ -162,8 +162,8 @@ contains
- !!$
- call filter_poisson_2d()
-
-- call fftw_mpi_execute_dft(plan_backward1, dataout1, datain1)
-- call fftw_mpi_execute_dft(plan_backward2,dataout2,datain2)
-+ call fftwf_mpi_execute_dft(plan_backward1, dataout1, datain1)
-+ call fftwf_mpi_execute_dft(plan_backward2,dataout2,datain2)
- do j = 1, local_resolution(c_Y)
- do i = 1, fft_resolution(c_X)
- velocity_x(i,j) = datain1(i,j)*normFFT
-@@ -198,7 +198,7 @@ contains
- if(is2DUpToDate) return
-
- ! init fftw mpi context
-- call fftw_mpi_init()
-+ call fftwf_mpi_init()
-
- if(rank==0) open(unit=21,file=filename,form="formatted")
-
-@@ -206,11 +206,11 @@ contains
- fft_resolution(:) = resolution(:)-1
- halfLength = fft_resolution(c_X)/2+1
- ! allocate local buffer (used to save datain/dataout1 ==> in-place transform!!)
-- alloc_local = fftw_mpi_local_size_2d_transposed(fft_resolution(c_Y),halfLength,main_comm,local_resolution(c_Y),&
-+ alloc_local = fftwf_mpi_local_size_2d_transposed(fft_resolution(c_Y),halfLength,main_comm,local_resolution(c_Y),&
- local_offset(c_Y),local_resolution(c_X),local_offset(c_X));
-
- ! allocate local buffer (used to save datain/dataout1 ==> in-place transform!!)
-- cbuffer1 = fftw_alloc_complex(alloc_local)
-+ cbuffer1 = fftwf_alloc_complex(alloc_local)
-
- ! link rdatain1 and dataout1 to cbuffer, setting the right dimensions for each
- call c_f_pointer(cbuffer1, rdatain1, [2*halfLength,local_resolution(c_Y)])
-@@ -218,17 +218,17 @@ contains
-
- ! second buffer used for backward transform. Used to copy dataout1 into dataout2 (input for backward transform and filter)
- ! and to save (in-place) the transform of the second component of the velocity
-- cbuffer2 = fftw_alloc_complex(alloc_local)
-+ cbuffer2 = fftwf_alloc_complex(alloc_local)
-
- call c_f_pointer(cbuffer2, rdatain2, [2*halfLength,local_resolution(c_Y)])
- call c_f_pointer(cbuffer2, dataout2, [fft_resolution(c_Y),local_resolution(c_X)])
-
- ! create MPI plans for in-place forward/backward DFT (note dimension reversal)
-- plan_forward1 = fftw_mpi_plan_dft_r2c_2d(fft_resolution(c_Y), fft_resolution(c_X), rdatain1, dataout1, &
-+ plan_forward1 = fftwf_mpi_plan_dft_r2c_2d(fft_resolution(c_Y), fft_resolution(c_X), rdatain1, dataout1, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_OUT))
-- plan_backward1 = fftw_mpi_plan_dft_c2r_2d(fft_resolution(c_Y), fft_resolution(c_X), dataout1, rdatain1, &
-+ plan_backward1 = fftwf_mpi_plan_dft_c2r_2d(fft_resolution(c_Y), fft_resolution(c_X), dataout1, rdatain1, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-- plan_backward2 = fftw_mpi_plan_dft_c2r_2d(fft_resolution(c_Y), fft_resolution(c_X), dataout2, rdatain2, &
-+ plan_backward2 = fftwf_mpi_plan_dft_c2r_2d(fft_resolution(c_Y), fft_resolution(c_X), dataout2, rdatain2, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-
- call computeKx(lengths(c_X))
-@@ -263,7 +263,7 @@ contains
- !!$ end do
- !!$
- ! compute transform (as many times as desired)
-- call fftw_mpi_execute_dft_r2c(plan_forward1, rdatain1, dataout1)
-+ call fftwf_mpi_execute_dft_r2c(plan_forward1, rdatain1, dataout1)
-
- !!$ do i = 1, fft_resolution(c_Y)
- !!$ write(*,'(a,i5,a,16f10.4)') 'aaaa[',rank,'] ', dataout1(i,1:local_resolution(c_X))
-@@ -276,8 +276,8 @@ contains
- real(mk),dimension(:,:),intent(inout) :: velocity_x,velocity_y
- integer(C_INTPTR_T) :: i, j
-
-- call fftw_mpi_execute_dft_c2r(plan_backward1,dataout1,rdatain1)
-- call fftw_mpi_execute_dft_c2r(plan_backward2,dataout2,rdatain2)
-+ call fftwf_mpi_execute_dft_c2r(plan_backward1,dataout1,rdatain1)
-+ call fftwf_mpi_execute_dft_c2r(plan_backward2,dataout2,rdatain2)
- do j = 1, local_resolution(c_Y)
- do i = 1, fft_resolution(c_X)
- velocity_x(i,j) = rdatain1(i,j)*normFFT
-@@ -303,7 +303,7 @@ contains
- real(mk),dimension(:,:),intent(inout) :: omega
- integer(C_INTPTR_T) :: i, j
-
-- call fftw_mpi_execute_dft_c2r(plan_backward1,dataout1,rdatain1)
-+ call fftwf_mpi_execute_dft_c2r(plan_backward1,dataout1,rdatain1)
- do j = 1, local_resolution(c_Y)
- do i = 1, fft_resolution(c_X)
- omega(i,j) = rdatain1(i,j)*normFFT
-@@ -405,7 +405,7 @@ contains
- subroutine filter_poisson_2d()
-
- integer(C_INTPTR_T) :: i, j
-- complex(C_DOUBLE_COMPLEX) :: coeff
-+ complex(C_FLOAT_COMPLEX) :: coeff
- if(local_offset(c_X)==0) then
- if(local_offset(c_Y) == 0) then
- dataout1(1,1) = 0.0
-@@ -452,9 +452,9 @@ contains
-
- subroutine filter_diffusion_2d(nudt)
-
-- real(C_DOUBLE), intent(in) :: nudt
-+ real(C_FLOAT), intent(in) :: nudt
- integer(C_INTPTR_T) :: i, j
-- complex(C_DOUBLE_COMPLEX) :: coeff
-+ complex(C_FLOAT_COMPLEX) :: coeff
-
- do i = 1,local_resolution(c_X)
- do j = 1, fft_resolution(c_Y)
-@@ -467,20 +467,20 @@ contains
-
- !> Clean fftw context (free memory, plans ...)
- subroutine cleanFFTW_2d()
-- call fftw_destroy_plan(plan_forward1)
-- call fftw_destroy_plan(plan_backward1)
-- !call fftw_destroy_plan(plan_forward2)
-- !call fftw_destroy_plan(plan_backward2)
-- call fftw_free(cbuffer1)
-- call fftw_free(cbuffer2)
-- call fftw_mpi_cleanup()
-+ call fftwf_destroy_plan(plan_forward1)
-+ call fftwf_destroy_plan(plan_backward1)
-+ !call fftwf_destroy_plan(plan_forward2)
-+ !call fftwf_destroy_plan(plan_backward2)
-+ call fftwf_free(cbuffer1)
-+ call fftwf_free(cbuffer2)
-+ call fftwf_mpi_cleanup()
- deallocate(fft_resolution)
- if(rank==0) close(21)
- end subroutine cleanFFTW_2d
-
- subroutine fft2d_diagnostics(nbelem)
- integer(C_INTPTR_T), intent(in) :: nbelem
-- complex(C_DOUBLE_COMPLEX) :: memoryAllocated
-+ complex(C_FLOAT_COMPLEX) :: memoryAllocated
- memoryAllocated = real(nbelem*sizeof(memoryAllocated),mk)*1e-6
- write(*,'(a,i5,a,i12,f10.2)') '[',rank,'] size of each buffer (elements / memory in MB):', &
- nbelem, memoryAllocated
-@@ -514,10 +514,10 @@ contains
- integer(C_INTPTR_T), dimension(2) :: n
-
- !> Field (real values) for fftw input
-- real(C_DOUBLE), pointer :: rdatain1Many(:,:,:)
-+ real(C_FLOAT), pointer :: rdatain1Many(:,:,:)
-
- ! init fftw mpi context
-- call fftw_mpi_init()
-+ call fftwf_mpi_init()
- howmany = 1
- if(rank==0) open(unit=21,file=filename,form="formatted")
-
-@@ -527,12 +527,12 @@ contains
- n(1) = fft_resolution(2)
- n(2) = halfLength
- ! allocate local buffer (used to save datain/dataout1 ==> in-place transform!!)
-- alloc_local = fftw_mpi_local_size_many_transposed(2,n,howmany,FFTW_MPI_DEFAULT_BLOCK,&
-+ alloc_local = fftwf_mpi_local_size_many_transposed(2,n,howmany,FFTW_MPI_DEFAULT_BLOCK,&
- FFTW_MPI_DEFAULT_BLOCK,main_comm,local_resolution(c_Y),&
- local_offset(c_Y),local_resolution(c_X),local_offset(c_X));
-
- ! allocate local buffer (used to save datain/dataout1 ==> in-place transform!!)
-- cbuffer1 = fftw_alloc_complex(alloc_local)
-+ cbuffer1 = fftwf_alloc_complex(alloc_local)
-
- ! link rdatain1 and dataout1 to cbuffer, setting the right dimensions for each
- call c_f_pointer(cbuffer1, rdatain1Many, [howmany,2*halfLength,local_resolution(c_Y)])
-@@ -540,17 +540,17 @@ contains
-
- ! second buffer used for backward transform. Used to copy dataout1 into dataout2 (input for backward transform and filter)
- ! and to save (in-place) the transform of the second component of the velocity
-- cbuffer2 = fftw_alloc_complex(alloc_local)
-+ cbuffer2 = fftwf_alloc_complex(alloc_local)
-
- call c_f_pointer(cbuffer2, rdatain1Many, [howmany,2*halfLength,local_resolution(c_Y)])
- call c_f_pointer(cbuffer2, dataout2, [fft_resolution(c_Y),local_resolution(c_X)])
-
- ! create MPI plans for in-place forward/backward DFT (note dimension reversal)
-- plan_forward1 = fftw_mpi_plan_dft_r2c_2d(fft_resolution(c_Y), fft_resolution(c_X), rdatain1Many, dataout1, &
-+ plan_forward1 = fftwf_mpi_plan_dft_r2c_2d(fft_resolution(c_Y), fft_resolution(c_X), rdatain1Many, dataout1, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_OUT))
-- plan_backward1 = fftw_mpi_plan_dft_c2r_2d(fft_resolution(c_Y), fft_resolution(c_X), dataout1, rdatain1, &
-+ plan_backward1 = fftwf_mpi_plan_dft_c2r_2d(fft_resolution(c_Y), fft_resolution(c_X), dataout1, rdatain1, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-- plan_backward2 = fftw_mpi_plan_dft_c2r_2d(fft_resolution(c_Y), fft_resolution(c_X), dataout2, rdatain2, &
-+ plan_backward2 = fftwf_mpi_plan_dft_c2r_2d(fft_resolution(c_Y), fft_resolution(c_X), dataout2, rdatain2, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-
- call computeKx(lengths(c_X))
-diff --git src/fftw/fft3d.f90 src/fftw/fft3d.f90
-index 0ad428e..dcefd1f 100755
---- src/fftw/fft3d.f90
-+++ src/fftw/fft3d.f90
-@@ -40,15 +40,15 @@ module fft3d
- type(C_PTR) :: cbuffer3
- !! Note Franck : check if local declarations of datain/out works and improve perfs.
- !> Field (complex values) for fftw input
-- complex(C_DOUBLE_COMPLEX), pointer :: datain1(:,:,:)=>NULL(), datain2(:,:,:)=>NULL(), datain3(:,:,:)=>NULL()
-+ complex(C_FLOAT_COMPLEX), pointer :: datain1(:,:,:)=>NULL(), datain2(:,:,:)=>NULL(), datain3(:,:,:)=>NULL()
- !> Field (real values) for fftw input (these are only pointers to the cbuffers)
-- real(C_DOUBLE), pointer :: rdatain1(:,:,:)=>NULL() ,rdatain2(:,:,:)=>NULL() ,rdatain3(:,:,:)=>NULL()
-+ real(C_FLOAT), pointer :: rdatain1(:,:,:)=>NULL() ,rdatain2(:,:,:)=>NULL() ,rdatain3(:,:,:)=>NULL()
- !> Field (real values) for fftw input in the fftw-many case
-- real(C_DOUBLE), pointer :: rdatain_many(:,:,:,:)=>NULL()
-+ real(C_FLOAT), pointer :: rdatain_many(:,:,:,:)=>NULL()
- !> Field (complex values) for fftw (forward) output
-- complex(C_DOUBLE_COMPLEX), pointer :: dataout1(:,:,:)=>NULL() ,dataout2(:,:,:)=>NULL() ,dataout3(:,:,:)=>NULL()
-+ complex(C_FLOAT_COMPLEX), pointer :: dataout1(:,:,:)=>NULL() ,dataout2(:,:,:)=>NULL() ,dataout3(:,:,:)=>NULL()
- !> Field (complex values) for fftw (forward) output in the fftw-many case
-- complex(C_DOUBLE_COMPLEX), pointer :: dataout_many(:,:,:,:)=>NULL()
-+ complex(C_FLOAT_COMPLEX), pointer :: dataout_many(:,:,:,:)=>NULL()
- !> GLOBAL number of points in each direction on which fft is applied (--> corresponds to "real" resolution - 1)
- integer(C_INTPTR_T),pointer :: fft_resolution(:)=>NULL()
- !> LOCAL number of points for fft
-@@ -56,15 +56,15 @@ module fft3d
- !> Offset in the direction of distribution
- integer(c_INTPTR_T),dimension(3) :: local_offset
- !> wave numbers for fft in x direction
-- real(C_DOUBLE), pointer :: kx(:)
-+ real(C_FLOAT), pointer :: kx(:)
- !> wave numbers for fft in y direction
-- real(C_DOUBLE), pointer :: ky(:)
-+ real(C_FLOAT), pointer :: ky(:)
- !> wave numbers for fft in z direction
-- real(C_DOUBLE), pointer :: kz(:)
-+ real(C_FLOAT), pointer :: kz(:)
- !> log file for fftw
- character(len=20),parameter :: filename ="parmesfftw.log"
- !> normalization factor
-- real(C_DOUBLE) :: normFFT
-+ real(C_FLOAT) :: normFFT
- !> true if we use fftw-many routines
- logical :: manycase
- !> true if all the allocation stuff for global variables has been done.
-@@ -89,7 +89,7 @@ contains
- if(is3DUpToDate) return
-
- ! init fftw mpi context
-- call fftw_mpi_init()
-+ call fftwf_mpi_init()
-
- if(rank==0) open(unit=21,file=filename,form="formatted")
-
-@@ -98,7 +98,7 @@ contains
- fft_resolution(:) = resolution(:)-1
-
- ! compute "optimal" size (according to fftw) for local data (warning : dimension reversal)
-- alloc_local = fftw_mpi_local_size_3d_transposed(fft_resolution(c_Z),fft_resolution(c_Y),fft_resolution(c_X),main_comm,&
-+ alloc_local = fftwf_mpi_local_size_3d_transposed(fft_resolution(c_Z),fft_resolution(c_Y),fft_resolution(c_X),main_comm,&
- local_resolution(c_Z),local_offset(c_Z),local_resolution(c_Y),local_offset(c_Y));
-
- ! Set a default value for c_X components.
-@@ -106,35 +106,35 @@ contains
- local_resolution(c_X) = fft_resolution(c_X)
-
- ! allocate local buffer (used to save datain/dataout ==> in-place transform!!)
-- cbuffer1 = fftw_alloc_complex(alloc_local)
-+ cbuffer1 = fftwf_alloc_complex(alloc_local)
- ! link datain and dataout to cbuffer, setting the right dimensions for each
- call c_f_pointer(cbuffer1, datain1, [fft_resolution(c_X),fft_resolution(c_Y),local_resolution(c_Z)])
- call c_f_pointer(cbuffer1, dataout1, [fft_resolution(c_X),fft_resolution(c_Z),local_resolution(c_Y)])
-
- ! second buffer used for backward transform. Used to copy dataout into dataout2 (input for backward transform and filter)
- ! and to save (in-place) the transform of the second component of the velocity
-- cbuffer2 = fftw_alloc_complex(alloc_local)
-+ cbuffer2 = fftwf_alloc_complex(alloc_local)
- call c_f_pointer(cbuffer2, datain2, [fft_resolution(c_X),fft_resolution(c_Y),local_resolution(c_Z)])
- call c_f_pointer(cbuffer2, dataout2, [fft_resolution(c_X),fft_resolution(c_Z),local_resolution(c_Y)])
-
- ! second buffer used for backward transform. Used to copy dataout into dataout2 (input for backward transform and filter)
- ! and to save (in-place) the transform of the second component of the velocity
-- cbuffer3 = fftw_alloc_complex(alloc_local)
-+ cbuffer3 = fftwf_alloc_complex(alloc_local)
- call c_f_pointer(cbuffer3, datain3, [fft_resolution(c_X),fft_resolution(c_Y),local_resolution(c_Z)])
- call c_f_pointer(cbuffer3, dataout3, [fft_resolution(c_X),fft_resolution(c_Z),local_resolution(c_Y)])
-
- ! create MPI plan for in-place forward/backward DFT (note dimension reversal)
-- plan_forward1 = fftw_mpi_plan_dft_3d(fft_resolution(c_Z), fft_resolution(c_Y), fft_resolution(c_X),datain1,dataout1,&
-+ plan_forward1 = fftwf_mpi_plan_dft_3d(fft_resolution(c_Z), fft_resolution(c_Y), fft_resolution(c_X),datain1,dataout1,&
- main_comm,FFTW_FORWARD,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_OUT))
-- plan_backward1 = fftw_mpi_plan_dft_3d(fft_resolution(c_Z),fft_resolution(c_Y),fft_resolution(c_X),dataout1,datain1,&
-+ plan_backward1 = fftwf_mpi_plan_dft_3d(fft_resolution(c_Z),fft_resolution(c_Y),fft_resolution(c_X),dataout1,datain1,&
- main_comm,FFTW_BACKWARD,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-- plan_forward2 = fftw_mpi_plan_dft_3d(fft_resolution(c_Z), fft_resolution(c_Y), fft_resolution(c_X),datain2,dataout2,&
-+ plan_forward2 = fftwf_mpi_plan_dft_3d(fft_resolution(c_Z), fft_resolution(c_Y), fft_resolution(c_X),datain2,dataout2,&
- main_comm,FFTW_FORWARD,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_OUT))
-- plan_backward2 = fftw_mpi_plan_dft_3d(fft_resolution(c_Z),fft_resolution(c_Y),fft_resolution(c_X),dataout2,datain2,&
-+ plan_backward2 = fftwf_mpi_plan_dft_3d(fft_resolution(c_Z),fft_resolution(c_Y),fft_resolution(c_X),dataout2,datain2,&
- main_comm,FFTW_BACKWARD,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-- plan_forward3 = fftw_mpi_plan_dft_3d(fft_resolution(c_Z), fft_resolution(c_Y), fft_resolution(c_X),datain3,dataout3,&
-+ plan_forward3 = fftwf_mpi_plan_dft_3d(fft_resolution(c_Z), fft_resolution(c_Y), fft_resolution(c_X),datain3,dataout3,&
- main_comm,FFTW_FORWARD,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_OUT))
-- plan_backward3 = fftw_mpi_plan_dft_3d(fft_resolution(c_Z),fft_resolution(c_Y),fft_resolution(c_X),dataout3,datain3,&
-+ plan_backward3 = fftwf_mpi_plan_dft_3d(fft_resolution(c_Z),fft_resolution(c_Y),fft_resolution(c_X),dataout3,datain3,&
- main_comm,FFTW_BACKWARD,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-
- call computeKx(lengths(c_X))
-@@ -173,17 +173,17 @@ contains
- end do
- end do
- ! compute transform (as many times as desired)
-- call fftw_mpi_execute_dft(plan_forward1, datain1, dataout1)
-- call fftw_mpi_execute_dft(plan_forward2, datain2, dataout2)
-- call fftw_mpi_execute_dft(plan_forward3, datain3, dataout3)
-+ call fftwf_mpi_execute_dft(plan_forward1, datain1, dataout1)
-+ call fftwf_mpi_execute_dft(plan_forward2, datain2, dataout2)
-+ call fftwf_mpi_execute_dft(plan_forward3, datain3, dataout3)
-
- ! apply poisson filter
- call filter_poisson_3d()
-
- ! inverse transform to retrieve velocity
-- call fftw_mpi_execute_dft(plan_backward1, dataout1,datain1)
-- call fftw_mpi_execute_dft(plan_backward2,dataout2,datain2)
-- call fftw_mpi_execute_dft(plan_backward3,dataout3,datain3)
-+ call fftwf_mpi_execute_dft(plan_backward1, dataout1,datain1)
-+ call fftwf_mpi_execute_dft(plan_backward2,dataout2,datain2)
-+ call fftwf_mpi_execute_dft(plan_backward3,dataout3,datain3)
- do k =1, local_resolution(c_Z)
- do j = 1, fft_resolution(c_Y)
- do i = 1, fft_resolution(c_X)
-@@ -213,7 +213,7 @@ contains
- if(is3DUpToDate) return
-
- ! init fftw mpi context
-- call fftw_mpi_init()
-+ call fftwf_mpi_init()
-
- if(rank==0) open(unit=21,file=filename,form="formatted")
- allocate(fft_resolution(3))
-@@ -221,7 +221,7 @@ contains
- halfLength = fft_resolution(c_X)/2+1
-
- ! compute "optimal" size (according to fftw) for local data (warning : dimension reversal)
-- alloc_local = fftw_mpi_local_size_3d_transposed(fft_resolution(c_Z),fft_resolution(c_Y),halfLength,&
-+ alloc_local = fftwf_mpi_local_size_3d_transposed(fft_resolution(c_Z),fft_resolution(c_Y),halfLength,&
- main_comm,local_resolution(c_Z),local_offset(c_Z),local_resolution(c_Y),local_offset(c_Y));
-
- ! init c_X part. This is required to compute kx with the same function in 2d and 3d cases.
-@@ -229,9 +229,9 @@ contains
- local_resolution(c_X) = halfLength
-
- ! allocate local buffer (used to save datain/dataout ==> in-place transform!!)
-- cbuffer1 = fftw_alloc_complex(alloc_local)
-- cbuffer2 = fftw_alloc_complex(alloc_local)
-- cbuffer3 = fftw_alloc_complex(alloc_local)
-+ cbuffer1 = fftwf_alloc_complex(alloc_local)
-+ cbuffer2 = fftwf_alloc_complex(alloc_local)
-+ cbuffer3 = fftwf_alloc_complex(alloc_local)
-
- ! link rdatain and dataout to cbuffer, setting the right dimensions for each
- call c_f_pointer(cbuffer1, rdatain1, [2*halfLength,fft_resolution(c_Y),local_resolution(c_Z)])
-@@ -246,17 +246,17 @@ contains
- rdatain3 = 0.0
-
- ! create MPI plans for in-place forward/backward DFT (note dimension reversal)
-- plan_forward1 = fftw_mpi_plan_dft_r2c_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), rdatain1, dataout1, &
-+ plan_forward1 = fftwf_mpi_plan_dft_r2c_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), rdatain1, dataout1, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_OUT))
-- plan_backward1 = fftw_mpi_plan_dft_c2r_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), dataout1, rdatain1, &
-+ plan_backward1 = fftwf_mpi_plan_dft_c2r_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), dataout1, rdatain1, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-- plan_forward2 = fftw_mpi_plan_dft_r2c_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), rdatain2, dataout2, &
-+ plan_forward2 = fftwf_mpi_plan_dft_r2c_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), rdatain2, dataout2, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_OUT))
-- plan_backward2 = fftw_mpi_plan_dft_c2r_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), dataout2, rdatain2, &
-+ plan_backward2 = fftwf_mpi_plan_dft_c2r_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), dataout2, rdatain2, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-- plan_forward3 = fftw_mpi_plan_dft_r2c_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), rdatain3, dataout3, &
-+ plan_forward3 = fftwf_mpi_plan_dft_r2c_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), rdatain3, dataout3, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_OUT))
-- plan_backward3 = fftw_mpi_plan_dft_c2r_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), dataout3, rdatain3, &
-+ plan_backward3 = fftwf_mpi_plan_dft_c2r_3d(fft_resolution(c_Z),fft_resolution(c_Y), fft_resolution(c_X), dataout3, rdatain3, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
-
- call computeKx(lengths(c_X))
-@@ -279,7 +279,7 @@ contains
-
- real(mk),dimension(:,:,:),intent(in) :: omega_x,omega_y,omega_z
- integer, dimension(3), intent(in) :: ghosts
-- real(mk) :: start
-+ real(8) :: start
- integer(C_INTPTR_T) :: i,j,k, ig, jg, kg
-
- ! ig, jg, kg are used to take into account
-@@ -301,9 +301,9 @@ contains
-
- ! compute transforms for each component
- start = MPI_WTIME()
-- call fftw_mpi_execute_dft_r2c(plan_forward1, rdatain1, dataout1)
-- call fftw_mpi_execute_dft_r2c(plan_forward2, rdatain2, dataout2)
-- call fftw_mpi_execute_dft_r2c(plan_forward3, rdatain3, dataout3)
-+ call fftwf_mpi_execute_dft_r2c(plan_forward1, rdatain1, dataout1)
-+ call fftwf_mpi_execute_dft_r2c(plan_forward2, rdatain2, dataout2)
-+ call fftwf_mpi_execute_dft_r2c(plan_forward3, rdatain3, dataout3)
- !!print *, "r2c time = ", MPI_WTIME() - start
-
- end subroutine r2c_3d
-@@ -316,12 +316,12 @@ contains
- subroutine c2r_3d(velocity_x,velocity_y,velocity_z, ghosts)
- real(mk),dimension(:,:,:),intent(inout) :: velocity_x,velocity_y,velocity_z
- integer, dimension(3), intent(in) :: ghosts
-- real(mk) :: start
-+ real(8) :: start
- integer(C_INTPTR_T) :: i,j,k, ig, jg, kg
- start = MPI_WTIME()
-- call fftw_mpi_execute_dft_c2r(plan_backward1,dataout1,rdatain1)
-- call fftw_mpi_execute_dft_c2r(plan_backward2,dataout2,rdatain2)
-- call fftw_mpi_execute_dft_c2r(plan_backward3,dataout3,rdatain3)
-+ call fftwf_mpi_execute_dft_c2r(plan_backward1,dataout1,rdatain1)
-+ call fftwf_mpi_execute_dft_c2r(plan_backward2,dataout2,rdatain2)
-+ call fftwf_mpi_execute_dft_c2r(plan_backward3,dataout3,rdatain3)
- !! print *, "c2r time : ", MPI_WTIME() -start
- ! copy back to velocity and normalisation
- do k =1, local_resolution(c_Z)
-@@ -346,7 +346,7 @@ contains
-
- real(mk),dimension(:,:,:),intent(in) :: omega
- integer, dimension(3), intent(in) :: ghosts
-- real(mk) :: start
-+ real(8) :: start
- integer(C_INTPTR_T) :: i,j,k, ig, jg, kg
-
- ! ig, jg, kg are used to take into account
-@@ -366,7 +366,7 @@ contains
-
- ! compute transforms for each component
- start = MPI_WTIME()
-- call fftw_mpi_execute_dft_r2c(plan_forward1, rdatain1, dataout1)
-+ call fftwf_mpi_execute_dft_r2c(plan_forward1, rdatain1, dataout1)
- !!print *, "r2c time = ", MPI_WTIME() - start
-
- end subroutine r2c_scalar_3d
-@@ -377,10 +377,10 @@ contains
- subroutine c2r_scalar_3d(omega, ghosts)
- real(mk),dimension(:,:,:),intent(inout) :: omega
- integer, dimension(3), intent(in) :: ghosts
-- real(mk) :: start
-+ real(8) :: start
- integer(C_INTPTR_T) :: i,j,k, ig, jg, kg
- start = MPI_WTIME()
-- call fftw_mpi_execute_dft_c2r(plan_backward1,dataout1,rdatain1)
-+ call fftwf_mpi_execute_dft_c2r(plan_backward1,dataout1,rdatain1)
- !! print *, "c2r time : ", MPI_WTIME() -start
- ! copy back to velocity and normalisation
- do k =1, local_resolution(c_Z)
-@@ -412,7 +412,7 @@ contains
- integer(C_INTPTR_T),dimension(3) :: n
-
- ! init fftw mpi context
-- call fftw_mpi_init()
-+ call fftwf_mpi_init()
- blocksize = FFTW_MPI_DEFAULT_BLOCK
- if(rank==0) open(unit=21,file=filename,form="formatted")
- allocate(fft_resolution(3))
-@@ -423,7 +423,7 @@ contains
- n(3) = halfLength
- howmany = 3
- ! compute "optimal" size (according to fftw) for local data (warning : dimension reversal)
-- alloc_local = fftw_mpi_local_size_many_transposed(3,n,howmany,blocksize,blocksize,&
-+ alloc_local = fftwf_mpi_local_size_many_transposed(3,n,howmany,blocksize,blocksize,&
- main_comm,local_resolution(c_Z),local_offset(c_Z),local_resolution(c_Y),local_offset(c_Y));
-
- ! init c_X part. This is required to compute kx with the same function in 2d and 3d cases.
-@@ -431,7 +431,7 @@ contains
- local_resolution(c_X) = halfLength
-
- ! allocate local buffer (used to save datain/dataout ==> in-place transform!!)
-- cbuffer1 = fftw_alloc_complex(alloc_local)
-+ cbuffer1 = fftwf_alloc_complex(alloc_local)
-
- ! link rdatain and dataout to cbuffer, setting the right dimensions for each
- call c_f_pointer(cbuffer1, rdatain_many, [howmany,2*halfLength,fft_resolution(c_Y),local_resolution(c_Z)])
-@@ -440,9 +440,9 @@ contains
- ! create MPI plans for in-place forward/backward DFT (note dimension reversal)
- n(3) = fft_resolution(c_X)
-
-- plan_forward1 = fftw_mpi_plan_many_dft_r2c(3,n,howmany,blocksize,blocksize, rdatain_many, dataout_many, &
-+ plan_forward1 = fftwf_mpi_plan_many_dft_r2c(3,n,howmany,blocksize,blocksize, rdatain_many, dataout_many, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_OUT))
-- plan_backward1 = fftw_mpi_plan_many_dft_c2r(3,n,howmany,blocksize,blocksize, dataout_many, rdatain_many, &
-+ plan_backward1 = fftwf_mpi_plan_many_dft_c2r(3,n,howmany,blocksize,blocksize, dataout_many, rdatain_many, &
- main_comm,ior(FFTW_MEASURE,FFTW_MPI_TRANSPOSED_IN))
- call computeKx(lengths(c_X))
- call computeKy(lengths(c_Y))
-@@ -464,7 +464,7 @@ contains
- subroutine r2c_3d_many(omega_x,omega_y,omega_z)
-
- real(mk),dimension(:,:,:),intent(in) :: omega_x,omega_y,omega_z
-- real(mk) :: start
-+ real(8) :: start
- integer(C_INTPTR_T) :: i,j,k
-
- ! init
-@@ -480,7 +480,7 @@ contains
-
- ! compute transform (as many times as desired)
- start = MPI_WTIME()
-- call fftw_mpi_execute_dft_r2c(plan_forward1, rdatain_many, dataout_many)
-+ call fftwf_mpi_execute_dft_r2c(plan_forward1, rdatain_many, dataout_many)
- !! print *, "r2c time = ", MPI_WTIME() - start
-
- end subroutine r2c_3d_many
-@@ -491,11 +491,11 @@ contains
- !! @param[in,out] velocity_z 3d scalar field, z-component of the output vector field
- subroutine c2r_3d_many(velocity_x,velocity_y,velocity_z)
- real(mk),dimension(:,:,:),intent(inout) :: velocity_x,velocity_y,velocity_z
-- real(mk) :: start
-+ real(8) :: start
- integer(C_INTPTR_T) :: i,j,k
-
- start = MPI_WTIME()
-- call fftw_mpi_execute_dft_c2r(plan_backward1,dataout_many,rdatain_many)
-+ call fftwf_mpi_execute_dft_c2r(plan_backward1,dataout_many,rdatain_many)
- !! print *, "c2r time : ", MPI_WTIME() -start
- do k =1, local_resolution(c_Z)
- do j = 1, fft_resolution(c_Y)
-@@ -536,7 +536,7 @@ contains
- !> Computation of frequencies coeff, over distributed direction(s)
- !> @param lengths size of the domain
- subroutine computeKy(length)
-- real(C_DOUBLE), intent(in) :: length
-+ real(C_FLOAT), intent(in) :: length
-
- !! Local loops indices
- integer(C_INTPTR_T) :: i
-@@ -589,8 +589,8 @@ contains
- subroutine filter_poisson_3d()
-
- integer(C_INTPTR_T) :: i,j,k
-- complex(C_DOUBLE_COMPLEX) :: coeff
-- complex(C_DOUBLE_COMPLEX) :: buffer1,buffer2
-+ complex(C_FLOAT_COMPLEX) :: coeff
-+ complex(C_FLOAT_COMPLEX) :: buffer1,buffer2
-
- ! Set first coeff (check for "all freq = 0" case)
- if(local_offset(c_Y) == 0) then
-@@ -648,10 +648,10 @@ contains
- !! @param[in] nudt \f$ \nu\times dt\f$, diffusion coefficient times current time step
- subroutine filter_curl_diffusion_3d(nudt)
-
-- real(C_DOUBLE), intent(in) :: nudt
-+ real(C_FLOAT), intent(in) :: nudt
- integer(C_INTPTR_T) :: i,j,k
-- complex(C_DOUBLE_COMPLEX) :: coeff
-- complex(C_DOUBLE_COMPLEX) :: buffer1,buffer2
-+ complex(C_FLOAT_COMPLEX) :: coeff
-+ complex(C_FLOAT_COMPLEX) :: buffer1,buffer2
-
- !! mind the transpose -> index inversion between y and z
- do j = 1,local_resolution(c_Y)
-@@ -674,9 +674,9 @@ contains
- !! @param[in] nudt \f$ \nu\times dt\f$, diffusion coefficient times current time step
- subroutine filter_diffusion_3d(nudt)
-
-- real(C_DOUBLE), intent(in) :: nudt
-+ real(C_FLOAT), intent(in) :: nudt
- integer(C_INTPTR_T) :: i,j,k
-- complex(C_DOUBLE_COMPLEX) :: coeff
-+ complex(C_FLOAT_COMPLEX) :: coeff
-
- !! mind the transpose -> index inversion between y and z
- do j = 1,local_resolution(c_Y)
-@@ -697,8 +697,8 @@ contains
- subroutine filter_curl_3d()
-
- integer(C_INTPTR_T) :: i,j,k
-- complex(C_DOUBLE_COMPLEX) :: coeff
-- complex(C_DOUBLE_COMPLEX) :: buffer1,buffer2
-+ complex(C_FLOAT_COMPLEX) :: coeff
-+ complex(C_FLOAT_COMPLEX) :: buffer1,buffer2
-
- !! mind the transpose -> index inversion between y and z
- do j = 1,local_resolution(c_Y)
-@@ -721,8 +721,8 @@ contains
- subroutine filter_projection_om_3d()
-
- integer(C_INTPTR_T) :: i,j,k
-- complex(C_DOUBLE_COMPLEX) :: coeff
-- complex(C_DOUBLE_COMPLEX) :: buffer1,buffer2,buffer3
-+ complex(C_FLOAT_COMPLEX) :: coeff
-+ complex(C_FLOAT_COMPLEX) :: buffer1,buffer2,buffer3
-
- ! Set first coeff (check for "all freq = 0" case)
- if(local_offset(c_Y) == 0) then
-@@ -783,9 +783,9 @@ contains
- !! @param[in] dxf, dyf, dzf: grid filter size = domainLength/(CoarseRes-1)
- subroutine filter_multires_om_3d(dxf, dyf, dzf)
-
-- real(C_DOUBLE), intent(in) :: dxf, dyf, dzf
-+ real(C_FLOAT), intent(in) :: dxf, dyf, dzf
- integer(C_INTPTR_T) :: i,j,k
-- real(C_DOUBLE) :: kxc, kyc, kzc
-+ real(C_FLOAT) :: kxc, kyc, kzc
-
- kxc = pi / dxf
- kyc = pi / dyf
-@@ -810,7 +810,7 @@ contains
- !! pressure from velocity in the Fourier space
- subroutine filter_pressure_3d()
- integer(C_INTPTR_T) :: i,j,k
-- complex(C_DOUBLE_COMPLEX) :: coeff
-+ complex(C_FLOAT_COMPLEX) :: coeff
-
- ! Set first coeff (check for "all freq = 0" case)
- if(local_offset(c_Y) == 0) then
-@@ -851,8 +851,8 @@ contains
- subroutine filter_poisson_3d_many()
-
- integer(C_INTPTR_T) :: i,j,k
-- complex(C_DOUBLE_COMPLEX) :: coeff
-- complex(C_DOUBLE_COMPLEX) :: buffer1,buffer2
-+ complex(C_FLOAT_COMPLEX) :: coeff
-+ complex(C_FLOAT_COMPLEX) :: buffer1,buffer2
-
- ! Set first coeff (check for "all freq = 0" case)
- if(local_offset(c_Y) == 0) then
-@@ -908,10 +908,10 @@ contains
- !! @param[in] nudt \f$ \nu\times dt\f$, diffusion coefficient times current time step
- subroutine filter_diffusion_3d_many(nudt)
-
-- real(C_DOUBLE), intent(in) :: nudt
-+ real(C_FLOAT), intent(in) :: nudt
- integer(C_INTPTR_T) :: i,j,k
-- complex(C_DOUBLE_COMPLEX) :: coeff
-- complex(C_DOUBLE_COMPLEX) :: buffer1,buffer2
-+ complex(C_FLOAT_COMPLEX) :: coeff
-+ complex(C_FLOAT_COMPLEX) :: buffer1,buffer2
-
- !! mind the transpose -> index inversion between y and z
- do j = 1,local_resolution(c_Y)
-@@ -931,18 +931,18 @@ contains
-
- !> Clean fftw context (free memory, plans ...)
- subroutine cleanFFTW_3d()
-- call fftw_destroy_plan(plan_forward1)
-- call fftw_destroy_plan(plan_backward1)
-+ call fftwf_destroy_plan(plan_forward1)
-+ call fftwf_destroy_plan(plan_backward1)
- if(.not.manycase) then
-- call fftw_destroy_plan(plan_forward2)
-- call fftw_destroy_plan(plan_backward2)
-- call fftw_destroy_plan(plan_forward3)
-- call fftw_destroy_plan(plan_backward3)
-- call fftw_free(cbuffer2)
-- call fftw_free(cbuffer3)
-+ call fftwf_destroy_plan(plan_forward2)
-+ call fftwf_destroy_plan(plan_backward2)
-+ call fftwf_destroy_plan(plan_forward3)
-+ call fftwf_destroy_plan(plan_backward3)
-+ call fftwf_free(cbuffer2)
-+ call fftwf_free(cbuffer3)
- endif
-- call fftw_free(cbuffer1)
-- call fftw_mpi_cleanup()
-+ call fftwf_free(cbuffer1)
-+ call fftwf_mpi_cleanup()
- deallocate(fft_resolution)
- deallocate(kx,ky,kz)
- if(rank==0) close(21)
-@@ -953,7 +953,7 @@ contains
- integer(C_INTPTR_T), intent(in) :: nbelem
- ! number of buffers used for fftw
- integer, optional,intent(in) :: howmany
-- complex(C_DOUBLE_COMPLEX) :: memoryAllocated
-+ complex(C_FLOAT_COMPLEX) :: memoryAllocated
-
- integer :: nbFields
- if(present(howmany)) then
-diff --git src/main/main.f90 src/main/main.f90
-index 38cc6a5..0fc8f5f 100755
---- src/main/main.f90
-+++ src/main/main.f90
-@@ -9,7 +9,7 @@ use vectorcalculus
- implicit none
-
- integer :: info
--real(mk) :: start, end
-+real(8) :: start, end
-
- !complex(mk), dimension(resolution(1),resolution(2)) :: omega,velocity_x,velocity_y
- call MPI_Init(info)
-@@ -116,7 +116,8 @@ contains
- real(mk),dimension(3) :: lengths,step
- integer, dimension(3) :: ghosts_v, ghosts_w
- integer(C_INTPTR_T),dimension(3) :: nfft,offset
-- real(mk) :: error,start
-+ real(mk) :: error
-+ real(8) :: start
- logical :: ok
-
- if (rank==0) print *, " ======= Test 3D Poisson (r2c) solver for resolution ", resolution
-diff --git src/scalesInterface/precision_tools.f90 src/scalesInterface/precision_tools.f90
-index 5dacf3f..4ae1a6a 100644
---- src/scalesInterface/precision_tools.f90
-+++ src/scalesInterface/precision_tools.f90
-@@ -20,15 +20,15 @@
- !------------------------------------------------------------------------------
-
- MODULE precision_tools
-- use mpi, only: MPI_DOUBLE_PRECISION
-+ use mpi, only: MPI_REAL
- implicit None
-
- !> Floats precision
- INTEGER, PARAMETER :: SP = kind(1.0)
- INTEGER, PARAMETER :: DP = kind(1.0d0)
-- INTEGER, PARAMETER :: WP = DP
-+ INTEGER, PARAMETER :: WP = SP
- !> the MPI type for REAL exchanges in simple or double precision
-- INTEGER, parameter :: MPI_REAL_WP = MPI_DOUBLE_PRECISION
-+ INTEGER, parameter :: MPI_REAL_WP = MPI_REAL
- REAL(WP), PRIVATE :: sample_real_at_WP
- REAL(WP), PARAMETER :: MAX_REAL_WP = HUGE(sample_real_at_WP)
- INTEGER, PRIVATE :: sample_int
diff --git a/HySoP/hysop/domain/tests/parmesfftw.log b/HySoP/hysop/domain/tests/parmesfftw.log
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/HySoP/src/Domain.f90 b/HySoP/src/Domain.f90
deleted file mode 100755
index d20f0998140a4301baf735b0c0bfef3d93fecbfd..0000000000000000000000000000000000000000
--- a/HySoP/src/Domain.f90
+++ /dev/null
@@ -1,83 +0,0 @@
-!> Physical domain definition and its discretisation.
-!! Note FP : fortran structures might be better but I avoid them on purpose, for f2py better compat.
-module Domain
-
- use client_data
-
- implicit none
-
- private
- public init_geometry, init_grid
- public physDomainLowerPoint,physDomainUpperPoint,grid_resolution,grid_step,domain_ghostsize,domainLength,domain_bc,gridCells
-
- !> Physical domain upper limit
- real(mk), dimension(:), pointer :: physDomainUpperPoint=>NULL()
- !> Physical domain lower limit
- real(mk), dimension(:), pointer :: physDomainLowerPoint =>NULL()
- !> Sizes of the domain
- real(mk), dimension(:), pointer :: domainLength =>NULL()
- !> Boundary conditions for the domain
- integer, dimension(:), pointer :: domain_bc=>NULL()
- !> Number of ghost points in each direction
- integer, dimension(:), pointer :: domain_ghostsize=>NULL()
- !> Grid resolution (number of points)
- integer, dimension(:), pointer :: grid_resolution =>NULL()
- !> Number of cells (in each dir) on the grid
- integer, dimension(dim3) :: gridCells
- !> Grid space step sizes
- real(mk), dimension(:), pointer :: grid_step =>NULL()
-
-
- integer, private :: istat
-
-contains
-
- !> Set continuous domain geometry
- !> \param boundary conditions type (ppm way)
- subroutine init_geometry(bc)
-
- !> Boundary conditions type (for ppm)
- integer, intent(in) :: bc
-
- ! Domain size and min/max coords
- allocate(physDomainLowerPoint(dim3), physDomainUpperPoint(dim3), domainLength(dim3),stat = istat)
- if(istat.ne.0) stop 'Geometry, allocation failed'
- physDomainUpperPoint = 0.0
- physDomainLowerPoint = 0.0
- physDomainUpperPoint(c_X) = 6.0!2.*pi!!1.0
- physDomainUpperPoint(c_Y) = 4.0!2.*pi!1.0
- !physDomainLowerPoint(c_X) = 0.0
- !physDomainLowerPoint(c_Y) = 0.0
- ! Boundary conditions and ghosts
- allocate(domain_bc(2*dime), domain_ghostsize(dime), stat = istat)
- if(istat.ne.0) stop 'BC, allocation failed'
- domain_bc = bc
- domain_ghostsize = 0 ! Warning : It seems that ghost>0 is required for ppm remesh
- domainLength = physDomainUpperPoint - physDomainLowerPoint
-
- end subroutine init_geometry
-
- !> Set discretisation parameters for the continuous domain.
- !! Resolution corresponds to the number of points in one direction.
- !! For periodic boundaries, point with index 1 is the same as point with last index
- !! but must be present (ppm required)
- subroutine init_grid()
-
- allocate(grid_resolution(dim3),grid_step(dim3),stat=istat)
- if(istat.ne.0) stop 'grid_resolution, allocation failed'
- grid_resolution = 1
- grid_resolution(c_X) = 129!2001
- grid_resolution(c_Y) = 65!1601
-!!$ grid_step(c_X) = (physDomainUpperPoint(c_X) - physDomainLowerPoint(c_X))/(real(grid_resolution(c_X),mk)-1.)
-!!$ grid_step(c_Y) = (physDomainUpperPoint(c_Y) - physDomainLowerPoint(c_Y))/(real(grid_resolution(c_Y),mk)-1.)
-!!$ grid_step(c_Z) = 1.
-!!$ grid_resolution(c_X) = 2001
-!! grid_resolution = 256
-!!$ grid_resolution(c_Z) = 1
- gridCells = max(grid_resolution-1,1)
-!!$ gridCells(c_Z) = 1
- grid_step = (physDomainUpperPoint - physDomainLowerPoint)/gridCells
-
- end subroutine init_grid
-
-end module Domain
diff --git a/HySoP/src/Penalize.f90 b/HySoP/src/Penalize.f90
deleted file mode 100755
index 6aaf75912bc2429bcb60fbc50d54f5bdffbbd1b5..0000000000000000000000000000000000000000
--- a/HySoP/src/Penalize.f90
+++ /dev/null
@@ -1,76 +0,0 @@
-!> Penalization stuff (init chi, penalize vorticity)
-module penalisation
-
- use client_data
- use mpi
- implicit none
-
- private
-
- public :: penalise_velocity
-
- ! Penalisation parameter
- real(mk),parameter,private :: lambda = 6e10
-
- ! Drag
- ! real(mk),dimension(dime) :: localDiagnostics
-
-contains
-
- !> Apply penalization functions to velocity (on boundaries to enforce Dirichlet cond. and on the sphere)
- !! We also compute drag and lift (current mpi process local values) during this call
- subroutine penalise_velocity(vel,dt,chi_sphere,chi_boundary)
- ! Velocity, intent(inout)
- real(mk), dimension(:,:,:,:,:), pointer :: vel
- ! Indicators of the sets where velocity must be penalized
- integer,dimension(:,:),pointer::chi_sphere
- ! Indicators of the sets where velocity must be penalized
- integer,dimension(:,:),pointer::chi_boundary
- ! Time step
- real(mk), intent(in) :: dt
- ! Local mesh, number of points in each dir (1st index) for each sub (2nd index)
- !integer, dimension(dime), intent(in) :: resolution
- integer :: k
- real(mk) :: coef
- !localDiagnostics=0.0
-
- coef=1./(1.+dt*lambda)
-
- !do k=1,size(chi_boundary,2)
- forall(k=1:size(chi_boundary,2))
- vel(:,chi_boundary(1,k),chi_boundary(2,k),chi_boundary(3,k),:)=&
- coef*vel(:,chi_boundary(1,k),chi_boundary(2,k),chi_boundary(3,k),:)
- end forall!do
- !forall(k=1:size(chi_sphere,2))
- do k=1,size(chi_sphere,2)
- vel(:,chi_sphere(1,k),chi_sphere(2,k),chi_sphere(3,k),:)=&
- coef*vel(:,chi_sphere(1,k),chi_sphere(2,k),chi_sphere(3,k),:)
- ! if( all(chi_sphere(:,k) < resolution(:))) then
- ! localDiagnostics=localDiagnostics + vel(:,chi_sphere(1,k),chi_sphere(2,k),chi_sphere(3,k),1)
- ! end if
- end do
- !end forall
-
- end subroutine penalise_velocity
-
- !> Collect and reduce drag/lift values over all mpi proc
-!!$ subroutine get_dragAndLift(diagnostics,dvol,radius)
-!!$ !> diagnostics
-!!$ real(mk),dimension(:) :: diagnostics
-!!$ !> element of volume
-!!$ real(mk),intent(in)::dvol
-!!$ !> sphere radius
-!!$ real(mk),intent(in)::radius
-!!$
-!!$ integer :: info
-!!$ real(mk) :: coef,uinf
-!!$
-!!$ uinf=1.0
-!!$ coef=2./(uinf**2*2.*radius)*dvol*lambda
-!!$ !localDiagnostics=coef*localDiagnostics
-!!$ ! Reduce drag and lift values over all procs
-!!$ !call MPI_Reduce(localDiagnostics,diagnostics,dime,MPI_DOUBLE_PRECISION,MPI_SUM,0,MPI_COMM_WORLD,info)
-!!$
-!!$ end subroutine get_dragAndLift
-
-end module Penalisation
diff --git a/HySoP/src/io_vtk.f90 b/HySoP/src/io_vtk.f90
deleted file mode 100755
index 7e89fcf58af45750a8e7e5f20ad2392b4b67f9ae..0000000000000000000000000000000000000000
--- a/HySoP/src/io_vtk.f90
+++ /dev/null
@@ -1,192 +0,0 @@
-!> Tools for vtk output
-!! \todo print a real and proper vtk output ...
-module io_vtk
-
- use client_data
- implicit none
-
-contains
-
- !> print velocity and vorticity to vtk file
- !>
- subroutine printToVTK(filename,iter,field1,field2,resolution,spacing,coordMin)
-
- ! File name prefix for velocity and vorticity outputs
- character(len=*), intent(in) :: filename
- ! Current iteration number
- integer, intent(in) :: iter
- real(mk), dimension(:,:,:), pointer :: field1, field2
- !> Number of points in each dir (1st index) for each sub (2nd index)
- integer, dimension(3),intent(in) :: resolution
- real(mk),dimension(3),intent(in)::coordMin
- real(mk), dimension(3),intent(in) :: spacing
-
- character(len=60) :: buffer
- integer :: nbpoints
-
- ! local resolution
- integer :: nx,ny,nz
-
- !local filename (depends on subproc number)
- character(len=30) :: localname,buffer2,localname2
-
- ! output = nb of iterations
- write(buffer,*) iter
- buffer = adjustl(buffer)
- ! output = velocity
-! write(name_vit,'(A)') trim(filename)//"_velocity_"//trim(buffer)//".vtk"
- ! write(name_omg,'(A)') trim(filename)//"_vorticity_"//trim(buffer)//".vtk"
-
- !call res_vtk_vit(trim(name_vit))
- !call res_vtk_omega(trim(name_omg))
-
- nx = resolution(1)
- ny = resolution(2)
- nz = resolution(3)
- nbpoints = nx*ny*nz
- write(buffer2, *) rank
- buffer2 = adjustl(buffer2)
- localname = trim(filename)//"_velocity_it"//trim(buffer)//"_"//trim(buffer2)//".vti"
- localname2 = trim(filename)//"_vorticity_it"//trim(buffer)//"_"//trim(buffer2)//".vti"
- open(unit=11,file=localname,form="formatted")
- open(unit=12,file=localname2,form="formatted")
- write(11,'(A26)')"# vtk DataFile Version 3.0"
- write(11,'(A7)')"vecteur"
- write(11,'(A5)')"ASCII"
- write(11,'(A25)')"DATASET STRUCTURED_POINTS"
- write(11,'(A10,3(i6,1x))')"DIMENSIONS",nx,ny,nz
- write(11,'(a6,3(f10.5))')"ORIGIN", coordMin
- write(11,'(A7,3(f10.5))')"SPACING",spacing
- write(11,'(A10,i10)') "POINT_DATA",nbpoints
- write(11,'(A21)') "VECTORS velo FLOAT"
- write(12,'(A26)')"# vtk DataFile Version 3.0"
- write(12,'(A7)')"vecteur"
- write(12,'(A5)')"ASCII"
- write(12,'(A25)')"DATASET STRUCTURED_POINTS"
- write(12,'(A10,3(i6,1x))')"DIMENSIONS",nx,ny,nz
- write(12,'(a6,3(f10.5))')"ORIGIN", coordMin
- write(12,'(A7,3(f10.5))')"SPACING",spacing
- write(12,'(A10,i10)') "POINT_DATA",nbpoints
- write(12,'(A21)') "VECTORS vort FLOAT"
- write(11,'(3(f20.9))') field1(1:nx,1:ny,1:nz)
- write(12,'(3(f20.9))') field2(1:nx,1:ny,1:nz)
- close(11)
- close(12)
-
- end subroutine printToVTK
-
-
- !> print test function (scalar) values to a vtk file
- !> Warning : only for 3D field
- subroutine printChi3dToVTK(filename,testFunc,resolution,spacing,coordMin)
- character(len=*), intent(in) :: filename
- real(mk), dimension(:,:,:), pointer :: testFunc
- real(mk), dimension(3),intent(in) :: spacing
- !> Number of points in each dir (1st index) for each sub (2nd index)
- integer, dimension(3),intent(in) :: resolution
- real(mk),dimension(3),intent(in)::coordMin
-
- integer :: nbpoints
- ! sub proc number
- ! local resolution
- integer :: nx,ny,nz
-
- !local filename (depends on subproc number)
- character(len=30) :: localname,buffer
-
- ! output = nb of iterations
- nx = resolution(1)
- ny = resolution(2)
- nz = resolution(3)
- nbpoints = nx*ny*nz
- write(buffer, *) rank
- buffer = adjustl(buffer)
- localname = trim(filename)//"_chi_"//trim(buffer)//".vti"
- open(unit=11,file=localname,form="formatted")
- write(11,'(A26)')"# vtk DataFile Version 3.0"
- write(11,'(A7)')"scalaire"
- write(11,'(A5)')"ASCII"
- write(11,'(A25)')"DATASET STRUCTURED_POINTS"
- write(11,'(A10,3(i8,1x))')"DIMENSIONS",nx,ny,nz
- write(11,'(a6,3(f10.5))')"ORIGIN", coordMin
- write(11,'(A7,3(f10.5))')"SPACING",spacing
- write(11,'(A10,i10)') "POINT_DATA",nbpoints
- write(11,'(A21)') "SCALARS chi FLOAT"
- write(11,'(A21)') "LOOKUP_TABLE default"
- write(11,'(f20.9)') testFunc(1:nx,1:ny,1:nz)
-
- end subroutine printChi3dToVTK
-
- subroutine printScalar3dToVTK(filename,scalar,resolution,spacing,coordMin)
- character(len=*), intent(in) :: filename
- real(mk), dimension(:,:,:), pointer :: scalar
- real(mk), dimension(3),intent(in) :: spacing
- !> Number of points in each dir (1st index) for each sub (2nd index)
- integer, dimension(3),intent(in) :: resolution
- real(mk),dimension(3),intent(in)::coordMin
-
- integer :: nbpoints
- ! sub proc number
- ! local resolution
- integer :: nx,ny,nz
-
- !local filename (depends on subproc number)
- character(len=30) :: localname,buffer
-
- ! output = nb of iterations
- nx = resolution(1)
- ny = resolution(2)
- nz = resolution(3)
- nbpoints = nx*ny*nz
- write(buffer, *) rank
- buffer = adjustl(buffer)
- localname = trim(filename)//"_chi_"//trim(buffer)//".vti"
- open(unit=11,file=localname,form="formatted")
- write(11,'(A26)')"# vtk DataFile Version 3.0"
- write(11,'(A7)')"scalaire"
- write(11,'(A5)')"ASCII"
- write(11,'(A25)')"DATASET STRUCTURED_POINTS"
- write(11,'(A10,3(i4,1x))')"DIMENSIONS",nx,ny,nz
- write(11,'(a6,3(f10.5))')"ORIGIN", coordMin
- write(11,'(A7,3(f10.5))')"SPACING",spacing
- write(11,'(A10,i10)') "POINT_DATA",nbpoints
- write(11,'(A21)') "SCALARS scal FLOAT"
- write(11,'(A21)') "LOOKUP_TABLE default"
- write(11,'(3(f20.9))') scalar(1:nx,1:ny,1:nz)
-
- end subroutine printScalar3dToVTK
-
- subroutine printPvtkFile(filename,spacing,coordMin,coordMax)
-
- ! File name prefix for the output
- character(len=*), intent(in) :: filename
- real(mk), dimension(3), intent(in) :: spacing
- real(mk),dimension(3),intent(in) ::coordMin,coordMax
- character(len=30)::outputname,subfilename
- real(mk)::x1,x2,y1,y2,z1,z2
-
- x1=coordMin(1)
- x2=coordMax(1)
- y1=coordMin(2)
- y2=coordMax(2)
- z1=coordMin(3)
- z2=coordMax(3)
- subfilename="boundaries_chi_0.vti"
- outputname = trim(filename)//".pvti"
- open(unit=11,file=outputname,form="formatted")
- write(11,'(A70)') "<VTKFile type=""PImageData"" version=""0.1"" byte_order=""LittleEndian"">"
- write(11,'(A25,6(f10.5),A30,3(f10.5),A15,3(f10.5),A3)') "<PImageData WholeExtent=""",x1,x2,y1,y2,z1,z2,&
- " "" GhostLevel=""2"" Origin=""",coordMin,""" Spacing=""",spacing,""""
- write(11,'(A30)') "<PPointData Scalars=â€Chiâ€>"
- write(11,'(A70)') "<PDataArray type=""Float32"" Name=""Chi"" /> "
- write(11,'(A15)') "</PPointData>"
- write(11,'(A70)') "<Piece Extent=""x1 x2 y1 y2 z1 z2"" Source=""", subfilename,"""/>"
-
- write(11,'(A15)') "</PImageData>"
-
- write(11,'(A11)') "</VTKFile>"
-
- end subroutine printPvtkFile
-
-end module io_vtk
-
diff --git a/HySoP/src/main/Ctrl b/HySoP/src/main/Ctrl
deleted file mode 100644
index 608461615dce27312f76ca8f680415ca9454f5c3..0000000000000000000000000000000000000000
--- a/HySoP/src/main/Ctrl
+++ /dev/null
@@ -1,61 +0,0 @@
-#-------------------------------------------------------------------------------
-# Philippe, Chatelain, pchatela@inf.ethz.ch
-# Michael Bergdorf, bergdorf@inf.ethz.ch
-# CSELab, ETH-Zuerich
-#-------------------------------------------------------------------------------
-
-#-------------------------------------------------------------------------------
-# NAME OF RUN
-#
-#=====================================================
-RUNTAG= tubes
-TALK= true
-
-#-------------------------------------------------------------------------------
-# DOMAIN // COMPUTATIONAL AND PHYSICAL
-#=====================================================
-NX= 65,65,129
-
-#-------------------------------------------------------------------------------
-# TIME STEPPING
-#=====================================================
-DT= 0.968815
-DT_ADAPT= true
-DTMAX= 10.000000
-TEND= 1000.000000
-ITEND = 10000
-
-#-------------------------------------------------------------------------------
-# PHYSICAL PARAMETERS
-#=====================================================
-NU= 0.001
-
-#-------------------------------------------------------------------------------
-# MULTIGRID // maxlev has to cope with nx
-#=====================================================
-MAXLEV = 6
-
-#-------------------------------------------------------------------------------
-# INITIAL CONDITION PARAMETERS // rem: none
-#=====================================================
-TRAILING_VORTICES_PRIMARY_SPAN = 0.7853982
-TRAILING_VORTICES_SECONDARY_SPAN = 0.403610
-TRAILING_VORTICES_PRIMARY_SIGMA = 0.222144
-TRAILING_VORTICES_SECONDARY_SIGMA = 0.10000
-TRAILING_VORTICES_PRIMARY_VERTDIFF = 0.0
-TRAILING_VORTICES_PRIMARY_GAMMA = 1.0
-TRAILING_VORTICES_PRIMARY_GAMMA_RATIO = 0.0
-TRAILING_VORTICES_NOISE_SYMMETRY = true
-TRAILING_VORTICES_NOISE_AMP1 = 0.11
-TRAILING_VORTICES_NOISE_AMP2 = 0.11
-#TRAILING_VORTICES_NOISE_AMP1 = 0.05
-#TRAILING_VORTICES_NOISE_AMP2 = 0.025
-TRAILING_VORTICES_NOISE_THETA1 = 0.785
-TRAILING_VORTICES_NOISE_THETA2 = 0.573710
-
-
-#-------------------------------------------------------------------------------
-# DUMP EVERY <NDUMP>TH STEP
-# RUN TIME LIMITATION
-#=====================================================
-NDUMP= 1
diff --git a/HySoP/src/main/Unused_or_obsolet/FieldsComputation.f90 b/HySoP/src/main/Unused_or_obsolet/FieldsComputation.f90
deleted file mode 100755
index d6b20e0782e063ceb2cb510128435569aa469870..0000000000000000000000000000000000000000
--- a/HySoP/src/main/Unused_or_obsolet/FieldsComputation.f90
+++ /dev/null
@@ -1,83 +0,0 @@
-!> Some specific (i.e. only dedicated to a particular simulation ...) routines
-!! => pertubation on velocity, offset introduction on velocity ...
-module FieldsComputation
-
- use client_data, only: mk,pi
- use client_topology, only: ppm_t_topo
- use mpi, only:MPI_COMM_WORLD,MPI_DOUBLE_PRECISION,MPI_SUM
- implicit none
-
- private
-
- public :: fit_velocity, perturb
-
-contains
-
- !> offset velocity to fit with desired flowrate (average)
- subroutine fit_velocity(vel,lengths,lowerPoint,upperPoint)
- ! Velocity, intent(inout)
- real(mk), dimension(:,:,:,:,:), pointer :: vel
- ! grid step, intent(in)
- !real(mk), dimension(:), pointer :: stepSize
- ! dims of the domain, intent(in)
- real(mk), dimension(:), pointer :: lengths
- real(mk), dimension(:), pointer :: lowerPoint,upperPoint
-
- !real(mk) :: theoretical_flowrate, computed_flowrate,surf
- real(mk) :: constant
-
- ! The flow is supposed to be along direction 1
- ! physical domain surface
- !surf = (upperPoint(3)-lowerPoint(3))*lengths(2)
- ! Value of the flow rate we want to fix
- !theoretical_flowrate = 1.
- !call computeFlowRate(vel, stepSize, topo,computed_flowrate)
- ! Correction is added to velocity ...
- constant = (upperPoint(3)-lowerPoint(3))/lengths(3) !(theoretical_flowrate - computed_flowrate)/surf
- ! print *, 'const', constant
- ! print *, computed_flowrate, '//',surf
-
- vel(1,:,:,:,1) = vel(1,:,:,:,1) + constant
-
- end subroutine fit_velocity
-
- !> Introduce a small perturbation to velocity
- subroutine perturb(vel, time)
- ! Velocity, intent(inout)
- real(mk), dimension(:,:,:,:,:), pointer :: vel
- ! current time
- real(mk) :: time
-
- vel(2,:,:,:,1) = sin(pi*(time-3.0))
-
- end subroutine perturb
-
- subroutine computeFlowRate(vel, stepSize, topo, flowRate)
-
- real(mk), dimension(:,:,:,:,:), pointer :: vel
- ! grid step, intent(in)
- real(mk), dimension(:), pointer :: stepSize
- type(ppm_t_topo), pointer :: topo
- real(mk), intent(out) :: flowRate
-
- integer, dimension(:,:), pointer :: nnodes => NULL()
- integer :: isub, isubl,info
-
- nnodes => topo%mesh(1)%nnodes
-
- do isub=1,topo%nsublist
- isubl=topo%isublist(isub)
- flowRate = vel(1,1,1,1,isub) + vel(1,1,1,nnodes(3,isubl),isub) +&
- vel(1,1,nnodes(2,isubl),1,isub) + vel(1,1,nnodes(2,isubl),nnodes(3,isubl),isub)
- flowRate = 0.25*flowRate + 0.5*(sum(vel(1,1,2:nnodes(2,isubl)-1,1,isub)) + &
- sum(vel(1,1,2:nnodes(2,isubl)-1,nnodes(3,isubl),isub)) &
- + sum(vel(1,1,1,2:nnodes(3,isubl)-1,isub)) + sum(vel(1,1,nnodes(2,isubl),2:nnodes(3,isubl)-1,isub))) &
- + sum(vel(1,1,2:nnodes(2,isubl)-1,2:nnodes(3,isubl)-1,isub))
- flowRate = stepSize(2)*stepSize(3)*flowRate
- enddo
-
- call MPI_AllReduce(flowRate, flowRate, 1, MPI_DOUBLE_PRECISION, MPI_SUM, MPI_COMM_WORLD,info)
-
- end subroutine computeFlowRate
-
-end module FieldsComputation
diff --git a/HySoP/src/main/unstable/NavierStokes2D.f90 b/HySoP/src/main/unstable/NavierStokes2D.f90
deleted file mode 100755
index a2e9b6782af2667a154e366c138de01da100bc9d..0000000000000000000000000000000000000000
--- a/HySoP/src/main/unstable/NavierStokes2D.f90
+++ /dev/null
@@ -1,603 +0,0 @@
-!> This module is used to run a simulation using
-!! ppm (core and numerics).
-!! Solve Navier-Stokes (vorticity) for a 2D flow around a cylinder.
-!!
-module NavierStokes2D
-
- ! All required ppm modules ...
- use ppm_module_init, only : ppm_init
- use ppm_module_data, only : ppm_kind_double,ppm_param_bcdef_periodic
- use ppm_module_finalize, only : ppm_finalize
- use ppm_module_map_field_ghost, only:ppm_map_field_ghost_get, ppm_map_field_ghost_put
- use ppm_module_map_field
- use ppm_module_is_initialized
- ! use client_io
- use client_data
- ! some tools
- use parmesTools
- ! Physical domain and grid
- use Domain
- ! Fields on the grid
- use Fields, only: initFields, velocity, vorticity2D, gauss,rhs,scalar!,testFunc!,getMemoryUsedForFields,shiftVelocityX, gauss!vel_ex)!, stream_function
- use PPMFields
- ! Topology
- use client_topology, only: PPMinitTopo,topo,getPPMLocalResolution,meshNum
- ! Poisson (ppm) solver
- use Solver, only : init_poisson_solver, solve_poisson, ppm_poisson_drv_none, ppm_poisson_drv_curl_fd2, ppm_poisson_drv_curl_fd4
- ! Penalisation stuff
- use penalisation, only : penalise_velocity
- ! Functions used to identify surfaces, volumes ...
- use SetsIndicators,only:chi_sphere,chi_boundary,compute_control_box,init_obstacles,nocaForces,&
- compute_test,chi_box,getMemoryForIndicators
- ! curl, prod ...
- use vectorcalculus
- ! everything dealing with particles
- use Particles!, only : initNSSolver_particles,getMemoryUsedForParticles,countAndUpdateParticles,countAndCreateParticles,RK4_2D,&
- ! createParticlesEverywhere,PPMupdateParticles2D,Ppmremesh2d,RK2_2D
- ! file io
- use io_vtk
-
- use mpi
-
- ! user-defined functions (for tests or fields initialization)
- use testsFunctions
-
- use poisson
-
-! use solverDiffusion
-
- implicit none
-
- ! Some global vars ...
- !> counter for memory usage
- real(mk) :: memoryUsed
- !> required flow rate (used to shift velocity after Poisson)
- real(mk) :: reqFlowRate
-
-contains
-
- !> All required initialisations :
- !! MPI, ppm
- !! Domain, grid
- !! Fields
- !! Particles
- subroutine init_client(Re,localResolution,coordMin)
-
- use client_topology, only: isubl
- !> Reynolds numner
- real(mk),intent(in) ::Re
- !> local mesh resolution
- integer, dimension(dim3),intent(out) :: localResolution
- !> Local (proc.) minimum point coordinates
- real(mk),dimension(dim3),intent(out) ::coordMin
-
- ! Precision and tolerance (for ppm init)
- integer :: prec,tol
- ! MPI comm
- integer :: comm
- ! debug mode (for ppm)
- integer :: debug
-
- !> Size of the control box (user defined)
- real(mk) :: sizeOfTheBox
- !> Dimensions and positions of the control volume
- real(mk),dimension(dime):: boxMin,boxMax
-
- !> For ppm fftw solver
- integer :: derive
-
- !> Sphere radius
- real(mk) :: sphere_radius
- !> Sphere position
- real(mk),dimension(dime) :: sphere_pos
- !> velocity inf
- real(mk),parameter :: uinf = 1.0
- integer :: nbPoints
-
- !> Thickness of the boundary layer used to enforce Dirichlet BC with penalisation
- real(mk) :: layer
-
- logical :: testInit = .False.
- integer :: info
-
- ! "read" mpi parameters
- call MPI_COMM_RANK(MPI_COMM_WORLD,rank,info)
- call MPI_COMM_SIZE(MPI_COMM_WORLD,nbprocs,info)
- comm = MPI_COMM_WORLD
-
- write (*,'(a,i5,a)') '[',rank,'] --------------------------------------------------------------> start initialization '
-
- !======================
- ! Init ppm
- !======================
- prec = ppm_kind_double
- debug = 0
- tol = -10
- info = 0 !!! Warning : info MUST be 0 else ppm does not init and tells nothing ...
- call ppm_init(dime,prec,tol,comm,debug,info)
-
- !======================
- ! Geometry and grid
- !======================
- ! Set domain size, resolution, boundaries, number of ghost points ...
- ! At the time, many values are set in Domain.f90 file
- call init_geometry(ppm_param_bcdef_periodic)
- call init_grid()
-
- !======================
- ! Creates the topology
- !======================
- ! Based on ppm.
- call PPMinitTopo(physDomainLowerPoint,physDomainUpperPoint,domain_bc,domain_ghostsize,grid_resolution)
-
- !> Get the coordinates of the lowest point for the current domain
- coordMin(:)=topo%min_subd(:,isubl)
- coordMin(c_Z) = physDomainUpperPoint(c_Z)
- !======================
- ! Fields allocation
- !======================
- ! Local number of nodes
- localResolution = getPPMLocalResolution(topo,meshNum)
-
- ! Allocate fields on the local mesh (velocity, vorticity ...)
- call initFields(localResolution,domain_ghostsize)
-
- !=======================================================
- ! Set obstacle (sphere) and other specific parameters.
- ! Compute a control volume for diagnostics computation
- !=======================================================
- !> Set sphere size and position
-!!$ sphere_radius=0.5
-!!$ sphere_pos(c_Y)=(physDomainUpperPoint(c_Y)+physDomainLowerPoint(c_Y))/2.0
-!!$ sphere_pos(c_X) = 0.0
-!!$ ! sphere_pos(c_Z) = 0.0
-!!$
-!!$ if(rank == 0) then
-!!$ reqFlowRate = requiredFlowRate2D(sphere_radius,domainLength,physDomainLowerPoint,physDomainUpperPoint,uinf)
-!!$ end if
-!!$ call MPI_Bcast(reqFlowRate,1,mpi_mk,0,MPI_COMM_WORLD,info);
-
- !! We set the size of the box (must be greater than the sphere diameter ...)
- ! sizeOfTheBox = domainLength(c_Y)-0.3 ! 6*sphere_radius
-
- !! Position of the upper and lower points of the box
- !! Compute the box position on the grid
- !nbPoints = floor(abs(0.5*(domainLength(c_Z)-sizeOfTheBox)/grid_step(c_Z)))
- !boxMin=physDomainLowerPoint!+3*grid_step
- !boxMax=physDomainUpperPoint!-3*grid_step
-!!$ nbPoints = 200
-!!$
-!!$ boxMin = physDomainLowerPoint
-!!$ boxMax = physDomainUpperPoint
-!!$ boxMin(c_Y)=physDomainLowerPoint(c_Y)+ nbPoints*grid_step(c_Y)
-!!$ boxMax(c_Y)=physDomainUpperPoint(c_Y)- nbPoints*grid_step(c_Y)
-!!$ boxMin(c_X)=physDomainLowerPoint(c_X)+ nbPoints*grid_step(c_X)
-!!$ boxMax(c_X)=physDomainUpperPoint(c_X)- (nbPoints+401)*grid_step(c_X)
-!!$
- !! compute indicator functions for the control box and the sphere
- ! call compute_control_box(localResolution,grid_step,boxMin,boxMax,sphere_pos,sphere_radius,coordMin)
-
- !====================================================================
- ! Compute indicator function for the boundaries in z dir
- ! (will be used to enforce dirichlet conditions on these boundaries.)
- !====================================================================
- layer = 0.0
- ! call init_obstacles(localResolution,grid_step,physDomainLowerPoint,physDomainUpperPoint,sphere_pos,sphere_radius,layer,coordMin)
- ! Test : export test function to vtk file.
- ! compute_test set 1 at all points belonging to chi_...
- ! testFunc=0.0
- !call compute_test(testFunc,chi_boundary)
- !call compute_test(testFunc,chi_box)
- !testFunc = 1.0
- !call printChiToVTK("box",testFunc,localResolution,grid_step,coordMin)
- !! display the memory used for indicator sets and fields
- ! memoryUsed=getMemoryUsedForFields()+getMemoryForIndicators()
-! deallocate(testFunc)
-
- !================================
- ! Solvers (grid and particles)
- !================================
-
- ! --- Grid solver for Poisson ---
- ! derive : means that finite difference, order 4, are used to compute velocity from stream function, in ppm
- !derive = ppm_poisson_drv_curl_fd4
- ! init fftw solver, from ppm
- !call init_poisson_solver(vorticity,velocity,topo%ID,meshNum,derive)
-
- ! Initialisation of all the fftw stuff (plans ...).
- ! Warnings :
- ! - this must be done before any initialisation of the fields : plans creation may rewrite data of fieldIn/fieldOut.
- ! - last argument (resolution) must be the global resolution : dedicated mpi-topologies are created for fftw.
- call initFFTW2D(grid_resolution,domainLength)
-
- !call diffusionInitFFT(topo%ID,velocity,vorticity,1./Re,domainLength,grid_resolution,physDomainLowerPoint,&
- ! physDomainUpperPoint,domain_bc)
- ! --- Particles ---
- ! Set particles parameters (kernel type, cutoff ...)
- call initNSSolver_particles()
-
- if(verbose) then
- write(*,'(a,i5,a)') '[',rank,'] ======================================== Summary ========================================'
- if (rank==0) then
- write(*,'(a,i5,a,3f10.4)') '[',rank,'] Computational domain (geom) dimensions : ', domainLength
- write(*,'(a,i5,a,3d20.10)') '[',rank,'] Space step : ', grid_step
- write(*,'(a,i5,a,f10.4)') '[',rank,'] Reynolds : ', Re
- write(*,'(a,i5,a,f10.4,3f10.4)') '[',rank,'] Sphere radius and position : ', sphere_radius,sphere_pos
- write(*,'(a,i5,a,f10.4)') '[',rank,'] The required flow rate is : ', reqFlowRate
- write(*,'(a,i5,a,i5)') '[',rank,'] Number of points in the boundary layer: ', nbpoints
- end if
- write(*,'(a,i5,a,3f10.5)') '[',rank,'] Current subdomain (geom) position : ', coordMin
- write(*,'(a,i5,a,3i10)') '[',rank,'] Current subdomain resolution : ', localResolution
- write(*,'(a,i5,a)') '[',rank,'] ========================================================================================='
- end if
-
- write (*,'(a,i5,a)') '[',rank,'] --------------------------------------------------------------> end of initialization'
-
- end subroutine init_client
-
- subroutine main_client() bind(c,name='NavierStokes2D')
-
- real(mk) :: initial_time,final_time
- real(mk) :: Re
- real(mk) :: t1
- real(mk), dimension(dim3) :: coordMin
- !> local mesh resolution
- integer, dimension(dim3) :: localResolution
-
- real(mk) :: shift = 0.0
- real(mk),dimension(dime)::coord
- integer :: i,info,j
- character(len=30) :: buffer
- real(mk),dimension(dime)::center
- Re = 133.4! 210.6
- initial_time = 0.0
- final_time = 100.0
- ! Initialisation stuff
- t1 = MPI_WTIME()
- call init_client(Re,localResolution,coordMin)
- write (*,'(a,i5,a,f10.5)') '[',rank,'] Initialisation time: ', MPI_WTIME()-t1
-
-
- do j=1,localResolution(c_Y)
- coord(c_Y) = coordMin(c_Y) + (j-1)*grid_step(c_Y)
- do i =1,localResolution(c_X)
- coord(c_X) = coordMin(c_X) + (i-1)*grid_step(c_X)
- vorticity2D(i,j,1) = -4.*pi*pi*cos(2.*pi*coord(c_X)/domainLength(c_X))/(domainLength(c_X)**2)! + cos(2.*pi*coord(c_Y)/domainLength(c_Y))
- end do
- end do
-
- PPMvelocity2D(c_Y,:,:,:) = 0.0
- !rhs(:,:,:,:) = velocity(:,:,:,:)
- !vorticity2D(:,:,:) = 1.0!velocity(:,:,:,:)
- !vorticity2D(1:localResolution(c_X)-1,1:localResolution(c_Y)-1,1) = 0.0
- !print *, "N2",norm2(velocity,localResolution,grid_step)!)velocity(c_X,:,:,:)
- !print *, "N2 v", norm2(vorticity2D,localResolution,grid_step)!)vorticity(c_X,:,:,:)
- call solvePoisson(vorticity2D,velocity,grid_resolution,topo%ID,meshNum)
- print *, "end of poisson solve"
-!!$ call MPI_BARRIER(MPI_COMM_WORLD,info)
-!!$
-!!$ print *, "post N2",norm2(velocity,localResolution,grid_step)!)velocity(c_X,:,:,:)
-!!$ !print *, "post N2 v", norm2(vorticity2D,localResolution,grid_step)!)vorticity(c_X,:,:,:)
-!!$ do i = 1, localResolution(c_X)
-!!$ print *,"------------", velocity(c_X,i,:,1)
-!!$ print *,"************", vorticity2D(i,:,1)
-!!$ end do
-!!$
-!!$
-
- !vorticity2D = vorticity - rhs
- !print *, "results :", norm1(vorticity,localResolution,grid_step)
-
-
-
-
-! call Mpi_barrier(MPI_COMM_WORLD,info)
-
-
- write(buffer,*) rank
- buffer = adjustl(buffer)
- buffer = "gauss"//buffer
- open(43,file=buffer) ! Output only for one process
- do j=1,localResolution(c_Y)
- coord(c_Y) = coordMin(c_Y) + (j-1)*grid_step(c_Y)
- ! do i =1,localResolution(c_X)
- !coord(c_X) = coordMin(c_X) + (i-1)*grid_step(c_X)
- write(43,'(4e14.5)') coord(c_Y),velocity(c_X,5,j,1)
- ! end do
- end do
-
- close(43)
-!!$ shift = 0!-500.*1e-3
-!!$ ! init a Gaussian
-!!$ center = 0.0
-!!$ !call Gaussian1D(scalar,localResolution,grid_step,coordMin,c_X,shift)
-!!$!! call Gaussian2D(scalar,localResolution,grid_step,coordMin,center)
-!!$ center(c_X) = 100.*1e-3
- !shift = 100.*1e-3
- ! call Gaussian1D(gauss,localResolution,grid_step,coordMin,c_X,shift)
-!!$ call Gaussian2D(gauss,localResolution,grid_step,coordMin,center)
-!!$ call ppm_map_field_ghost_get(topo%ID,meshNum,domain_ghostsize,info)
-!!$ call ppm_map_field_push(topo%ID,meshNum,PPMscalar2D,info)
-!!$ call ppm_map_field_send(info)
-!!$ call ppm_map_field_pop(topo%ID,meshNum,PPMscalar2D,domain_ghostsize,info)
- ! Time loop
-! call timeLoop(initial_time,final_time,Re,localResolution,coordMin)
-!!$ rhs = 0.0
-!!$ rhs(1,:,:,:) = gauss - scalar
-!!$
-!!$ print *, rank,"norms ", norm1(rhs,localResolution,grid_step),norm2(rhs,localResolution,grid_step),normInf(rhs,localResolution)
-!!$ !print *, "jzaiziaui", rank,rhs(1,65,12,1),rhs(1,1,12,1)
-!!$ !do j = 1, localResolution(c_Y)
-!!$ j = 43
-!!$ coord(c_Y) =coordMin(c_Y) + (j-1)*grid_step(c_Y)
-!!$ do i = 1,localResolution(c_X)
-!!$ coord(c_X) = coordMin(c_X) + (i-1)*grid_step(c_X)
-!!$ if(gauss(i,j,1)< 1e-5) gauss(i,j,1)=0.0
-!!$ if(scalar(i,j,1)< 1e-5) scalar(i,j,1)=0.0
-!!$ write(43,'(4e14.5)') coord(c_X),coord(c_Y),real(gauss(i,j,1)),real(PPMscalar2D(i,j,1))
-!!$ end do
- !end do
-
-!!$ print *,"max diff", maxloc(rhs),maxval(rhs)
-!!$ close(43)
- !call printToVTK("gauss",0,gauss,vorticity,localResolution,grid_step,coordMin)
-
- ! Close everything related to ppm
- call ppm_finalize(info)
- write (*,'(a,i5,a)') '[',rank,'] ==================================== End of simulation. ===================================='
-
- end subroutine main_client
-
-
- !> Simulation over time ...
- subroutine timeLoop(initial_time,final_time,Re,resolution,coordMin)
-
- !> Starting time
- real(mk), intent(in) :: initial_time
- !> Ending time
- real(mk), intent(in) :: final_time
- !> Reynolds number
- real(mk), intent(in) :: Re
- !> Local mesh resolution
- integer, dimension(dim3) :: resolution
- !> coordinates of the lowest point of the domain
- real(mk),dimension(dim3),intent(in) :: coordMin
-
- real(mk) :: current_time,elapsed_time,time_step
- integer :: iter,i,j,k
- logical :: resetpos
- real(mk) :: nu,dtMax
- ! real(mk), dimension(:,:), pointer :: err1, err2, errinf
- ! diagnostics 1:3 -> drag/lifts "porous" drag, 4:6 Winkelmans paper method
- ! real(mk), dimension(dime) :: diagnostics
- real(mk),dimension(dime)::force
-
- real(mk)::dvol,x,z,y
- real(mk),dimension(dime) :: norm2Vel,nref
- integer :: info
- integer,parameter :: maxiter = 1
- dvol=product(grid_step)
- nu = 1./Re!0.5*FolkeRatio/Re!*uinf
- current_time = initial_time
- iter = 1
-
- ! Max value allowed for the time step
- dtMax = 1e-3!0.01!grid_step(1)**2/(6.*nu)
- print *, "dtmax", dtMax
- ! offset for velocity to set a desired average value for flow rate.
- ! Initial time step
- time_step=dtMax
-
- if(rank==0) open(10,file='diagnostics') ! Output only for one process
-
- !! Compute a first distribution of velocity and vorticity
- !call computeInitialFields(time_step,resolution,grid_step,coordMin)
-!
- ! Synchronise all procs after initialization process ...
- call MPI_BARRIER(MPI_COMM_WORLD,info)
- write (*,'(a,i5,a)') '[',rank,'] --------------------------------------------------------------> start simulation'
-
- resetpos = .TRUE.
- !current_time=final_time
- !do while(current_time <= final_time)
- do while(iter <= maxiter)
- elapsed_time = MPI_Wtime()
- ! Perturbation step, only required for high Reynolds number
- ! if( current_time>3.0 .and. current_time<4.0) then
- ! call perturb(velocity, current_time)
- ! end if
-
- !============================================================
- ! Compute the diagnostics, Noca method
- !============================================================
- !call nocaForces(force,velocity,vorticity,nu,coordMin,grid_step,time_step,dvol)
-
- if(rank == 0) then
- write(*,'(i5,a,3f10.5)') iter, ' drag: ', force
- write(10,'(11e14.5)') current_time,force
- end if
-
- !============================================================
- ! Solve Navier-Stokes using particular method
- !============================================================
- call PPMupdateParticles2DScalar(PPMscalar2D,.true.,topo%ID,meshNum,PPMvelocity2D)
- call RK2_2DScalar(time_step,topo%ID,meshNum,domain_ghostsize,PPMvelocity2D)
- call PPMremesh2DScalar(topo%ID,meshNum,domain_ghostsize,PPMscalar2D)
-
- !============================================================
- ! Solve Poisson for the new vorticity --> velocity
- !============================================================
- ! Compute velocity from vorticity
- ! Two steps:
- ! - solve Poisson for stream_function and update velocity from stream_function : everything is supposed
- ! to be done in ppm routine; indeed we do not have to deal with stream_function.
- ! - update velocity to fit with a required flow rate
- ! Solve poisson to find velocity
-!!$ call solve_poisson(vorticity,velocity,topo%ID,meshNum,domain_ghostsize)
-!!$ call ppm_map_field_ghost_get(topo%ID,meshNum,domain_ghostsize,info)
-!!$ call ppm_map_field_push(topo%ID,meshNum,velocity,3,info)
-!!$ call ppm_map_field_send(info)
-!!$ call ppm_map_field_pop(topo%ID,meshNum,velocity,3,domain_ghostsize,info)
-!!$ print *, "POST poisson", minval(vorticity),maxval(vorticity),minval(velocity),maxval(velocity)
-!!$ print *, 'veloc', sum(velocity(c_X,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(velocity(c_Y,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(velocity(c_Z,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1))
-!!$ print *, 'vort',sum(vorticity(c_X,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(vorticity(c_Y,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(vorticity(c_Z,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1))
-
-!!$
-!!$ call shiftVelocityX(reqFlowRate,grid_step,resolution,domainLength(c_Y)*domainLength(c_Z),coordMin,physDomainLowerPoint)
-!!$ call ppm_map_field_ghost_get(topo%ID,meshNum,domain_ghostsize,info)
-!!$ call ppm_map_field_push(topo%ID,meshNum,velocity, 3, info)
-!!$ call ppm_map_field_send(info)
-!!$ call ppm_map_field_pop(topo%ID,meshNum,velocity,3,domain_ghostsize,info)
-
-!!$ print *, "POST shift", minval(vorticity),maxval(vorticity),minval(velocity),maxval(velocity)
-!!$ print *, 'veloc', sum(velocity(c_X,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(velocity(c_Y,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(velocity(c_Z,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1))
-!!$ print *, 'vort',sum(vorticity(c_X,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(vorticity(c_Y,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(vorticity(c_Z,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1))
-
- !============================================================
- ! Penalize velocity on the sphere and on the boundaries
-!!$ !============================================================
-!!$ call penalise_velocity(velocity,time_step,chi_sphere,chi_boundary)
-!!$
-!!$ call ppm_map_field_ghost_get(topo%ID,meshNum,domain_ghostsize,info)
-!!$ call ppm_map_field_push(topo%ID,meshNum,velocity, 3, info)
-!!$ call ppm_map_field_send(info)
-!!$ call ppm_map_field_pop(topo%ID,meshNum,velocity,3,domain_ghostsize,info)
-!!$
-!!$ print *, "POST penal", minval(vorticity),maxval(vorticity),minval(velocity),maxval(velocity)
-!!$ print *, 'veloc', sum(velocity(c_X,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(velocity(c_Y,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(velocity(c_Z,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1))
-! call printToVTK("post-penal",iter,velocity,vorticity,resolution,grid_step,coordMin)
-
-
- !============================================================
- ! Compute the new "penalized" vorticity
- !============================================================
-!!$ call curlDF4(velocity,vorticity,resolution,grid_step)
-!!$ call ppm_map_field_ghost_get(topo%ID,meshNum,domain_ghostsize,info)
-!!$ call ppm_map_field_push(topo%ID,meshNum,vorticity,3,info)
-!!$ call ppm_map_field_send(info)
-!!$ call ppm_map_field_pop(topo%ID,meshNum,vorticity,3,domain_ghostsize,info)
-!!$
-!!$
- !============================================================
- ! Compute stretch/diffusion from current velocity/vorticity
- !============================================================
-!!$ call computeRHS(velocity,vorticity,rhs,resolution,grid_step,nu)
-!!$ !!call computeStretch(velocity,vorticity,rhs,resolution,grid_step)
-!!$ call ppm_map_field_ghost_get(topo%ID,meshNum,domain_ghostsize,info)
-!!$ call ppm_map_field_push(topo%ID,meshNum,rhs,3,info)
-!!$ call ppm_map_field_send(info)
-!!$ call ppm_map_field_pop(topo%ID,meshNum,rhs,3,domain_ghostsize,info)
-
-!!$ print *, 'veloc', sum(velocity(c_X,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(velocity(c_Y,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(velocity(c_Z,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1))
-!!$ print *, 'vort',sum(vorticity(c_X,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(vorticity(c_Y,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(vorticity(c_Z,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1))
-!!$ print *, 'stretch',sum(rhs(c_X,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(rhs(c_Y,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1)),&
-!!$ sum(rhs(c_Z,1:resolution(c_X)-1,1:resolution(c_Y)-1,1:resolution(c_Z)-1,nsublist))&
-!!$ /((resolution(c_X)-1)*(resolution(c_Y)-1)*(resolution(c_Z)-1))
-!!$ print *, 'max v...', maxval(velocity(c_X,:,:,:,:)), maxval(velocity(c_Y,:,:,:,:)), maxval(velocity(c_Z,:,:,:,:))
-!!$ print *, 'min v...', minval(velocity(c_X,:,:,:,:)), minval(velocity(c_Y,:,:,:,:)), minval(velocity(c_Z,:,:,:,:))
-!!$ print *, 'max w...', maxval(vorticity(c_X,:,:,:,:)), maxval(vorticity(c_Y,:,:,:,:)), maxval(vorticity(c_Z,:,:,:,:))
-!!$ print *, 'min w...', minval(vorticity(c_X,:,:,:,:)), minval(vorticity(c_Y,:,:,:,:)), minval(vorticity(c_Z,:,:,:,:))
-!!$ print *, 'max s...', maxval(rhs(c_X,:,:,:,:)), maxval(rhs(c_Y,:,:,:,:)), maxval(rhs(c_Z,:,:,:,:))
-!!$ print *, 'min s...', minval(rhs(c_X,:,:,:,:)), minval(rhs(c_Y,:,:,:,:)), minval(rhs(c_Z,:,:,:,:))
-!!$
-!!$
-
-
-
-!!$ print *, 'indices ...', maxloc(vorticity(:,:,:,:,:)),'toto',minloc(vorticity(c_Y,:,:,:,:))
-!!$
-!!$
-!!$ print *, 'vort', vorticity(c_Y,-1,-1,4,1)
-!!$ print *, 'vel', velocity(c_X,1,1,4,1), velocity(c_X,1,1,128,1)
-!!$ print *, 'vel +1', velocity(c_X,1,1,5,1), velocity(c_X,1,1,129,1)
-!!$ print *, 'vel', velocity(c_X,1,1,6,1), velocity(c_X,1,1,130,1)
-!!$ print *, 'vel -1', velocity(c_X,1,1,3,1), velocity(c_X,1,1,127,1)
-!!$ print *, 'vel', velocity(c_X,1,1,2,1), velocity(c_X,1,1,126,1)
-
-
- ! Update time
- current_time = current_time + time_step
-
- if(verbose) then
- !memoryUsed = memoryUsed + getMemoryUsedForParticles()
- write(*,'(a,i5,a,i10)') "[", rank,"] end of iter ",iter
- write(*,'(a,i5,a,f10.4)') "[", rank,"] simulation time : ", MPI_WTime()-elapsed_time
- write(*,'(a,i5,a,f14.10)') "[", rank,"] current time step : ", time_step
- write(*,'(a,i5,a,f10.4)') "[", rank,"] Memory used : ", memoryUsed
- write(*,'(a,i5,a,f14.10)') "[", rank,"] current time : ", current_time
- end if
-
- ! Compute the new time step according to vorticity maximum value
- ! call updateTimeStep(time_step,vorticity,dtMax)
-
- ! Output every 20 time unit ...
-! if(mod(current_time,20.).lt.time_step) then
- ! call printToVTK("run",iter,velocity,vorticity,resolution,grid_step,coordMin)
- ! end if
-
- iter = iter+1
- !call MPI_BARRIER(MPI_COMM_WORLD,info)
- enddo
-
- if(rank==0) close(10)
-
- end subroutine timeLoop
-
- subroutine updateTimeStep(dt,ref_field,dtMax)
-
- real(mk), dimension(:,:,:,:,:), pointer :: ref_field
- real(mk), intent(inout) :: dt
- real(mk),intent(in)::dtMax
-
- real(mk) :: local_max,omega_max
- integer :: info
-
- local_max = maxval(ref_field(:,:,:,:,nsublist)) ! We ignore the ppm nsubs stuff ...
- call MPI_ALLReduce(local_max,omega_max,1,MPI_DOUBLE_PRECISION,MPI_MAX,MPI_COMM_WORLD,info)
- dt = min(0.25/omega_max,dtMax)
-
- end subroutine updateTimeStep
-
-
-
-
-end module NavierStokes2D
-
diff --git a/HySoP/src/main/unstable/NavierStokes3D.f90 b/HySoP/src/main/unstable/NavierStokes3D.f90
deleted file mode 100755
index 20be7b68fa73438cacbb30dbe649c5731caa4c61..0000000000000000000000000000000000000000
--- a/HySoP/src/main/unstable/NavierStokes3D.f90
+++ /dev/null
@@ -1,444 +0,0 @@
-!> This module is used to run a simulation using
-!! ppm (core and numerics)
-!!
-module ppmNavierStokes3D
-
- ! All required ppm modules ...
- use ppm_module_init, only : ppm_init
- use ppm_module_data, only : ppm_kind_double
- use ppm_module_finalize, only : ppm_finalize
- use ppm_module_map_field_ghost, only:ppm_map_field_ghost_get, ppm_map_field_ghost_put
- use ppm_module_map_field
- use ppm_module_data, only: ppm_param_bcdef_periodic
-
- ! use client_io
- use client_data
- ! some tools
- use parmesTools
- ! Physical domain and grid
- use Domain
- ! Fields on the grid
- use Fields, only: init_fields, velocity, vorticity, rhs,testFunc,getMemoryUsedForFields!, vel_ex!, stream_function
- ! Topology
- use client_topology, only: init_topo,topo,getPPMLocalResolution
- ! Poisson (ppm) solver
- use Solver, only : init_poisson_solver, solve_poisson, ppm_poisson_drv_none, ppm_poisson_drv_curl_fd2, ppm_poisson_drv_curl_fd4
- ! Penalisation stuff
- use penalisation, only : penalise_velocity
- ! Functions used to identify surfaces, volumes ...
- use SetsIndicators,only:chi_sphere,chi_boundary,compute_control_box,init_boundary_layer,nocaForces,&
- compute_test,chi_box,getMemoryForIndicators
- ! curl, prod ...
- use vectorcalculus, only: curldf4, computeRHS, norm1, norm2, normInf
- ! everything dealing with particles
- use Particles, only : init_particles,update_particles,push_particles,remesh,getMemoryUsedForParticles
- ! file io
- use io_vtk
-
- use mpi
-
- ! user-defined functions (for tests or fields initialization)
- use testsFunctions
-
- implicit none
-
- integer, private :: info
-
- ! Some global vars ...
- !> Sphere radius
- real(mk),private :: sphere_radius
- !> Sphere position
- real(mk),dimension(dime),private :: sphere_pos
- !> counter for memory usage
- real(mk) :: memoryUsed
-
-contains
-
- !> All required initialisations :
- !! MPI, ppm
- !! Domain, grid
- !! Fields
- !! Particles
- subroutine init_client(Re,localResolution,coordMin)
-
- use client_topology, only: isubl
- !> Reynolds numner
- real(mk),intent(in) ::Re
- !> local mesh resolution
- integer, dimension(dime),intent(out) :: localResolution
- !> Local (proc.) minimum point coordinates
- real(mk),dimension(dime),intent(out) ::coordMin
-
- ! Precision and tolerance (for ppm init)
- integer :: prec,tol
- ! MPI comm
- integer :: comm
- ! debug mode (for ppm)
- integer :: debug
-
-
- !> Dimensions and positions of the control volume
- real(mk),dimension(dime):: boxMin,boxMax
-
- !> For ppm fftw solver
- integer :: derive
-
- memoryUsed = 0
-
- ! "read" mpi parameters
- call MPI_COMM_RANK(MPI_COMM_WORLD,rank,info)
- call MPI_COMM_SIZE(MPI_COMM_WORLD,nbprocs,info)
- comm = MPI_COMM_WORLD
-
- write (*,'(a,i5,a)') '[',rank,'] --------------------------------------------------------------> start initialization '
-
- !======================
- ! Init ppm
- !======================
- prec = ppm_kind_double ! Defined in ppm_param.h
- debug = 0
- tol = -10
- info = -1
- call ppm_init(dime,prec,tol,comm,debug,info)
-
- !======================
- ! Geometry and grid
- !======================
- ! Set domain size, resolution, boundaries, number of ghost points ...
- ! At the time, many values are set in Domain.f90 file
- call init_geometry(ppm_param_bcdef_periodic)
- call init_grid()
-
- !======================
- ! Creates the topology
- !======================
- ! Based on ppm.
- call init_topo(falseLowerPoint,falseUpperPoint,domain_bc,domain_ghostsize,grid_resolution)
-
- !> Get the coordinates of the lowest point for the current domain
- coordMin(:)=topo%min_subd(:,isubl)
-
- !======================
- ! Fields allocation
- !======================
- ! Local number of nodes
- localResolution = getPPMLocalResolution()
- ! Allocate fields (velocity, vorticity ...)
- call init_fields(localResolution,domain_ghostsize)
-
- !=======================================================
- ! Compute a control volume for diagnostics computation
- !=======================================================
- !! Position of the upper and lower points of the box
- boxMin=falseLowerPoint!+1.0!15*grid_step
- boxMax=falseUpperPoint!15*grid_step
- !print *, rank,'sizes',boxMax-boxMin
- !print *, rank, 'sx', 0.5*(boxMax(3)-boxMin(3))*(boxMax(2)-boxMin(2)),(boxMax(3)-boxMin(3))*(boxMax(2)-boxMin(2))
- !print *, rank, 'sy', 0.5*(boxMax(3)-boxMin(3))*(boxMax(1)-boxMin(1)),(boxMax(3)-boxMin(3))*(boxMax(1)-boxMin(1))
- !print *, rank, 'sz', 0.5*(boxMax(1)-boxMin(1))*(boxMax(2)-boxMin(2)),(boxMax(1)-boxMin(1))*(boxMax(2)-boxMin(2))
- !! Sphere radius and position
- sphere_radius=0.5
- sphere_pos=(upperPoint+lowerPoint)/2.0
-
- !! compute indicator functions for the control box and the sphere
- call compute_control_box(localResolution,grid_step,boxMin,boxMax,sphere_pos,sphere_radius,coordMin)
- !! Check : == 1 inside the box (excluding the sphere), 0 elsewhere
-
- !=============================================================
- ! Compute indicator function for the boundaries in z dir
- ! (will be used to enforce dirichlet conditions on these bound.)
- !=============================================================
- call init_boundary_layer(localResolution,grid_step,lowerPoint,upperPoint,coordMin)
-
- ! Test : export test function to vtk file.
- ! compute_test set 1 at all points belonging to chi_...
- testFunc=0.0
- call compute_test(testFunc,chi_boundary)
- call compute_test(testFunc,chi_box)
- call printChiToVTK("box",testFunc,localResolution,grid_step,coordMin)
- !! display the memory used for indicator sets and fields
- memoryUsed=getMemoryUsedForFields()+getMemoryForIndicators()
- deallocate(testFunc)
-
- !================================
- ! Solvers (grid and particles)
- !================================
-
- ! --- Grid solver for Poisson ---
- ! derive : means that finite difference, order 4, are used to compute velocity from stream function, in ppm
- derive = ppm_poisson_drv_curl_fd4
- ! init fftw solver, from ppm
- call init_poisson_solver(vorticity,velocity,topo%ID,topo%mesh(1)%ID,derive)
-
- ! --- Particles ---
- ! Set particles parameters (kernel type, cutoff ...)
- call init_particles()
-
- if(verbose) then
- ! write(*,'(a,i5,a100)') '[',rank,'] ============================================= Summary ============================================='
- write(*,'(a,i5,a)') '[',rank,'] ======================================== Summary ========================================'
- if (rank==0) then
- write(*,'(a,i5,a,3f10.4)') '[',rank,'] Computational domain (geom) dimensions : ', lengths
- write(*,'(a,i5,a,3d20.10)') '[',rank,'] Space step : ', grid_step
- write(*,'(a,i5,a,f10.4)') '[',rank,'] Reynolds : ', Re
- end if
- write(*,'(a,i5,a,3f10.5)') '[',rank,'] Current subdomain (geom) position : ', coordMin
- write(*,'(a,i5,a,3i10)') '[',rank,'] Current subdomain resolution : ', localResolution
- ! write(*,'(a,i5,a)') '[',rank,'] ===================================================================================================='
- write(*,'(a,i5,a)') '[',rank,'] ========================================================================================='
- end if
-
- write (*,'(a,i5,a)') '[',rank,'] --------------------------------------------------------------> end of initialization'
-
- end subroutine init_client
-
- subroutine computeInitialFields(fit_velo,dt,resolution,step,coordMin)
- !> offset value for velocity to fit with a given flow rate
- real(mk),intent(in) :: fit_velo
- !> current time step
- real(mk),intent(in) ::dt
- !> local mesh resolution
- integer,dimension(dime),intent(in) :: resolution
- !> mesh step sizes
- real(mk),dimension(dime),intent(in)::step
- !> Local (proc.) minimum point coordinates
- real(mk),dimension(dime),intent(in) ::coordMin
- ! set velocity to 0. and compute a full vorticity distribution, such that
- ! Omega_y = -3z/(Lz^2)
- velocity = 0.0
- call init_vorticity(vorticity,resolution,step,coordMin,lowerPoint,upperPoint)
- ! Init ghost values for vorticity
- call ppm_map_field_ghost_get(topo%ID,topo%mesh(1)%ID,domain_ghostsize,info)
- call ppm_map_field_push(topo%ID,topo%mesh(1)%ID,vorticity, 3, info)
- call ppm_map_field_send(info)
- call ppm_map_field_pop(topo%ID,topo%mesh(1)%ID,vorticity,3,domain_ghostsize,info)
- ! Solve poisson for velocity
- call solve_poisson(vorticity,velocity,topo%ID,topo%mesh(1)%ID,domain_ghostsize)
- velocity(c_X,:,:,:,:) = velocity(c_X,:,:,:,:) + fit_velo
- ! Penalize to take sphere and boundaries into account
- call penalise_velocity(velocity,dt,chi_sphere,chi_boundary)
- call ppm_map_field_ghost_get(topo%ID,topo%mesh(1)%ID,domain_ghostsize,info)
- call ppm_map_field_push(topo%ID,topo%mesh(1)%ID,velocity, 3, info)
- call ppm_map_field_send(info)
- call ppm_map_field_pop(topo%ID,topo%mesh(1)%ID,velocity,3,domain_ghostsize,info)
- ! Compute and map the new "penalized" vorticity
- call curlDF4(velocity,vorticity,resolution,step)
- call ppm_map_field_ghost_get(topo%ID,topo%mesh(1)%ID,domain_ghostsize,info)
- call ppm_map_field_push(topo%ID,topo%mesh(1)%ID,vorticity,3,info)
- call ppm_map_field_send(info)
- call ppm_map_field_pop(topo%ID,topo%mesh(1)%ID,vorticity,3,domain_ghostsize,info)
-
- end subroutine computeInitialFields
-
- subroutine main_client() bind(c,name='NavierStokes3D')
-
- real(mk) :: initial_time,final_time
- real(mk) :: Re
- real(mk) :: t1
- real(mk), dimension(dime) :: coordMin
- !> local mesh resolution
- integer, dimension(dime) :: localResolution
- Re = 133.4! 210.6
- initial_time = 0.0
- final_time = initial_time!20.
-
- ! Initialisation stuff
- t1 = MPI_WTIME()
- call init_client(Re,localResolution,coordMin)
- write (*,'(a,i5,a,f10.5)') '[',rank,'] Initialisation time: ', MPI_WTIME()-t1
-
- ! Time loop
- call timeLoop(initial_time,final_time,Re,localResolution,coordMin)
-
- ! Close everything related to ppm
- call ppm_finalize(info)
- write (*,'(a,i5,a)') '[',rank,'] ================== End of simulation. =================='
-
- end subroutine main_client
-
-
- !> Simulation over time ...
- subroutine timeLoop(initial_time,final_time,Re,resolution,coordMin)
-
- !> Starting time
- real(mk), intent(in) :: initial_time
- !> Ending time
- real(mk), intent(in) :: final_time
- !> Reynolds number
- real(mk), intent(in) :: Re
- !> Local mesh resolution
- integer, dimension(dime) :: resolution
- !> coordinates of the lowest point of the domain
- real(mk),dimension(dime),intent(in) :: coordMin
-
- real(mk) :: current_time,elapsed_time,time_step
- integer :: iter
- logical :: resetpos
- real(mk) :: fit_velo,nu,dtMax
- ! real(mk), dimension(:,:), pointer :: err1, err2, errinf
- ! diagnostics 1:3 -> drag/lifts "porous" drag, 4:6 Winkelmans paper method
- ! real(mk), dimension(dime) :: diagnostics
- real(mk),dimension(dime)::force
-
- real(mk)::dvol
-
- dvol=product(grid_step)
- nu =1./Re
- current_time = initial_time
- iter = 1
-
- ! Max value allowed for the time step
- dtMax = grid_step(1)**2/(6.*nu)
-
- ! offset for velocity to set a desired average value for flow rate.
- fit_velo = (upperPoint(c_Z)-lowerPoint(c_Z))/lengths(c_Z)
- ! Initial time step
- time_step=dtMax
-
- if(rank==0) open(10,file='diagnostics') ! Output only for one process
-
- !! Compute a first distribution of velocity and vorticity
- call computeInitialFields(fit_velo,time_step,resolution,grid_step,coordMin)
- call printToVTK("init",iter,velocity,vorticity,topo,grid_step)
- force=0.0
- call nocaForces(force,velocity,vorticity,1./Re,coordMin,grid_step,time_step,dvol)
- if(rank==0) print*, 'Initial drag ', force
- ! Synchronise all procs after initialization process ...
- call MPI_BARRIER(MPI_COMM_WORLD,info)
- write (*,'(a,i5,a)') '[',rank,'] --------------------------------------------------------------> start simulation'
- resetpos = .TRUE.
- do while(current_time <= final_time)
- elapsed_time = MPI_Wtime()
- ! Perturbation step, only required for high Reynolds number
- ! if( current_time>3.0 .and. current_time<4.0) then
- ! call perturb(velocity, current_time)
- ! end if
-
- !============================================================
- ! Compute stretch/diffusion from current velocity/vorticity
- !============================================================
-
-
- print *, rank, 'vel X', velocity(1,10,10,-1:3,1)
- print *, rank, 'vel X', velocity(1,10,10,resolution(3)-2:resolution(3)+2,1)
- print *, rank, 'vort X', vorticity(1,10,10,-1:3,1)
- print *, rank, 'vort X', vorticity(1,10,10,resolution(3)-2:resolution(3)+2,1)
-
- call computeRHS(velocity,vorticity,rhs,resolution,grid_step,nu)
- print *, rank, 'rhs pre', minval(rhs),maxval(rhs)
- print *, rank, 'rhs preX', rhs(1,10,10,-1:3,1)
- print *, rank, 'rhs preX', rhs(1,10,10,resolution(3)-2:resolution(3)+2,1)
-! print *, rank, 'rhs preY', rhs(2,10,10,-1:3,1),rhs(2,10,10,resolution(3)-2:resolution(3)+2,1)
- ! print *, rank, 'rhs pre2', rhs(3,10,10,-1:3,1),rhs(3,10,10,resolution(3)-2:resolution(3)+2,1)
-
- call ppm_map_field_ghost_get(topo%ID,topo%mesh(1)%ID,domain_ghostsize,info)
- call ppm_map_field_push(topo%ID,topo%mesh(1)%ID,rhs,3,info)
- call ppm_map_field_send(info)
- call ppm_map_field_pop(topo%ID,topo%mesh(1)%ID,rhs,3,domain_ghostsize,info)
-
- print *, rank, 'rhs', minval(rhs),maxval(rhs)
- print *, rank, 'rhs postX', rhs(1,10,10,-1:3,1)
- print *, rank, 'rhs postX', rhs(1,10,10,resolution(3)-2:resolution(3)+2,1)
- ! print *, rank, 'rhs postY', rhs(2,10,10,-1:3,1),rhs(2,10,10,resolution(3)-2:resolution(3)+2,1)
- ! print *, rank, 'rhs post2', rhs(3,10,10,-1:3,1),rhs(3,10,10,resolution(3)-2:resolution(3)+2,1)
-
- !============================================================
- ! Solve Navier-Stokes using particular method
- !============================================================
- ! Initialize the particles according to the last computed vorticity, velocity and rhs
- call update_particles(vorticity,resetpos,topo%ID,topo%mesh(1)%ID,velocity)
- ! Integrate
- call push_particles(time_step,topo%ID,topo%mesh(1)%ID,domain_ghostsize,velocity,rhs)
- ! Remesh
- call remesh(topo%ID, topo%mesh(1)%ID,domain_ghostsize,vorticity)
- ! Ghost values for vorticity
- call ppm_map_field_ghost_get(topo%ID,topo%mesh(1)%ID,domain_ghostsize,info)
- call ppm_map_field_push(topo%ID,topo%mesh(1)%ID,vorticity, 3, info)
- call ppm_map_field_send(info)
- call ppm_map_field_pop(topo%ID,topo%mesh(1)%ID,vorticity,3,domain_ghostsize,info)
-
- !============================================================
- ! Solve Poisson for the new vorticity --> velocity
- !============================================================
- ! Compute velocity from vorticity
- ! Two steps:
- ! - solve Poisson for stream_function and update velocity from stream_function : everything is supposed
- ! to be done in ppm routine; indeed we do not have to deal with stream_function.
- ! - update velocity to fit with required boundary values
- ! Solve poisson to find velocity
- call solve_poisson(vorticity,velocity,topo%ID,topo%mesh(1)%ID,domain_ghostsize)
- velocity(c_X,:,:,:,:) = velocity(c_X,:,:,:,:) + fit_velo
-
- !============================================================
- ! Penalize velocity on the sphere and on the boundaries
- !============================================================
- call penalise_velocity(velocity,time_step,chi_boundary,chi_sphere)
- call ppm_map_field_ghost_get(topo%ID,topo%mesh(1)%ID,domain_ghostsize,info)
- call ppm_map_field_push(topo%ID,topo%mesh(1)%ID,velocity, 3, info)
- call ppm_map_field_send(info)
- call ppm_map_field_pop(topo%ID,topo%mesh(1)%ID,velocity,3,domain_ghostsize,info)
-
- !============================================================
- ! Compute the new "penalized" vorticity
- !============================================================
- call curlDF4(velocity,vorticity,resolution,grid_step)
- call ppm_map_field_ghost_get(topo%ID,topo%mesh(1)%ID,domain_ghostsize,info)
- call ppm_map_field_push(topo%ID,topo%mesh(1)%ID,vorticity,3,info)
- call ppm_map_field_send(info)
- call ppm_map_field_pop(topo%ID,topo%mesh(1)%ID,vorticity,3,domain_ghostsize,info)
-
- !============================================================
- ! Compute the diagnostics, Noca method
- !============================================================
- call nocaForces(force,velocity,vorticity,1./Re,coordMin,grid_step,time_step,dvol)
-
- if(rank == 0) then
- write(*,'(i5,a,3f10.5)') iter, ' drag: ', force
- write(10,'(11e14.5)') current_time,force
- end if
-
- if(verbose) then
- memoryUsed = memoryUsed + getMemoryUsedForParticles()
- write(*,'(a,i5,a,i10)') "[", rank,"] end of iter ",iter
- write(*,'(a,i5,a,f10.4)') "[", rank,"] simulation time : ", MPI_WTime()-elapsed_time
- write(*,'(a,i5,a,f10.5)') "[", rank,"] current time step : ", time_step
- write(*,'(a,i5,a,f10.4)') "[", rank,"] Memory used : ", memoryUsed
- end if
-
- ! Update time
- current_time = current_time + time_step
-
- ! Compute the new time step according to vorticity maximum value
- call updateTimeStep(time_step,vorticity,dtMax)
-
- ! Output every 10 time unit ...
- if(mod(current_time,20.).lt.time_step) then
- call printToVTK("run",iter,velocity,vorticity,topo,grid_step)
- end if
-
- !current_time = final_time
- iter = iter+1
- call MPI_BARRIER(MPI_COMM_WORLD,info)
- enddo
-
- if(rank==0) close(10)
-
- end subroutine timeLoop
-
- subroutine updateTimeStep(dt,ref_field,dtMax)
-
- real(mk), dimension(:,:,:,:,:), pointer :: ref_field
- real(mk), intent(inout) :: dt
- real(mk),intent(in)::dtMax
-
- real(mk) :: local_max,omega_max
-
- local_max = maxval(ref_field(:,:,:,:,1)) ! We ignore the ppm nsubs stuff ...
- call MPI_Reduce(local_max,omega_max,1,MPI_DOUBLE_PRECISION,MPI_MAX,0,MPI_COMM_WORLD,info)
- if(rank == 0) then
- dt = min(0.25/omega_max,dtMax)
- end if
- call MPI_bcast(dt,1,MPI_DOUBLE_PRECISION,0,MPI_COMM_WORLD,info)
- end subroutine updateTimeStep
-
-end module ppmNavierStokes3D
diff --git a/HySoP/src/parmesTools.f90 b/HySoP/src/parmesTools.f90
deleted file mode 100755
index e48a4e7badb9f4420dbee213854c8b10a67a1a17..0000000000000000000000000000000000000000
--- a/HySoP/src/parmesTools.f90
+++ /dev/null
@@ -1,20 +0,0 @@
-!> Some useful tools for assertion, profiling ...
-module parmesTools
-
- use client_data
- implicit none
-
- contains
-
- subroutine parmesAssert(var,value,message)
- integer, intent(in) :: var
- integer, intent(in) :: value
- character(len=*) :: message
-
- if(var/=value) then
- write (*,'(a,i3,a,a)') '[',rank, "] Parmes error: ", message
- stop
- end if
- end subroutine parmesAssert
-
-end module parmesTools
diff --git a/HySoP/src/tests/F2003/testAllocatedPtr.cxx b/HySoP/src/tests/F2003/testAllocatedPtr.cxx
deleted file mode 100644
index 40f329a18cdc506df865c760b4c9c74edbf67659..0000000000000000000000000000000000000000
--- a/HySoP/src/tests/F2003/testAllocatedPtr.cxx
+++ /dev/null
@@ -1,57 +0,0 @@
-/** \file testAllocatedPtr.cxx
- Test F2003 C interoperability
- Send a vector (i.e allocated pointer) to Fortran. Must get it back still properly allocated with a different content.
-
- */
-#include<iostream>
-#include <string>
-#include "WrapC.hpp"
-#include "ParmesDef.hpp"
-#include<vector>
-#include <math.h>
-
-using namespace std ;
-
-using Parmes::Def::real_t;
-
-// Declare the Fortran subroutine
-extern "C" void wrapC2F_allocatedPtr(double*, int*, real_t*);
-
-
-int main(int argc, char* argv[])
-{
-
- int length = 12;
- std::vector<real_t> myVector(length);
- for(int i = 0; i<length; ++i)
- myVector[i] = 2.3;
-
- real_t expectedContent = 1.1;
-
- // Send myVector to the Fortran Wrapper.
- // myVector is supposed to be modified such that myVector[i] = expectedContent *i
- wrapC2F_allocatedPtr(&myVector[0], &length, &expectedContent);
-
- for(int i = 0; i<length ; ++i)
- cout << myVector[i] << endl;
-
- if(myVector.size()!= length)
- {
- cout << "ERROR" << endl;
- return 1;
- }
-
-
- for(int i = 0; i< length ; ++i)
- {
- real_t check = myVector[i] - expectedContent*(i+1);
- real_t tol = 1e-10;
- if(fabs(check)>tol)
- {
- cout << "ERROR" << endl;
- return 1;
- }
- }
-
-}
-
diff --git a/HySoP/src/tests/F2003/testNullPtr.cxx b/HySoP/src/tests/F2003/testNullPtr.cxx
deleted file mode 100644
index d552d8912080203aed9b04868ae3ae72c12b2ced..0000000000000000000000000000000000000000
--- a/HySoP/src/tests/F2003/testNullPtr.cxx
+++ /dev/null
@@ -1,43 +0,0 @@
-/** \file testNullPtr.cxx
- Test F2003 C interoperability
-
- Send a null pointer to Fortran : must send back a properly allocated vector
-
- */
-#include<iostream>
-#include <string>
-#include "WrapC.hpp"
-
-using namespace std ;
-
-extern "C" {
-
- void wrapC2F_NULLPtr(C2FPtr*);
- void wrapC2F_NULLPtrBis(double**, int*);
-
-}
-
-int main(int argc, char* argv[])
-{
- double * toto = 0;
- int ntoto;
- std::cout << "Fortran 2003 wrapper ..." << std::endl;
-
- //
- C2FPtr * myVector = new C2FPtr;
-
- wrapC2F_NULLPtr(myVector);
-
- for(int i =0; i<myVector->length; ++i)
- cout << myVector->elements[i] << endl;
-
- wrapC2F_NULLPtrBis(&toto, &ntoto);
-
- cout << ntoto << endl;
- for(int i = 0; i<ntoto ;++i)
- cout << toto[i] << endl;
-
- delete(myVector);
-
-}
-
diff --git a/HySoP/src/tests/F2003/userMod.f90 b/HySoP/src/tests/F2003/userMod.f90
deleted file mode 100644
index 25870aa503fcd1ac4b1c80ab12f9f1f918818ff9..0000000000000000000000000000000000000000
--- a/HySoP/src/tests/F2003/userMod.f90
+++ /dev/null
@@ -1,66 +0,0 @@
-module userMod
-
- implicit none
-
-contains
-
- ! Already allocated pointer, no size information, intent(IN)
- subroutine modifyX(x,factor)
-
- real(kind=8), dimension(:), intent(inout) :: x
- real(kind=8), intent(in) :: factor
-
- integer :: i
- do i=1,size(x)
- x(i) = i*factor
- end do
-
- end subroutine modifyX
-
- subroutine cas4(x)
-
- real(kind=8), dimension(:), intent(inout) :: x
-
-
- print *, 'cas3a', x(1), ' ', x(2)
-
- x(2) = x(2) +1.65
- print *, 'cas 3b', x(1), ' ', x(2)
-
- end subroutine cas4
-
- subroutine cas5(x)
-
- !! integer, intent(in) :: size
- real(kind=8), pointer, dimension(:) :: x
-
- allocate(x(2))
- x(1) =12
- x(2) = 8
- print *, 'cas5a', x(1), ' ', x(2)
-
- x(2) = 1.65
- print *, 'cas 5b', x(1), ' ', x(2)
- print * , x
- end subroutine cas5
-
- subroutine cas6(x)
-
- !! integer, intent(in) :: size
- real(kind=8), pointer, dimension(:) :: x
-
- x(1) =12
- x(2) = 8
- print *, 'cas6a', shape(x), ' ', x(1), ' ', x(2)
-
- x(2) = 1.65
- print *, 'cas 6b', x(1), ' ', x(2)
- print * , x
-
- end subroutine cas6
-
- subroutine Application3()
-
- end subroutine Application3
-
-end module userMod
diff --git a/HySoP/src/tests/F2003/wrapper.f90 b/HySoP/src/tests/F2003/wrapper.f90
deleted file mode 100644
index ef2db12eea93872301067b7e19ffa103cd149cc9..0000000000000000000000000000000000000000
--- a/HySoP/src/tests/F2003/wrapper.f90
+++ /dev/null
@@ -1,86 +0,0 @@
-module testWrap
-
- ! The fortran wrapper from Parmes
- use WrapFort
- ! Some subroutines for tests
- use userMod
-
- implicit none
-
-contains
-
- !> Send an already allocated C pointer to a Fortran subroutine.
- !! @param type(c_Ptr) a C pointer (void*)
- !! @param type(c_int) size of C pointer
- subroutine wrapC2F_allocatedPtr(cptr, sizeCptr, expectedContent) bind(C, name='wrapC2F_allocatedPtr')
-
- type(c_Ptr),intent(in),VALUE :: cptr
- integer (kind=c_int), intent(IN) :: sizeCptr
- real(kind = c_double), intent(IN) :: expectedContent
-
- real(kind=c_double), pointer, dimension(:) :: xp => NULL()
-
- if(NDEBUG) print *, '=== wrapC2F_allocatedPtr ==='
- ! Associate cptr and xp.
- call c_f_pointer (cptr, xp, (/sizeCPtr/))
-
- if(.not.associated(xp) ) then
- print *, 'Error, association failed'
- end if
-
- ! Do some stuff on xp ...
- xp(1) = -3.9
- call modifyX(xp,expectedContent)
- print *, '=== End wrapC2F_allocatedPtr === '
-
- end subroutine WrapC2F_allocatedPtr
-
- !> Send a NULL C pointer to a Fortran subroutine and get it back properly allocated
- !! @param[inout] type(c_Ptr) a C pointer (void*)
- !! @param[out] type(c_int) size of C pointer
- subroutine wrapC2F_NULLPtr(vector) bind(C, name='wrapC2F_NULLPtr')
-
- type(C2FPtr) :: vector
-
- real(kind=c_double), pointer, dimension(:) :: xp => NULL()
-
- if(NDEBUG) print *, '=== wrapC2F_NULLPtr ==='
-
- call cas5(xp)
-
- if(.not.associated(xp) ) then
- print *, 'Error, association failed'
- end if
-
- vector%length = size(xp)
- vector%elements = c_loc(xp(1))
-
- print *, '=== End of wrapC2F_NULLPtr === '
- end subroutine wrapC2F_NULLPtr
-
- !> Send a NULL C pointer to a Fortran subroutine and get it back properly allocated
- !! @param[inout] type(c_Ptr) a C pointer (void*)
- !! @param[out] type(c_int) size of C pointer
- subroutine wrapC2F_NULLPtrBis(vector, length) bind(C, name='wrapC2F_NULLPtrBis')
-
- type(c_ptr),intent(inout) :: vector
- integer(c_int), intent(out) :: length
-
- real(kind=c_double), pointer, dimension(:) :: xp => NULL()
-
- if(NDEBUG) print *, '=== wrapC2F_NULLPtr ==='
-
- call cas5(xp)
-
-!!$ if(.not.associated(xp) ) then
-!!$ print *, 'Error, association failed'
-!!$ end if
-!!$ length = size(xp)
-!!$ vector= c_loc(xp(1))
-
- call aliasF2C(vector, xp, length)
-
- print *, '=== End of wrapC2F_NULLPtr === '
- end subroutine wrapC2F_NULLPtrBis
-
-end module testWrap