From 7f9f091f423d8380fb6356fe55c2d87576e7ba99 Mon Sep 17 00:00:00 2001
From: graham <graham.macpherson@strath.ac.uk>
Date: Fri, 9 Jan 2009 17:37:25 +0000
Subject: [PATCH] Removing size specification for OPstream and IPstream for
neighbour face centre and area exchanges, as per email from Mattijs re buffer
alignment.
---
.../referredCellList/referredCellList.C | 6 ++----
.../mdTools/meanMomentumEnergyAndNMols.H | 16 ++++++++--------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
index 5f49f206d8b..3285a68eb7d 100644
--- a/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
+++ b/src/lagrangian/molecularDynamics/molecule/interactionLists/referredCellList/referredCellList.C
@@ -234,8 +234,7 @@ void Foam::referredCellList::buildReferredCellList
OPstream toNeighbProc
(
Pstream::blocking,
- patch.neighbProcNo(),
- + 2*(sizeof(label) + patch.size()*sizeof(vector))
+ patch.neighbProcNo()
);
toNeighbProc << patch.faceCentres() << patch.faceAreas();
@@ -261,8 +260,7 @@ void Foam::referredCellList::buildReferredCellList
IPstream fromNeighbProc
(
Pstream::blocking,
- patch.neighbProcNo(),
- 2*(sizeof(label) + patch.size()*sizeof(vector))
+ patch.neighbProcNo()
);
fromNeighbProc >> neighbFaceCentres >> neighbFaceAreas;
diff --git a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
index 8266c78c25f..6429eb5698f 100644
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
@@ -48,7 +48,7 @@ scalar singleStepTotalPE = 0.0;
scalar singleStepTotalrDotf = 0.0;
-vector singleStepCentreOfMass(vector::zero);
+//vector singleStepCentreOfMass(vector::zero);
label singleStepNMols = molecules.size();
@@ -68,13 +68,13 @@ label singleStepNMols = molecules.size();
singleStepTotalMass += molMass;
- singleStepCentreOfMass += mol().position()*molMass;
+ //singleStepCentreOfMass += mol().position()*molMass;
}
- if(singleStepNMols)
- {
- singleStepCentreOfMass /= singleStepTotalMass;
- }
+ // if(singleStepNMols)
+ // {
+ // singleStepCentreOfMass /= singleStepTotalMass;
+ // }
for
(
@@ -97,8 +97,8 @@ label singleStepNMols = molecules.size();
singleStepTotalLinearMomentum += molV * molMass;
- singleStepTotalAngularMomentum += molPiGlobal
- +((mol().position() - singleStepCentreOfMass) ^ (molV * molMass));
+ singleStepTotalAngularMomentum += molPiGlobal;
+ //+((mol().position() - singleStepCentreOfMass) ^ (molV * molMass));
if(mag(molV) > singleStepMaxVelocityMag)
{
--
GitLab