From 3a6da307a26170611ea9519d8fbfe0fcf9219991 Mon Sep 17 00:00:00 2001 From: David Bowler Date: Fri, 13 Dec 2024 15:45:33 +0000 Subject: [PATCH 1/3] Updated version numbers --- README.md | 2 +- docs/conf.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 01cd052df..a0e032853 100644 --- a/README.md +++ b/README.md @@ -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) diff --git a/docs/conf.py b/docs/conf.py index b5b0f6847..e139dcfd4 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -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. From 45beb528607b810397a31105783fa15f5ba63197 Mon Sep 17 00:00:00 2001 From: Tsuyoshi Miyazaki Date: Tue, 17 Dec 2024 18:29:07 +0900 Subject: [PATCH 2/3] changed the part "Diag.BlockSizeR" in manual changed the part "Diag.BlockSizeR" in manual --- docs/input_tags.rst | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/input_tags.rst b/docs/input_tags.rst index ef7217026..5a3595571 100644 --- a/docs/input_tags.rst +++ b/docs/input_tags.rst @@ -692,8 +692,11 @@ Diag.PaddingHmatrix (*boolean*) Diag.BlockSizeR (*integer*) Block size for rows (See next). + From v1.4, the default value is 30 when Diag.PaddingHmatrix is true. + It is recommended to check the efficiency (CPU time) on your platform by changing this value. + Usually 20-30 is appropriate. - *default*: Determined automatically + *default*: 30 or Determined automatically (if Diag.PaddingHmatrix= true) Diag.BlockSizeC (*integer*) R ... rows, C ... columns From c27c0681f72b1d84537e02e213a9220e8fb63d0c Mon Sep 17 00:00:00 2001 From: Tsuyoshi Miyazaki Date: Wed, 18 Dec 2024 11:45:49 +0900 Subject: [PATCH 3/3] changed the default value of BlockSizeR from 30 to 32 changed the default value of BlockSizeR from 30 to 32 --- docs/input_tags.rst | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/input_tags.rst b/docs/input_tags.rst index 5a3595571..b3180c33c 100644 --- a/docs/input_tags.rst +++ b/docs/input_tags.rst @@ -692,11 +692,11 @@ Diag.PaddingHmatrix (*boolean*) Diag.BlockSizeR (*integer*) Block size for rows (See next). - From v1.4, the default value is 30 when Diag.PaddingHmatrix is true. + 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-30 is appropriate. + Usually 20-40 is appropriate. - *default*: 30 or Determined automatically (if Diag.PaddingHmatrix= true) + *default*: 32 or Determined automatically (if Diag.PaddingHmatrix= true) Diag.BlockSizeC (*integer*) R ... rows, C ... columns