yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 3976
committer: Chao Yuan <chaoyuan2012@xxxxxxxxx>
timestamp: Tue 2016-11-22 18:45:57 +0100
message:
  Revert DryingEngine.
modified:
  pkg/pfv/UnsaturatedEngine.cpp


--
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/pfv/UnsaturatedEngine.cpp'
--- pkg/pfv/UnsaturatedEngine.cpp	2016-11-22 17:29:15 +0000
+++ pkg/pfv/UnsaturatedEngine.cpp	2016-11-22 17:45:57 +0000
@@ -357,5 +357,61 @@
 //--------------end of comparison with experiment----------------------------
 
 
+//#########################################################
+//         CONVECTIVE DRYING EXTENSION
+//#########################################################
+
+class PhaseCluster : public Serializable
+{
+  		double totalCellVolume;
+	public :
+
+				
+		virtual ~PhaseCluster();
+		vector<TwoPhaseFlowEngine::CellHandle> pores;
+		TwoPhaseFlowEngine::RTriangulation* tri;
+
+		
+		YADE_CLASS_BASE_DOC_ATTRS_INIT_CTOR_PY(PhaseCluster,Serializable,"Preliminary.",
+		((int,label,-1,,"Unique label of this cluster, should be reflected in pores of this cluster."))
+		((double,volume,0,,"cumulated volume of all pores."))
+		((double,entryPc,0,,"smallest entry capillary pressure."))
+		((int,entryPore,0,,"the pore of the cluster incident to the throat with smallest entry Pc."))
+		((double,interfacialArea,0,,"interfacial area of the cluster"))
+					,,,
+		)
+};
+
+REGISTER_SERIALIZABLE(PhaseCluster);
+YADE_PLUGIN((PhaseCluster));
+
+PhaseCluster::~PhaseCluster(){}
+
+
+class DryingEngine : public UnsaturatedEngine
+{
+	public :
+		virtual ~DryingEngine();
+		vector<shared_ptr<PhaseCluster> > clusters;
+		
+		boost::python::list pyClusters() {
+			boost::python::list ret;
+			for(vector<shared_ptr<PhaseCluster> >::iterator it=clusters.begin(); it!=clusters.end(); ++it) ret.append(*it);
+			return ret;}
+	
+		YADE_CLASS_BASE_DOC_ATTRS_INIT_CTOR_PY(DryingEngine,UnsaturatedEngine,"Extended TwoPhaseFlowEngine for application to convective drying.",
+// 		((shared_ptr<PhaseCluster> , cluster,new PhaseCluster,,"The list of clusters"))
+					,,,
+		.def("getClusters",&DryingEngine::pyClusters/*,(boost::python::arg("folder")="./VTK")*/,"Save pressure field in vtk format. Specify a folder name for output.")
+		)
+		DECLARE_LOGGER;
+};
+
+DryingEngine::~DryingEngine(){};
+
+REGISTER_SERIALIZABLE(DryingEngine);
+YADE_PLUGIN((DryingEngine));
+
+
 #endif //TWOPHASEFLOW
 #endif //FLOW_ENGINE