------------------------------------------------------------ revno: 4098 committer: Anton Gladky <[email protected]> timestamp: Mon 2014-07-21 20:14:48 +0200 message: Remove LBMbody.cpp and LBMlink.cpp. Move its content into the headers-files and LBMnode.cpp removed: pkg/lbm/LBMbody.cpp pkg/lbm/LBMlink.cpp modified: pkg/lbm/LBMbody.hpp pkg/lbm/LBMlink.hpp pkg/lbm/LBMnode.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
=== removed file 'pkg/lbm/LBMbody.cpp' --- pkg/lbm/LBMbody.cpp 2014-03-31 16:01:57 +0000 +++ pkg/lbm/LBMbody.cpp 1970-01-01 00:00:00 +0000 @@ -1,16 +0,0 @@ -/************************************************************************* -* Copyright (C) 2009-2012 by Franck Lominé * -* [email protected] * -* * -* This program is free software; it is licensed under the terms of the * -* GNU General Public License v2 or later. See file LICENSE for details. * -* * -*************************************************************************/ -#ifdef LBM_ENGINE - -#include "LBMbody.hpp" - -YADE_PLUGIN((LBMbody)); -LBMbody::~LBMbody(){}; - -#endif //LBM_ENGINE === modified file 'pkg/lbm/LBMbody.hpp' --- pkg/lbm/LBMbody.hpp 2014-03-31 16:01:57 +0000 +++ pkg/lbm/LBMbody.hpp 2014-07-21 18:14:48 +0000 @@ -14,7 +14,7 @@ class LBMbody: public Serializable{ public: - virtual ~LBMbody(); + virtual ~LBMbody() {}; //Real radius(){return ext[0];} bool isBox(){if(type==1)return true; else return false;} bool isPtc(){if(type==2)return true; else return false;} === removed file 'pkg/lbm/LBMlink.cpp' --- pkg/lbm/LBMlink.cpp 2014-03-31 16:01:57 +0000 +++ pkg/lbm/LBMlink.cpp 1970-01-01 00:00:00 +0000 @@ -1,17 +0,0 @@ -/************************************************************************* -* Copyright (C) 2009-2012 by Franck Lominé * -* [email protected] * -* * -* This program is free software; it is licensed under the terms of the * -* GNU General Public License v2 or later. See file LICENSE for details. * -* * -*************************************************************************/ -#ifdef LBM_ENGINE - -#include "LBMlink.hpp" - -YADE_PLUGIN((LBMlink)); -LBMlink::~LBMlink(){}; -void LBMlink::ReinitDynamicalProperties(){sid=-1;fid=-1;idx_sigma_i=-1;isBd=false;VbMid=Vector3r::Zero();DistMid=Vector3r::Zero();ct=0.;return;} - -#endif //LBM_ENGINE === modified file 'pkg/lbm/LBMlink.hpp' --- pkg/lbm/LBMlink.hpp 2014-03-31 16:01:57 +0000 +++ pkg/lbm/LBMlink.hpp 2014-07-21 18:14:48 +0000 @@ -14,8 +14,15 @@ class LBMlink: public Serializable{ public: - void ReinitDynamicalProperties(); - virtual ~LBMlink(); + void ReinitDynamicalProperties() { + sid=-1; fid=-1; + idx_sigma_i=-1; isBd=false; + VbMid=Vector3r::Zero(); + DistMid=Vector3r::Zero(); + ct=0.; + return; + }; + virtual ~LBMlink() {}; YADE_CLASS_BASE_DOC_ATTRS_CTOR(LBMlink,Serializable, "Link class for Lattice Boltzmann Method ", === modified file 'pkg/lbm/LBMnode.cpp' --- pkg/lbm/LBMnode.cpp 2014-03-31 16:01:57 +0000 +++ pkg/lbm/LBMnode.cpp 2014-07-21 18:14:48 +0000 @@ -9,10 +9,14 @@ #ifdef LBM_ENGINE #include "LBMnode.hpp" +#include "LBMlink.hpp" +#include "LBMbody.hpp" -YADE_PLUGIN((LBMnode)); +YADE_PLUGIN((LBMnode)(LBMlink)(LBMbody)); LBMnode::~LBMnode(){}; + + void LBMnode::MixteBC(string lbmodel,Real density, Vector3r U, string where){ Real rhoVx=density*U.x(); Real rhoVy=density*U.y();
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
