Commit 7a8f3cd0 authored by andy's avatar andy
Browse files

Merge branch 'master' of /home/dm4/OpenFOAM/OpenFOAM-dev

parents a9a592df 63a84dff
......@@ -85,10 +85,28 @@ setenv ParaView_DIR $WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-
# set paths if binaries or source are present
if ( -r $ParaView_DIR || -r $paraviewInstDir ) then
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR}
if (! -r $ParaView_INCLUDE_DIR && -r $ParaView_DIR/include/paraview) then
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview
endif
set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}
if (! -r $ParaView_LIB_DIR && -r ${ParaView_DIR}/lib/paraview) then
set ParaView_LIB_DIR=${ParaView_DIR}/lib/paraview
endif
setenv PATH ${ParaView_DIR}/bin:${PATH}
setenv LD_LIBRARY_PATH "${ParaView_DIR}/lib/paraview-${ParaView_MAJOR}:${LD_LIBRARY_PATH}"
setenv LD_LIBRARY_PATH "${ParaView_LIB_DIR}:${LD_LIBRARY_PATH}"
setenv PV_PLUGIN_PATH $FOAM_LIBBIN/paraview-${ParaView_MAJOR}
setenv ParaView_INCLUDE_DIR $ParaView_DIR/include/paraview-${ParaView_MAJOR}
if ($?FOAM_VERBOSE && $?prompt) then
echo "Using paraview"
echo " ParaView_DIR : $ParaView_DIR"
echo " ParaView_LIB_DIR : $ParaView_LIB_DIR"
echo " ParaView_INCLUDE_DIR : $ParaView_INCLUDE_DIR"
echo " PV_PLUGIN_PATH : $PV_PLUGIN_PATH"
endif
# add in python libraries if required
set paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
......
......@@ -94,11 +94,30 @@ export ParaView_DIR=$WM_THIRD_PARTY_DIR/platforms/$WM_ARCH$WM_COMPILER/paraview-
# set paths if binaries or source are present
if [ -r $ParaView_DIR -o -r $paraviewInstDir ]
then
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR
if [ ! -d $ParaView_INCLUDE_DIR -a -d $ParaView_DIR/include/paraview ]
then
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview
fi
ParaView_LIB_DIR=$ParaView_DIR/lib/paraview-$ParaView_MAJOR
if [ ! -d $ParaView_LIB_DIR -a -d $ParaView_DIR/lib/paraview ]
then
ParaView_LIB_DIR=$ParaView_DIR/lib/paraview
fi
export PATH=$ParaView_DIR/bin:$PATH
export LD_LIBRARY_PATH=$ParaView_DIR/lib/paraview-$ParaView_MAJOR:$LD_LIBRARY_PATH
export LD_LIBRARY_PATH=$ParaView_LIB_DIR:$LD_LIBRARY_PATH
export PV_PLUGIN_PATH=$FOAM_LIBBIN/paraview-$ParaView_MAJOR
export ParaView_INCLUDE_DIR=$ParaView_DIR/include/paraview-$ParaView_MAJOR
if [ "$FOAM_VERBOSE" -a "$PS1" ]
then
echo "Using paraview"
echo " ParaView_DIR : $ParaView_DIR"
echo " ParaView_LIB_DIR : $ParaView_LIB_DIR"
echo " ParaView_INCLUDE_DIR : $ParaView_INCLUDE_DIR"
echo " PV_PLUGIN_PATH : $PV_PLUGIN_PATH"
fi
# add in python libraries if required
paraviewPython=$ParaView_DIR/Utilities/VTKPythonWrapping
......
......@@ -40,6 +40,7 @@ namespace constant
const char* const atomic::group = "atomic";
// Note: cannot use dimless etc. since not guaranteed to be constructed
defineDimensionedConstantWithDefault
(
atomic::group,
......@@ -49,7 +50,7 @@ defineDimensionedConstantWithDefault
"alpha",
sqr(electromagnetic::e)
/(
dimensionedScalar("C", dimless, 2.0)
dimensionedScalar("C", dimensionSet(0, 0, 0, 0, 0), 2.0)
*electromagnetic::epsilon0
*universal::h
*universal::c
......@@ -70,7 +71,15 @@ defineDimensionedConstantWithDefault
sqr(atomic::alpha)
*atomic::me
*universal::c
/(Foam::dimensionedScalar("C", Foam::dimless, 2.0)*universal::h)
/(
Foam::dimensionedScalar
(
"C",
dimensionSet(0, 0, 0, 0, 0),
2.0
)
*universal::h
)
),
constantatomicRinf,
"Rinf"
......@@ -86,8 +95,13 @@ defineDimensionedConstantWithDefault
"a0",
atomic::alpha
/(
Foam::dimensionedScalar("C", Foam::dimless, 4.0*mathematical::pi)
*atomic::Rinf
Foam::dimensionedScalar
(
"C",
dimensionSet(0, 0, 0, 0, 0),
4.0*mathematical::pi
)
*atomic::Rinf
)
),
constantatomica0,
......@@ -104,7 +118,12 @@ defineDimensionedConstantWithDefault
"re",
Foam::sqr(electromagnetic::e)
/(
Foam::dimensionedScalar("C", Foam::dimless, 4.0*mathematical::pi)
Foam::dimensionedScalar
(
"C",
dimensionSet(0, 0, 0, 0, 0),
4.0*mathematical::pi
)
*electromagnetic::epsilon0
*atomic::me
*Foam::sqr(universal::c)
......@@ -122,7 +141,7 @@ defineDimensionedConstantWithDefault
dimensionedScalar
(
"Eh",
Foam::dimensionedScalar("C", Foam::dimless, 2.0)
Foam::dimensionedScalar("C", dimensionSet(0, 0, 0, 0, 0), 2.0)
*atomic::Rinf*universal::h*universal::c
),
constantatomicEh,
......
......@@ -55,6 +55,7 @@ defineDimensionedConstantWithDefault
);
// Note: cannot use dimless etc. since not guaranteed to be constructed
defineDimensionedConstantWithDefault
(
electromagnetic::group,
......@@ -63,7 +64,12 @@ defineDimensionedConstantWithDefault
dimensionedScalar
(
"epsilon0",
dimensionedScalar("C", dimless, 1.0)
dimensionedScalar
(
"C",
dimensionSet(0, 0, 0, 0, 0),
1.0
)
/(electromagnetic::mu0*sqr(universal::c))
),
constantelectromagneticepsilon0,
......@@ -96,7 +102,7 @@ defineDimensionedConstantWithDefault
dimensionedScalar
(
"C",
Foam::dimless,
dimensionSet(0, 0, 0, 0, 0),
1.0/(4.0*mathematical::pi)
)
/electromagnetic::epsilon0
......@@ -114,7 +120,7 @@ defineDimensionedConstantWithDefault
dimensionedScalar
(
"G0",
dimensionedScalar("C", dimless, 2)
dimensionedScalar("C", dimensionSet(0, 0, 0, 0, 0), 2)
*sqr(electromagnetic::e)
/universal::h
),
......@@ -130,7 +136,7 @@ defineDimensionedConstantWithDefault
dimensionedScalar
(
"KJ",
dimensionedScalar("C", dimless, 2)
dimensionedScalar("C", dimensionSet(0, 0, 0, 0, 0), 2)
*electromagnetic::e
/universal::h
),
......@@ -147,7 +153,10 @@ defineDimensionedConstantWithDefault
(
"phi0",
universal::h
/(dimensionedScalar("C", dimless, 2)*electromagnetic::e)
/(
dimensionedScalar("C", dimensionSet(0, 0, 0, 0, 0), 2)
*electromagnetic::e
)
),
constantelectromagneticphi0,
"phi0"
......
......@@ -113,6 +113,7 @@ defineDimensionedConstant
);
// Note: cannot use dimless etc since not guaranteed to be constructed
defineDimensionedConstantWithDefault
(
physicoChemical::group,
......@@ -120,7 +121,7 @@ defineDimensionedConstantWithDefault
Foam::dimensionedScalar
(
"NA",
Foam::dimless/Foam::dimMoles,
dimensionSet(0, 0, 0, 0, -1), //Foam::dimless/Foam::dimMoles,
6.0221417930e+23
),
constantphysicoChemicalNA,
......
......@@ -67,6 +67,7 @@ defineDimensionedConstantWithDefault
);
// Note: cannot use dimless etc. since not guaranteed to be constructed
defineDimensionedConstantWithDefault
(
physicoChemical::group,
......@@ -77,7 +78,7 @@ defineDimensionedConstantWithDefault
Foam::dimensionedScalar
(
"C",
Foam::dimless,
dimensionSet(0, 0, 0, 0, 0), //Foam::dimless,
Foam::sqr(mathematical::pi)/60.0
)
*Foam::pow4(physicoChemical::k)
......@@ -96,7 +97,12 @@ defineDimensionedConstantWithDefault
(
"b",
(universal::h*universal::c/physicoChemical::k)
/Foam::dimensionedScalar("C", Foam::dimless, 4.965114231)
/Foam::dimensionedScalar
(
"C",
dimensionSet(0, 0, 0, 0, 0), //Foam::dimless
4.965114231
)
),
constantphysicoChemicalb,
"b"
......@@ -110,7 +116,12 @@ defineDimensionedConstantWithDefault
dimensionedScalar
(
"c1",
Foam::dimensionedScalar("C", Foam::dimless, mathematical::twoPi)
Foam::dimensionedScalar
(
"C",
dimensionSet(0, 0, 0, 0, 0), //Foam::dimless,
mathematical::twoPi
)
*universal::h*Foam::sqr(universal::c)
),
constantphysicoChemicalc1,
......
......@@ -38,6 +38,7 @@ namespace constant
const char* const universal::group = "universal";
// Note: cannot use dimless etc. since not guaranteed to be constructed
defineDimensionedConstantWithDefault
(
"universal",
......@@ -46,7 +47,14 @@ defineDimensionedConstantWithDefault
(
"hr",
universal::h
/(dimensionedScalar("C", dimless, mathematical::twoPi))
/(
dimensionedScalar
(
"C",
dimensionSet(0, 0, 0, 0, 0),//dimless
mathematical::twoPi
)
)
),
constantuniversalhr,
"hr"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment