From 22813d3a41bcd62ca3d10b345e1a3577cf7da481 Mon Sep 17 00:00:00 2001 From: Soroush Safaei Date: Sat, 10 Feb 2018 18:37:30 +1300 Subject: [PATCH 1/8] implemented working geometry --- docs/Makefile | 192 ------------ docs/conf.py | 286 ------------------ docs/index.rst | 22 -- docs/make.bat | 263 ---------------- .../STATIC_SOLUTION.part0.exelem | 201 ++++++++++++ .../STATIC_SOLUTION.part0.exnode | 192 ++++++++++++ src/fortran/expected_results/results.txt | 1 - src/fortran/input/CMHEART.inp | 3 - .../output/STATIC_SOLUTION.part0.exelem | 201 ++++++++++++ .../output/STATIC_SOLUTION.part0.exnode | 192 ++++++++++++ src/fortran/stokes_static.F90 | 117 +++---- src/fortran/visualiseStokes.com | 20 ++ 12 files changed, 871 insertions(+), 819 deletions(-) delete mode 100644 docs/Makefile delete mode 100644 docs/conf.py delete mode 100644 docs/index.rst delete mode 100644 docs/make.bat create mode 100644 src/fortran/expected_results/STATIC_SOLUTION.part0.exelem create mode 100644 src/fortran/expected_results/STATIC_SOLUTION.part0.exnode delete mode 100644 src/fortran/expected_results/results.txt delete mode 100644 src/fortran/input/CMHEART.inp create mode 100644 src/fortran/output/STATIC_SOLUTION.part0.exelem create mode 100644 src/fortran/output/STATIC_SOLUTION.part0.exnode create mode 100755 src/fortran/visualiseStokes.com diff --git a/docs/Makefile b/docs/Makefile deleted file mode 100644 index 897a3a5..0000000 --- a/docs/Makefile +++ /dev/null @@ -1,192 +0,0 @@ -# Makefile for Sphinx documentation -# - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = sphinx-build -PAPER = -BUILDDIR = _build - -# User-friendly check for sphinx-build -ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) -endif - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) . - -.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest coverage gettext - -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " applehelp to make an Apple Help Book" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " xml to make Docutils-native XML files" - @echo " pseudoxml to make pseudoxml-XML files for display purposes" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - @echo " coverage to run coverage check of the documentation (if enabled)" - -clean: - rm -rf $(BUILDDIR)/* - -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/XXXXXXXX.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/XXXXXXXX.qhc" - -applehelp: - $(SPHINXBUILD) -b applehelp $(ALLSPHINXOPTS) $(BUILDDIR)/applehelp - @echo - @echo "Build finished. The help book is in $(BUILDDIR)/applehelp." - @echo "N.B. You won't be able to view it unless you put it in" \ - "~/Library/Documentation/Help or install it in your application" \ - "bundle." - -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/XXXXXXXX" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/XXXXXXXX" - @echo "# devhelp" - -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -latexpdfja: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through platex and dvipdfmx..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." - -coverage: - $(SPHINXBUILD) -b coverage $(ALLSPHINXOPTS) $(BUILDDIR)/coverage - @echo "Testing of coverage in the sources finished, look at the " \ - "results in $(BUILDDIR)/coverage/python.txt." - -xml: - $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml - @echo - @echo "Build finished. The XML files are in $(BUILDDIR)/xml." - -pseudoxml: - $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml - @echo - @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." diff --git a/docs/conf.py b/docs/conf.py deleted file mode 100644 index bf40d6d..0000000 --- a/docs/conf.py +++ /dev/null @@ -1,286 +0,0 @@ -# -*- coding: utf-8 -*- -# -# XXXXXXXX documentation build configuration file, created by -# sphinx-quickstart on Tue Sep 26 16:27:22 2017. -# -# This file is execfile()d with the current directory set to its -# containing dir. -# -# Note that not all possible configuration values are present in this -# autogenerated file. -# -# All configuration values have a default; values that are commented out -# serve to show the default. - -import sys -import os -import shlex - -# If extensions (or modules to document with autodoc) are in another directory, -# add these directories to sys.path here. If the directory is relative to the -# documentation root, use os.path.abspath to make it absolute, like shown here. -#sys.path.insert(0, os.path.abspath('.')) - -# -- General configuration ------------------------------------------------ - -# If your documentation needs a minimal Sphinx version, state it here. -#needs_sphinx = '1.0' - -# Add any Sphinx extension module names here, as strings. They can be -# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom -# ones. -extensions = [ - 'sphinx.ext.mathjax', -] - -# Add any paths that contain templates here, relative to this directory. -templates_path = ['_templates'] - -# The suffix(es) of source filenames. -# You can specify multiple suffix as a list of string: -# source_suffix = ['.rst', '.md'] -source_suffix = '.rst' - -# The encoding of source files. -#source_encoding = 'utf-8-sig' - -# The master toctree document. -master_doc = 'index' - -# General information about the project. -project = u'XXXXXXXX' -copyright = u'2017, YYYYYYYY' -author = u'YYYYYYYY' - -# The version info for the project you're documenting, acts as replacement for -# |version| and |release|, also used in various other places throughout the -# built documents. -# -# The short X.Y version. -version = 'X.Y.Z' -# The full version, including alpha/beta/rc tags. -release = 'X.Y.Z' - -# The language for content autogenerated by Sphinx. Refer to documentation -# for a list of supported languages. -# -# This is also used if you do content translation via gettext catalogs. -# Usually you set "language" from the command line for these cases. -language = None - -# There are two options for replacing |today|: either, you set today to some -# non-false value, then it is used: -#today = '' -# Else, today_fmt is used as the format for a strftime call. -#today_fmt = '%B %d, %Y' - -# List of patterns, relative to source directory, that match files and -# directories to ignore when looking for source files. -exclude_patterns = ['_build'] - -# The reST default role (used for this markup: `text`) to use for all -# documents. -#default_role = None - -# If true, '()' will be appended to :func: etc. cross-reference text. -#add_function_parentheses = True - -# If true, the current module name will be prepended to all description -# unit titles (such as .. function::). -#add_module_names = True - -# If true, sectionauthor and moduleauthor directives will be shown in the -# output. They are ignored by default. -#show_authors = False - -# The name of the Pygments (syntax highlighting) style to use. -pygments_style = 'sphinx' - -# A list of ignored prefixes for module index sorting. -#modindex_common_prefix = [] - -# If true, keep warnings as "system message" paragraphs in the built documents. -#keep_warnings = False - -# If true, `todo` and `todoList` produce output, else they produce nothing. -todo_include_todos = False - - -# -- Options for HTML output ---------------------------------------------- - -# The theme to use for HTML and HTML Help pages. See the documentation for -# a list of builtin themes. -html_theme = 'alabaster' - -# Theme options are theme-specific and customize the look and feel of a theme -# further. For a list of options available for each theme, see the -# documentation. -#html_theme_options = {} - -# Add any paths that contain custom themes here, relative to this directory. -#html_theme_path = [] - -# The name for this set of Sphinx documents. If None, it defaults to -# " v documentation". -#html_title = None - -# A shorter title for the navigation bar. Default is the same as html_title. -#html_short_title = None - -# The name of an image file (relative to this directory) to place at the top -# of the sidebar. -#html_logo = None - -# The name of an image file (within the static path) to use as favicon of the -# docs. This file should be a Windows icon file (.ico) being 16x16 or 32x32 -# pixels large. -#html_favicon = None - -# Add any paths that contain custom static files (such as style sheets) here, -# relative to this directory. They are copied after the builtin static files, -# so a file named "default.css" will overwrite the builtin "default.css". -html_static_path = ['_static'] - -# Add any extra paths that contain custom files (such as robots.txt or -# .htaccess) here, relative to this directory. These files are copied -# directly to the root of the documentation. -#html_extra_path = [] - -# If not '', a 'Last updated on:' timestamp is inserted at every page bottom, -# using the given strftime format. -#html_last_updated_fmt = '%b %d, %Y' - -# If true, SmartyPants will be used to convert quotes and dashes to -# typographically correct entities. -#html_use_smartypants = True - -# Custom sidebar templates, maps document names to template names. -#html_sidebars = {} - -# Additional templates that should be rendered to pages, maps page names to -# template names. -#html_additional_pages = {} - -# If false, no module index is generated. -#html_domain_indices = True - -# If false, no index is generated. -#html_use_index = True - -# If true, the index is split into individual pages for each letter. -#html_split_index = False - -# If true, links to the reST sources are added to the pages. -#html_show_sourcelink = True - -# If true, "Created using Sphinx" is shown in the HTML footer. Default is True. -#html_show_sphinx = True - -# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True. -#html_show_copyright = True - -# If true, an OpenSearch description file will be output, and all pages will -# contain a tag referring to it. The value of this option must be the -# base URL from which the finished HTML is served. -#html_use_opensearch = '' - -# This is the file name suffix for HTML files (e.g. ".xhtml"). -#html_file_suffix = None - -# Language to be used for generating the HTML full-text search index. -# Sphinx supports the following languages: -# 'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja' -# 'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr' -#html_search_language = 'en' - -# A dictionary with options for the search language support, empty by default. -# Now only 'ja' uses this config value -#html_search_options = {'type': 'default'} - -# The name of a javascript file (relative to the configuration directory) that -# implements a search results scorer. If empty, the default will be used. -#html_search_scorer = 'scorer.js' - -# Output file base name for HTML help builder. -htmlhelp_basename = 'XXXXXXXXdoc' - -# -- Options for LaTeX output --------------------------------------------- - -latex_elements = { -# The paper size ('letterpaper' or 'a4paper'). -#'papersize': 'letterpaper', - -# The font size ('10pt', '11pt' or '12pt'). -#'pointsize': '10pt', - -# Additional stuff for the LaTeX preamble. -#'preamble': '', - -# Latex figure (float) alignment -#'figure_align': 'htbp', -} - -# Grouping the document tree into LaTeX files. List of tuples -# (source start file, target name, title, -# author, documentclass [howto, manual, or own class]). -latex_documents = [ - (master_doc, 'XXXXXXXX.tex', u'XXXXXXXX Documentation', - u'YYYYYYYY', 'manual'), -] - -# The name of an image file (relative to this directory) to place at the top of -# the title page. -#latex_logo = None - -# For "manual" documents, if this is true, then toplevel headings are parts, -# not chapters. -#latex_use_parts = False - -# If true, show page references after internal links. -#latex_show_pagerefs = False - -# If true, show URL addresses after external links. -#latex_show_urls = False - -# Documents to append as an appendix to all manuals. -#latex_appendices = [] - -# If false, no module index is generated. -#latex_domain_indices = True - - -# -- Options for manual page output --------------------------------------- - -# One entry per manual page. List of tuples -# (source start file, name, description, authors, manual section). -man_pages = [ - (master_doc, 'xxxxxxxx', u'XXXXXXXX Documentation', - [author], 1) -] - -# If true, show URL addresses after external links. -#man_show_urls = False - - -# -- Options for Texinfo output ------------------------------------------- - -# Grouping the document tree into Texinfo files. List of tuples -# (source start file, target name, title, author, -# dir menu entry, description, category) -texinfo_documents = [ - (master_doc, 'XXXXXXXX', u'XXXXXXXX Documentation', - author, 'XXXXXXXX', 'One line description of project.', - 'Miscellaneous'), -] - -# Documents to append as an appendix to all manuals. -#texinfo_appendices = [] - -# If false, no module index is generated. -#texinfo_domain_indices = True - -# How to display URL addresses: 'footnote', 'no', or 'inline'. -#texinfo_show_urls = 'footnote' - -# If true, do not generate a @detailmenu in the "Top" node's menu. -#texinfo_no_detailmenu = False diff --git a/docs/index.rst b/docs/index.rst deleted file mode 100644 index c6e8d46..0000000 --- a/docs/index.rst +++ /dev/null @@ -1,22 +0,0 @@ -.. XXXXXXXX documentation master file, created by - sphinx-quickstart on Tue Sep 26 16:27:22 2017. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -Welcome to XXXXXXXX's documentation! -==================================== - -Contents: - -.. toctree:: - :maxdepth: 2 - - - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`modindex` -* :ref:`search` - diff --git a/docs/make.bat b/docs/make.bat deleted file mode 100644 index 9744509..0000000 --- a/docs/make.bat +++ /dev/null @@ -1,263 +0,0 @@ -@ECHO OFF - -REM Command file for Sphinx documentation - -if "%SPHINXBUILD%" == "" ( - set SPHINXBUILD=sphinx-build -) -set BUILDDIR=_build -set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% . -set I18NSPHINXOPTS=%SPHINXOPTS% . -if NOT "%PAPER%" == "" ( - set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS% - set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS% -) - -if "%1" == "" goto help - -if "%1" == "help" ( - :help - echo.Please use `make ^` where ^ is one of - echo. html to make standalone HTML files - echo. dirhtml to make HTML files named index.html in directories - echo. singlehtml to make a single large HTML file - echo. pickle to make pickle files - echo. json to make JSON files - echo. htmlhelp to make HTML files and a HTML help project - echo. qthelp to make HTML files and a qthelp project - echo. devhelp to make HTML files and a Devhelp project - echo. epub to make an epub - echo. latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter - echo. text to make text files - echo. man to make manual pages - echo. texinfo to make Texinfo files - echo. gettext to make PO message catalogs - echo. changes to make an overview over all changed/added/deprecated items - echo. xml to make Docutils-native XML files - echo. pseudoxml to make pseudoxml-XML files for display purposes - echo. linkcheck to check all external links for integrity - echo. doctest to run all doctests embedded in the documentation if enabled - echo. coverage to run coverage check of the documentation if enabled - goto end -) - -if "%1" == "clean" ( - for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i - del /q /s %BUILDDIR%\* - goto end -) - - -REM Check if sphinx-build is available and fallback to Python version if any -%SPHINXBUILD% 2> nul -if errorlevel 9009 goto sphinx_python -goto sphinx_ok - -:sphinx_python - -set SPHINXBUILD=python -m sphinx.__init__ -%SPHINXBUILD% 2> nul -if errorlevel 9009 ( - echo. - echo.The 'sphinx-build' command was not found. Make sure you have Sphinx - echo.installed, then set the SPHINXBUILD environment variable to point - echo.to the full path of the 'sphinx-build' executable. Alternatively you - echo.may add the Sphinx directory to PATH. - echo. - echo.If you don't have Sphinx installed, grab it from - echo.http://sphinx-doc.org/ - exit /b 1 -) - -:sphinx_ok - - -if "%1" == "html" ( - %SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/html. - goto end -) - -if "%1" == "dirhtml" ( - %SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml. - goto end -) - -if "%1" == "singlehtml" ( - %SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml. - goto end -) - -if "%1" == "pickle" ( - %SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can process the pickle files. - goto end -) - -if "%1" == "json" ( - %SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can process the JSON files. - goto end -) - -if "%1" == "htmlhelp" ( - %SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can run HTML Help Workshop with the ^ -.hhp project file in %BUILDDIR%/htmlhelp. - goto end -) - -if "%1" == "qthelp" ( - %SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; now you can run "qcollectiongenerator" with the ^ -.qhcp project file in %BUILDDIR%/qthelp, like this: - echo.^> qcollectiongenerator %BUILDDIR%\qthelp\XXXXXXXX.qhcp - echo.To view the help file: - echo.^> assistant -collectionFile %BUILDDIR%\qthelp\XXXXXXXX.ghc - goto end -) - -if "%1" == "devhelp" ( - %SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. - goto end -) - -if "%1" == "epub" ( - %SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The epub file is in %BUILDDIR%/epub. - goto end -) - -if "%1" == "latex" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - if errorlevel 1 exit /b 1 - echo. - echo.Build finished; the LaTeX files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "latexpdf" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - cd %BUILDDIR%/latex - make all-pdf - cd %~dp0 - echo. - echo.Build finished; the PDF files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "latexpdfja" ( - %SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex - cd %BUILDDIR%/latex - make all-pdf-ja - cd %~dp0 - echo. - echo.Build finished; the PDF files are in %BUILDDIR%/latex. - goto end -) - -if "%1" == "text" ( - %SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The text files are in %BUILDDIR%/text. - goto end -) - -if "%1" == "man" ( - %SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The manual pages are in %BUILDDIR%/man. - goto end -) - -if "%1" == "texinfo" ( - %SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo. - goto end -) - -if "%1" == "gettext" ( - %SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The message catalogs are in %BUILDDIR%/locale. - goto end -) - -if "%1" == "changes" ( - %SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes - if errorlevel 1 exit /b 1 - echo. - echo.The overview file is in %BUILDDIR%/changes. - goto end -) - -if "%1" == "linkcheck" ( - %SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck - if errorlevel 1 exit /b 1 - echo. - echo.Link check complete; look for any errors in the above output ^ -or in %BUILDDIR%/linkcheck/output.txt. - goto end -) - -if "%1" == "doctest" ( - %SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest - if errorlevel 1 exit /b 1 - echo. - echo.Testing of doctests in the sources finished, look at the ^ -results in %BUILDDIR%/doctest/output.txt. - goto end -) - -if "%1" == "coverage" ( - %SPHINXBUILD% -b coverage %ALLSPHINXOPTS% %BUILDDIR%/coverage - if errorlevel 1 exit /b 1 - echo. - echo.Testing of coverage in the sources finished, look at the ^ -results in %BUILDDIR%/coverage/python.txt. - goto end -) - -if "%1" == "xml" ( - %SPHINXBUILD% -b xml %ALLSPHINXOPTS% %BUILDDIR%/xml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The XML files are in %BUILDDIR%/xml. - goto end -) - -if "%1" == "pseudoxml" ( - %SPHINXBUILD% -b pseudoxml %ALLSPHINXOPTS% %BUILDDIR%/pseudoxml - if errorlevel 1 exit /b 1 - echo. - echo.Build finished. The pseudo-XML files are in %BUILDDIR%/pseudoxml. - goto end -) - -:end diff --git a/src/fortran/expected_results/STATIC_SOLUTION.part0.exelem b/src/fortran/expected_results/STATIC_SOLUTION.part0.exelem new file mode 100644 index 0000000..6adc3cc --- /dev/null +++ b/src/fortran/expected_results/STATIC_SOLUTION.part0.exelem @@ -0,0 +1,201 @@ + Group name: StokesRegion + Shape. Dimension=2 + #Scale factor sets= 1 + l.Lagrange*l.Lagrange, #Scale factors=4 + #Nodes= 4 + #Fields=4 + 1) Coordinate, coordinate, rectangular cartesian, #Components=2 + x. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + y. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2) U, field, rectangular cartesian, #Components=3 + 1. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3) del U_del n, field, rectangular cartesian, #Components=3 + 1. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4) Materials, field, rectangular cartesian, #Components=2 + 1. constant*constant, no modify, grid based. + #xi1=0, #xi2=0 + 2. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + Element: 1 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 1 2 5 6 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 2 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 2 3 6 7 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 3 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 3 4 7 8 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 4 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 5 6 9 10 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 5 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 6 7 10 11 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 6 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 7 8 11 12 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 7 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 9 10 13 14 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 8 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 10 11 14 15 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 9 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 11 12 15 16 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 diff --git a/src/fortran/expected_results/STATIC_SOLUTION.part0.exnode b/src/fortran/expected_results/STATIC_SOLUTION.part0.exnode new file mode 100644 index 0000000..2900916 --- /dev/null +++ b/src/fortran/expected_results/STATIC_SOLUTION.part0.exnode @@ -0,0 +1,192 @@ + Group name: StokesRegion + #Fields=4 + 1) Coordinate, coordinate, rectangular cartesian, #Components=2 + x. Value index= 1, #Derivatives= 0 + y. Value index= 2, #Derivatives= 0 + 2) U, field, rectangular cartesian, #Components=3 + 1. Value index= 3, #Derivatives= 0 + 2. Value index= 4, #Derivatives= 0 + 3. Value index= 5, #Derivatives= 0 + 3) del U_del n, field, rectangular cartesian, #Components=3 + 1. Value index= 6, #Derivatives= 0 + 2. Value index= 7, #Derivatives= 0 + 3. Value index= 8, #Derivatives= 0 + 4) Materials, field, rectangular cartesian, #Components=2 + 1. Value index= 9, #Derivatives= 0 + 2. Value index= 10, #Derivatives= 0 + Node: 1 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 1.0901513302419586E+01 + 1.0148614788529272E-11 + 1.0378060669630887E-11 + 3.1353923793432077E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 2 + 3.3333333333333331E-01 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 1.0000000000000000E+00 + 2.7592262631199432E+01 + 8.3333333342046068E-02 + 2.7777777779855961E-02 + -5.0110560845827408E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 3 + 6.6666666666666663E-01 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 1.0000000000000000E+00 + 2.7592262631195471E+01 + 8.3333333342046068E-02 + 2.7777777779855961E-02 + -5.0110560845827408E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 4 + 1.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 1.0901513302414328E+01 + -1.0116929431700257E-11 + -3.6364521728898529E-12 + -3.1882013073915667E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 5 + 0.0000000000000000E+00 + 1.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 2.4126556016596762E+01 + 8.3333333331930520E-02 + 2.7777777718643423E-02 + -1.9412142555298874E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 6 + 3.3333333333333331E-01 + 1.0000000000000000E+00 + -1.1414153992951605E-11 + 1.0000000000069182E+00 + 1.9402123505003484E+01 + -5.8333333328872428E-01 + -5.0000000020055702E-01 + -2.7777777769272018E-02 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 7 + 6.6666666666666663E-01 + 1.0000000000000000E+00 + -1.1350783279293575E-11 + 9.9999999999337319E-01 + 1.9402123504995604E+01 + -5.8333333328872417E-01 + -5.0000000020055702E-01 + -2.7777777769272021E-02 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 8 + 1.0000000000000000E+00 + 1.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 2.4126556016590314E+01 + -8.3333333303996615E-02 + 5.5555555637114007E-02 + -4.9501737805862627E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 9 + 0.0000000000000000E+00 + 2.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 4.9713204783765406E+00 + 8.3333333331930520E-02 + 2.7777777718643423E-02 + -1.9412142555298874E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 10 + 3.3333333333333331E-01 + 2.0000000000000000E+00 + 4.0440480505852691E-11 + 9.9999999999155953E-01 + 7.1783011959820309E+00 + -5.8333333328872428E-01 + -5.0000000020055702E-01 + -2.7777777769272018E-02 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 11 + 6.6666666666666663E-01 + 2.0000000000000000E+00 + 4.0712304309671806E-11 + 1.0000000000078662E+00 + 7.1783011960152123E+00 + -5.8333333328872417E-01 + -5.0000000020055702E-01 + -2.7777777769272021E-02 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 12 + 1.0000000000000000E+00 + 2.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 4.9713204784127427E+00 + -8.3333333303996615E-02 + 5.5555555637114007E-02 + -4.9501737805862627E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 13 + 0.0000000000000000E+00 + 3.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 5.6091042226294405E+00 + 1.0139581415351851E-11 + -1.0283004599143842E-11 + 3.1353923793432062E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 14 + 3.3333333333333331E-01 + 3.0000000000000000E+00 + -6.3011398419993023E-11 + 9.9999999999619316E-01 + 1.5056138638185477E+00 + 1.6666666667628444E-01 + -2.7777777695646513E-02 + -4.0598765851701072E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 15 + 6.6666666666666663E-01 + 3.0000000000000000E+00 + -6.3647661313185245E-11 + 1.0000000000038995E+00 + 1.5056138637845415E+00 + 1.6666666667628444E-01 + -2.7777777695646527E-02 + -4.0598765851701072E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 16 + 1.0000000000000000E+00 + 3.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 5.6091042225962147E+00 + -1.0171266772180866E-11 + 3.5413961024028090E-12 + -3.1882013073915647E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 diff --git a/src/fortran/expected_results/results.txt b/src/fortran/expected_results/results.txt deleted file mode 100644 index 84c0069..0000000 --- a/src/fortran/expected_results/results.txt +++ /dev/null @@ -1 +0,0 @@ -working. diff --git a/src/fortran/input/CMHEART.inp b/src/fortran/input/CMHEART.inp deleted file mode 100644 index 5e4cd14..0000000 --- a/src/fortran/input/CMHEART.inp +++ /dev/null @@ -1,3 +0,0 @@ -'../../../TOOLS/NavierStokesMeshes/HEX-M2-V2-P1_FE.aux' -'../../../TOOLS/NavierStokesMeshes/HEX-M2-V2-P1_FE.C' -'../../../TOOLS/NavierStokesMeshes/HEX-M2-V2-P1_FE.M' diff --git a/src/fortran/output/STATIC_SOLUTION.part0.exelem b/src/fortran/output/STATIC_SOLUTION.part0.exelem new file mode 100644 index 0000000..6adc3cc --- /dev/null +++ b/src/fortran/output/STATIC_SOLUTION.part0.exelem @@ -0,0 +1,201 @@ + Group name: StokesRegion + Shape. Dimension=2 + #Scale factor sets= 1 + l.Lagrange*l.Lagrange, #Scale factors=4 + #Nodes= 4 + #Fields=4 + 1) Coordinate, coordinate, rectangular cartesian, #Components=2 + x. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + y. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2) U, field, rectangular cartesian, #Components=3 + 1. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3) del U_del n, field, rectangular cartesian, #Components=3 + 1. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4) Materials, field, rectangular cartesian, #Components=2 + 1. constant*constant, no modify, grid based. + #xi1=0, #xi2=0 + 2. l.Lagrange*l.Lagrange, no modify, standard node based. + #Nodes= 4 + 1. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 2. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 3. #Values=1 + Value indices: 1 + Scale factor indices: -1 + 4. #Values=1 + Value indices: 1 + Scale factor indices: -1 + Element: 1 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 1 2 5 6 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 2 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 2 3 6 7 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 3 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 3 4 7 8 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 4 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 5 6 9 10 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 5 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 6 7 10 11 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 6 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 7 8 11 12 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 7 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 9 10 13 14 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 8 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 10 11 14 15 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 + Element: 9 0 0 + Values: + 1.0000000000000000E+00 + Nodes: + 11 12 15 16 + Scale factors: + 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 diff --git a/src/fortran/output/STATIC_SOLUTION.part0.exnode b/src/fortran/output/STATIC_SOLUTION.part0.exnode new file mode 100644 index 0000000..2900916 --- /dev/null +++ b/src/fortran/output/STATIC_SOLUTION.part0.exnode @@ -0,0 +1,192 @@ + Group name: StokesRegion + #Fields=4 + 1) Coordinate, coordinate, rectangular cartesian, #Components=2 + x. Value index= 1, #Derivatives= 0 + y. Value index= 2, #Derivatives= 0 + 2) U, field, rectangular cartesian, #Components=3 + 1. Value index= 3, #Derivatives= 0 + 2. Value index= 4, #Derivatives= 0 + 3. Value index= 5, #Derivatives= 0 + 3) del U_del n, field, rectangular cartesian, #Components=3 + 1. Value index= 6, #Derivatives= 0 + 2. Value index= 7, #Derivatives= 0 + 3. Value index= 8, #Derivatives= 0 + 4) Materials, field, rectangular cartesian, #Components=2 + 1. Value index= 9, #Derivatives= 0 + 2. Value index= 10, #Derivatives= 0 + Node: 1 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 1.0901513302419586E+01 + 1.0148614788529272E-11 + 1.0378060669630887E-11 + 3.1353923793432077E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 2 + 3.3333333333333331E-01 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 1.0000000000000000E+00 + 2.7592262631199432E+01 + 8.3333333342046068E-02 + 2.7777777779855961E-02 + -5.0110560845827408E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 3 + 6.6666666666666663E-01 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 1.0000000000000000E+00 + 2.7592262631195471E+01 + 8.3333333342046068E-02 + 2.7777777779855961E-02 + -5.0110560845827408E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 4 + 1.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 1.0901513302414328E+01 + -1.0116929431700257E-11 + -3.6364521728898529E-12 + -3.1882013073915667E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 5 + 0.0000000000000000E+00 + 1.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 2.4126556016596762E+01 + 8.3333333331930520E-02 + 2.7777777718643423E-02 + -1.9412142555298874E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 6 + 3.3333333333333331E-01 + 1.0000000000000000E+00 + -1.1414153992951605E-11 + 1.0000000000069182E+00 + 1.9402123505003484E+01 + -5.8333333328872428E-01 + -5.0000000020055702E-01 + -2.7777777769272018E-02 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 7 + 6.6666666666666663E-01 + 1.0000000000000000E+00 + -1.1350783279293575E-11 + 9.9999999999337319E-01 + 1.9402123504995604E+01 + -5.8333333328872417E-01 + -5.0000000020055702E-01 + -2.7777777769272021E-02 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 8 + 1.0000000000000000E+00 + 1.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 2.4126556016590314E+01 + -8.3333333303996615E-02 + 5.5555555637114007E-02 + -4.9501737805862627E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 9 + 0.0000000000000000E+00 + 2.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 4.9713204783765406E+00 + 8.3333333331930520E-02 + 2.7777777718643423E-02 + -1.9412142555298874E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 10 + 3.3333333333333331E-01 + 2.0000000000000000E+00 + 4.0440480505852691E-11 + 9.9999999999155953E-01 + 7.1783011959820309E+00 + -5.8333333328872428E-01 + -5.0000000020055702E-01 + -2.7777777769272018E-02 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 11 + 6.6666666666666663E-01 + 2.0000000000000000E+00 + 4.0712304309671806E-11 + 1.0000000000078662E+00 + 7.1783011960152123E+00 + -5.8333333328872417E-01 + -5.0000000020055702E-01 + -2.7777777769272021E-02 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 12 + 1.0000000000000000E+00 + 2.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 4.9713204784127427E+00 + -8.3333333303996615E-02 + 5.5555555637114007E-02 + -4.9501737805862627E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 13 + 0.0000000000000000E+00 + 3.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 5.6091042226294405E+00 + 1.0139581415351851E-11 + -1.0283004599143842E-11 + 3.1353923793432062E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 14 + 3.3333333333333331E-01 + 3.0000000000000000E+00 + -6.3011398419993023E-11 + 9.9999999999619316E-01 + 1.5056138638185477E+00 + 1.6666666667628444E-01 + -2.7777777695646513E-02 + -4.0598765851701072E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 15 + 6.6666666666666663E-01 + 3.0000000000000000E+00 + -6.3647661313185245E-11 + 1.0000000000038995E+00 + 1.5056138637845415E+00 + 1.6666666667628444E-01 + -2.7777777695646527E-02 + -4.0598765851701072E-12 + 1.2345678806304932E+00 + 1.0000000000000000E+00 + Node: 16 + 1.0000000000000000E+00 + 3.0000000000000000E+00 + 0.0000000000000000E+00 + 0.0000000000000000E+00 + 5.6091042225962147E+00 + -1.0171266772180866E-11 + 3.5413961024028090E-12 + -3.1882013073915647E-13 + 1.2345678806304932E+00 + 1.0000000000000000E+00 diff --git a/src/fortran/stokes_static.F90 b/src/fortran/stokes_static.F90 index 8f4ed54..3903eb5 100644 --- a/src/fortran/stokes_static.F90 +++ b/src/fortran/stokes_static.F90 @@ -1,4 +1,4 @@ -PROGRAM STOKESSTATICEXAMPLE +PROGRAM stokes_static ! !================================================================================================================================ @@ -24,9 +24,8 @@ PROGRAM STOKESSTATICEXAMPLE #include "mpif.h" #endif - !Test program parameters - REAL(CMISSRP), PARAMETER :: HEIGHT=1.0_CMISSRP + REAL(CMISSRP), PARAMETER :: HEIGHT=3.0_CMISSRP REAL(CMISSRP), PARAMETER :: WIDTH=1.0_CMISSRP REAL(CMISSRP), PARAMETER :: LENGTH=1.0_CMISSRP @@ -42,8 +41,9 @@ PROGRAM STOKESSTATICEXAMPLE INTEGER(CMISSIntg), PARAMETER :: EquationsSetUserNumberStokes=10 INTEGER(CMISSIntg), PARAMETER :: ProblemUserNumber=11 INTEGER(CMISSIntg), PARAMETER :: GeneratedMeshUserNumber=12 + INTEGER(CMISSIntg), PARAMETER :: AnalyticFieldUserNumber=13 - INTEGER(CMISSIntg), PARAMETER :: DomainUserNumber=2 + INTEGER(CMISSIntg), PARAMETER :: DomainUserNumber=1 INTEGER(CMISSIntg), PARAMETER :: SolverStokesUserNumber=1 INTEGER(CMISSIntg), PARAMETER :: MaterialsFieldUserNumberStokesMu=1 INTEGER(CMISSIntg), PARAMETER :: MaterialsFieldUserNumberStokesRho=2 @@ -110,47 +110,31 @@ PROGRAM STOKESSTATICEXAMPLE !CMISS variables - !Regions TYPE(cmfe_RegionType) :: Region TYPE(cmfe_RegionType) :: WorldRegion - !Coordinate systems TYPE(cmfe_CoordinateSystemType) :: CoordinateSystem TYPE(cmfe_CoordinateSystemType) :: WorldCoordinateSystem - !Basis TYPE(cmfe_BasisType) :: BasisGeometry TYPE(cmfe_BasisType) :: BasisVelocity TYPE(cmfe_BasisType) :: BasisPressure - !Nodes TYPE(cmfe_NodesType) :: Nodes - !Elements TYPE(cmfe_MeshElementsType) :: MeshElementsSpace TYPE(cmfe_MeshElementsType) :: MeshElementsVelocity TYPE(cmfe_MeshElementsType) :: MeshElementsPressure - !Meshes TYPE(cmfe_MeshType) :: Mesh TYPE(cmfe_GeneratedMeshType) :: GeneratedMesh - !Decompositions TYPE(cmfe_DecompositionType) :: Decomposition - !Fields TYPE(cmfe_FieldsType) :: Fields - !Field types - TYPE(cmfe_FieldType) :: GeometricField + TYPE(cmfe_FieldType) :: GeometricField,AnalyticField TYPE(cmfe_FieldType) :: EquationsSetField TYPE(cmfe_FieldType) :: DependentFieldStokes TYPE(cmfe_FieldType) :: MaterialsFieldStokes - !Boundary conditions TYPE(cmfe_BoundaryConditionsType) :: BoundaryConditionsStokes - !Equations sets TYPE(cmfe_EquationsSetType) :: EquationsSetStokes - !Equations TYPE(cmfe_EquationsType) :: EquationsStokes - !Problems TYPE(cmfe_ProblemType) :: Problem - !Control loops TYPE(cmfe_ControlLoopType) :: ControlLoop - !Solvers TYPE(cmfe_SolverType) :: LinearSolverStokes - !Solver equations TYPE(cmfe_SolverEquationsType) :: SolverEquationsStokes !Generic CMISS variables @@ -184,13 +168,13 @@ PROGRAM STOKESSTATICEXAMPLE !PROBLEM CONTROL PANEL - NUMBER_GLOBAL_X_ELEMENTS=1 + NUMBER_GLOBAL_X_ELEMENTS=3 NUMBER_GLOBAL_Y_ELEMENTS=3 - NUMBER_GLOBAL_Z_ELEMENTS=1 + NUMBER_GLOBAL_Z_ELEMENTS=3 MESH_COMPONENT_NUMBER_SPACE=1 MESH_COMPONENT_NUMBER_VELOCITY=1 MESH_COMPONENT_NUMBER_PRESSURE=1 - NUMBER_OF_DIMENSIONS=3 + NUMBER_OF_DIMENSIONS=2 BASIS_TYPE=CMFE_BASIS_LINEAR_LAGRANGE_INTERPOLATION BASIS_XI_INTERPOLATION_SPACE=CMFE_BASIS_LINEAR_LAGRANGE_INTERPOLATION BASIS_XI_INTERPOLATION_VELOCITY=CMFE_BASIS_LINEAR_LAGRANGE_INTERPOLATION @@ -204,14 +188,14 @@ PROGRAM STOKESSTATICEXAMPLE FIXED_WALL_NODES_STOKES_FLAG=.TRUE. INLET_WALL_NODES_STOKES_FLAG=.TRUE. IF(FIXED_WALL_NODES_STOKES_FLAG) THEN - NUMBER_OF_FIXED_WALL_NODES_STOKES=1 + NUMBER_OF_FIXED_WALL_NODES_STOKES=8 ALLOCATE(FIXED_WALL_NODES_STOKES(NUMBER_OF_FIXED_WALL_NODES_STOKES)) - FIXED_WALL_NODES_STOKES=[1] + FIXED_WALL_NODES_STOKES=[1,4,5,8,9,12,13,16] ENDIF IF(INLET_WALL_NODES_STOKES_FLAG) THEN - NUMBER_OF_INLET_WALL_NODES_STOKES=1 + NUMBER_OF_INLET_WALL_NODES_STOKES=2 ALLOCATE(INLET_WALL_NODES_STOKES(NUMBER_OF_INLET_WALL_NODES_STOKES)) - INLET_WALL_NODES_STOKES=[2] + INLET_WALL_NODES_STOKES=[2,3] !Set initial boundary conditions BOUNDARY_CONDITIONS_STOKES(1)=0.0_CMISSRP BOUNDARY_CONDITIONS_STOKES(2)=1.0_CMISSRP @@ -261,6 +245,7 @@ PROGRAM STOKESSTATICEXAMPLE !Start the creation of a new region CALL cmfe_Region_Initialise(Region,Err) CALL cmfe_Region_CreateStart(RegionUserNumber,WorldRegion,Region,Err) + CALL cmfe_Region_LabelSet(Region,"StokesRegion",Err) !Set the regions coordinate system as defined above CALL cmfe_Region_CoordinateSystemSet(Region,CoordinateSystem,Err) !Finish the creation of the region @@ -291,6 +276,7 @@ PROGRAM STOKESSTATICEXAMPLE ENDIF !Finish the creation of the basis CALL cmfe_Basis_CreateFinish(BasisGeometry,Err) + !Start the creation of another basis IF(BASIS_XI_INTERPOLATION_VELOCITY==BASIS_XI_INTERPOLATION_SPACE) THEN BasisVelocity=BasisGeometry @@ -317,6 +303,7 @@ PROGRAM STOKESSTATICEXAMPLE !Finish the creation of the basis CALL cmfe_Basis_CreateFinish(BasisVelocity,Err) ENDIF + !Start the creation of another basis IF(BASIS_XI_INTERPOLATION_PRESSURE==BASIS_XI_INTERPOLATION_SPACE) THEN BasisPressure=BasisGeometry @@ -360,9 +347,14 @@ PROGRAM STOKESSTATICEXAMPLE !Set the default basis CALL cmfe_GeneratedMesh_BasisSet(GeneratedMesh,BasisGeometry,Err) !Define the mesh on the region - CALL cmfe_GeneratedMesh_ExtentSet(GeneratedMesh,[WIDTH,HEIGHT,LENGTH],Err) - CALL cmfe_GeneratedMesh_NumberOfElementsSet(GeneratedMesh,[NUMBER_GLOBAL_X_ELEMENTS,NUMBER_GLOBAL_Y_ELEMENTS, & - & NUMBER_GLOBAL_Z_ELEMENTS],Err) + IF(NUMBER_OF_DIMENSIONS==2) THEN + CALL cmfe_GeneratedMesh_ExtentSet(GeneratedMesh,[WIDTH,HEIGHT],Err) + CALL cmfe_GeneratedMesh_NumberOfElementsSet(GeneratedMesh,[NUMBER_GLOBAL_X_ELEMENTS,NUMBER_GLOBAL_Y_ELEMENTS],Err) + ELSE IF(NUMBER_OF_DIMENSIONS==3) THEN + CALL cmfe_GeneratedMesh_ExtentSet(GeneratedMesh,[WIDTH,HEIGHT,LENGTH],Err) + CALL cmfe_GeneratedMesh_NumberOfElementsSet(GeneratedMesh,[NUMBER_GLOBAL_X_ELEMENTS,NUMBER_GLOBAL_Y_ELEMENTS, & + & NUMBER_GLOBAL_Z_ELEMENTS],Err) + ENDIF !Finish the creation of a generated mesh in the region CALL cmfe_Mesh_Initialise(Mesh,Err) CALL cmfe_GeneratedMesh_CreateFinish(GeneratedMesh,MeshUserNumber,Mesh,Err) @@ -371,7 +363,7 @@ PROGRAM STOKESSTATICEXAMPLE !================================================================================================================================ ! - !GEOMETRIC FIELD + !MESH DECOMPOSITION !Create a decomposition CALL cmfe_Decomposition_Initialise(Decomposition,Err) @@ -382,6 +374,12 @@ PROGRAM STOKESSTATICEXAMPLE !Finish the decomposition CALL cmfe_Decomposition_CreateFinish(Decomposition,Err) + ! + !================================================================================================================================ + ! + + !GEOMETRIC FIELD + !Start to create a default (geometric) field on the region CALL cmfe_Field_Initialise(GeometricField,Err) CALL cmfe_Field_CreateStart(GeometricFieldUserNumber,Region,GeometricField,Err) @@ -392,18 +390,14 @@ PROGRAM STOKESSTATICEXAMPLE !Set the scaling to use CALL cmfe_Field_ScalingTypeSet(GeometricField,CMFE_FIELD_NO_SCALING,Err) !Set the mesh component to be used by the field components. - !DO COMPONENT_NUMBER=1,NUMBER_OF_DIMENSIONS - ! CALL cmfe_Field_ComponentMeshComponentSet(GeometricField,CMFE_FIELD_U_VARIABLE_TYPE,COMPONENT_NUMBER, & - ! & MESH_COMPONENT_NUMBER_SPACE,Err) - !ENDDO - CALL cmfe_Field_ComponentMeshComponentSet(GeometricField,CMFE_FIELD_U_VARIABLE_TYPE,1,1,Err) - CALL cmfe_Field_ComponentMeshComponentSet(GeometricField,CMFE_FIELD_U_VARIABLE_TYPE,2,1,Err) - CALL cmfe_Field_ComponentMeshComponentSet(GeometricField,CMFE_FIELD_U_VARIABLE_TYPE,3,1,Err) + DO COMPONENT_NUMBER=1,NUMBER_OF_DIMENSIONS + CALL cmfe_Field_ComponentMeshComponentSet(GeometricField,CMFE_FIELD_U_VARIABLE_TYPE,COMPONENT_NUMBER, & + & MESH_COMPONENT_NUMBER_SPACE,Err) + ENDDO !Finish creating the field CALL cmfe_Field_CreateFinish(GeometricField,Err) - - CALL cmfe_Field_ParameterSetUpdateStart(GeometricField,CMFE_FIELD_U_VARIABLE_TYPE,CMFE_FIELD_VALUES_SET_TYPE,Err) - CALL cmfe_Field_ParameterSetUpdateFinish(GeometricField,CMFE_FIELD_U_VARIABLE_TYPE,CMFE_FIELD_VALUES_SET_TYPE,Err) + !Update the geometric field parameters + CALL cmfe_GeneratedMesh_GeometricParametersCalculate(GeneratedMesh,GeometricField,Err) ! !================================================================================================================================ @@ -414,11 +408,10 @@ PROGRAM STOKESSTATICEXAMPLE !Create the equations set for static Stokes CALL cmfe_EquationsSet_Initialise(EquationsSetStokes,Err) CALL cmfe_Field_Initialise(EquationsSetField,Err) + !Set the equations set to be a static Stokes problem CALL cmfe_EquationsSet_CreateStart(EquationsSetUserNumberStokes,Region,GeometricField,[CMFE_EQUATIONS_SET_FLUID_MECHANICS_CLASS, & & CMFE_EQUATIONS_SET_STOKES_EQUATION_TYPE,CMFE_EQUATIONS_SET_STATIC_STOKES_SUBTYPE],EquationsSetFieldUserNumber, & & EquationsSetField,EquationsSetStokes,Err) - !Set the equations set to be a static Stokes problem - !Finish creating the equations set CALL cmfe_EquationsSet_CreateFinish(EquationsSetStokes,Err) @@ -430,8 +423,8 @@ PROGRAM STOKESSTATICEXAMPLE !Create the equations set dependent field variables for static Stokes CALL cmfe_Field_Initialise(DependentFieldStokes,Err) - CALL cmfe_EquationsSet_DependentCreateStart(EquationsSetStokes,DependentFieldUserNumberStokes, & - & DependentFieldStokes,Err) + CALL cmfe_EquationsSet_DependentCreateStart(EquationsSetStokes,DependentFieldUserNumberStokes,DependentFieldStokes,Err) + CALL cmfe_Field_VariableLabelSet(DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,"U",Err) !Set the mesh component to be used by the field components. DO COMPONENT_NUMBER=1,NUMBER_OF_DIMENSIONS CALL cmfe_Field_ComponentMeshComponentSet(DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,COMPONENT_NUMBER, & @@ -461,8 +454,8 @@ PROGRAM STOKESSTATICEXAMPLE !Create the equations set materials field variables for static Stokes CALL cmfe_Field_Initialise(MaterialsFieldStokes,Err) - CALL cmfe_EquationsSet_MaterialsCreateStart(EquationsSetStokes,MaterialsFieldUserNumberStokes, & - & MaterialsFieldStokes,Err) + CALL cmfe_EquationsSet_MaterialsCreateStart(EquationsSetStokes,MaterialsFieldUserNumberStokes,MaterialsFieldStokes,Err) + CALL cmfe_Field_VariableLabelSet(MaterialsFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,"Materials",Err) !Finish the equations set materials field variables CALL cmfe_EquationsSet_MaterialsCreateFinish(EquationsSetStokes,Err) CALL cmfe_Field_ComponentValuesInitialise(MaterialsFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,CMFE_FIELD_VALUES_SET_TYPE, & @@ -474,6 +467,19 @@ PROGRAM STOKESSTATICEXAMPLE !================================================================================================================================ ! + !ANALYTIC FIELD + + !Create the equations set analytic field variables + CALL cmfe_Field_Initialise(AnalyticField,Err) + CALL cmfe_EquationsSet_AnalyticCreateStart(EquationsSetStokes,CMFE_EQUATIONS_SET_NAVIER_STOKES_EQUATION_TWO_DIM_4, & + & AnalyticFieldUserNumber,AnalyticField,Err) + !Finish the equations set analytic field variables + CALL cmfe_EquationsSet_AnalyticCreateFinish(EquationsSetStokes,Err) + + ! + !================================================================================================================================ + ! + !EQUATIONS !Create the equations set equations @@ -598,6 +604,13 @@ PROGRAM STOKESSTATICEXAMPLE !================================================================================================================================ ! + !Output Analytic analysis + !Call cmfe_AnalyticAnalysis_Output(DependentFieldStokes,"StokesAnalytic",Err) + + ! + !================================================================================================================================ + ! + !RUN SOLVERS !Solve the problem @@ -611,13 +624,13 @@ PROGRAM STOKESSTATICEXAMPLE !OUTPUT - EXPORT_FIELD_IO=.TRUE. + EXPORT_FIELD_IO=.FALSE. IF(EXPORT_FIELD_IO) THEN WRITE(*,'(A)') "Exporting fields..." CALL cmfe_Fields_Initialise(Fields,Err) CALL cmfe_Fields_Create(Region,Fields,Err) - CALL cmfe_Fields_NodesExport(Fields,"StaticStokes","FORTRAN",Err) - CALL cmfe_Fields_ElementsExport(Fields,"StaticStokes","FORTRAN",Err) + CALL cmfe_Fields_NodesExport(Fields,"stokes_static","FORTRAN",Err) + CALL cmfe_Fields_ElementsExport(Fields,"stokes_static","FORTRAN",Err) CALL cmfe_Fields_Finalise(Fields,Err) WRITE(*,'(A)') "Field exported!" ENDIF @@ -627,4 +640,4 @@ PROGRAM STOKESSTATICEXAMPLE WRITE(*,'(A)') "Program successfully completed." STOP -END PROGRAM STOKESSTATICEXAMPLE +END PROGRAM stokes_static diff --git a/src/fortran/visualiseStokes.com b/src/fortran/visualiseStokes.com new file mode 100755 index 0000000..a350ebf --- /dev/null +++ b/src/fortran/visualiseStokes.com @@ -0,0 +1,20 @@ +gfx read node "./output/STATIC_SOLUTION.part0.exnode"; +gfx read element "./output/STATIC_SOLUTION.part0.exelem"; + +gfx define faces egroup StokesRegion + +gfx define field Coordinate.x component Coordinate.x +gfx define field Coordinate.y component Coordinate.y +gfx define field Coordinate.z component Coordinate.z + +gfx def field x_velocity component U.1 +gfx def field y_velocity component U.2 +gfx def field z_velocity component U.3 +gfx def field pressure component U.4 + +gfx define field vector_field coord rectangular_cartesian component U.1 U.2 U.3 U.4 +gfx modify g_element StokesRegion node_points data z_velocity + +gfx edit scene +gfx create window 1; +gfx def faces From e6e8d1ca47060b99c37ccc4213271eab9edffe41 Mon Sep 17 00:00:00 2001 From: Soroush Safaei Date: Sun, 11 Feb 2018 21:22:41 +1300 Subject: [PATCH 2/8] cleaned up the code --- src/fortran/stokes_static.F90 | 282 ++++++++++++++++------------------ 1 file changed, 133 insertions(+), 149 deletions(-) diff --git a/src/fortran/stokes_static.F90 b/src/fortran/stokes_static.F90 index 3903eb5..7c3ed89 100644 --- a/src/fortran/stokes_static.F90 +++ b/src/fortran/stokes_static.F90 @@ -1,29 +1,19 @@ PROGRAM stokes_static - ! - !================================================================================================================================ - ! - - !PROGRAM LIBRARIES - USE OpenCMISS USE OpenCMISS_Iron #ifndef NOMPIMOD USE MPI #endif - - ! - !================================================================================================================================ - ! - - !PROGRAM VARIABLES AND TYPES - IMPLICIT NONE - #ifdef NOMPIMOD #include "mpif.h" #endif + ! + !================================================================================================================================ + ! + !Test program parameters REAL(CMISSRP), PARAMETER :: HEIGHT=3.0_CMISSRP REAL(CMISSRP), PARAMETER :: WIDTH=1.0_CMISSRP @@ -77,22 +67,17 @@ PROGRAM stokes_static INTEGER(CMISSIntg) :: TOTAL_NUMBER_OF_ELEMENTS INTEGER(CMISSIntg) :: MAXIMUM_ITERATIONS INTEGER(CMISSIntg) :: RESTART_VALUE -! INTEGER(CMISSIntg) :: MPI_IERROR INTEGER(CMISSIntg) :: NUMBER_OF_FIXED_WALL_NODES_STOKES INTEGER(CMISSIntg) :: NUMBER_OF_INLET_WALL_NODES_STOKES - INTEGER(CMISSIntg) :: EQUATIONS_STOKES_OUTPUT INTEGER(CMISSIntg) :: COMPONENT_NUMBER INTEGER(CMISSIntg) :: NODE_NUMBER INTEGER(CMISSIntg) :: ELEMENT_NUMBER INTEGER(CMISSIntg) :: NODE_COUNTER INTEGER(CMISSIntg) :: CONDITION - INTEGER(CMISSIntg) :: LINEAR_SOLVER_STOKES_OUTPUT_TYPE - INTEGER, ALLOCATABLE, DIMENSION(:):: FIXED_WALL_NODES_STOKES INTEGER, ALLOCATABLE, DIMENSION(:):: INLET_WALL_NODES_STOKES - REAL(CMISSRP) :: INITIAL_FIELD_STOKES(3) REAL(CMISSRP) :: BOUNDARY_CONDITIONS_STOKES(3) REAL(CMISSRP) :: DIVERGENCE_TOLERANCE @@ -102,7 +87,6 @@ PROGRAM stokes_static REAL(CMISSRP) :: VALUE REAL(CMISSRP) :: MU_PARAM_STOKES REAL(CMISSRP) :: RHO_PARAM_STOKES - LOGICAL :: EXPORT_FIELD_IO LOGICAL :: LINEAR_SOLVER_STOKES_DIRECT_FLAG LOGICAL :: FIXED_WALL_NODES_STOKES_FLAG @@ -140,8 +124,7 @@ PROGRAM stokes_static !Generic CMISS variables INTEGER(CMISSIntg) :: NumberOfComputationalNodes,ComputationalNodeNumber,BoundaryNodeDomain - INTEGER(CMISSIntg) :: EquationsSetIndex - INTEGER(CMISSIntg) :: Err + INTEGER(CMISSIntg) :: EquationsSetIndex,Err ! !================================================================================================================================ @@ -171,15 +154,14 @@ PROGRAM stokes_static NUMBER_GLOBAL_X_ELEMENTS=3 NUMBER_GLOBAL_Y_ELEMENTS=3 NUMBER_GLOBAL_Z_ELEMENTS=3 + NUMBER_OF_DIMENSIONS=2 MESH_COMPONENT_NUMBER_SPACE=1 MESH_COMPONENT_NUMBER_VELOCITY=1 MESH_COMPONENT_NUMBER_PRESSURE=1 - NUMBER_OF_DIMENSIONS=2 BASIS_TYPE=CMFE_BASIS_LINEAR_LAGRANGE_INTERPOLATION BASIS_XI_INTERPOLATION_SPACE=CMFE_BASIS_LINEAR_LAGRANGE_INTERPOLATION BASIS_XI_INTERPOLATION_VELOCITY=CMFE_BASIS_LINEAR_LAGRANGE_INTERPOLATION BASIS_XI_INTERPOLATION_PRESSURE=CMFE_BASIS_LINEAR_LAGRANGE_INTERPOLATION - !Set initial values INITIAL_FIELD_STOKES(1)=0.0_CMISSRP INITIAL_FIELD_STOKES(2)=0.0_CMISSRP @@ -188,18 +170,18 @@ PROGRAM stokes_static FIXED_WALL_NODES_STOKES_FLAG=.TRUE. INLET_WALL_NODES_STOKES_FLAG=.TRUE. IF(FIXED_WALL_NODES_STOKES_FLAG) THEN - NUMBER_OF_FIXED_WALL_NODES_STOKES=8 - ALLOCATE(FIXED_WALL_NODES_STOKES(NUMBER_OF_FIXED_WALL_NODES_STOKES)) - FIXED_WALL_NODES_STOKES=[1,4,5,8,9,12,13,16] + NUMBER_OF_FIXED_WALL_NODES_STOKES=8 + ALLOCATE(FIXED_WALL_NODES_STOKES(NUMBER_OF_FIXED_WALL_NODES_STOKES)) + FIXED_WALL_NODES_STOKES=[1,4,5,8,9,12,13,16] ENDIF IF(INLET_WALL_NODES_STOKES_FLAG) THEN - NUMBER_OF_INLET_WALL_NODES_STOKES=2 - ALLOCATE(INLET_WALL_NODES_STOKES(NUMBER_OF_INLET_WALL_NODES_STOKES)) - INLET_WALL_NODES_STOKES=[2,3] - !Set initial boundary conditions - BOUNDARY_CONDITIONS_STOKES(1)=0.0_CMISSRP - BOUNDARY_CONDITIONS_STOKES(2)=1.0_CMISSRP - BOUNDARY_CONDITIONS_STOKES(3)=0.0_CMISSRP + NUMBER_OF_INLET_WALL_NODES_STOKES=2 + ALLOCATE(INLET_WALL_NODES_STOKES(NUMBER_OF_INLET_WALL_NODES_STOKES)) + INLET_WALL_NODES_STOKES=[2,3] + !Set initial boundary conditions + BOUNDARY_CONDITIONS_STOKES(1)=0.0_CMISSRP + BOUNDARY_CONDITIONS_STOKES(2)=1.0_CMISSRP + BOUNDARY_CONDITIONS_STOKES(3)=0.0_CMISSRP ENDIF !Set material parameters MU_PARAM_STOKES=1.0_CMISSRP @@ -267,70 +249,71 @@ PROGRAM stokes_static CALL cmfe_Basis_NumberOfXiSet(BasisGeometry,NUMBER_OF_DIMENSIONS,Err) !Set the basis xi interpolation and number of Gauss points IF(NUMBER_OF_DIMENSIONS==2) THEN - CALL cmfe_Basis_InterpolationXiSet(BasisGeometry,[BASIS_XI_INTERPOLATION_SPACE,BASIS_XI_INTERPOLATION_SPACE],Err) - CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisGeometry,[BASIS_XI_GAUSS_SPACE,BASIS_XI_GAUSS_SPACE],Err) - ELSE IF(NUMBER_OF_DIMENSIONS==3) THEN - CALL cmfe_Basis_InterpolationXiSet(BasisGeometry,[BASIS_XI_INTERPOLATION_SPACE,BASIS_XI_INTERPOLATION_SPACE, & - & BASIS_XI_INTERPOLATION_SPACE],Err) - CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisGeometry,[BASIS_XI_GAUSS_SPACE,BASIS_XI_GAUSS_SPACE,BASIS_XI_GAUSS_SPACE],Err) + CALL cmfe_Basis_InterpolationXiSet(BasisGeometry,[BASIS_XI_INTERPOLATION_SPACE,BASIS_XI_INTERPOLATION_SPACE],Err) + CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisGeometry,[BASIS_XI_GAUSS_SPACE,BASIS_XI_GAUSS_SPACE],Err) + ELSE + CALL cmfe_Basis_InterpolationXiSet(BasisGeometry,[BASIS_XI_INTERPOLATION_SPACE,BASIS_XI_INTERPOLATION_SPACE, & + & BASIS_XI_INTERPOLATION_SPACE],Err) + CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisGeometry,[BASIS_XI_GAUSS_SPACE,BASIS_XI_GAUSS_SPACE,BASIS_XI_GAUSS_SPACE], & + & Err) ENDIF !Finish the creation of the basis CALL cmfe_Basis_CreateFinish(BasisGeometry,Err) !Start the creation of another basis IF(BASIS_XI_INTERPOLATION_VELOCITY==BASIS_XI_INTERPOLATION_SPACE) THEN - BasisVelocity=BasisGeometry + BasisVelocity=BasisGeometry ELSE - MESH_NUMBER_OF_COMPONENTS=MESH_NUMBER_OF_COMPONENTS+1 - !Initialise a new velocity basis - CALL cmfe_Basis_Initialise(BasisVelocity,Err) - !Start the creation of a basis - CALL cmfe_Basis_CreateStart(BASIS_NUMBER_VELOCITY,BasisVelocity,Err) - !Set the basis type (Lagrange/Simplex) - CALL cmfe_Basis_TypeSet(BasisVelocity,BASIS_TYPE,Err) - !Set the basis xi number - CALL cmfe_Basis_NumberOfXiSet(BasisVelocity,NUMBER_OF_DIMENSIONS,Err) - !Set the basis xi interpolation and number of Gauss points - IF(NUMBER_OF_DIMENSIONS==2) THEN - CALL cmfe_Basis_InterpolationXiSet(BasisVelocity,[BASIS_XI_INTERPOLATION_VELOCITY,BASIS_XI_INTERPOLATION_VELOCITY],Err) - CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisVelocity,[BASIS_XI_GAUSS_VELOCITY,BASIS_XI_GAUSS_VELOCITY],Err) - ELSE IF(NUMBER_OF_DIMENSIONS==3) THEN - CALL cmfe_Basis_InterpolationXiSet(BasisVelocity,[BASIS_XI_INTERPOLATION_VELOCITY,BASIS_XI_INTERPOLATION_VELOCITY, & - & BASIS_XI_INTERPOLATION_VELOCITY],Err) - CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisVelocity,[BASIS_XI_GAUSS_VELOCITY,BASIS_XI_GAUSS_VELOCITY, & - & BASIS_XI_GAUSS_VELOCITY],Err) - ENDIF - !Finish the creation of the basis - CALL cmfe_Basis_CreateFinish(BasisVelocity,Err) + MESH_NUMBER_OF_COMPONENTS=MESH_NUMBER_OF_COMPONENTS+1 + !Initialise a new velocity basis + CALL cmfe_Basis_Initialise(BasisVelocity,Err) + !Start the creation of a basis + CALL cmfe_Basis_CreateStart(BASIS_NUMBER_VELOCITY,BasisVelocity,Err) + !Set the basis type (Lagrange/Simplex) + CALL cmfe_Basis_TypeSet(BasisVelocity,BASIS_TYPE,Err) + !Set the basis xi number + CALL cmfe_Basis_NumberOfXiSet(BasisVelocity,NUMBER_OF_DIMENSIONS,Err) + !Set the basis xi interpolation and number of Gauss points + IF(NUMBER_OF_DIMENSIONS==2) THEN + CALL cmfe_Basis_InterpolationXiSet(BasisVelocity,[BASIS_XI_INTERPOLATION_VELOCITY,BASIS_XI_INTERPOLATION_VELOCITY],Err) + CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisVelocity,[BASIS_XI_GAUSS_VELOCITY,BASIS_XI_GAUSS_VELOCITY],Err) + ELSE + CALL cmfe_Basis_InterpolationXiSet(BasisVelocity,[BASIS_XI_INTERPOLATION_VELOCITY,BASIS_XI_INTERPOLATION_VELOCITY, & + & BASIS_XI_INTERPOLATION_VELOCITY],Err) + CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisVelocity,[BASIS_XI_GAUSS_VELOCITY,BASIS_XI_GAUSS_VELOCITY, & + & BASIS_XI_GAUSS_VELOCITY],Err) + ENDIF + !Finish the creation of the basis + CALL cmfe_Basis_CreateFinish(BasisVelocity,Err) ENDIF !Start the creation of another basis IF(BASIS_XI_INTERPOLATION_PRESSURE==BASIS_XI_INTERPOLATION_SPACE) THEN - BasisPressure=BasisGeometry + BasisPressure=BasisGeometry ELSE IF(BASIS_XI_INTERPOLATION_PRESSURE==BASIS_XI_INTERPOLATION_VELOCITY) THEN - BasisPressure=BasisVelocity + BasisPressure=BasisVelocity ELSE - MESH_NUMBER_OF_COMPONENTS=MESH_NUMBER_OF_COMPONENTS+1 - !Initialise a new pressure basis - CALL cmfe_Basis_Initialise(BasisPressure,Err) - !Start the creation of a basis - CALL cmfe_Basis_CreateStart(BASIS_NUMBER_PRESSURE,BasisPressure,Err) - !Set the basis type (Lagrange/Simplex) - CALL cmfe_Basis_TypeSet(BasisPressure,BASIS_TYPE,Err) - !Set the basis xi number - CALL cmfe_Basis_NumberOfXiSet(BasisPressure,NUMBER_OF_DIMENSIONS,Err) - !Set the basis xi interpolation and number of Gauss points - IF(NUMBER_OF_DIMENSIONS==2) THEN - CALL cmfe_Basis_InterpolationXiSet(BasisPressure,[BASIS_XI_INTERPOLATION_PRESSURE,BASIS_XI_INTERPOLATION_PRESSURE],Err) - CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisPressure,[BASIS_XI_GAUSS_PRESSURE,BASIS_XI_GAUSS_PRESSURE],Err) - ELSE IF(NUMBER_OF_DIMENSIONS==3) THEN - CALL cmfe_Basis_InterpolationXiSet(BasisPressure,[BASIS_XI_INTERPOLATION_PRESSURE,BASIS_XI_INTERPOLATION_PRESSURE, & - & BASIS_XI_INTERPOLATION_PRESSURE],Err) - CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisPressure,[BASIS_XI_GAUSS_PRESSURE,BASIS_XI_GAUSS_PRESSURE, & - & BASIS_XI_GAUSS_PRESSURE],Err) - ENDIF - !Finish the creation of the basis - CALL cmfe_Basis_CreateFinish(BasisPressure,Err) + MESH_NUMBER_OF_COMPONENTS=MESH_NUMBER_OF_COMPONENTS+1 + !Initialise a new pressure basis + CALL cmfe_Basis_Initialise(BasisPressure,Err) + !Start the creation of a basis + CALL cmfe_Basis_CreateStart(BASIS_NUMBER_PRESSURE,BasisPressure,Err) + !Set the basis type (Lagrange/Simplex) + CALL cmfe_Basis_TypeSet(BasisPressure,BASIS_TYPE,Err) + !Set the basis xi number + CALL cmfe_Basis_NumberOfXiSet(BasisPressure,NUMBER_OF_DIMENSIONS,Err) + !Set the basis xi interpolation and number of Gauss points + IF(NUMBER_OF_DIMENSIONS==2) THEN + CALL cmfe_Basis_InterpolationXiSet(BasisPressure,[BASIS_XI_INTERPOLATION_PRESSURE,BASIS_XI_INTERPOLATION_PRESSURE],Err) + CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisPressure,[BASIS_XI_GAUSS_PRESSURE,BASIS_XI_GAUSS_PRESSURE],Err) + ELSE + CALL cmfe_Basis_InterpolationXiSet(BasisPressure,[BASIS_XI_INTERPOLATION_PRESSURE,BASIS_XI_INTERPOLATION_PRESSURE, & + & BASIS_XI_INTERPOLATION_PRESSURE],Err) + CALL cmfe_Basis_QuadratureNumberOfGaussXiSet(BasisPressure,[BASIS_XI_GAUSS_PRESSURE,BASIS_XI_GAUSS_PRESSURE, & + & BASIS_XI_GAUSS_PRESSURE],Err) + ENDIF + !Finish the creation of the basis + CALL cmfe_Basis_CreateFinish(BasisPressure,Err) ENDIF ! @@ -348,12 +331,12 @@ PROGRAM stokes_static CALL cmfe_GeneratedMesh_BasisSet(GeneratedMesh,BasisGeometry,Err) !Define the mesh on the region IF(NUMBER_OF_DIMENSIONS==2) THEN - CALL cmfe_GeneratedMesh_ExtentSet(GeneratedMesh,[WIDTH,HEIGHT],Err) - CALL cmfe_GeneratedMesh_NumberOfElementsSet(GeneratedMesh,[NUMBER_GLOBAL_X_ELEMENTS,NUMBER_GLOBAL_Y_ELEMENTS],Err) - ELSE IF(NUMBER_OF_DIMENSIONS==3) THEN - CALL cmfe_GeneratedMesh_ExtentSet(GeneratedMesh,[WIDTH,HEIGHT,LENGTH],Err) - CALL cmfe_GeneratedMesh_NumberOfElementsSet(GeneratedMesh,[NUMBER_GLOBAL_X_ELEMENTS,NUMBER_GLOBAL_Y_ELEMENTS, & - & NUMBER_GLOBAL_Z_ELEMENTS],Err) + CALL cmfe_GeneratedMesh_ExtentSet(GeneratedMesh,[WIDTH,HEIGHT],Err) + CALL cmfe_GeneratedMesh_NumberOfElementsSet(GeneratedMesh,[NUMBER_GLOBAL_X_ELEMENTS,NUMBER_GLOBAL_Y_ELEMENTS],Err) + ELSE + CALL cmfe_GeneratedMesh_ExtentSet(GeneratedMesh,[WIDTH,HEIGHT,LENGTH],Err) + CALL cmfe_GeneratedMesh_NumberOfElementsSet(GeneratedMesh,[NUMBER_GLOBAL_X_ELEMENTS,NUMBER_GLOBAL_Y_ELEMENTS, & + & NUMBER_GLOBAL_Z_ELEMENTS],Err) ENDIF !Finish the creation of a generated mesh in the region CALL cmfe_Mesh_Initialise(Mesh,Err) @@ -391,8 +374,8 @@ PROGRAM stokes_static CALL cmfe_Field_ScalingTypeSet(GeometricField,CMFE_FIELD_NO_SCALING,Err) !Set the mesh component to be used by the field components. DO COMPONENT_NUMBER=1,NUMBER_OF_DIMENSIONS - CALL cmfe_Field_ComponentMeshComponentSet(GeometricField,CMFE_FIELD_U_VARIABLE_TYPE,COMPONENT_NUMBER, & - & MESH_COMPONENT_NUMBER_SPACE,Err) + CALL cmfe_Field_ComponentMeshComponentSet(GeometricField,CMFE_FIELD_U_VARIABLE_TYPE,COMPONENT_NUMBER, & + & MESH_COMPONENT_NUMBER_SPACE,Err) ENDDO !Finish creating the field CALL cmfe_Field_CreateFinish(GeometricField,Err) @@ -410,8 +393,8 @@ PROGRAM stokes_static CALL cmfe_Field_Initialise(EquationsSetField,Err) !Set the equations set to be a static Stokes problem CALL cmfe_EquationsSet_CreateStart(EquationsSetUserNumberStokes,Region,GeometricField,[CMFE_EQUATIONS_SET_FLUID_MECHANICS_CLASS, & - & CMFE_EQUATIONS_SET_STOKES_EQUATION_TYPE,CMFE_EQUATIONS_SET_STATIC_STOKES_SUBTYPE],EquationsSetFieldUserNumber, & - & EquationsSetField,EquationsSetStokes,Err) + & CMFE_EQUATIONS_SET_STOKES_EQUATION_TYPE,CMFE_EQUATIONS_SET_STATIC_STOKES_SUBTYPE],EquationsSetFieldUserNumber, & + & EquationsSetField,EquationsSetStokes,Err) !Finish creating the equations set CALL cmfe_EquationsSet_CreateFinish(EquationsSetStokes,Err) @@ -427,23 +410,23 @@ PROGRAM stokes_static CALL cmfe_Field_VariableLabelSet(DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,"U",Err) !Set the mesh component to be used by the field components. DO COMPONENT_NUMBER=1,NUMBER_OF_DIMENSIONS - CALL cmfe_Field_ComponentMeshComponentSet(DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,COMPONENT_NUMBER, & - & MESH_COMPONENT_NUMBER_VELOCITY,Err) - CALL cmfe_Field_ComponentMeshComponentSet(DependentFieldStokes,CMFE_FIELD_DELUDELN_VARIABLE_TYPE,COMPONENT_NUMBER, & - & MESH_COMPONENT_NUMBER_VELOCITY,Err) + CALL cmfe_Field_ComponentMeshComponentSet(DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,COMPONENT_NUMBER, & + & MESH_COMPONENT_NUMBER_VELOCITY,Err) + CALL cmfe_Field_ComponentMeshComponentSet(DependentFieldStokes,CMFE_FIELD_DELUDELN_VARIABLE_TYPE,COMPONENT_NUMBER, & + & MESH_COMPONENT_NUMBER_VELOCITY,Err) ENDDO COMPONENT_NUMBER=NUMBER_OF_DIMENSIONS+1 - CALL cmfe_Field_ComponentMeshComponentSet(DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,COMPONENT_NUMBER, & - & MESH_COMPONENT_NUMBER_PRESSURE,Err) - CALL cmfe_Field_ComponentMeshComponentSet(DependentFieldStokes,CMFE_FIELD_DELUDELN_VARIABLE_TYPE,COMPONENT_NUMBER, & - & MESH_COMPONENT_NUMBER_PRESSURE,Err) + CALL cmfe_Field_ComponentMeshComponentSet(DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,COMPONENT_NUMBER, & + & MESH_COMPONENT_NUMBER_PRESSURE,Err) + CALL cmfe_Field_ComponentMeshComponentSet(DependentFieldStokes,CMFE_FIELD_DELUDELN_VARIABLE_TYPE,COMPONENT_NUMBER, & + & MESH_COMPONENT_NUMBER_PRESSURE,Err) !Finish the equations set dependent field variables CALL cmfe_EquationsSet_DependentCreateFinish(EquationsSetStokes,Err) !Initialise dependent field DO COMPONENT_NUMBER=1,NUMBER_OF_DIMENSIONS - CALL cmfe_Field_ComponentValuesInitialise(DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,CMFE_FIELD_VALUES_SET_TYPE, & - & COMPONENT_NUMBER,INITIAL_FIELD_STOKES(COMPONENT_NUMBER),Err) + CALL cmfe_Field_ComponentValuesInitialise(DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,CMFE_FIELD_VALUES_SET_TYPE, & + & COMPONENT_NUMBER,INITIAL_FIELD_STOKES(COMPONENT_NUMBER),Err) ENDDO ! @@ -459,9 +442,9 @@ PROGRAM stokes_static !Finish the equations set materials field variables CALL cmfe_EquationsSet_MaterialsCreateFinish(EquationsSetStokes,Err) CALL cmfe_Field_ComponentValuesInitialise(MaterialsFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,CMFE_FIELD_VALUES_SET_TYPE, & - & MaterialsFieldUserNumberStokesMu,MU_PARAM_STOKES,Err) + & MaterialsFieldUserNumberStokesMu,MU_PARAM_STOKES,Err) CALL cmfe_Field_ComponentValuesInitialise(MaterialsFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,CMFE_FIELD_VALUES_SET_TYPE, & - & MaterialsFieldUserNumberStokesRho,RHO_PARAM_STOKES,Err) + & MaterialsFieldUserNumberStokesRho,RHO_PARAM_STOKES,Err) ! !================================================================================================================================ @@ -472,7 +455,7 @@ PROGRAM stokes_static !Create the equations set analytic field variables CALL cmfe_Field_Initialise(AnalyticField,Err) CALL cmfe_EquationsSet_AnalyticCreateStart(EquationsSetStokes,CMFE_EQUATIONS_SET_NAVIER_STOKES_EQUATION_TWO_DIM_4, & - & AnalyticFieldUserNumber,AnalyticField,Err) + & AnalyticFieldUserNumber,AnalyticField,Err) !Finish the equations set analytic field variables CALL cmfe_EquationsSet_AnalyticCreateFinish(EquationsSetStokes,Err) @@ -502,7 +485,7 @@ PROGRAM stokes_static CALL cmfe_Problem_Initialise(Problem,Err) CALL cmfe_ControlLoop_Initialise(ControlLoop,Err) CALL cmfe_Problem_CreateStart(ProblemUserNumber,[CMFE_PROBLEM_FLUID_MECHANICS_CLASS,CMFE_PROBLEM_STOKES_EQUATION_TYPE, & - & CMFE_PROBLEM_STATIC_STOKES_SUBTYPE],Problem,Err) + & CMFE_PROBLEM_STATIC_STOKES_SUBTYPE],Problem,Err) !Finish the creation of a problem. CALL cmfe_Problem_CreateFinish(Problem,Err) !Start the creation of the problem control loop @@ -525,15 +508,15 @@ PROGRAM stokes_static CALL cmfe_Solver_OutputTypeSet(LinearSolverStokes,LINEAR_SOLVER_STOKES_OUTPUT_TYPE,Err) !Set the solver settings IF(LINEAR_SOLVER_STOKES_DIRECT_FLAG) THEN - CALL cmfe_Solver_LinearTypeSet(LinearSolverStokes,CMFE_SOLVER_LINEAR_DIRECT_SOLVE_TYPE,Err) - CALL cmfe_Solver_LibraryTypeSet(LinearSolverStokes,CMFE_SOLVER_MUMPS_LIBRARY,Err) + CALL cmfe_Solver_LinearTypeSet(LinearSolverStokes,CMFE_SOLVER_LINEAR_DIRECT_SOLVE_TYPE,Err) + CALL cmfe_Solver_LibraryTypeSet(LinearSolverStokes,CMFE_SOLVER_MUMPS_LIBRARY,Err) ELSE - CALL cmfe_Solver_LinearTypeSet(LinearSolverStokes,CMFE_SOLVER_LINEAR_ITERATIVE_SOLVE_TYPE,Err) - CALL cmfe_Solver_LinearIterativeMaximumIterationsSet(LinearSolverStokes,MAXIMUM_ITERATIONS,Err) - CALL cmfe_Solver_LinearIterativeDivergenceToleranceSet(LinearSolverStokes,DIVERGENCE_TOLERANCE,Err) - CALL cmfe_Solver_LinearIterativeRelativeToleranceSet(LinearSolverStokes,RELATIVE_TOLERANCE,Err) - CALL cmfe_Solver_LinearIterativeAbsoluteToleranceSet(LinearSolverStokes,ABSOLUTE_TOLERANCE,Err) - CALL cmfe_Solver_LinearIterativeGMRESRestartSet(LinearSolverStokes,RESTART_VALUE,Err) + CALL cmfe_Solver_LinearTypeSet(LinearSolverStokes,CMFE_SOLVER_LINEAR_ITERATIVE_SOLVE_TYPE,Err) + CALL cmfe_Solver_LinearIterativeMaximumIterationsSet(LinearSolverStokes,MAXIMUM_ITERATIONS,Err) + CALL cmfe_Solver_LinearIterativeDivergenceToleranceSet(LinearSolverStokes,DIVERGENCE_TOLERANCE,Err) + CALL cmfe_Solver_LinearIterativeRelativeToleranceSet(LinearSolverStokes,RELATIVE_TOLERANCE,Err) + CALL cmfe_Solver_LinearIterativeAbsoluteToleranceSet(LinearSolverStokes,ABSOLUTE_TOLERANCE,Err) + CALL cmfe_Solver_LinearIterativeGMRESRestartSet(LinearSolverStokes,RESTART_VALUE,Err) ENDIF !Finish the creation of the problem solver CALL cmfe_Problem_SolversCreateFinish(Problem,Err) @@ -569,34 +552,35 @@ PROGRAM stokes_static CALL cmfe_SolverEquations_BoundaryConditionsCreateStart(SolverEquationsStokes,BoundaryConditionsStokes,Err) !Set fixed wall nodes IF(FIXED_WALL_NODES_STOKES_FLAG) THEN - DO NODE_COUNTER=1,NUMBER_OF_FIXED_WALL_NODES_STOKES - NODE_NUMBER=FIXED_WALL_NODES_STOKES(NODE_COUNTER) - CONDITION=CMFE_BOUNDARY_CONDITION_FIXED_WALL - CALL cmfe_Decomposition_NodeDomainGet(Decomposition,NODE_NUMBER,1,BoundaryNodeDomain,Err) - IF(BoundaryNodeDomain==ComputationalNodeNumber) THEN - DO COMPONENT_NUMBER=1,NUMBER_OF_DIMENSIONS - VALUE=0.0_CMISSRP - CALL cmfe_BoundaryConditions_SetNode(BoundaryConditionsStokes,DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,1, & - & CMFE_NO_GLOBAL_DERIV,NODE_NUMBER,COMPONENT_NUMBER,CONDITION,VALUE,Err) - ENDDO - ENDIF - ENDDO + DO NODE_COUNTER=1,NUMBER_OF_FIXED_WALL_NODES_STOKES + NODE_NUMBER=FIXED_WALL_NODES_STOKES(NODE_COUNTER) + CONDITION=CMFE_BOUNDARY_CONDITION_FIXED_WALL + CALL cmfe_Decomposition_NodeDomainGet(Decomposition,NODE_NUMBER,1,BoundaryNodeDomain,Err) + IF(BoundaryNodeDomain==ComputationalNodeNumber) THEN + DO COMPONENT_NUMBER=1,NUMBER_OF_DIMENSIONS + VALUE=0.0_CMISSRP + CALL cmfe_BoundaryConditions_SetNode(BoundaryConditionsStokes,DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,1, & + & CMFE_NO_GLOBAL_DERIV,NODE_NUMBER,COMPONENT_NUMBER,CONDITION,VALUE,Err) + ENDDO + ENDIF + ENDDO ENDIF !Set velocity boundary conditions IF(INLET_WALL_NODES_STOKES_FLAG) THEN - DO NODE_COUNTER=1,NUMBER_OF_INLET_WALL_NODES_STOKES - NODE_NUMBER=INLET_WALL_NODES_STOKES(NODE_COUNTER) - CONDITION=CMFE_BOUNDARY_CONDITION_FIXED_INLET - CALL cmfe_Decomposition_NodeDomainGet(Decomposition,NODE_NUMBER,1,BoundaryNodeDomain,Err) - IF(BoundaryNodeDomain==ComputationalNodeNumber) THEN - DO COMPONENT_NUMBER=1,NUMBER_OF_DIMENSIONS - VALUE=BOUNDARY_CONDITIONS_STOKES(COMPONENT_NUMBER) - CALL cmfe_BoundaryConditions_SetNode(BoundaryConditionsStokes,DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,1, & - & CMFE_NO_GLOBAL_DERIV,NODE_NUMBER,COMPONENT_NUMBER,CONDITION,VALUE,Err) - ENDDO - ENDIF - ENDDO + DO NODE_COUNTER=1,NUMBER_OF_INLET_WALL_NODES_STOKES + NODE_NUMBER=INLET_WALL_NODES_STOKES(NODE_COUNTER) + CONDITION=CMFE_BOUNDARY_CONDITION_FIXED_INLET + CALL cmfe_Decomposition_NodeDomainGet(Decomposition,NODE_NUMBER,1,BoundaryNodeDomain,Err) + IF(BoundaryNodeDomain==ComputationalNodeNumber) THEN + DO COMPONENT_NUMBER=1,NUMBER_OF_DIMENSIONS + VALUE=BOUNDARY_CONDITIONS_STOKES(COMPONENT_NUMBER) + CALL cmfe_BoundaryConditions_SetNode(BoundaryConditionsStokes,DependentFieldStokes,CMFE_FIELD_U_VARIABLE_TYPE,1, & + & CMFE_NO_GLOBAL_DERIV,NODE_NUMBER,COMPONENT_NUMBER,CONDITION,VALUE,Err) + ENDDO + ENDIF + ENDDO ENDIF + !CALL cmfe_SolverEquations_BoundaryConditionsAnalytic(SolverEquationsStokes,Err) !Finish the creation of the equations set boundary conditions CALL cmfe_SolverEquations_BoundaryConditionsCreateFinish(SolverEquationsStokes,Err) @@ -605,7 +589,7 @@ PROGRAM stokes_static ! !Output Analytic analysis - !Call cmfe_AnalyticAnalysis_Output(DependentFieldStokes,"StokesAnalytic",Err) + !CALL cmfe_AnalyticAnalysis_Output(DependentFieldStokes,"StokesAnalytic",Err) ! !================================================================================================================================ @@ -626,13 +610,13 @@ PROGRAM stokes_static EXPORT_FIELD_IO=.FALSE. IF(EXPORT_FIELD_IO) THEN - WRITE(*,'(A)') "Exporting fields..." - CALL cmfe_Fields_Initialise(Fields,Err) - CALL cmfe_Fields_Create(Region,Fields,Err) - CALL cmfe_Fields_NodesExport(Fields,"stokes_static","FORTRAN",Err) - CALL cmfe_Fields_ElementsExport(Fields,"stokes_static","FORTRAN",Err) - CALL cmfe_Fields_Finalise(Fields,Err) - WRITE(*,'(A)') "Field exported!" + WRITE(*,'(A)') "Exporting fields..." + CALL cmfe_Fields_Initialise(Fields,Err) + CALL cmfe_Fields_Create(Region,Fields,Err) + CALL cmfe_Fields_NodesExport(Fields,"stokes_static","FORTRAN",Err) + CALL cmfe_Fields_ElementsExport(Fields,"stokes_static","FORTRAN",Err) + CALL cmfe_Fields_Finalise(Fields,Err) + WRITE(*,'(A)') "Field exported!" ENDIF !Finialise CMISS From 1e8cb942ee742666957ba090f3bd879d96f0aa75 Mon Sep 17 00:00:00 2001 From: Soroush Safaei Date: Mon, 12 Feb 2018 12:00:50 +1300 Subject: [PATCH 3/8] fixed the docs --- README.rst | 44 ++-- .../output/STATIC_SOLUTION.part0.exelem | 201 ------------------ .../output/STATIC_SOLUTION.part0.exnode | 192 ----------------- 3 files changed, 26 insertions(+), 411 deletions(-) delete mode 100644 src/fortran/output/STATIC_SOLUTION.part0.exelem delete mode 100644 src/fortran/output/STATIC_SOLUTION.part0.exnode diff --git a/README.rst b/README.rst index 17c34cc..2059e95 100644 --- a/README.rst +++ b/README.rst @@ -1,42 +1,50 @@ +============= +Stokes Static +============= +Stokes equation is a linearised form of the Navier-Stokes equations in the limit of small Reynolds number. +This equation, also named creeping flow, is a type of fluid flow where advective inertial forces are small compared with viscous forces. +The static form of the Stokes equation is implemented in this example. -================= -Example Name Here -================= - -Short synopsis of the example. Building the example ==================== -If this not a pure Python example place the instructions here on how to configure and build with CMake:: +The fortran version of the example can be configured and built with CMake:: + + git clone https://github.com/OpenCMISS-Examples/stokes_static.git + mkdir stokes_static-build + cd stokes_static-build + cmake -DOpenCMISSLibs_DIR=~/opencmiss/install/ ../stokes_static/ + make - git clone https://github.com/you/your-example.git # maybe your example is somewhere else like: OpenCMISS-Examples - mkdir build - cmake -DOpenCMISSLibs_DIR=/path/to/opencmisslib/install ../your-example - make # cmake --build . will also work here and is much more platform agnostic. Running the example =================== -Explain how the example is run:: +Fortran version:: - cd build - ./src/fortran/XXXXXXXX + cd ./src/fortran/ + ./stokes_static -or maybe it is a Python only example:: +Python version:: - source /path/to/opencmisslibs/install/virtaul_environments/oclibs_venv_pyXY_release/bin/activate - python src/python/XXXXXXXX.py + source /install/.../.../virtualenvironments/oclibs_pyXY_release/bin/activate + cd ./src/python/ + python stokes_static.py where the XY in the path are the Python major and minor versions respectively. +The results can be visualised by running `visualise.com <./src/fortran/visualise.com>`_ with the `Cmgui visualiser `_. + + Prerequisites ============= -Are there any external sources that are required over and above CMake, OpenCMISS libraries. Sources like meshes which might be stored outside of the example itself. +There are no additional input files required for this example as it is self-contained. + License ======= -A line on the license applicable to this example. \ No newline at end of file +License applicable to this example is described in `LICENSE <./LICENSE>`_. diff --git a/src/fortran/output/STATIC_SOLUTION.part0.exelem b/src/fortran/output/STATIC_SOLUTION.part0.exelem deleted file mode 100644 index 6adc3cc..0000000 --- a/src/fortran/output/STATIC_SOLUTION.part0.exelem +++ /dev/null @@ -1,201 +0,0 @@ - Group name: StokesRegion - Shape. Dimension=2 - #Scale factor sets= 1 - l.Lagrange*l.Lagrange, #Scale factors=4 - #Nodes= 4 - #Fields=4 - 1) Coordinate, coordinate, rectangular cartesian, #Components=2 - x. l.Lagrange*l.Lagrange, no modify, standard node based. - #Nodes= 4 - 1. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 4. #Values=1 - Value indices: 1 - Scale factor indices: -1 - y. l.Lagrange*l.Lagrange, no modify, standard node based. - #Nodes= 4 - 1. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 4. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2) U, field, rectangular cartesian, #Components=3 - 1. l.Lagrange*l.Lagrange, no modify, standard node based. - #Nodes= 4 - 1. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 4. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. l.Lagrange*l.Lagrange, no modify, standard node based. - #Nodes= 4 - 1. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 4. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. l.Lagrange*l.Lagrange, no modify, standard node based. - #Nodes= 4 - 1. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 4. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3) del U_del n, field, rectangular cartesian, #Components=3 - 1. l.Lagrange*l.Lagrange, no modify, standard node based. - #Nodes= 4 - 1. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 4. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. l.Lagrange*l.Lagrange, no modify, standard node based. - #Nodes= 4 - 1. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 4. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. l.Lagrange*l.Lagrange, no modify, standard node based. - #Nodes= 4 - 1. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 4. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 4) Materials, field, rectangular cartesian, #Components=2 - 1. constant*constant, no modify, grid based. - #xi1=0, #xi2=0 - 2. l.Lagrange*l.Lagrange, no modify, standard node based. - #Nodes= 4 - 1. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 2. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 3. #Values=1 - Value indices: 1 - Scale factor indices: -1 - 4. #Values=1 - Value indices: 1 - Scale factor indices: -1 - Element: 1 0 0 - Values: - 1.0000000000000000E+00 - Nodes: - 1 2 5 6 - Scale factors: - 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 - Element: 2 0 0 - Values: - 1.0000000000000000E+00 - Nodes: - 2 3 6 7 - Scale factors: - 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 - Element: 3 0 0 - Values: - 1.0000000000000000E+00 - Nodes: - 3 4 7 8 - Scale factors: - 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 - Element: 4 0 0 - Values: - 1.0000000000000000E+00 - Nodes: - 5 6 9 10 - Scale factors: - 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 - Element: 5 0 0 - Values: - 1.0000000000000000E+00 - Nodes: - 6 7 10 11 - Scale factors: - 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 - Element: 6 0 0 - Values: - 1.0000000000000000E+00 - Nodes: - 7 8 11 12 - Scale factors: - 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 - Element: 7 0 0 - Values: - 1.0000000000000000E+00 - Nodes: - 9 10 13 14 - Scale factors: - 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 - Element: 8 0 0 - Values: - 1.0000000000000000E+00 - Nodes: - 10 11 14 15 - Scale factors: - 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 - Element: 9 0 0 - Values: - 1.0000000000000000E+00 - Nodes: - 11 12 15 16 - Scale factors: - 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 1.0000000000000000E+00 diff --git a/src/fortran/output/STATIC_SOLUTION.part0.exnode b/src/fortran/output/STATIC_SOLUTION.part0.exnode deleted file mode 100644 index 2900916..0000000 --- a/src/fortran/output/STATIC_SOLUTION.part0.exnode +++ /dev/null @@ -1,192 +0,0 @@ - Group name: StokesRegion - #Fields=4 - 1) Coordinate, coordinate, rectangular cartesian, #Components=2 - x. Value index= 1, #Derivatives= 0 - y. Value index= 2, #Derivatives= 0 - 2) U, field, rectangular cartesian, #Components=3 - 1. Value index= 3, #Derivatives= 0 - 2. Value index= 4, #Derivatives= 0 - 3. Value index= 5, #Derivatives= 0 - 3) del U_del n, field, rectangular cartesian, #Components=3 - 1. Value index= 6, #Derivatives= 0 - 2. Value index= 7, #Derivatives= 0 - 3. Value index= 8, #Derivatives= 0 - 4) Materials, field, rectangular cartesian, #Components=2 - 1. Value index= 9, #Derivatives= 0 - 2. Value index= 10, #Derivatives= 0 - Node: 1 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 1.0901513302419586E+01 - 1.0148614788529272E-11 - 1.0378060669630887E-11 - 3.1353923793432077E-13 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 2 - 3.3333333333333331E-01 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 1.0000000000000000E+00 - 2.7592262631199432E+01 - 8.3333333342046068E-02 - 2.7777777779855961E-02 - -5.0110560845827408E-12 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 3 - 6.6666666666666663E-01 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 1.0000000000000000E+00 - 2.7592262631195471E+01 - 8.3333333342046068E-02 - 2.7777777779855961E-02 - -5.0110560845827408E-12 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 4 - 1.0000000000000000E+00 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 1.0901513302414328E+01 - -1.0116929431700257E-11 - -3.6364521728898529E-12 - -3.1882013073915667E-13 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 5 - 0.0000000000000000E+00 - 1.0000000000000000E+00 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 2.4126556016596762E+01 - 8.3333333331930520E-02 - 2.7777777718643423E-02 - -1.9412142555298874E-12 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 6 - 3.3333333333333331E-01 - 1.0000000000000000E+00 - -1.1414153992951605E-11 - 1.0000000000069182E+00 - 1.9402123505003484E+01 - -5.8333333328872428E-01 - -5.0000000020055702E-01 - -2.7777777769272018E-02 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 7 - 6.6666666666666663E-01 - 1.0000000000000000E+00 - -1.1350783279293575E-11 - 9.9999999999337319E-01 - 1.9402123504995604E+01 - -5.8333333328872417E-01 - -5.0000000020055702E-01 - -2.7777777769272021E-02 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 8 - 1.0000000000000000E+00 - 1.0000000000000000E+00 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 2.4126556016590314E+01 - -8.3333333303996615E-02 - 5.5555555637114007E-02 - -4.9501737805862627E-13 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 9 - 0.0000000000000000E+00 - 2.0000000000000000E+00 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 4.9713204783765406E+00 - 8.3333333331930520E-02 - 2.7777777718643423E-02 - -1.9412142555298874E-12 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 10 - 3.3333333333333331E-01 - 2.0000000000000000E+00 - 4.0440480505852691E-11 - 9.9999999999155953E-01 - 7.1783011959820309E+00 - -5.8333333328872428E-01 - -5.0000000020055702E-01 - -2.7777777769272018E-02 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 11 - 6.6666666666666663E-01 - 2.0000000000000000E+00 - 4.0712304309671806E-11 - 1.0000000000078662E+00 - 7.1783011960152123E+00 - -5.8333333328872417E-01 - -5.0000000020055702E-01 - -2.7777777769272021E-02 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 12 - 1.0000000000000000E+00 - 2.0000000000000000E+00 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 4.9713204784127427E+00 - -8.3333333303996615E-02 - 5.5555555637114007E-02 - -4.9501737805862627E-13 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 13 - 0.0000000000000000E+00 - 3.0000000000000000E+00 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 5.6091042226294405E+00 - 1.0139581415351851E-11 - -1.0283004599143842E-11 - 3.1353923793432062E-13 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 14 - 3.3333333333333331E-01 - 3.0000000000000000E+00 - -6.3011398419993023E-11 - 9.9999999999619316E-01 - 1.5056138638185477E+00 - 1.6666666667628444E-01 - -2.7777777695646513E-02 - -4.0598765851701072E-12 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 15 - 6.6666666666666663E-01 - 3.0000000000000000E+00 - -6.3647661313185245E-11 - 1.0000000000038995E+00 - 1.5056138637845415E+00 - 1.6666666667628444E-01 - -2.7777777695646527E-02 - -4.0598765851701072E-12 - 1.2345678806304932E+00 - 1.0000000000000000E+00 - Node: 16 - 1.0000000000000000E+00 - 3.0000000000000000E+00 - 0.0000000000000000E+00 - 0.0000000000000000E+00 - 5.6091042225962147E+00 - -1.0171266772180866E-11 - 3.5413961024028090E-12 - -3.1882013073915647E-13 - 1.2345678806304932E+00 - 1.0000000000000000E+00 From 585a2dc6284582b9527098ccafdbc38634343f3b Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Fri, 16 Feb 2018 10:02:43 +1300 Subject: [PATCH 4/8] Rename visualiseStokes.com to visualiseStokesStatic.cmgui --- src/fortran/{visualiseStokes.com => visualiseStokesStatic.cmgui} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/fortran/{visualiseStokes.com => visualiseStokesStatic.cmgui} (100%) diff --git a/src/fortran/visualiseStokes.com b/src/fortran/visualiseStokesStatic.cmgui similarity index 100% rename from src/fortran/visualiseStokes.com rename to src/fortran/visualiseStokesStatic.cmgui From 9816fc5adf83d071133746ea08be5ccc2b4c3cf6 Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Fri, 16 Feb 2018 10:03:29 +1300 Subject: [PATCH 5/8] Correct name of Fortran executable. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index 2059e95..e3038f1 100644 --- a/README.rst +++ b/README.rst @@ -25,7 +25,7 @@ Running the example Fortran version:: cd ./src/fortran/ - ./stokes_static + ./stokes_static_fortran Python version:: From d995d074200bd13beef0082664d0c1bcc9ad7baf Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Fri, 16 Feb 2018 10:04:01 +1300 Subject: [PATCH 6/8] Remove documentation on non-existent Python example. --- README.rst | 8 -------- 1 file changed, 8 deletions(-) diff --git a/README.rst b/README.rst index e3038f1..cf40ab8 100644 --- a/README.rst +++ b/README.rst @@ -27,14 +27,6 @@ Fortran version:: cd ./src/fortran/ ./stokes_static_fortran -Python version:: - - source /install/.../.../virtualenvironments/oclibs_pyXY_release/bin/activate - cd ./src/python/ - python stokes_static.py - -where the XY in the path are the Python major and minor versions respectively. - The results can be visualised by running `visualise.com <./src/fortran/visualise.com>`_ with the `Cmgui visualiser `_. From 53bb42bd1ed0903719216cc8b1b1c00dec8a5080 Mon Sep 17 00:00:00 2001 From: Hugh Sorby Date: Fri, 16 Feb 2018 10:04:44 +1300 Subject: [PATCH 7/8] Update visualisation filename. --- README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.rst b/README.rst index cf40ab8..25c3e0b 100644 --- a/README.rst +++ b/README.rst @@ -27,7 +27,7 @@ Fortran version:: cd ./src/fortran/ ./stokes_static_fortran -The results can be visualised by running `visualise.com <./src/fortran/visualise.com>`_ with the `Cmgui visualiser `_. +The results can be visualised by running `visualiseStokesStatic.cmgui <./src/fortran/visualiseStokesStatic.cmgui>`_ with the `Cmgui visualiser `_. Prerequisites From 45b1f5afd34758765e6adf2fb9439edd3d18053e Mon Sep 17 00:00:00 2001 From: Soroush Safaei Date: Fri, 16 Feb 2018 18:43:43 +1300 Subject: [PATCH 8/8] added output folder --- .../expected_results/{ => output}/STATIC_SOLUTION.part0.exelem | 0 .../expected_results/{ => output}/STATIC_SOLUTION.part0.exnode | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename src/fortran/expected_results/{ => output}/STATIC_SOLUTION.part0.exelem (100%) rename src/fortran/expected_results/{ => output}/STATIC_SOLUTION.part0.exnode (100%) diff --git a/src/fortran/expected_results/STATIC_SOLUTION.part0.exelem b/src/fortran/expected_results/output/STATIC_SOLUTION.part0.exelem similarity index 100% rename from src/fortran/expected_results/STATIC_SOLUTION.part0.exelem rename to src/fortran/expected_results/output/STATIC_SOLUTION.part0.exelem diff --git a/src/fortran/expected_results/STATIC_SOLUTION.part0.exnode b/src/fortran/expected_results/output/STATIC_SOLUTION.part0.exnode similarity index 100% rename from src/fortran/expected_results/STATIC_SOLUTION.part0.exnode rename to src/fortran/expected_results/output/STATIC_SOLUTION.part0.exnode