v2.0.0 pre-release port to OpenFOAM-14

.github/workflows/CI.yml

@@ -7,34 +7,36 @@ on:
     branches:
       - main
 concurrency:
-  group: ${ {github.event_name }}-${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: ${{github.event_name == 'pull_request'}}
+  group: ${{ github.event_name }}-${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.event_name == 'pull_request' }}
 jobs:
   CI:
     defaults:
       run:
         shell: bash -ileo pipefail {0}
-    strategy:
-      matrix:
-        cxx: ['g++']
-        cmake_build_type: ['Release']
-
-    runs-on: ubuntu-latest
-    container:
-      image: microfluidica/openfoam:13
-      options: --user root
+    runs-on: ubuntu-24.04
     steps:
       - name: Checkout AdditiveFOAM
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
+      - name: Install OpenFOAM-14
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y software-properties-common wget
+          wget -qO- https://dl.openfoam.org/gpg.key \
+            | sudo tee /etc/apt/trusted.gpg.d/openfoam.asc > /dev/null
+          sudo add-apt-repository --yes \
+            "http://dl.openfoam.org/ubuntu main dev"
+          sudo apt-get update
+          sudo apt-get install -y openfoam14
       - name: Build AdditiveFOAM
         run: |
-          . /opt/openfoam13/etc/bashrc || true
+          . /opt/openfoam14/etc/bashrc
           . ./etc/bashrc
           test -n "$WM_PROJECT_DIR"
           ./Allwmake
       - name: Test AdditiveFOAM
         run: |
-          . /opt/openfoam13/etc/bashrc || true
+          . /opt/openfoam14/etc/bashrc
           . ./etc/bashrc
           cp -r tutorials/AMB2018-02-B userCase
           cd userCase

README.md

