yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3877
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Wed 2014-04-02 19:11:24 +0200
message:
  Fix compilation in ViscElCap.
modified:
  pkg/dem/ViscoelasticCapillarPM.cpp
  pkg/dem/ViscoelasticCapillarPM.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/ViscoelasticCapillarPM.cpp'
--- pkg/dem/ViscoelasticCapillarPM.cpp	2014-04-02 15:33:41 +0000
+++ pkg/dem/ViscoelasticCapillarPM.cpp	2014-04-02 17:11:24 +0000
@@ -50,6 +50,7 @@
       else if (mat1->CapillarType == "Weigert")          phys->CapillarType = Weigert;
       else if (mat1->CapillarType == "Rabinovich")       phys->CapillarType = Rabinovich;
       else if (mat1->CapillarType == "Lambert")          phys->CapillarType = Lambert;
+      else if (mat1->CapillarType == "Soulie")           phys->CapillarType = Soulie;
       else                                               phys->CapillarType = None_Capillar;
     } else {
       throw runtime_error("CapillarType should be equal for both particles!.");

=== modified file 'pkg/dem/ViscoelasticCapillarPM.hpp'
--- pkg/dem/ViscoelasticCapillarPM.hpp	2014-04-02 15:33:41 +0000
+++ pkg/dem/ViscoelasticCapillarPM.hpp	2014-04-02 17:11:24 +0000
@@ -16,7 +16,7 @@
 REGISTER_SERIALIZABLE(ViscElCapMat);
 
 /// Interaction physics
-enum CapType {None_Capillar, Willett_numeric, Willett_analytic, Weigert, Rabinovich, Lambert};
+enum CapType {None_Capillar, Willett_numeric, Willett_analytic, Weigert, Rabinovich, Lambert, Soulie};
 class ViscElCapPhys : public ViscElPhys{
 	public:
 		virtual ~ViscElCapPhys();
@@ -28,7 +28,7 @@
 		((Real,Vb,NaN,,"Liquid bridge volume [m^3]"))
 		((Real,gamma,NaN,,"Surface tension [N/m]"))
 		((Real,theta,NaN,,"Contact angle [rad]"))
-		((CapType,CapillarType,None_Capillar,,"Different types of capillar interaction: Willett_numeric, Willett_analytic, Weigert, Rabinovich, Lambert")),
+		((CapType,CapillarType,None_Capillar,,"Different types of capillar interaction: Willett_numeric, Willett_analytic, Weigert, Rabinovich, Lambert, Soulie")),
 		createIndex();
 	)
 	REGISTER_CLASS_INDEX(ViscElCapPhys,ViscElPhys);