yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

Merge authors:
  Alexander Eulitz [Eugen] (kubeu)
  Jérôme Duriez (jduriez)
------------------------------------------------------------
revno: 4116 [merge]
committer: Christian Jakob <jakob@xxxxxxxxxxxxxxxxxxx>
timestamp: Thu 2014-07-24 16:01:09 +0200
message:
  Merge branch 'master' of github.com:yade/trunk
modified:
  doc/sphinx/installation.rst
  pkg/dem/JointedCohesiveFrictionalPM.hpp


--
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 'doc/sphinx/installation.rst'
--- doc/sphinx/installation.rst	2014-07-22 11:43:37 +0000
+++ doc/sphinx/installation.rst	2014-07-23 15:13:15 +0000
@@ -179,12 +179,12 @@
 ^^^^^^^^^^^
 
 You should create a separate build-place-folder, where Yade will be configured 
-and where the source code will be compiled. Here is an example for a folderstructure:
+and where the source code will be compiled. Here is an example for a folder structure::
 
-	myYade/       ## base directory
-		trunk/      ## folder for sourcecode in which you use github
-		build/      ## folder in which sources will be compiled; build-directory; use cmake here
-		install/    ## installfolder
+	myYade/       		## base directory
+		trunk/		## folder for sourcecode in which you use github
+		build/		## folder in which sources will be compiled; build-directory; use cmake here
+		install/	## install folder
 
 Then inside this build-directory you should start cmake to configure the compilation process::
 
@@ -239,7 +239,8 @@
 	make install
 
 The "install" command will in fact also recompile if source files have been modified. 
-Hence there is no absolute need to type the two commands separately.
+Hence there is no absolute need to type the two commands separately. You may receive make errors if you don't have root privileges.
+These errors are not critical but without root privileges yade won't be linked in /usr/local/bin/.
 
 After compilation finished successfully
 the new built can be started by navigating to /path/to/installfolder/bin and calling yade via (based on version yade-2014-02-20.git-a7048f4)::
@@ -249,7 +250,7 @@
 
 For building the documentation you should at first execute the command "make install"
 and then "make doc" to build it. The generated files will be stored in your current
-build directory/doc/sphinx/_build.
+build directory/doc/sphinx/_build. Once again root privileges are necessary for linking. Link will be created in /usr/local/share/doc/.
 
 "make manpage" command generates and moves manpages in a standard place.
 "make check" command executes standard test to check the functionality of compiled program.

=== modified file 'pkg/dem/JointedCohesiveFrictionalPM.hpp'
--- pkg/dem/JointedCohesiveFrictionalPM.hpp	2014-07-18 18:18:50 +0000
+++ pkg/dem/JointedCohesiveFrictionalPM.hpp	2014-07-24 11:35:36 +0000
@@ -59,7 +59,7 @@
 			((Real,initD,0,,"equilibrium distance for interacting particles. Computed as the interparticular distance at first contact detection."))
 			((bool,isCohesive,false,,"If false, particles interact in a frictional way. If true, particles are bonded regarding the given :yref:`cohesion<JCFpmMat.cohesion>` and :yref:`tensile strength<JCFpmMat.tensileStrength>` (or their jointed variants)."))
 			((bool,more,false,,"specifies if the interaction is crossed by more than 3 joints. If true, interaction is deleted (temporary solution)."))
-			((bool,isOnJoint,false,,"defined as true when both interacting particles are :yref:`on joint<JCFpmState.onJoint>` and are in opposite sides of the joint surface. In this case, mechanical parameters of the interaction are derived from the ''joint...'' material properties of the particles, and normal of the interaction is re-oriented (see also :yref:`Law2_ScGeom_JCFpmPhys_JointedCohesiveFrictionalPM`)."))
+			((bool,isOnJoint,false,,"defined as true when both interacting particles are :yref:`on joint<JCFpmState.onJoint>` and are in opposite sides of the joint surface. In this case, mechanical parameters of the interaction are derived from the ''joint...'' material properties of the particles. Furthermore, the normal of the interaction may be re-oriented (see :yref:`Law2_ScGeom_JCFpmPhys_JointedCohesiveFrictionalPM.smoothJoint`)."))
 			((Real,tanFrictionAngle,0,,"tangent of Coulomb friction angle for this interaction (auto. computed). [-]"))
 			((Real,crossSection,0,,"crossSection=pi*Rmin^2. [m2]"))
 			((Real,FnMax,0,,"positiv value computed from :yref:`tensile strength<JCFpmMat.tensileStrength>` (or joint variant) to define the maximum admissible normal force in traction: Fn >= -FnMax. [N]"))