@@ -15,13 +15,13 @@ The documentation for `AdditiveFOAM` is hosted on [GitHub Pages](https://ornl.gi
 | [tutorials](tutorials)                                     | Tutorial cases |
 
 ## Installation
-[![OpenFOAM-13](https://img.shields.io/badge/OpenFOAM-13-blue.svg)](https://github.com/OpenFOAM/OpenFOAM-13)
+[![OpenFOAM-14](https://img.shields.io/badge/OpenFOAM-14-blue.svg)](https://github.com/OpenFOAM/OpenFOAM-14)
 
-AdditiveFOAM requires OpenFOAM-13 from the OpenFOAM Foundation. Install or
-build OpenFOAM-13 first, then source the OpenFOAM environment:
+AdditiveFOAM requires OpenFOAM-14 from the OpenFOAM Foundation. Install or
+build OpenFOAM-14 first, then source the OpenFOAM environment:
 
 ```sh
-source /path/to/OpenFOAM-13/etc/bashrc
+source /path/to/OpenFOAM-14/etc/bashrc
 ```
 
 Clone AdditiveFOAM, enter the repository, and source the AdditiveFOAM
@@ -33,7 +33,7 @@ cd AdditiveFOAM
 source etc/bashrc
 ```
 
-The AdditiveFOAM `etc/bashrc` checks that OpenFOAM-13 is active and sets the required paths.
+The AdditiveFOAM `etc/bashrc` checks that OpenFOAM-14 is active and sets the required paths.
 
 Build all AdditiveFOAM libraries, solvers, and utilities with the master build
 script from the repository root:
@@ -46,13 +46,13 @@ For regular use, source both environments in each new shell or add them to your
 shell startup file:
 
 ```sh
-source /path/to/OpenFOAM-13/etc/bashrc
+source /path/to/OpenFOAM-14/etc/bashrc
 source /path/to/AdditiveFOAM/etc/bashrc
 ```
 
 ## Citing
 [![DOI](https://joss.theoj.org/papers/10.21105/joss.07770/status.svg)](https://doi.org/10.21105/joss.07770)
-[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.8034097.svg)](https://doi.org/10.5281/zenodo.8034097)
+[![DOI](https://img.shields.io/badge/DOI-10.5281%2Fzenodo.8034097-blue.svg)](https://doi.org/10.5281/zenodo.8034097)
 
 If you use AdditiveFOAM in your work, please cite the JOSS article and
 consider citing the Zenodo DOI for the version used.

applications/solvers/additiveFoam/Allwclean

@@ -4,7 +4,7 @@ cd ${0%/*} || exit 1    # Run from this directory
 rm -rf Make/gitInfo.H
 
 wclean libso functionObjects
-wmake  libso utilities
+wclean libso utilities
 wclean libso movingHeatSource
 wclean
 

applications/solvers/additiveFoam/derivedFvPatchFields/marangoni/marangoniFvPatchVectorField.C

@@ -29,7 +29,7 @@ License
 #include "symmTransformField.H"
 
 #include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
+#include "fieldMapper.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "fvcGrad.H"
@@ -40,7 +40,7 @@ License
 Foam::marangoniFvPatchVectorField::marangoniFvPatchVectorField
 (
     const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF
+    const DimensionedField<vector, fvMesh>& iF
 )
 :
     transformFvPatchField<vector>(p, iF),
@@ -52,7 +52,7 @@ Foam::marangoniFvPatchVectorField::marangoniFvPatchVectorField
 Foam::marangoniFvPatchVectorField::marangoniFvPatchVectorField
 (
     const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
+    const DimensionedField<vector, fvMesh>& iF,
     const dictionary& dict
 )
 :
@@ -91,8 +91,8 @@ Foam::marangoniFvPatchVectorField::marangoniFvPatchVectorField
 (
     const marangoniFvPatchVectorField& ptf,
     const fvPatch& p,
-    const DimensionedField<vector, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
+    const DimensionedField<vector, fvMesh>& iF,
+    const fieldMapper& mapper
 )
 :
     transformFvPatchVectorField(ptf, p, iF, mapper),
@@ -104,7 +104,7 @@ Foam::marangoniFvPatchVectorField::marangoniFvPatchVectorField
 Foam::marangoniFvPatchVectorField::marangoniFvPatchVectorField
 (
     const marangoniFvPatchVectorField& ptf,
-    const DimensionedField<vector, volMesh>& iF
+    const DimensionedField<vector, fvMesh>& iF
 )
 :
     transformFvPatchVectorField(ptf, iF),
@@ -118,7 +118,7 @@ Foam::marangoniFvPatchVectorField::marangoniFvPatchVectorField
 void Foam::marangoniFvPatchVectorField::map
 (
     const fvPatchVectorField& pvf,
-    const fvPatchFieldMapper& mapper
+    const fieldMapper& mapper
 )
 {
     transformFvPatchVectorField::map(pvf, mapper);

applications/solvers/additiveFoam/derivedFvPatchFields/marangoni/marangoniFvPatchVectorField.H

@@ -75,14 +75,14 @@ public:
         marangoniFvPatchVectorField
         (
             const fvPatch&,
-            const DimensionedField<vector, volMesh>&
+            const DimensionedField<vector, fvMesh>&
         );
 
         //- Construct from patch, internal field and dictionary
         marangoniFvPatchVectorField
         (
             const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
+            const DimensionedField<vector, fvMesh>&,
             const dictionary&
         );
 
@@ -92,8 +92,8 @@ public:
         (
             const marangoniFvPatchVectorField&,
             const fvPatch&,
-            const DimensionedField<vector, volMesh>&,
-            const fvPatchFieldMapper&
+            const DimensionedField<vector, fvMesh>&,
+            const fieldMapper&
         );
 
         //- Disallow copy without setting internal field reference
@@ -106,13 +106,13 @@ public:
         marangoniFvPatchVectorField
         (
             const marangoniFvPatchVectorField&,
-            const DimensionedField<vector, volMesh>&
+            const DimensionedField<vector, fvMesh>&
         );
 
         //- Construct and return a clone setting internal field reference
         virtual tmp<fvPatchVectorField> clone
         (
-            const DimensionedField<vector, volMesh>& iF
+            const DimensionedField<vector, fvMesh>& iF
         ) const
         {
             return tmp<fvPatchVectorField>
@@ -130,7 +130,7 @@ public:
             virtual void map
             (
                 const fvPatchVectorField&,
-                const fvPatchFieldMapper&
+                const fieldMapper&
             );
 
             //- Reset the fvPatchField to the given fvPatchField

applications/solvers/additiveFoam/derivedFvPatchFields/mixedTemperature/mixedTemperatureFvPatchScalarField.C

@@ -27,7 +27,7 @@ License
 
 #include "mixedTemperatureFvPatchScalarField.H"
 #include "addToRunTimeSelectionTable.H"
-#include "fvPatchFieldMapper.H"
+#include "fieldMapper.H"
 #include "volFields.H"
 #include "surfaceFields.H"
 #include "IOdictionary.H"
@@ -38,7 +38,7 @@ Foam::mixedTemperatureFvPatchScalarField::
 mixedTemperatureFvPatchScalarField
 (
     const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
+    const DimensionedField<scalar, fvMesh>& iF,
     const dictionary& dict
 )
 :
@@ -87,8 +87,8 @@ mixedTemperatureFvPatchScalarField
 (
     const mixedTemperatureFvPatchScalarField& ptf,
     const fvPatch& p,
-    const DimensionedField<scalar, volMesh>& iF,
-    const fvPatchFieldMapper& mapper
+    const DimensionedField<scalar, fvMesh>& iF,
+    const fieldMapper& mapper
 )
 :
     mixedFvPatchScalarField(ptf, p, iF, mapper),
@@ -102,7 +102,7 @@ Foam::mixedTemperatureFvPatchScalarField::
 mixedTemperatureFvPatchScalarField
 (
     const mixedTemperatureFvPatchScalarField& ptf,
-    const DimensionedField<scalar, volMesh>& iF
+    const DimensionedField<scalar, fvMesh>& iF
 )
 :
     mixedFvPatchScalarField(ptf, iF),
@@ -117,7 +117,7 @@ mixedTemperatureFvPatchScalarField
 void Foam::mixedTemperatureFvPatchScalarField::map
 (
     const fvPatchScalarField& ptf,
-    const fvPatchFieldMapper& mapper
+    const fieldMapper& mapper
 )
 {
     mixedFvPatchScalarField::map(ptf, mapper);

applications/solvers/additiveFoam/derivedFvPatchFields/mixedTemperature/mixedTemperatureFvPatchScalarField.H

@@ -106,7 +106,7 @@ public:
         mixedTemperatureFvPatchScalarField
         (
             const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
+            const DimensionedField<scalar, fvMesh>&,
             const dictionary&
         );
 
@@ -116,8 +116,8 @@ public:
         (
             const mixedTemperatureFvPatchScalarField&,
             const fvPatch&,
-            const DimensionedField<scalar, volMesh>&,
-            const fvPatchFieldMapper&
+            const DimensionedField<scalar, fvMesh>&,
+            const fieldMapper&
         );
 
         //- Disallow copy without setting internal field reference
@@ -130,13 +130,13 @@ public:
         mixedTemperatureFvPatchScalarField
         (
             const mixedTemperatureFvPatchScalarField&,
-            const DimensionedField<scalar, volMesh>&
+            const DimensionedField<scalar, fvMesh>&
         );
 
         //- Construct and return a clone setting internal field reference
         virtual tmp<fvPatchScalarField> clone
         (
-            const DimensionedField<scalar, volMesh>& iF
+            const DimensionedField<scalar, fvMesh>& iF
         ) const
         {
             return tmp<fvPatchScalarField>
@@ -158,7 +158,7 @@ public:
             virtual void map
             (
                 const fvPatchScalarField&,
-                const fvPatchFieldMapper&
+                const fieldMapper&
             );
 
             //- Reset the fvPatchField to the given fvPatchField

applications/solvers/additiveFoam/moveMesh.H

@@ -8,9 +8,7 @@ if (pimple.firstPimpleIter() || pimple.moveMeshOuterCorrectors())
         gh = (g & mesh.C()) - ghRef;
         ghf = (g & mesh.Cf()) - ghRef;
 
-        MRF.update();
-
-        if (correctPhi || mesh.topoChanged())
+        if (correctPhi || mesh.poly().topoChanged())
         {
             // Calculate absolute flux
             // from the mapped surface velocity

applications/solvers/additiveFoam/movingHeatSource/absorptionModels/absorptionModel/absorptionModel.C

@@ -53,7 +53,7 @@ Foam::IOobject Foam::absorptionModel::createIOobject
     (
         dict.name(),
         mesh.time().name(),
-        mesh.thisDb(),
+        mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE
     );

applications/solvers/additiveFoam/movingHeatSource/heatSourceModels/heatSourceModel/heatSourceModel.C

@@ -56,7 +56,7 @@ Foam::IOobject Foam::heatSourceModel::createIOobject
     (
         dict.name(),
         mesh.time().constant(),
-        mesh.thisDb(),
+        mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE
     );

applications/solvers/additiveFoam/movingHeatSource/refinementModels/refinementModel/refinementModel.C

@@ -53,7 +53,7 @@ Foam::IOobject Foam::refinementModel::createIOobject
     (
         dict.name(),
         mesh.time().constant(),
-        mesh.thisDb(),
+        mesh,
         IOobject::MUST_READ,
         IOobject::NO_WRITE
     );

applications/utilities/heatSourceModels/conversion/primesToAdditiveFoam/primesToAdditiveFoam.C

@@ -19,6 +19,7 @@ Description
 #include "scalarField.H"
 #include "stringList.H"
 #include "HashTable.H"
+#include "mathematicalConstants.H"
 
 using namespace Foam;