correction for fluid force transfer to DEMsystem

DEMSystems/sphereDEMSystem/sphereDEMSystem.cpp

@@ -159,13 +159,14 @@ pFlow::span<pFlow::realx3> pFlow::sphereDEMSystem::parPosition()
 
 pFlow::span<pFlow::realx3> pFlow::sphereDEMSystem::parFluidForce() 
 {
-	auto& hVec =  particles_->fluidTorqueHostAll();
+	auto& hVec =  particles_->fluidForceHostAll();
+	
 	return span<realx3>(hVec.data(), hVec.size());
 }
 
 pFlow::span<pFlow::realx3> pFlow::sphereDEMSystem::parFluidTorque() 
 {
-	auto& hVec =  particles_->fluidForceHostAll();
+	auto& hVec =  particles_->fluidTorqueHostAll();
 	return span<realx3>(hVec.data(), hVec.size());
 }
 

src/Property/property.hpp

@@ -24,6 +24,8 @@ Licence:
 
 #include "Vectors.hpp"
 #include "hashMap.hpp"
+#include "fileSystem.hpp"
+#include "iFstream.hpp"
 
 namespace pFlow
 {

src/phasicFlow/containers/Vector/Vector.cpp

@@ -84,7 +84,6 @@ bool pFlow::Vector<T, Allocator>::readVector
 	return true;
 }
 
-#include "streams.hpp"
 
 template<typename T, typename Allocator>
 bool pFlow::Vector<T, Allocator>::writeVector

src/phasicFlow/containers/span/span.hpp

@@ -22,6 +22,7 @@ Licence:
 #define __span_hpp__
 
 #include "types.hpp"
+#include "iOstream.hpp"
 
 namespace pFlow {
 
@@ -156,6 +157,23 @@ public:
 
 };
 
+template<typename T>
+inline 
+iOstream& operator<<(iOstream& os, const span<T>& s)
+{
+    os << token::BEGIN_LIST;
+    for(size_t i=0; i<s.size(); i++)
+    {
+        os << s[i]<<token::NL;
+    }
+    
+    os << token::END_LIST;
+
+    os.check(FUNCTION_NAME);
+
+    return os;
+}
+
 } // pFlow
 
 #endif //__span_hpp__