yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Alexander Eulitz [Eugen] (kubeu)
  Bruno Chareyre (bruno-chareyre)
  Luc Sibille (luc-sibille)
------------------------------------------------------------
revno: 3813 [merge]
committer: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
timestamp: Mon 2014-02-03 17:11:36 +0100
message:
  Merge branch 'master' of github.com:yade/trunk
modified:
  core/main/main.py.in
  doc/sphinx/prog.rst
  pkg/dem/Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.cpp


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'core/main/main.py.in'
--- core/main/main.py.in	2014-01-14 18:37:09 +0000
+++ core/main/main.py.in	2014-02-03 16:10:20 +0000
@@ -104,7 +104,7 @@
 if not 'openmp' in features and (opts.cores or (opts.threads and opts.threads>1)):
 	print 'WARNING: compiled without OpenMP, -j/--threads/--cores have no effect.'
 
-# OpenMP env variables must be se before loading yade libs ("import yade" below)
+# OpenMP env variables must be set before loading yade libs ("import yade" below)
 # changes have no effeect after libgomp initializes
 if opts.cores:
 	if opts.threads: print 'WARNING: --threads ignored, since --cores specified.'

=== modified file 'doc/sphinx/prog.rst'
--- doc/sphinx/prog.rst	2013-09-11 10:53:43 +0000
+++ doc/sphinx/prog.rst	2013-09-12 06:56:25 +0000
@@ -97,7 +97,7 @@
 ---------------------------------------------------
 A frequently used IDE is Kdevelop. We recommend using this software for navigating 
 in the sources, compiling and debugging. Other useful tools for debugging and 
-profiling are Valgrind and KCachegrind. A series a wiki pages are dedicated to 
+profiling are Valgrind and KCachegrind. A series of wiki pages is dedicated to 
 these tools in the `development section <https://yade-dem.org/wiki/Yade#Development>`__ of the wiki.
 
 Hosting and versioning

=== modified file 'pkg/dem/Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.cpp'
--- pkg/dem/Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.cpp	2013-03-06 20:47:43 +0000
+++ pkg/dem/Ip2_CohFrictMat_CohFrictMat_CohFrictPhys.cpp	2014-01-24 17:15:20 +0000
@@ -43,7 +43,9 @@
 
 			// harmonic average of alphas parameters
 			Real AlphaKr = 2.0*sdec1->alphaKr*sdec2->alphaKr/(sdec1->alphaKr+sdec2->alphaKr);
-			Real AlphaKtw = 2.0*sdec1->alphaKtw*sdec2->alphaKtw/(sdec1->alphaKtw+sdec2->alphaKtw);
+			Real AlphaKtw;
+			if (sdec1->alphaKtw && sdec2->alphaKtw) AlphaKtw = 2.0*sdec1->alphaKtw*sdec2->alphaKtw/(sdec1->alphaKtw+sdec2->alphaKtw);
+			else AlphaKtw=0;
 
 			Real Ks;
 			if (Va && Vb) Ks = 2.0*Ea*Da*Va*Eb*Db*Vb/(Ea*Da*Va+Eb*Db*Vb);//harmonic average of two stiffnesses with ks=V*kn for each sphere