Merge branch 'release/2.0.0'

.gitignore

@@ -0,0 +1,47 @@
+# compiled object files
+*.slo
+*.lo
+*.o
+*.obj
+
+# compiled dynamic libraries
+*.so
+
+# fortran module files
+*.mod
+
+# compiled static libraries
+*.la
+*.a
+*.lib
+
+# executables
+*.exe
+*.out
+*.a
+*.app
+
+# log files
+*.log
+
+# special directories
+src/pre-lib/
+OLD/
+static/
+shared/
+doc/html/
+wiki/
+forks/
+references/
+exe/
+
+# special files
+get_automatic_changelog.sh
+mpi_speedup.dat
+mpi_speedup.lay
+openmp_speedup.dat
+openmp_speedup.lay
+.doxygenconfig.bak
+diagnostic_messages
+error_messages
+run_diff

.gitmodules

@@ -1,6 +1,16 @@
 [submodule "src/third_party/PENF"]
 	path = src/third_party/PENF
 	url = https://github.com/szaghi/PENF
+	branch = master
 [submodule "src/third_party/BeFoR64"]
 	path = src/third_party/BeFoR64
 	url = https://github.com/szaghi/BeFoR64
+	branch = master
+[submodule "src/third_party/StringiFor"]
+	path = src/third_party/StringiFor
+	url = https://github.com/szaghi/StringiFor
+	branch = master
+[submodule "src/third_party/FoXy"]
+	path = src/third_party/FoXy
+	url = https://github.com/Fortran-FOSS-Programmers/FoXy
+	branch = master

.travis.yml

@@ -1,7 +1,4 @@
-language: python
-
-python:
-  - 2.7
+language: generic
 
 sudo: false
 
@@ -17,14 +14,15 @@ addons:
     sources:
       - ubuntu-toolchain-r-test
     packages:
-      - gfortran-4.9
+      - gfortran-6
       - binutils
       - python-pip
-      - graphviz      
+      - graphviz
 
 env:
   global:
-    - SCRIPT="FoBiS.py rule -ex makecoverage"
+    - MAKECOVERAGE="FoBiS.py rule -ex makecoverage"
+    - MAKEDOC="./makedoc.sh szaghi/VTKFortran"
 
 before_install:
   - git submodule update --init --recursive
@@ -35,20 +33,20 @@ install:
       mkdir "$HOME/.local/bin"
     fi
   - export PATH="$HOME/.local/bin:$PATH"
-  - export FC=/usr/bin/gfortran-4.9
-  - ln -fs /usr/bin/gfortran-4.9 "$HOME/.local/bin/gfortran" && gfortran --version
-  - ls -l /usr/bin/gfortran-4.9
-  - ln -fs /usr/bin/gcov-4.9 "$HOME/.local/bin/gcov" && gcov --version
-  - pip install --upgrade pygooglechart
-  - pip install --upgrade graphviz
-  - pip install --upgrade FoBiS.py
-  - pip install --upgrade markdown-checklist 
-  - pip install --upgrade ford
+  - export FC=/usr/bin/gfortran-6
+  - ln -fs /usr/bin/gfortran-6 "$HOME/.local/bin/gfortran" && gfortran --version
+  - ls -l /usr/bin/gfortran-6
+  - ln -fs /usr/bin/gcov-6 "$HOME/.local/bin/gcov" && gcov --version
+  - pip install --user --upgrade pygooglechart
+  - pip install --user --upgrade graphviz
+  - pip install --user --upgrade FoBiS.py
+  - pip install --user --upgrade markdown-checklist
+  - pip install --user --upgrade ford
 
 script:
-  - $SCRIPT
+  - $MAKECOVERAGE
 
 after_success:
