Merge branch 'master' of ssh://noisy/home/noisy2/OpenFOAM/OpenFOAM-dev

359825f0 · henry · ca23897c · 934b0769 · 359825f0 · 359825f0
Commit 359825f0 authored 16 years ago by henry
--- a/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
+++ b/src/lagrangian/molecularDynamics/potential/energyScalingFunction/derived/shifted/shifted.H
@@ -57,7 +57,6 @@ class shifted

        scalar e_at_rCut_;

-
 public:

    //- Runtime type information

--- a/tutorials/gnemdFoam/nanoNozzle/system/potentialDict
+++ b/tutorials/gnemdFoam/nanoNozzle/system/potentialDict
@@ -63,7 +63,7 @@ pair
            shift2      0.97e-9;
            scale2      1.2e11;
        }
-        writeTables     yes;
+        writeTables     no;
    }

    Ar-Ne
@@ -80,7 +80,7 @@ pair
            epsilon         8.765026657e-22;
        }
        energyScalingFunction   shiftedForce;
-        writeTables     yes;
+        writeTables     no;
    }

    Ne-Ne
@@ -97,7 +97,7 @@ pair
            epsilon         5.813260729e-22;
        }
        energyScalingFunction   shiftedForce;
-        writeTables     yes;
+        writeTables     no;
    }
 }


--- a/tutorials/mdEquilibrationFoam/periodicCube/system/controlDict
+++ b/tutorials/mdEquilibrationFoam/periodicCube/system/controlDict
@@ -20,7 +20,7 @@ startTime       0;

 stopAt          endTime;

-endTime         4e-10;
+endTime         1e-10;

 deltaT          1e-14;


--- a/tutorials/mhdFoam/Allrun
+++ b/tutorials/mhdFoam/Allrun
@@ -3,7 +3,7 @@
 . $WM_PROJECT_DIR/bin/tools/RunFunctions

 # Get application name from directory
-application=`basename $PWD`
+application="mdEquilibrationFoam"

 (cd hartmann && runApplication blockMesh)
 (cd hartmann && runApplication $application)