CONFIG: increment patch level

- used fluidThermo::typeName instead of fluidThermo::dictName
  within the Cp() method.

META-INFO/api-info

@@ -1,2 +1,2 @@
 api=1912
-patch=200506
+patch=200626

src/OpenFOAM/containers/PtrLists/PtrList/PtrListI.H

@@ -121,21 +121,21 @@ inline void Foam::PtrList<T>::append(T* ptr)
 template<class T>
 inline void Foam::PtrList<T>::append(autoPtr<T>& aptr)
 {
-    return UPtrList<T>::append(aptr.release());
+    UPtrList<T>::append(aptr.release());
 }
 
 
 template<class T>
 inline void Foam::PtrList<T>::append(autoPtr<T>&& aptr)
 {
-    return UPtrList<T>::append(aptr.release());
+    UPtrList<T>::append(aptr.release());
 }
 
 
 template<class T>
 inline void Foam::PtrList<T>::append(const tmp<T>& tptr)
 {
-    return UPtrList<T>::append(tptr.ptr());
+    UPtrList<T>::append(tptr.ptr());
 }
 
 

src/OpenFOAM/db/IOobject/IOobject.C

@@ -456,10 +456,19 @@ const Foam::fileName& Foam::IOobject::caseName() const
 Foam::fileName Foam::IOobject::path() const
 {
     // A file is 'outside' of the case if it has been specified using an
-    // absolute path (starts with '/')
+    // absolute path
 
-    if (instance().starts_with('/'))
+    const auto first = instance().find('/');
+
+    if
+    (
+        first == 0
+        #ifdef _WIN32
+     || (first == 2 && instance()[1] == ':')  // Eg, d:/path
+        #endif
+    )
     {
+        // Absolute path (starts with '/' or 'd:/')
         return instance();
     }
 

src/OpenFOAM/db/dictionary/primitiveEntry/primitiveEntry.C

@@ -151,7 +151,7 @@ Foam::label Foam::primitiveEntry::startLineNumber() const
 
     if (tokens.size())
     {
-        tokens.first().lineNumber();
+        return tokens.first().lineNumber();
     }
 
     return -1;

src/OpenFOAM/primitives/Pair/PairI.H

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017-2019 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -89,7 +89,7 @@ inline Foam::Pair<T>::Pair(const FixedList<T, 2>& list)
 template<class T>
 inline Foam::Pair<T>::Pair(const T& f, const T& s, const bool doSort)
 {
-    if (doSort && f < s)
+    if (doSort && s < f)
     {
         first()  = s;
         second() = f;

src/conversion/Make/files

@@ -20,8 +20,8 @@ starcd/STARCDMeshWriter.C
 
 polyDualMesh/polyDualMesh.C
 
-vtk/output/foamVtkInternalWriter.H
-vtk/output/foamVtkPatchWriter.H
+vtk/output/foamVtkInternalWriter.C
+vtk/output/foamVtkPatchWriter.C
 vtk/output/foamVtkSurfaceFieldWriter.C
 
 LIB = $(FOAM_LIBBIN)/libconversion

src/finiteVolume/fields/fvPatchFields/derived/scaledFixedValue/scaledFixedValueFvPatchField.H

@@ -55,7 +55,7 @@ Usage
             (100.0 1.0)
         );
 
-        patch
+        refValue
         {
             type            fixedValue;
             value           uniform (15 0 0);

src/functionObjects/field/externalCoupled/externalCoupledTemperatureMixed/externalCoupledTemperatureMixedFvPatchScalarField.C

@@ -280,9 +280,18 @@ void Foam::externalCoupledTemperatureMixedFvPatchScalarField::writeData
 
     const scalarField Tfluid(tfluid);
 
-
     // Heat transfer coefficient [W/m2/K]
-    const scalarField htc(qDot/(max(Twall - Tfluid), 1e-3));
+    // This htc needs to be always larger or equal to zero
+    //const scalarField htc(qDot/max(Twall - Tfluid, 1e-3));
+    scalarField htc(qDot.size(), 0);
+    forAll (qDot, i)
+    {
+        scalar deltaT = mag(Twall[i] - Tfluid[i]);
+        if (deltaT > 1e-3)
+        {
+            htc[i] = sign(qDot[i])*qDot[i]/deltaT;
+        }
+    }
 
     const Field<scalar>& magSf = this->patch().magSf();
 

src/functionObjects/field/heatTransferCoeff/heatTransferCoeffModels/ReynoldsAnalogy/ReynoldsAnalogy.C

@@ -5,7 +5,7 @@
     \\  /    A nd           | www.openfoam.com
      \\/     M anipulation  |
 -------------------------------------------------------------------------------
-    Copyright (C) 2017 OpenCFD Ltd.
+    Copyright (C) 2017-2020 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -81,10 +81,10 @@ Foam::heatTransferCoeffModels::ReynoldsAnalogy::Cp(const label patchi) const
         const label n = mesh_.boundary()[patchi].size();
         return tmp<Field<scalar>>::New(n, CpRef_);
     }
-    else if (mesh_.foundObject<fluidThermo>(fluidThermo::typeName))
+    else if (mesh_.foundObject<fluidThermo>(fluidThermo::dictName))
     {
         const fluidThermo& thermo =
-            mesh_.lookupObject<fluidThermo>(fluidThermo::typeName);
+            mesh_.lookupObject<fluidThermo>(fluidThermo::dictName);
 
         const scalarField& pp = thermo.p().boundaryField()[patchi];
         const scalarField& Tp = thermo.T().boundaryField()[patchi];

src/thermophysicalModels/basic/basicThermo/basicThermo.C

@@ -275,7 +275,7 @@ Foam::basicThermo::basicThermo
     (
         IOobject
         (
-            "thermo:alpha",
+            phasePropertyName("thermo:alpha"),
             mesh.time().timeName(),
             mesh,
             IOobject::READ_IF_PRESENT,