diff --git a/Makefile.project b/Makefile.project index 8d08eee..05719bb 100644 --- a/Makefile.project +++ b/Makefile.project @@ -4,8 +4,8 @@ _SMEKA_project = 1 # Step this version upon new versions PROJECT_MAJOR = 0 -PROJECT_MINOR = 6 -PROJECT_MICRO = 1 +PROJECT_MINOR = 7 +PROJECT_MICRO = 0 PROJECT_VERSION = $(PROJECT_MAJOR).$(PROJECT_MINOR).$(PROJECT_MICRO) # These are constant default diff --git a/default_settings.bash b/default_settings.bash index a56878c..117b6b9 100644 --- a/default_settings.bash +++ b/default_settings.bash @@ -7,6 +7,7 @@ function var_N { case $var in VAR) _ps 0 ;; a) _ps 1 ;; + cp|fp) _ps 1 ;; *) _ps 3 ;; esac } diff --git a/ford_doc.md b/ford_doc.md index 4bb04c5..6ea05b9 100644 --- a/ford_doc.md +++ b/ford_doc.md @@ -1,10 +1,10 @@ project: fdict -version: 0.6.1 +version: 0.7.0 summary: Documentation of fortran type-free variable and dictionary src_dir: sources author: Nick R. Papior github: https://github.com/zerothi -year: 2015-2017 +year: 2015-2019 project_github: https://github.com/zerothi/fdict project_download: https://github.com/zerothi/fdict/releases output_dir: ./documentation diff --git a/setup.sh b/setup.sh index 12c7961..db0d68e 100755 --- a/setup.sh +++ b/setup.sh @@ -34,13 +34,15 @@ function _help { echo " changing this file and settings.inc" echo "" echo " The following options control how the dimensions are allocated:" - for v in -s -d -c -z -b -h -i -l ; do + for v in -s -d -c -z -b -h -i -l -cp -fp ; do echo " $v : allows 0- dimensions of $(var_name ${v:1})" done echo " -A : short for all the above options simultaneously" echo " -R : short for -s -d " echo " -C : short for -c -z " echo " -I : short for -h -i -l " + echo " -I : short for -h -i -l " + echo " -P : short for -cp -fp " echo " The above options can be combined with the last option taking precedence." echo "" echo "Example" @@ -99,6 +101,9 @@ while [ $# -gt 0 ]; do -I) quick_setup $1 h i l shift ;; + -P) + quick_setup $1 cp fp + shift ;; -help) _help ; exit ;; *) diff --git a/src/variable_pp.F90 b/src/variable_pp.F90 index ef13aa4..911c893 100644 --- a/src/variable_pp.F90 +++ b/src/variable_pp.F90 @@ -27,6 +27,9 @@ module variable !! !! The assignment routine behaves like `=` (delete old value) !! whereas the associate routine behaves like `=>` (nullify old value). + !! + !! The data-types allowed in this type is *not* limited by this + !! module, but we currently allow integers, reals, complex and C-pointers. ! Load the iso_c_binding for containing a C-pointer use, intrinsic :: iso_c_binding