← Back to team overview

yade-dev team mailing list archive

Re: [Branch ~yade-dev/yade/trunk] Rev 2116: Removed CapillaryRecorder and ContactStressRecorder. Renamed SimpleElasticRelationshipsWater to I...

 

I tried to update (since something around 2100 I guess), it does not compile. Because things linked with "Shape", and OpenGLRenderingEngine (see log).
I made scons -c before.

Jerome

noreply@xxxxxxxxxxxxx a écrit :
------------------------------------------------------------
revno: 2116
committer: Luc Scholtes <sch50p@fluent-ph>
branch nick: trunk
timestamp: Tue 2010-03-30 14:55:22 +1000
message:
  Removed CapillaryRecorder and ContactStressRecorder. Renamed SimpleElasticRelationshipsWater to Ip2_FrictMat_FrictMat_CapillaryLawPhys (can probably be removed as it is identical to Ip2_Frictmat_FrictMat_FrictPhys...) and CapillaryCohesiveLaw to CapillaryLaw. Modified all Capillary related files.
removed:
  pkg/dem/Engine/PartialEngine/CapillaryRecorder.cpp
  pkg/dem/Engine/PartialEngine/CapillaryRecorder.hpp
  pkg/dem/Engine/PartialEngine/ContactStressRecorder.cpp
  pkg/dem/Engine/PartialEngine/ContactStressRecorder.hpp
renamed:
  pkg/dem/Engine/Functor/SimpleElasticRelationshipsWater.cpp => pkg/dem/Engine/Functor/Ip2_Frictmat_FrictMat_CapillaryLawPhys.cpp
  pkg/dem/Engine/Functor/SimpleElasticRelationshipsWater.hpp => pkg/dem/Engine/Functor/Ip2_Frictmat_FrictMat_CapillaryLawPhys.hpp
  pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.cpp => pkg/dem/Engine/GlobalEngine/CapillaryLaw.cpp
  pkg/dem/Engine/GlobalEngine/CapillaryCohesiveLaw.hpp => pkg/dem/Engine/GlobalEngine/CapillaryLaw.hpp
modified:
  pkg/dem/DataClass/InteractionPhysics/CapillaryParameters.hpp
  pkg/dem/Engine/PartialEngine/CapillaryPressureEngine.cpp
  pkg/dem/Engine/PartialEngine/CapillaryPressureEngine.hpp
  pkg/dem/Engine/PartialEngine/CapillaryStressRecorder.cpp
  pkg/dem/Engine/PartialEngine/CapillaryStressRecorder.hpp
  pkg/dem/Engine/PartialEngine/SampleCapillaryPressureEngine.cpp
  pkg/dem/Engine/PartialEngine/SampleCapillaryPressureEngine.hpp
  pkg/dem/Engine/PartialEngine/TriaxialStateRecorder.hpp
  pkg/dem/PreProcessor/TriaxialTestWater.cpp
  pkg/dem/PreProcessor/TriaxialTestWater.hpp
  py/system.py
  pkg/dem/Engine/Functor/Ip2_Frictmat_FrictMat_CapillaryLawPhys.cpp
  pkg/dem/Engine/Functor/Ip2_Frictmat_FrictMat_CapillaryLawPhys.hpp
  pkg/dem/Engine/GlobalEngine/CapillaryLaw.cpp
  pkg/dem/Engine/GlobalEngine/CapillaryLaw.hpp
The size of the diff (1282 lines) is larger than your specified limit of 1000 lines

--
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


--
Jérôme Duriez
ATER Iut 1 Grenoble, département GMP - Laboratoire 3S-R
04.56.52.86.49 (ne pas laisser de messages sur le répondeur)




Follow ups

References