yade-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 4048
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Tue 2014-07-01 21:45:25 +0200
message:
  Fix compilation with disabled openmp.
modified:
  pkg/common/InteractionLoop.hpp
  pkg/lbm/HydrodynamicsLawLBM.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/common/InteractionLoop.hpp'
--- pkg/common/InteractionLoop.hpp	2014-05-23 13:05:19 +0000
+++ pkg/common/InteractionLoop.hpp	2014-07-01 19:45:25 +0000
@@ -20,7 +20,7 @@
 		std::vector<std::list<idPair> > eraseAfterLoopIds;
 		void eraseAfterLoop(Body::id_t id1,Body::id_t id2){ eraseAfterLoopIds[omp_get_thread_num()].push_back(idPair(id1,id2)); }
 	#else
-		list<idPair> eraseAfterLoopIds;
+    std::list<idPair> eraseAfterLoopIds;
 		void eraseAfterLoop(Body::id_t id1,Body::id_t id2){ eraseAfterLoopIds.push_back(idPair(id1,id2)); }
 	#endif
 	public:

=== modified file 'pkg/lbm/HydrodynamicsLawLBM.cpp'
--- pkg/lbm/HydrodynamicsLawLBM.cpp	2014-07-01 18:19:00 +0000
+++ pkg/lbm/HydrodynamicsLawLBM.cpp	2014-07-01 19:45:25 +0000
@@ -33,6 +33,7 @@
 
 
 namespace bfs=boost::filesystem;
+using std::ofstream;
 
 template<class Scalar> VECTOR3_TEMPLATE(Scalar) operator*(Scalar s, const VECTOR3_TEMPLATE(Scalar)& v) {return v*s;}
 inline Vector3i vect3rToVect3i(Vector3r vect){Vector3i newvect((int)vect[0],(int)vect[1],(int)vect[2]);return(newvect);}
@@ -1183,7 +1184,7 @@
     cerr <<"START: HydrodynamicsLawLBM::saveStats()"<<endl;
     #endif
     cerr << "| Save stats ..."<<endl;
-    ofstream file(LBMmachFile.c_str(), ios::app);
+    ofstream file(LBMmachFile.c_str(), std::ios::app);
     file <<iter_number<<" "<<iter_number*timestep<<" "<<VmaxC<<" "<<VmaxC/c<<endl;
     #ifdef LBM_VERBOSE
     cerr <<"END: HydrodynamicsLawLBM::saveStats()"<<endl;
@@ -1203,7 +1204,7 @@
 {
 
     cerr << "| Save Observed Ptc ..."<<endl;
-    ofstream file(ObservedPtcFile.c_str(), ios::app);
+    ofstream file(ObservedPtcFile.c_str(), std::ios::app);
     file <<iter_number<<" "<<iter_number*timestep<<" ";
     file <<dx*LBbodies[ObservedPtc].pos.x()<<" "<<dx*LBbodies[ObservedPtc].pos.y()<<" "<<dx*LBbodies[ObservedPtc].pos.z()<<" ";
     file <<dx*LBbodies[ObservedPtc].radius<<" ";