small updates and removing X permissions

fbcac8e2 · Andrew Heather · graham · b33f76e5 · fbcac8e2 · fbcac8e2
Commit fbcac8e2 authored Jun 23, 2008 by Andrew Heather Committed by graham Jun 23, 2008
--- a/applications/solvers/molecularDynamics/gnemdFoam/gnemdFoam.C
+++ b/applications/solvers/molecularDynamics/gnemdFoam/gnemdFoam.C
--- a/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
+++ b/applications/solvers/molecularDynamics/mdEquilibrationFoam/mdEquilibrationFoam.C
--- a/applications/solvers/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H
+++ b/applications/solvers/molecularDynamics/mdEquilibrationFoam/readmdEquilibrationDict.H
--- a/src/lagrangian/Allwmake
+++ b/src/lagrangian/Allwmake
@@ -5,7 +5,13 @@ wmake libso basic
 wmake libso solidParticle
 wmake libso intermediate
 wmake libso dieselSpray
+<<<<<<< HEAD:src/lagrangian/Allwmake
 wmake libso molecularDynamics/potential
 wmake libso molecularDynamics/molecule

 
+=======
+(cd molecularDynamics && wmake libso potential)
+(cd molecularDynamics && wmake libso molecule)
+
+>>>>>>> small updates and removing X permissions:src/lagrangian/Allwmake
--- a/src/lagrangian/molecularDynamics/molecule/correlationFunction/bufferedAccumulator/bufferedAccumulator.C
+++ b/src/lagrangian/molecularDynamics/molecule/correlationFunction/bufferedAccumulator/bufferedAccumulator.C
--- a/src/lagrangian/molecularDynamics/molecule/correlationFunction/bufferedAccumulator/bufferedAccumulator.H
+++ b/src/lagrangian/molecularDynamics/molecule/correlationFunction/bufferedAccumulator/bufferedAccumulator.H
--- a/src/lagrangian/molecularDynamics/molecule/correlationFunction/bufferedAccumulator/bufferedAccumulatorI.H
+++ b/src/lagrangian/molecularDynamics/molecule/correlationFunction/bufferedAccumulator/bufferedAccumulatorI.H
--- a/src/lagrangian/molecularDynamics/molecule/correlationFunction/bufferedAccumulator/bufferedAccumulatorIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/correlationFunction/bufferedAccumulator/bufferedAccumulatorIO.C
--- a/src/lagrangian/molecularDynamics/molecule/distribution/distribution.C
+++ b/src/lagrangian/molecularDynamics/molecule/distribution/distribution.C
--- a/src/lagrangian/molecularDynamics/molecule/distribution/distribution.H
+++ b/src/lagrangian/molecularDynamics/molecule/distribution/distribution.H
--- a/src/lagrangian/molecularDynamics/molecule/distribution/distributionI.H
+++ b/src/lagrangian/molecularDynamics/molecule/distribution/distributionI.H
--- a/src/lagrangian/molecularDynamics/molecule/distribution/distributionIO.C
+++ b/src/lagrangian/molecularDynamics/molecule/distribution/distributionIO.C
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/averageMDFields.H
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/calculateMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/calculateMDFields.H
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/createMDFields.H
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/md.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/md.H
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/meanMomentumEnergyAndNMols.H
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/resetMDFields.H
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressure.H
--- a/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H
+++ b/src/lagrangian/molecularDynamics/molecule/mdTools/temperatureAndPressureVariables.H