yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3837
committer: Jan Stransky <jan.stransky@xxxxxxxxxxx>
timestamp: Wed 2016-04-13 10:37:42 +0200
message:
  Added frictAngle MatchMaker for Ip2_FrictMat_CpmMat_FrictPhys
modified:
  pkg/dem/ConcretePM.cpp
  pkg/dem/ConcretePM.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 'pkg/dem/ConcretePM.cpp'
--- pkg/dem/ConcretePM.cpp	2016-04-12 04:37:00 +0000
+++ pkg/dem/ConcretePM.cpp	2016-04-13 08:37:42 +0000
@@ -24,7 +24,9 @@
 	TIMING_DELTAS_START();
 	const shared_ptr<FrictMat>& mat1 = YADE_PTR_CAST<FrictMat>(pp1);
 	const shared_ptr<CpmMat>& mat2 = YADE_PTR_CAST<CpmMat>(pp2);
-	Ip2_FrictMat_FrictMat_FrictPhys().go(mat1,mat2,interaction);
+	Ip2_FrictMat_FrictMat_FrictPhys iPhysFunctor = Ip2_FrictMat_FrictMat_FrictPhys();
+	iPhysFunctor.frictAngle = frictAngle;
+	iPhysFunctor.go(mat1,mat2,interaction);
 	TIMING_DELTAS_CHECKPOINT("end of Ip2_FritPhys");
 }
 

=== modified file 'pkg/dem/ConcretePM.hpp'
--- pkg/dem/ConcretePM.hpp	2015-05-04 16:59:30 +0000
+++ pkg/dem/ConcretePM.hpp	2016-04-13 08:37:42 +0000
@@ -241,6 +241,7 @@
 		FUNCTOR2D(FrictMat,CpmMat);
 		DECLARE_LOGGER;
 		YADE_CLASS_BASE_DOC_ATTRS(Ip2_FrictMat_CpmMat_FrictPhys,IPhysFunctor,"Convert :yref:`CpmMat` instance and :yref:`FrictMat` instance to :yref:`FrictPhys` with corresponding parameters (young, poisson, frictionAngle). Uses simple (arithmetic) averages if material parameters are different.",
+			((shared_ptr<MatchMaker>,frictAngle,,,"See :yref:`Ip2_FrictMat_FrictMat_FrictPhys`."))
 		);
 };
 REGISTER_SERIALIZABLE(Ip2_FrictMat_CpmMat_FrictPhys);