Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@ DOI for the specific version you have used in any given study.

## Version number

CONQUEST is now at version 1.3 (tag:v1.3)
CONQUEST is now at version 1.4 (tag:v1.4)
4 changes: 2 additions & 2 deletions docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,9 @@
# built documents.
#
# The short X.Y version.
version = u'1.3'
version = u'1.4'
# The full version, including alpha/beta/rc tags.
release = u'1.3'
release = u'1.4'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
5 changes: 4 additions & 1 deletion docs/input_tags.rst
Original file line number Diff line number Diff line change
Expand Up @@ -692,8 +692,11 @@ Diag.PaddingHmatrix (*boolean*)

Diag.BlockSizeR (*integer*)
Block size for rows (See next).
From v1.4, the default value is 32 when Diag.PaddingHmatrix is true.
It is recommended to check the efficiency (CPU time) on your platform by changing this value.
Usually 20-40 is appropriate.

*default*: Determined automatically
*default*: 32 or Determined automatically (if Diag.PaddingHmatrix= true)

Diag.BlockSizeC (*integer*)
R ... rows, C ... columns
Expand Down