-  - cd $TRAVIS_BUILD_DIR
+  - find . -name '*.gcno' -print
   - bash <(curl -s https://codecov.io/bash)
-  - ./makedoc.sh szaghi/Lib_VTK_IO
+  - $MAKEDOC

codecov.yml

@@ -0,0 +1,6 @@
+coverage:
+  ignore:
+    - src/lib/befor64*
+    - src/lib/foxy*
+    - src/lib/penf.F90
+    - src/lib/stringifor*

fobos

@@ -10,83 +10,83 @@ $CSHARED_INT = -cpp -c -fpic -assume realloc_lhs
 $LSHARED     = -shared
 $CSTATIC_GNU = -cpp -c -frealloc-lhs
 $CSTATIC_INT = -cpp -c -assume realloc_lhs
-$DEBUG_GNU   = -O0 -g3 -Warray-bounds -Wcharacter-truncation -Wline-truncation -Wimplicit-interface -Wimplicit-procedure -Wunderflow -Wuninitialized -fcheck=all -fmodule-private -ffree-line-length-132 -fimplicit-none -fbacktrace -fdump-core -finit-real=nan
-$DEBUG_INT   = -O0 -debug all -check all -warn all -extend-source 132 -traceback -gen-interfaces#-fpe-all=0 -fp-stack-check -fstack-protector-all -ftrapuv -no-ftz -std03
+$DEBUG_GNU   = -O0 -g3 -Warray-bounds -Wcharacter-truncation -Wline-truncation -Wimplicit-interface -Wimplicit-procedure -Wunderflow -Wuninitialized -fcheck=all -ffree-line-length-132 -fimplicit-none -fbacktrace -fdump-core -finit-real=nan
+$DEBUG_INT   = -O0 -debug all -check all -warn all -extend-source 132 -traceback -gen-interfaces#-fpe-all=0 -fp-stack-check -fstack-protector-all -ftrapuv -no-ftz -std08
 $OPTIMIZE    = -O2
-$EXDIRS      = src/third_party/BeFoR64/src/tests/ src/third_party/PENF/src/tests/
+$EXDIRS      = src/pre-lib/ src/third_party/BeFoR64/ src/third_party/FoXy/ src/third_party/PENF/ src/third_party/StringiFor/
 
 # main modes
 [shared-gnu]
 template  = template-shared-gnu
-target    = src/Lib_VTK_IO.f90
+target    = src/lib/vtk_fortran.f90
 build_dir = ./shared/
-output    = Lib_VTK_IO.so
+output    = libvtkfortran.so
 mklib     = shared
 
 [static-gnu]
 template  = template-static-gnu
-target    = src/Lib_VTK_IO.f90
+target    = src/lib/vtk_fortran.f90
 build_dir = ./static/
-output    = Lib_VTK_IO.a
+output    = libvtkfortran.a
 mklib     = static
 
 [tests-gnu]
 template  = template-static-gnu
-build_dir = ./tests
+build_dir = exe
 
 [shared-gnu-debug]
 template  = template-shared-gnu-debug
-target    = src/Lib_VTK_IO.f90
+target    = src/lib/vtk_fortran.f90
 build_dir = ./shared/
-output    = Lib_VTK_IO.so
+output    = libvtkfortran.so
 mklib     = shared
 
 [static-gnu-debug]
 template  = template-static-gnu-debug
-target    = src/Lib_VTK_IO.f90
+target    = src/lib/vtk_fortran.f90
 build_dir = ./static/
-output    = Lib_VTK_IO.a
+output    = libvtkfortran.a
 mklib     = static
 
 [tests-gnu-debug]
 template  = template-static-gnu-debug
-build_dir = ./tests
+build_dir = exe
 
 [shared-intel]
 template  = template-shared-intel
-target    = src/Lib_VTK_IO.f90
+target    = src/lib/vtk_fortran.f90
 build_dir = ./shared/
-output    = Lib_VTK_IO.so
+output    = libvtkfortran.so
 mklib     = shared
 
 [static-intel]
 template  = template-static-intel
-target    = src/Lib_VTK_IO.f90
+target    = src/lib/vtk_fortran.f90
 build_dir = ./static/
-output    = Lib_VTK_IO.a
+output    = libvtkfortran.a
 mklib     = static
 
 [tests-intel]
 template  = template-static-intel
-build_dir = ./tests
+build_dir = exe
 
 [shared-intel-debug]
 template  = template-shared-intel-debug
-target    = src/Lib_VTK_IO.f90
+target    = src/lib/vtk_fortran.f90
 build_dir = ./shared/
-output    = Lib_VTK_IO.so
+output    = libvtkfortran.so
 mklib     = shared
 
 [static-intel-debug]
 template  = template-static-intel-debug
-target    = src/Lib_VTK_IO.f90
+target    = src/lib/vtk_fortran.f90
 build_dir = ./static/
-output    = Lib_VTK_IO.a
+output    = libvtkfortran.a
 mklib     = static
 
 [tests-intel-debug]
 template  = template-static-intel-debug
-build_dir = ./tests
+build_dir = exe
 
 #templates
 [template-shared-gnu]
@@ -205,22 +205,20 @@ rule = rm -rf doc/html/*
 
 [rule-maketar]
 help = Rule for making tar archive of the project
-rule = tar -czf Lib_VTK_IO.tar.gz *
+rule = tar -czf vtk_fortran.tar.gz *
 
 [rule-makecoverage]
 help   = Rule for performing coverage analysis
 rule_1 = FoBiS.py clean -mode tests-gnu
 rule_2 = FoBiS.py build -mode tests-gnu -coverage
-rule_3 = ./tests/Test_Driver -all
-rule_4 = ./tests/test_fs
-rule_5 = gcov -o tests/obj/ src/lib/*
+rule_3 = ./run_tests.sh
+rule_4 = gcov -o exe/obj/ src/lib/vtk_fortran*.f90
 
 [rule-coverage-analysis]
 help   = Rule for performing coverage analysis and saving reports in markdown
 rule_1 = FoBiS.py clean -mode tests-gnu
 rule_2 = FoBiS.py build -mode tests-gnu -coverage
-rule_3 = ./tests/Test_Driver -all
-rule_4 = ./tests/test_fs
-rule_5 = gcov -o tests/obj/ src/lib/*
-rule_6 = FoBiS.py rule -gcov_analyzer wiki/ Coverage-Analysis
-rule_7 = rm -f *.gcov XML_*vt?
+rule_3 = ./run_tests.sh
+rule_4 = gcov -o exe/obj/ src/lib/vtk_fortran*.f90
+rule_5 = FoBiS.py rule -gcov_analyzer wiki/ Coverage-Analysis
+rule_6 = rm -f *.gcov XML_*vt?

run_tests.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+all_passed () {
+  local array="$1[@]"
+  local ok=1
+  for element in "${!array}"; do
+    if [ "$element" == 'F' ]; then
+      ok=0
+      break
+    fi
+  done
+  echo $ok
+}
+
+echo "Run all tests"
+declare -a tests_executed
+for e in $( find ./exe/ -type f -executable -print ); do
+  is_passed=`$e | grep -i "Are all tests passed? " | awk '{print $5}'`
+  tests_executed=("${tests_executed[@]}" "$is_passed")
+  echo "  run test $e, is passed? $is_passed"
+  if [ "$is_passed" == 'F' ]; then
+    echo
+    echo "Test failed"
+    ./exe/$e
+  fi
+done
+passed=$(all_passed tests_executed)
+echo "Number of tests executed ${#tests_executed[@]}"
+if [ $passed -eq 1 ]; then
+  echo "All tests passed"
+  exit 0
+else
+  echo "Some tests failed"
+  exit 1
+fi

src/lib/befor64.F90

@@ -0,0 +1 @@
+../third_party/BeFoR64/src/lib/befor64.F90

src/lib/befor64_pack_data_m.F90

@@ -0,0 +1 @@
+../third_party/BeFoR64/src/lib/befor64_pack_data_m.F90

src/lib/foxy.f90

@@ -0,0 +1 @@
+../third_party/FoXy/src/lib/foxy.f90

src/lib/foxy_xml_file.f90

@@ -0,0 +1 @@
+../third_party/FoXy/src/lib/foxy_xml_file.f90

src/lib/foxy_xml_tag.f90

@@ -0,0 +1 @@
+../third_party/FoXy/src/lib/foxy_xml_tag.f90

src/lib/penf.F90

@@ -0,0 +1 @@
+../third_party/PENF/src/lib/penf.F90

src/lib/stringifor.F90

@@ -0,0 +1 @@
+../third_party/StringiFor/src/lib/stringifor.F90

src/lib/stringifor_string_t.F90

@@ -0,0 +1 @@
+../third_party/StringiFor/src/lib/stringifor_string_t.F90

src/lib/vtk_fortran.f90

@@ -0,0 +1,18 @@
+!< VTK_Fortran, pure Fortran (2003+) library to parse and emitt VTK files.
+module vtk_fortran
+!-----------------------------------------------------------------------------------------------------------------------------------
+!< VTK_Fortran, pure Fortran (2003+) library to parse and emitt VTK files.
+!-----------------------------------------------------------------------------------------------------------------------------------
+use vtk_fortran_pvtk_file, only : pvtk_file
+use vtk_fortran_vtk_file, only : vtk_file
+use vtk_fortran_vtm_file, only : vtm_file
+!-----------------------------------------------------------------------------------------------------------------------------------
+
+!-----------------------------------------------------------------------------------------------------------------------------------
+implicit none
+private
+public :: pvtk_file
+public :: vtk_file
+public :: vtm_file
+!-----------------------------------------------------------------------------------------------------------------------------------
+endmodule vtk_fortran