yade-dev team mailing list archive

[Bruno Chareyre <bruno.chareyre@xxxxxxxxxxx>]

Jacob, I uncommited r2956 because you commited .directory and
pkg/dem/.directory, which are useless and gives conflicts.
Could you please recommit without those?
Apart from that, great job! :)
I'll check in more details after you recommit. It seems to me that the
code can be simplified.

For defining the hertzOn flag automatically, you could search what type
of Ip2 functor is used. An exemple of loop on engines can be found in
TriaxialStateRecorder.cpp (below). In your case it will need to find the
InteractionLoop first, then check InteractionLoop::physDispatcher type.

if ( !triaxialStressController ){
        vector<shared_ptr<Engine> >::iterator itFirst =
scene->engines.begin();
        vector<shared_ptr<Engine> >::iterator itLast = scene->engines.end();
        for ( ;itFirst!=itLast; ++itFirst ){
            if ( ( *itFirst )->getClassName() ==
"TriaxialCompressionEngine" || ( *itFirst )->getClassName() ==
"ThreeDTriaxialEngine" ){
                LOG_DEBUG ( "stress controller engine found" );
                triaxialStressController = 
YADE_PTR_CAST<TriaxialStressController> ( *itFirst );
                //triaxialCompressionEngine =
shared_ptr<TriaxialCompressionEngine>
(static_cast<TriaxialCompressionEngine*> ( (*itFirst).get()));
            }
        }
        if ( !triaxialStressController ) LOG_DEBUG ( "stress controller
engine NOT found" );
    }

P.S. The "if" after the "else" is useless here:

+ 				if (!hertzOn)
+				{
+					if (fusionDetection && !cundallContactPhysics->meniscus) bodiesMenisciiList.insert((*ii));
+                                	cundallContactPhysics->meniscus=true;
+				}
+				else if (hertzOn)





On 10/11/11 12:06, noreply@xxxxxxxxxxxxx wrote:
> ------------------------------------------------------------
> revno: 2956
> committer: me <me@debian>
> branch nick: yade
> timestamp: Thu 2011-11-10 12:04:14 +0100
> message:
>   Add forgotten files
> added:
>   .directory
>   examples/CapillaryPhys-example.py
>   pkg/dem/.directory
>   pkg/dem/Ip2_FrictMat_FrictMat_MindlinCapillaryPhys.cpp
>   pkg/dem/Ip2_FrictMat_FrictMat_MindlinCapillaryPhys.hpp
>
>
> --
> 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
>
>
> _______________________________________________
> Mailing list: https://launchpad.net/~yade-dev
> Post to     : yade-dev@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~yade-dev
> More help   : https://help.launchpad.net/ListHelp


-- 
_______________
Bruno Chareyre
Associate Professor
ENSE³ - Grenoble INP
11, rue des Mathématiques
BP 46
38402 St Martin d'Hères, France
Tél : +33 4 56 52 86 21
Fax : +33 4 76 82 70 43
________________