Author: bugman
Date: Fri Jul 11 16:47:21 2014
New Revision: 24529
URL: http://svn.gna.org/viewcvs/relax?rev=24529&view=rev
Log:
Merged revisions 24521,24526-24528 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r24521 | bugman | 2014-07-11 10:39:52 +0200 (Fri, 11 Jul 2014) | 6 lines
Updated the minfx version in the release checklist document to 1.0.8.
This version has not been released yet, but it will include important fixes
and additions for
constrained parallelised grid searches.
........
r24526 | bugman | 2014-07-11 16:19:49 +0200 (Fri, 11 Jul 2014) | 3 lines
Fix for a broken link in the development chapter of the relax manual.
........
r24527 | bugman | 2014-07-11 16:25:35 +0200 (Fri, 11 Jul 2014) | 6 lines
Fixes for dead hyperlinks in the relaxation dispersion chapter of the relax
manual.
The B14 model links to
http://www.nmr-relax.com/api/3.2/lib.dispersion.b14-module.html were broken
as the B in B14 was capitalised.
........
r24528 | bugman | 2014-07-11 16:43:26 +0200 (Fri, 11 Jul 2014) | 6 lines
Sent in the verbosity argument value to the minfx.grid.grid_split()
function.
The minfx function in the next release (1.0.8) will now be more verbose, so
this will help with user
feedback when running the model-free analysis on a cluster or multi-core
system using MPI.
........
Modified:
branches/frame_order_cleanup/ (props changed)
branches/frame_order_cleanup/docs/Release_Checklist
branches/frame_order_cleanup/docs/latex/develop.tex
branches/frame_order_cleanup/docs/latex/dispersion.tex
branches/frame_order_cleanup/specific_analyses/model_free/api.py
Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 11 16:47:21 2014
@@ -1 +1 @@
-/trunk:1-24511
+/trunk:1-24528
Modified: branches/frame_order_cleanup/docs/Release_Checklist
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/Release_Checklist?rev=24529&r1=24528&r2=24529&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/Release_Checklist (original)
+++ branches/frame_order_cleanup/docs/Release_Checklist Fri Jul 11 16:47:21
2014
@@ -70,7 +70,7 @@
Bundle minfx and bmrblib by checking out the latest stable release tags, for
example:
-$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/tags/1.0.7/minfx
+$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/tags/1.0.8/minfx
$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/bmrblib/tags/1.0.3/bmrblib
@@ -107,7 +107,7 @@
$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/2.0.1
$ cd 2.0.1
-$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/tags/1.0.7/minfx
+$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/minfx/tags/1.0.8/minfx
$ svn co svn+ssh://bugman@xxxxxxxxxxx/svn/bmrblib/tags/1.0.3/bmrblib
$ scons binary_dist key=xxxxx
@@ -115,7 +115,7 @@
$ svn co http://svn.gna.org/svn/relax/tags/2.0.1
$ cd 2.0.1
-$ svn co http://svn.gna.org/svn/minfx/tags/1.0.7/minfx
+$ svn co http://svn.gna.org/svn/minfx/tags/1.0.8/minfx
$ svn co http://svn.gna.org/svn/bmrblib/tags/1.0.3/bmrblib
$ scons binary_dist
Modified: branches/frame_order_cleanup/docs/latex/develop.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/latex/develop.tex?rev=24529&r1=24528&r2=24529&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/latex/develop.tex (original)
+++ branches/frame_order_cleanup/docs/latex/develop.tex Fri Jul 11 16:47:21
2014
@@ -918,7 +918,7 @@
Having a large web of links across relax's infrastructure aids in the search
engine indexing of the mailing list archives and the
\href{http://www.nmr-relax.com}{http://www.nmr-relax.com} web site.
The web of links is useful for catching those Google bots.
-That way the Google searching of the mailing list archives located on the
\href{http://www.nmr-relax.com/\-communication.html}{communication web page}
will be more up to date.
+That way the Google searching of the mailing list archives located on the
\href{http://www.nmr-relax.com/communication.html}{communication web page}
will be more up to date.
However to increase the search engine ranking of the web site, links to
\href{http://www.nmr-relax.com}{http://www.nmr-relax.com} from external sites
is required.
This is one reason why relax can be found at a number of sites across the
web:
\begin{description}
Modified: branches/frame_order_cleanup/docs/latex/dispersion.tex
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/docs/latex/dispersion.tex?rev=24529&r1=24528&r2=24529&view=diff
==============================================================================
--- branches/frame_order_cleanup/docs/latex/dispersion.tex (original)
+++ branches/frame_order_cleanup/docs/latex/dispersion.tex Fri Jul 11
16:47:21 2014
@@ -653,7 +653,7 @@
More information about the B14 full model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/B14\_full},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.B14-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.b14-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#B14\_full}.
\end{itemize}
@@ -672,7 +672,7 @@
More information about the B14 model is available from:
\begin{itemize}
\item the relax wiki at \url{http://wiki.nmr-relax.com/B14},
- \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.B14-module.html},
+ \item the API documentation at
\url{http://www.nmr-relax.com/api/3.2/lib.dispersion.b14-module.html},
\item the relaxation dispersion page of the relax website at
\url{http://www.nmr-relax.com/analyses/relaxation\_dispersion.html#B14}.
\end{itemize}
Modified: branches/frame_order_cleanup/specific_analyses/model_free/api.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/model_free/api.py?rev=24529&r1=24528&r2=24529&view=diff
==============================================================================
--- branches/frame_order_cleanup/specific_analyses/model_free/api.py
(original)
+++ branches/frame_order_cleanup/specific_analyses/model_free/api.py Fri
Jul 11 16:47:21 2014
@@ -1366,7 +1366,7 @@
print("Parallelised diffusion tensor grid search.")
# Loop over each grid subdivision.
- for subdivision in
grid_split(divisions=processor.processor_size(), lower=opt_params.lower,
upper=opt_params.upper, inc=opt_params.inc):
+ for subdivision in
grid_split(divisions=processor.processor_size(), lower=opt_params.lower,
upper=opt_params.upper, inc=opt_params.inc, verbosity=verbosity):
# Set the points.
opt_params.subdivision = subdivision
r24529 - in /branches/frame_order_cleanup: ./ docs/ docs/latex/ specific_analyses/model_free/