yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 2272
committer: Václav Šmilauer <eudoxos@xxxxxxxx>
branch nick: trunk
timestamp: Thu 2010-06-03 09:31:33 +0200
message:
  1. Re-enable PeriIsoCompressor and PeriTriaxController
modified:
  pkg/dem/Engine/GlobalEngine/PeriIsoCompressor.cpp
  py/_extraDocs.py


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

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

=== modified file 'pkg/dem/Engine/GlobalEngine/PeriIsoCompressor.cpp'
--- pkg/dem/Engine/GlobalEngine/PeriIsoCompressor.cpp	2010-06-03 00:02:23 +0000
+++ pkg/dem/Engine/GlobalEngine/PeriIsoCompressor.cpp	2010-06-03 07:31:33 +0000
@@ -10,9 +10,11 @@
 
 using namespace std;
 
-#ifndef YADE_WM3
-YADE_PLUGIN((PeriIsoCompressor)(PeriTriaxController)(Peri3dController))
-#endif
+YADE_PLUGIN((PeriIsoCompressor)(PeriTriaxController)
+	#ifndef YADE_WM3
+		(Peri3dController)
+	#endif
+)
 
 CREATE_LOGGER(PeriIsoCompressor);
 void PeriIsoCompressor::action(){

=== modified file 'py/_extraDocs.py'
--- py/_extraDocs.py	2010-03-20 12:40:44 +0000
+++ py/_extraDocs.py	2010-06-03 07:31:33 +0000
@@ -27,3 +27,29 @@
 #		.. note::
 #			The c++ documentation will be overwritten by this string.
 #	"""
+
+
+wrapper.Peri3dController.__doc__=r'''
+Class for controlling independently strain and stress tensor components of the periodic cell.
+
+:yref:`goal<Peri3dController.goal>` are the goal values, while :yref:`stressMask<Peri3dController.stressMask` determines which components prescribe stress and which prescribe strain.
+
+Current stiffness and stress tensors are update at every step using formulas presented in [Kuhl2001]_:
+
+.. math::
+
+	\begin{align}
+		\tens{K}&=\frac{1}{V}\sum_c {d_0^c}^2\left[K_N^c \vec{N}^c\otimes\vec{N}^c+K_T^c{\vec{T}^c}^T\cdot\vec{T}^c
+
+
+
+
+
+
+
+
+
+
+
+
+'''