------------------------------------------------------------ revno: 3887 committer: Bruno Chareyre <bruno.chare...@hmg.inpg.fr> timestamp: Thu 2014-04-03 18:44:33 +0200 message: fix include paths after moving files to pkg/pfv modified: pkg/pfv/DFNFlow.cpp pkg/pfv/FlowEngine.hpp pkg/pfv/PeriodicFlowEngine.hpp pkg/pfv/SoluteFlowEngine.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/DFNFlow.cpp' --- pkg/pfv/DFNFlow.cpp 2014-04-03 13:37:55 +0000 +++ pkg/pfv/DFNFlow.cpp 2014-04-03 16:44:33 +0000 @@ -13,7 +13,7 @@ // #define DFNFLOW #ifdef DFNFLOW #define TEMPLATE_FLOW_NAME DFNFlowEngineT -#include <yade/pkg/dem/FlowEngine.hpp> +#include <yade/pkg/pfv/FlowEngine.hpp> class DFNCellInfo : public FlowCellInfo { === modified file 'pkg/pfv/FlowEngine.hpp' --- pkg/pfv/FlowEngine.hpp 2014-04-03 13:37:55 +0000 +++ pkg/pfv/FlowEngine.hpp 2014-04-03 16:44:33 +0000 @@ -351,7 +351,7 @@ ) }; // Definition of functions in a separate file for clarity -#include<yade/pkg/dem/FlowEngine.ipp> +#include<yade/pkg/pfv/FlowEngine.ipp> class FlowCellInfo : public CGT::SimpleCellInfo { public: === modified file 'pkg/pfv/PeriodicFlowEngine.hpp' --- pkg/pfv/PeriodicFlowEngine.hpp 2014-04-03 13:37:55 +0000 +++ pkg/pfv/PeriodicFlowEngine.hpp 2014-04-03 16:44:33 +0000 @@ -10,7 +10,7 @@ /// It is a bit more complicated as for FlowEngine, though, because we need template inheriting from template, which breaks YADE_CLASS_XXX logic_error /// See below the commented exemple, for a possible solution -#include <yade/pkg/dem/FlowEngine.hpp> +#include <yade/pkg/pfv/FlowEngine.hpp> class PeriodicCellInfo : public FlowCellInfo { === modified file 'pkg/pfv/SoluteFlowEngine.cpp' --- pkg/pfv/SoluteFlowEngine.cpp 2014-04-03 13:37:55 +0000 +++ pkg/pfv/SoluteFlowEngine.cpp 2014-04-03 16:44:33 +0000 @@ -12,7 +12,7 @@ #ifdef SOLUTE_FLOW #define TEMPLATE_FLOW_NAME SoluteFlowEngineT -#include <yade/pkg/dem/FlowEngine.hpp> +#include <yade/pkg/pfv/FlowEngine.hpp> #undef TEMPLATE_FLOW_NAME class SoluteCellInfo : public FlowCellInfo @@ -144,9 +144,7 @@ //Copy data to concentration array FOREACH(CellHandle& cell, solver->T[solver->currentTes].cellHandles){ cell->info().solute()= ex2[cell->info().id]; - - } - + } tripletList2.clear(); } @@ -156,6 +154,7 @@ //Boundary conditions according to soluteTransport. //It simply assigns boundary concentrations to cells with a common vertices (e.g. infinite large sphere which makes up the boundary condition in flowEngine) //s is a switch, if 0 only bc_id1 is used (advection only). If >0 than both bc_id1 and bc_id2 are used. + //NOTE (bruno): cell cirulators can be use to get all cells having bcid2 has a vertex more efficiently (see e.g. FlowBoundingSphere.ipp:721) FOREACH(CellHandle& cell, solver->T[solver->currentTes].cellHandles) { for (unsigned int ngb=0;ngb<4;ngb++){
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : yade-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp