Skip to content

Commit

Permalink
maint: bumped version number of limited cp|fp to max 1 dimension
Browse files Browse the repository at this point in the history
Currently it seems max 1 dimensions for C-pointers is sufficient.

Signed-off-by: Nick Papior <[email protected]>
  • Loading branch information
zerothi committed Jan 30, 2019
1 parent a5f7fbf commit e61e470
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Makefile.project
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions default_settings.bash
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ function var_N {
case $var in
VAR) _ps 0 ;;
a) _ps 1 ;;
cp|fp) _ps 1 ;;
*) _ps 3 ;;
esac
}
Expand Down
4 changes: 2 additions & 2 deletions ford_doc.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
7 changes: 6 additions & 1 deletion setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <num> : allows 0-<num> dimensions of $(var_name ${v:1})"
done
echo " -A <num> : short for all the above options simultaneously"
echo " -R <num> : short for -s <num> -d <num>"
echo " -C <num> : short for -c <num> -z <num>"
echo " -I <num> : short for -h <num> -i <num> -l <num>"
echo " -I <num> : short for -h <num> -i <num> -l <num>"
echo " -P <num> : short for -cp <num> -fp <num>"
echo " The above options can be combined with the last option taking precedence."
echo ""
echo "Example"
Expand Down Expand Up @@ -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 ;;
*)
Expand Down
3 changes: 3 additions & 0 deletions src/variable_pp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit e61e470

Please sign in to comment.