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

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H

@@ -114,11 +114,11 @@ public:
         //- the dragfunction K used in the momentum eq.
         //    ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub)
         //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
-        // **********************************<EFBFBD>NB ! *****************************
+        // ********************************** NB! *****************************
         // for numerical reasons alpha and beta has been
         // extracted from the dragFunction K,
         // so you MUST divide K by alpha*beta when implemnting the drag function
-        // **********************************<EFBFBD>NB ! *****************************
+        // ********************************** NB! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
 

applications/solvers/multiphase/compressibleTwoPhaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H

@@ -114,12 +114,12 @@ public:
         //- the heat-transfer function K used in the enthalpy eq.
         //    ddt(alpha*rhoa*ha) + ... = ... alpha*beta*K*(Ta - Tb)
         //    ddt(beta*rhob*hb) + ...  = ... alpha*beta*K*(Tb - Ta)
-        // **********************************<EFBFBD>NB ! *****************************
+        // ********************************** NB!*****************************
         // for numerical reasons alpha and beta has been
         // extracted from the heat-transfer function K,
         // so you MUST divide K by alpha*beta when implementing the
         // heat-transfer function
-        // **********************************<EFBFBD>NB ! *****************************
+        // ********************************** NB!*****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
 

applications/solvers/multiphase/interPhaseChangeFoam/phaseChangeTwoPhaseMixtures/Kunz/Kunz.H

@@ -35,8 +35,8 @@ Description
     \verbatim
         Kunz, R.F., Boger, D.A., Stinebring, D.R., Chyczewski, Lindau. J.W.,
         Gibeling, H.J., Venkateswaran, S., Govindan, T.R.,
-        “A Preconditioned Implicit Method for Two-Phase Flows with Application
+        "A Preconditioned Implicit Method for Two-Phase Flows with Application
-         to Cavitation Prediction,”
+         to Cavitation Prediction,"
         Computers and Fluids,
         29(8):849-875, 2000.
     \endverbatim

applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H

@@ -131,11 +131,11 @@ public:
         //- the dragfunction K used in the momentum eq.
         //    ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub)
         //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
-        // **********************************<EFBFBD>NB ! *****************************
+        // ********************************** NB! *****************************
         // for numerical reasons alpha and beta has been
         // extracted from the dragFunction K,
         // so you MUST divide K by alpha*beta when implemnting the drag function
-        // **********************************<EFBFBD>NB ! *****************************
+        // ********************************** NB! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
 

applications/solvers/multiphase/multiphaseEulerFoam/interfacialModels/heatTransferModels/heatTransferModel/heatTransferModel.H

@@ -114,12 +114,12 @@ public:
         //- the heat-transfer function K used in the enthalpy eq.
         //    ddt(alpha*rhoa*ha) + ... = ... alpha*beta*K*(Ta - Tb)
         //    ddt(beta*rhob*hb) + ...  = ... alpha*beta*K*(Tb - Ta)
-        // **********************************<EFBFBD>NB ! *****************************
+        // ********************************** NB! *****************************
         // for numerical reasons alpha and beta has been
         // extracted from the heat-transfer function K,
         // so you MUST divide K by alpha*beta when implementing the
         // heat-transfer function
-        // **********************************<EFBFBD>NB ! *****************************
+        // ********************************** NB! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
 

applications/solvers/multiphase/twoPhaseEulerFoam/interfacialModels/dragModels/dragModel/dragModel.H

@@ -114,11 +114,11 @@ public:
         //- the dragfunction K used in the momentum eq.
         //    ddt(alpha*rhoa*Ua) + ... = ... alpha*beta*K*(Ua-Ub)
         //    ddt(beta*rhob*Ub) + ...  = ... alpha*beta*K*(Ub-Ua)
-        // **********************************<EFBFBD>NB ! *****************************
+        // ********************************** NB ! *****************************
         // for numerical reasons alpha and beta has been
         // extracted from the dragFunction K,
         // so you MUST divide K by alpha*beta when implemnting the drag function
-        // **********************************<EFBFBD>NB ! *****************************
+        // ********************************** NB ! *****************************
         virtual tmp<volScalarField> K(const volScalarField& Ur) const = 0;
 };
 

etc/config/settings.csh

@@ -372,7 +372,7 @@ unsetenv MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
 
 switch ("$WM_MPLIB")
 case OPENMPI:
-    setenv FOAM_MPI openmpi-1.5.3
+    setenv FOAM_MPI openmpi-1.5.4
     # optional configuration tweaks:
     _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.csh`
 

etc/config/settings.sh

@@ -114,6 +114,16 @@ Linux)
         export WM_LDFLAGS='-mabi=64 -G0'
         ;;
 
+    armv7l)
+        WM_ARCH=linuxARM7
+        export WM_COMPILER_LIB_ARCH=32
+        export WM_CC='gcc'
+        export WM_CXX='g++'
+        export WM_CFLAGS='-fPIC'
+        export WM_CXXFLAGS='-fPIC'
+        export WM_LDFLAGS=
+        ;;
+
     ppc64)
         WM_ARCH=linuxPPC64
         export WM_COMPILER_LIB_ARCH=64
@@ -393,7 +403,7 @@ unset MPI_ARCH_PATH MPI_HOME FOAM_MPI_LIBBIN
 
 case "$WM_MPLIB" in
 OPENMPI)
-    export FOAM_MPI=openmpi-1.5.3
+    export FOAM_MPI=openmpi-1.5.4
     # optional configuration tweaks:
     _foamSource `$WM_PROJECT_DIR/bin/foamEtcFile config/openmpi.sh`
 

src/lagrangian/molecularDynamics/molecule/reducedUnits/reducedUnits.H

@@ -76,7 +76,7 @@ class reducedUnits
 
                 scalar refPressure_;
 
-               scalar refMassDensity_;
+                scalar refMassDensity_;
 
                 scalar refNumberDensity_;
 
@@ -103,9 +103,9 @@ public:
     // Constructors
 
         //- Construct with no argument, uses default values:
-        // length  = 1nm
+        //  length  = 1nm
-        // mass = 1.660538782e−27kg (unified atomic mass unit)
+        //  mass = 1.660538782e-27kg (unified atomic mass unit)
-        // temperature = 1K (therefore, energy = 1*kb)
+        //  temperature = 1K (therefore, energy = 1*kb)
         reducedUnits();
 
         //- Construct from components

src/lagrangian/molecularDynamics/old/reducedUnits/reducedUnits.H

@@ -76,7 +76,7 @@ class reducedUnits
 
                 scalar refPressure_;
 
-               scalar refMassDensity_;
+                scalar refMassDensity_;
 
                 scalar refNumberDensity_;
 
@@ -103,9 +103,9 @@ public:
     // Constructors
 
         //- Construct with no argument, uses default values:
-        // length  = 1nm
+        //  length  = 1nm
-        // mass = 1.660538782e−27kg (unified atomic mass unit)
+        //  mass = 1.660538782e-27kg (unified atomic mass unit)
-        // temperature = 1K (therefore, energy = 1*kb)
+        //  temperature = 1K (therefore, energy = 1*kb)
         reducedUnits();
 
         //- Construct from components

src/sampling/meshToMeshInterpolation/tetOverlapVolume/tetOverlapVolume.H

@@ -81,8 +81,8 @@ class tetOverlapVolume
             const point& fc
         ) const;
 
-public:
 
+public:
 
     //- Runtime type information
     ClassName("tetOverlapVolume");

src/turbulenceModels/compressible/RAS/SpalartAllmaras/SpalartAllmaras.H

@@ -33,7 +33,7 @@ Description
         "A One-Equation Turbulence Model for Aerodynamic Flows"
         P.R. Spalart,
         S.R. Allmaras,
-        La Recherche A´rospatiale, No. 1, 1994, pp. 5–21.
+        La Recherche Aerospatiale, No. 1, 1994, pp. 5-21.
 
         Extended according to:
 

src/turbulenceModels/incompressible/RAS/SpalartAllmaras/SpalartAllmaras.H

@@ -33,7 +33,7 @@ Description
         "A One-Equation Turbulence Model for Aerodynamic Flows"
         P.R. Spalart,
         S.R. Allmaras,
-        La Recherche A´rospatiale, No. 1, 1994, pp. 5–21.
+        La Recherche Aerospatiale, No. 1, 1994, pp. 5-21.
 
         Extended according to:
 

tutorials/incompressible/pisoFoam/les/motorBike/lesFiles/fvSolution

@@ -105,8 +105,8 @@ PIMPLE
 
 relaxationFactors
 {
-    U               1;
+    "U.*"               1;
-    nuTilda         1;
+    "nuTilda.*"         1;
 }
 
 

wmake/rules/linuxARM7/c

@@ -0,0 +1,16 @@
+.SUFFIXES: .c .h
+
+cWARN        = -Wall
+
+cc          = gcc
+
+include $(RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $$SOURCE -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -shared
+LINKEXE     = $(cc) -Xlinker --add-needed -Xlinker -z -Xlinker nodefs

wmake/rules/linuxARM7/c++

@@ -0,0 +1,21 @@
+.SUFFIXES: .C .cxx .cc .cpp
+
+c++WARN     = -Wall -Wextra -Wno-unused-parameter -Wold-style-cast
+
+CC          = g++
+
+include $(RULES)/c++$(WM_COMPILE_OPTION)
+
+ptFLAGS     = -DNoRepository -ftemplate-depth-100
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $$SOURCE -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -shared -Xlinker --add-needed -Xlinker --no-as-needed
+LINKEXE     = $(CC) $(c++FLAGS) -Xlinker --add-needed -Xlinker --no-as-needed

wmake/rules/linuxARM7/c++Debug

@@ -0,0 +1,2 @@
+c++DBUG    = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline

wmake/rules/linuxARM7/c++Opt

@@ -0,0 +1,2 @@
+c++DBUG     =
+c++OPT      = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard

wmake/rules/linuxARM7/c++Prof

@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2

wmake/rules/linuxARM7/cDebug

@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions

wmake/rules/linuxARM7/cOpt

@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3 -floop-optimize -falign-loops -falign-labels -falign-functions -falign-jumps -mcpu=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard

wmake/rules/linuxARM7/cProf

@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2

wmake/rules/linuxARM7/general

@@ -0,0 +1,9 @@
+CPP        = cpp -traditional-cpp $(GFLAGS)
+LD         = ld -melf_i386
+
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+
+include $(GENERAL_RULES)/standard
+
+include $(RULES)/c
+include $(RULES)/c++